Skip to content

Commit 3dda435

Browse files
felladrinAndrea Falzetti
felladrin
and
Andrea Falzetti
committed
Update Platform Version of JetBrains Backend Plugin to 223.7126-EAP-CANDIDATE-SNAPSHOT
Co-authored-by: Andrea Falzetti <[email protected]> (cherry picked from commit c152611)
1 parent e492617 commit 3dda435

19 files changed

+220
-62
lines changed

‎components/ide/jetbrains/backend-plugin/gradle-latest.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
22
# for insight into build numbers and IntelliJ Platform versions.
3-
pluginSinceBuild=223
3+
pluginSinceBuild=223.7126
44
pluginUntilBuild=223.*
55
# Plugin Verifier integration -> https://github.com/JetBrains/gradle-intellij-plugin#plugin-verifier-dsl
66
# See https://jb.gg/intellij-platform-builds-list for available build versions.
77
pluginVerifierIdeVersions=2022.3
88
# Version from "com.jetbrains.intellij.idea" which can be found at https://www.jetbrains.com/intellij-repository/snapshots
9-
platformVersion=223.6160-EAP-CANDIDATE-SNAPSHOT
9+
platformVersion=223.7126-EAP-CANDIDATE-SNAPSHOT

‎components/ide/jetbrains/backend-plugin/gradle-stable.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
22
# for insight into build numbers and IntelliJ Platform versions.
3-
pluginSinceBuild=222
3+
pluginSinceBuild=222.4345
44
pluginUntilBuild=222.*
55
# Plugin Verifier integration -> https://github.com/JetBrains/gradle-intellij-plugin#plugin-verifier-dsl
66
# See https://jb.gg/intellij-platform-builds-list for available build versions.
77
pluginVerifierIdeVersions=2022.2
88
# Version from "com.jetbrains.intellij.idea" which can be found at https://www.jetbrains.com/intellij-repository/snapshots
9-
platformVersion=222.3345-EAP-CANDIDATE-SNAPSHOT
9+
platformVersion=222.4345-EAP-CANDIDATE-SNAPSHOT

‎components/ide/jetbrains/backend-plugin/launch-dev-server.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,17 @@ TEST_BACKEND_DIR="/workspace/ide-backend-$JB_QUALIFIER"
2828
if [ ! -d "$TEST_BACKEND_DIR" ]; then
2929
mkdir -p $TEST_BACKEND_DIR
3030
if [[ $RUN_FROM == "snapshot" ]]; then
31+
SNAPSHOT_VERSION=$(grep "platformVersion=" "gradle-$JB_QUALIFIER.properties" | sed 's/platformVersion=//')
3132
(cd $TEST_BACKEND_DIR &&
32-
SNAPSHOT_VERSION=$(grep "platformVersion=" "gradle-$JB_QUALIFIER.properties" | sed 's/platformVersion=//') &&
3333
echo "Downloading the $JB_QUALIFIER version of IntelliJ IDEA ($SNAPSHOT_VERSION)..." &&
3434
curl -sSLo backend.zip "https://www.jetbrains.com/intellij-repository/snapshots/com/jetbrains/intellij/idea/ideaIU/$SNAPSHOT_VERSION/ideaIU-$SNAPSHOT_VERSION.zip" &&
3535
unzip backend.zip &&
3636
rm backend.zip &&
3737
ln -s "ideaIU-$SNAPSHOT_VERSION" . &&
3838
rm -r "ideaIU-$SNAPSHOT_VERSION" &&
3939
cp -r /ide-desktop/backend/jbr . &&
40-
cp /ide-desktop/backend/bin/idea.properties ./bin &&
41-
cp /ide-desktop/backend/bin/idea64.vmoptions ./bin)
40+
cp ./bin/linux/idea.properties ./bin &&
41+
cp ./bin/linux/idea64.vmoptions ./bin)
4242
else
4343
if [[ $JB_QUALIFIER == "stable" ]]; then
4444
PRODUCT_TYPE="release"

‎components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/GitpodCLIHelper.kt

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
// Copyright (c) 2022 Gitpod GmbH. All rights reserved.
2+
// Licensed under the GNU Affero General Public License (AGPL).
3+
// See License-AGPL.txt in the project root for license information.
4+
5+
package io.gitpod.jetbrains.remote
6+
7+
import java.nio.file.Path
8+
9+
interface GitpodCLIHelper {
10+
suspend fun open(file: Path, shouldWait: Boolean)
11+
}

‎components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/GitpodCLIService.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ package io.gitpod.jetbrains.remote
66

77
import com.intellij.codeWithMe.ClientId
88
import com.intellij.ide.BrowserUtil
9-
import com.intellij.ide.CommandLineProcessor
109
import com.intellij.openapi.application.ApplicationManager
1110
import com.intellij.openapi.client.ClientSession
1211
import com.intellij.openapi.client.ClientSessionsManager
@@ -40,6 +39,7 @@ class GitpodCLIService : RestService() {
4039

4140
private val manager = service<GitpodManager>()
4241
private val portsService = service<GitpodPortsService>()
42+
private val cliHelperService = service<GitpodCLIHelper>()
4343

4444
override fun getServiceName() = SERVICE_NAME
4545

@@ -71,7 +71,7 @@ class GitpodCLIService : RestService() {
7171
return withClient(request, context) {
7272
GlobalScope.launch {
7373
withContext(Dispatchers.IO) {
74-
CommandLineProcessor.doOpenFileOrProject(file, shouldWait).future.get()
74+
cliHelperService.open(file, shouldWait)
7575
}
7676
}
7777
}

‎components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/GitpodClientProjectSessionTracker.kt

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,13 @@ import com.intellij.ide.BrowserUtil
99
import com.intellij.notification.NotificationAction
1010
import com.intellij.notification.NotificationType
1111
import com.intellij.openapi.Disposable
12-
import com.intellij.openapi.client.ClientProjectSession
12+
import com.intellij.openapi.client.ClientSessionsManager
1313
import com.intellij.openapi.components.service
1414
import com.intellij.openapi.diagnostic.thisLogger
1515
import com.intellij.openapi.fileEditor.FileEditorManagerEvent
1616
import com.intellij.openapi.fileEditor.FileEditorManagerListener
1717
import com.intellij.openapi.fileTypes.LanguageFileType
18+
import com.intellij.openapi.project.Project
1819
import com.intellij.remoteDev.util.onTerminationOrNow
1920
import com.intellij.util.application
2021
import com.jetbrains.rd.util.lifetime.Lifetime
@@ -32,12 +33,11 @@ import java.util.concurrent.CancellationException
3233
import java.util.concurrent.CompletableFuture
3334

3435
@Suppress("UnstableApiUsage", "OPT_IN_USAGE")
35-
class GitpodClientProjectSessionTracker(
36-
private val session: ClientProjectSession
37-
) : Disposable {
36+
class GitpodClientProjectSessionTracker(private val project: Project) : Disposable {
3837

3938
private val manager = service<GitpodManager>()
4039
private val portsService = service<GitpodPortsService>()
40+
private val session = ClientSessionsManager.getProjectSession(project)
4141

4242
private lateinit var info: Info.WorkspaceInfoResponse
4343
private val lifetime = Lifetime.Eternal.createNested()
@@ -89,7 +89,7 @@ class GitpodClientProjectSessionTracker(
8989
notification.addAction(makePublicAction)
9090
}
9191

92-
ClientId.withClientId(session.clientId) {
92+
ClientId.withClientId(session?.clientId) {
9393
notification.notify(null)
9494
}
9595
}
@@ -108,7 +108,7 @@ class GitpodClientProjectSessionTracker(
108108
}
109109

110110
private fun openBrowser(url: String) {
111-
ClientId.withClientId(session.clientId) {
111+
ClientId.withClientId(session?.clientId) {
112112
BrowserUtil.browse(url)
113113
}
114114
}
@@ -196,7 +196,7 @@ class GitpodClientProjectSessionTracker(
196196

197197
private fun registerActiveLanguageAnalytics() {
198198
val activeLanguages = mutableSetOf<String>()
199-
session.project.messageBus.connect().subscribe(FileEditorManagerListener.FILE_EDITOR_MANAGER, object : FileEditorManagerListener {
199+
project.messageBus.connect().subscribe(FileEditorManagerListener.FILE_EDITOR_MANAGER, object : FileEditorManagerListener {
200200
override fun selectionChanged(event: FileEditorManagerEvent) {
201201
super.selectionChanged(event)
202202
if (event.manager.selectedEditor == null) {
@@ -219,6 +219,7 @@ class GitpodClientProjectSessionTracker(
219219
}
220220

221221
private fun trackEvent(eventName: String, props: Map<String, Any?>) {
222+
if (session == null) return
222223
manager.trackEvent(eventName, mapOf(
223224
"sessionId" to session.clientId.value
224225
).plus(props))

‎components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/GitpodGlobalPortForwardingService.kt

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
// Copyright (c) 2022 Gitpod GmbH. All rights reserved.
2+
// Licensed under the GNU Affero General Public License (AGPL).
3+
// See License-AGPL.txt in the project root for license information.
4+
5+
package io.gitpod.jetbrains.remote
6+
7+
import com.intellij.openapi.Disposable
8+
9+
interface GitpodGlobalPortForwardingService {
10+
fun monitorPortsOfPid(disposable: Disposable, pid: Long)
11+
}

‎components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/GitpodTerminalService.kt

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44

55
package io.gitpod.jetbrains.remote
66

7-
import com.intellij.openapi.client.ClientProjectSession
7+
// import com.intellij.openapi.components.service
88
import com.intellij.openapi.diagnostic.thisLogger
9+
import com.intellij.openapi.project.Project
910
import com.intellij.util.application
1011
import com.jediterm.terminal.ui.TerminalWidget
1112
import com.jediterm.terminal.ui.TerminalWidgetListener
@@ -24,17 +25,17 @@ import java.util.concurrent.CompletableFuture
2425
import java.util.concurrent.ExecutionException
2526
import java.util.concurrent.TimeUnit
2627

27-
@Suppress("UnstableApiUsage")
28-
class GitpodTerminalService(session: ClientProjectSession) {
28+
class GitpodTerminalService(project: Project) {
2929
private companion object {
3030
var hasStarted = false
3131
}
3232

33-
private val terminalView = TerminalView.getInstance(session.project)
34-
private val backendTerminalManager = BackendTerminalManager.getInstance(session.project)
33+
private val terminalView = TerminalView.getInstance(project)
34+
private val backendTerminalManager = BackendTerminalManager.getInstance(project)
3535
private val terminalServiceFutureStub = TerminalServiceGrpc.newFutureStub(GitpodManager.supervisorChannel)
3636
private val terminalServiceStub = TerminalServiceGrpc.newStub(GitpodManager.supervisorChannel)
3737
private val statusServiceStub = StatusServiceGrpc.newStub(GitpodManager.supervisorChannel)
38+
// private val portForwardingService = service<GitpodGlobalPortForwardingService>()
3839

3940
init {
4041
start()
@@ -186,6 +187,10 @@ class GitpodTerminalService(session: ClientProjectSession) {
186187
exitTaskWhenTerminalWidgetGetsClosed(supervisorTerminal, shellTerminalWidget)
187188

188189
listenForTaskTerminationAndTitleChanges(supervisorTerminal, shellTerminalWidget)
190+
191+
// This works for auto-forwarding ports opened in Gitpod Terminals, but it's currently not useful as we
192+
// have the GitpodPortForwardingService already auto-forwarding all the ports from the workspace.
193+
// portForwardingService.monitorPortsOfPid(shellTerminalWidget, supervisorTerminal.pid)
189194
}
190195

191196
private fun listenForTaskTerminationAndTitleChanges(

‎components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/latest/GitpodCLIHelperImpl.kt

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
// Copyright (c) 2022 Gitpod GmbH. All rights reserved.
2+
// Licensed under the GNU Affero General Public License (AGPL).
3+
// See License-AGPL.txt in the project root for license information.
4+
5+
package io.gitpod.jetbrains.remote.latest
6+
7+
import com.intellij.ide.CommandLineProcessor
8+
import io.gitpod.jetbrains.remote.GitpodCLIHelper
9+
import java.nio.file.Path
10+
11+
@Suppress("UnstableApiUsage")
12+
class GitpodCLIHelperImpl : GitpodCLIHelper {
13+
override suspend fun open(file :Path, shouldWait: Boolean) {
14+
CommandLineProcessor.doOpenFileOrProject(file, shouldWait).future.await()
15+
}
16+
}

‎components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/latest/GitpodGlobalPortForwardingServiceImpl.kt

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
// Copyright (c) 2022 Gitpod GmbH. All rights reserved.
2+
// Licensed under the GNU Affero General Public License (AGPL).
3+
// See License-AGPL.txt in the project root for license information.
4+
5+
package io.gitpod.jetbrains.remote.latest
6+
7+
import com.intellij.openapi.Disposable
8+
import com.intellij.openapi.components.service
9+
import com.intellij.openapi.diagnostic.thisLogger
10+
import com.intellij.openapi.project.Project
11+
import com.intellij.openapi.util.Disposer
12+
import com.intellij.remoteDev.util.onTerminationOrNow
13+
import com.intellij.ui.RowIcon
14+
import com.intellij.util.application
15+
import com.jetbrains.rd.platform.codeWithMe.portForwarding.*
16+
import com.jetbrains.rd.platform.util.lifetime
17+
import com.jetbrains.rd.util.lifetime.LifetimeStatus
18+
import io.gitpod.jetbrains.remote.GitpodIgnoredPortsForNotificationService
19+
import io.gitpod.jetbrains.remote.GitpodManager
20+
import io.gitpod.jetbrains.remote.GitpodGlobalPortForwardingService
21+
import io.gitpod.jetbrains.remote.GitpodPortsService
22+
import io.gitpod.jetbrains.remote.icons.GitpodIcons
23+
import io.gitpod.supervisor.api.Status
24+
import io.gitpod.supervisor.api.StatusServiceGrpc
25+
import io.grpc.stub.ClientCallStreamObserver
26+
import io.grpc.stub.ClientResponseObserver
27+
import io.ktor.utils.io.*
28+
import java.util.concurrent.CompletableFuture
29+
import java.util.concurrent.TimeUnit
30+
import javax.swing.Icon
31+
32+
@Suppress("UnstableApiUsage")
33+
class GitpodGlobalPortForwardingServiceImpl: GitpodGlobalPortForwardingService {
34+
private val globalPortForwardingManager = service<GlobalPortForwardingManager>()
35+
36+
override fun monitorPortsOfPid(disposable: Disposable, pid: Long) {
37+
globalPortForwardingManager.monitorPortsOfPid(
38+
disposable,
39+
pid,
40+
object : ListeningPortHandler {
41+
override fun onPortListeningStarted(port: ListeningPort) {
42+
thisLogger().warn("gitpod: onPortListeningStarted ${port.portType} ${port.pid} ${port.socketAddress}")
43+
}
44+
},
45+
PortListeningOptions.INCLUDE_SELF_AND_CHILDREN
46+
)
47+
}
48+
}

‎components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/latest/GitpodPortForwardingService.kt

Lines changed: 9 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
package io.gitpod.jetbrains.remote.latest
66

77
import com.intellij.openapi.Disposable
8-
import com.intellij.openapi.client.ClientProjectSession
98
import com.intellij.openapi.components.service
109
import com.intellij.openapi.diagnostic.thisLogger
10+
import com.intellij.openapi.project.Project
1111
import com.intellij.openapi.util.Disposer
1212
import com.intellij.remoteDev.util.onTerminationOrNow
1313
import com.intellij.util.application
@@ -27,7 +27,7 @@ import java.util.concurrent.TimeUnit
2727
import javax.swing.Icon
2828

2929
@Suppress("UnstableApiUsage")
30-
class GitpodPortForwardingService(private val session: ClientProjectSession) {
30+
class GitpodPortForwardingService(private val project: Project) {
3131
companion object {
3232
const val FORWARDED_PORT_LABEL = "gitpod"
3333
}
@@ -46,7 +46,7 @@ class GitpodPortForwardingService(private val session: ClientProjectSession) {
4646
}
4747

4848
private fun observePortsListWhileProjectIsOpen() = application.executeOnPooledThread {
49-
while (session.project.lifetime.status == LifetimeStatus.Alive) {
49+
while (project.lifetime.status == LifetimeStatus.Alive) {
5050
try {
5151
observePortsList().get()
5252
} catch (throwable: Throwable) {
@@ -74,7 +74,7 @@ class GitpodPortForwardingService(private val session: ClientProjectSession) {
7474
val portsStatusResponseObserver = object :
7575
ClientResponseObserver<Status.PortsStatusRequest, Status.PortsStatusResponse> {
7676
override fun beforeStart(request: ClientCallStreamObserver<Status.PortsStatusRequest>) {
77-
session.project.lifetime.onTerminationOrNow { request.cancel("gitpod: Project terminated.", null) }
77+
project.lifetime.onTerminationOrNow { request.cancel("gitpod: Project terminated.", null) }
7878
}
7979
override fun onNext(response: Status.PortsStatusResponse) {
8080
application.invokeLater { updateForwardedPortsList(response) }
@@ -104,38 +104,15 @@ class GitpodPortForwardingService(private val session: ClientProjectSession) {
104104
hostPort,
105105
PortType.TCP,
106106
setOf(FORWARDED_PORT_LABEL),
107-
hostPort,
108-
ClientPortPickingStrategy.REASSIGN_WHEN_BUSY
109-
) {
110-
this.name = port.name
111-
this.description = port.description
112-
this.icon = null
113-
this.tooltip = "Forwarded Port"
114-
}
107+
ClientPortAttributes(hostPort, ClientPortPickingStrategy.REASSIGN_WHEN_BUSY),
108+
)
109+
110+
forwardedPort.presentation.name = port.name
111+
forwardedPort.presentation.description = port.description
115112

116113
val portListenerDisposable = portToDisposableMap.getOrPut(hostPort, fun() = Disposer.newDisposable())
117114

118115
forwardedPort.addPortListener(portListenerDisposable, object: ForwardedPortListener {
119-
override fun becameReadOnly(port: ForwardedPort, reason: String?) {
120-
thisLogger().warn("gitpod: becameReadOnly($port, $reason)")
121-
}
122-
123-
override fun descriptionChanged(port: ForwardedPort, oldDescription: String?, newDescription: String?) {
124-
thisLogger().warn("gitpod: descriptionChanged($port, $oldDescription, $newDescription)")
125-
}
126-
127-
override fun exposedUrlChanged(port: ForwardedPort, newUrl: String) {
128-
thisLogger().warn("gitpod: exposedUrlChanged($port, $newUrl)")
129-
}
130-
131-
override fun iconChanged(port: ForwardedPort, oldIcon: Icon?, newIcon: Icon?) {
132-
thisLogger().warn("gitpod: iconChanged($port, $oldIcon, $newIcon)")
133-
}
134-
135-
override fun nameChanged(port: ForwardedPort, oldName: String?, newName: String?) {
136-
thisLogger().warn("gitpod: nameChanged($port, $oldName, $newName)")
137-
}
138-
139116
override fun stateChanged(port: ForwardedPort, newState: ClientPortState) {
140117
when (newState) {
141118
is ClientPortState.Assigned -> {
@@ -150,10 +127,6 @@ class GitpodPortForwardingService(private val session: ClientProjectSession) {
150127
}
151128
}
152129
}
153-
154-
override fun tooltipChanged(port: ForwardedPort, oldTooltip: String?, newTooltip: String?) {
155-
thisLogger().warn("gitpod: tooltipChanged($port, $oldTooltip, $newTooltip)")
156-
}
157130
})
158131
} catch (error: Error) {
159132
thisLogger().warn("gitpod: ${error.message}")

‎components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/latest/GitpodPortsActionCopyUrl.kt

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
// Copyright (c) 2022 Gitpod GmbH. All rights reserved.
2+
// Licensed under the GNU Affero General Public License (AGPL).
3+
// See License-AGPL.txt in the project root for license information.
4+
5+
package io.gitpod.jetbrains.remote.latest
6+
7+
import com.intellij.openapi.actionSystem.AnAction
8+
import com.intellij.openapi.actionSystem.AnActionEvent
9+
import com.intellij.openapi.diagnostic.thisLogger
10+
import com.intellij.openapi.ide.CopyPasteManager
11+
import com.jetbrains.rd.platform.codeWithMe.portForwarding.PortForwardingDataKeys
12+
import java.awt.datatransfer.StringSelection
13+
14+
@Suppress("ComponentNotRegistered", "UnstableApiUsage")
15+
class GitpodPortsActionCopyUrl : AnAction() {
16+
override fun actionPerformed(e: AnActionEvent) {
17+
val port = e.dataContext.getData(PortForwardingDataKeys.PORT)
18+
if (port != null) {
19+
thisLogger().warn("gitpod: Exec GitpodPortsActionCopyUrl: ${port.hostPortNumber}")
20+
CopyPasteManager.getInstance().setContents(StringSelection(port.hostPortNumber.toString()))
21+
} else {
22+
thisLogger().warn("gitpod: Exec: GitpodPortsActionCopyUrl: error unknown port")
23+
}
24+
}
25+
}

0 commit comments

Comments
 (0)