Update Platform Version of JetBrains Backend Plugin to 223.7126-EAP-C…

…ANDIDATE-SNAPSHOT

Co-authored-by: Andrea Falzetti <[email protected]>

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

@@ -1,9 +1,9 @@
 # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 # for insight into build numbers and IntelliJ Platform versions.
-pluginSinceBuild=223
+pluginSinceBuild=223.7126
 pluginUntilBuild=223.*
 # Plugin Verifier integration -> https://github.com/JetBrains/gradle-intellij-plugin#plugin-verifier-dsl
 # See https://jb.gg/intellij-platform-builds-list for available build versions.
 pluginVerifierIdeVersions=2022.3
 # Version from "com.jetbrains.intellij.idea" which can be found at https://www.jetbrains.com/intellij-repository/snapshots
-platformVersion=223.6160-EAP-CANDIDATE-SNAPSHOT
+platformVersion=223.7126-EAP-CANDIDATE-SNAPSHOT

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

@@ -28,17 +28,17 @@ TEST_BACKEND_DIR="/workspace/ide-backend-$JB_QUALIFIER"
 if [ ! -d "$TEST_BACKEND_DIR" ]; then
   mkdir -p $TEST_BACKEND_DIR
   if [[ $RUN_FROM == "snapshot" ]]; then
+    SNAPSHOT_VERSION=$(grep "platformVersion=" "gradle-$JB_QUALIFIER.properties" | sed 's/platformVersion=//')
     (cd $TEST_BACKEND_DIR &&
-    SNAPSHOT_VERSION=$(grep "platformVersion=" "gradle-$JB_QUALIFIER.properties" | sed 's/platformVersion=//') &&
     echo "Downloading the $JB_QUALIFIER version of IntelliJ IDEA ($SNAPSHOT_VERSION)..." &&
     curl -sSLo backend.zip "https://www.jetbrains.com/intellij-repository/snapshots/com/jetbrains/intellij/idea/ideaIU/$SNAPSHOT_VERSION/ideaIU-$SNAPSHOT_VERSION.zip" &&
     unzip backend.zip &&
     rm backend.zip &&
     ln -s "ideaIU-$SNAPSHOT_VERSION" . &&
     rm -r "ideaIU-$SNAPSHOT_VERSION" &&
     cp -r /ide-desktop/backend/jbr . &&
-    cp /ide-desktop/backend/bin/idea.properties ./bin &&
-    cp /ide-desktop/backend/bin/idea64.vmoptions ./bin)
+    cp ./bin/linux/idea.properties ./bin &&
+    cp ./bin/linux/idea64.vmoptions ./bin)
   else
     if [[ $JB_QUALIFIER == "stable" ]]; then
       PRODUCT_TYPE="release"

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

@@ -0,0 +1,11 @@
+// Copyright (c) 2022 Gitpod GmbH. All rights reserved.
+// Licensed under the GNU Affero General Public License (AGPL).
+// See License-AGPL.txt in the project root for license information.
+
+package io.gitpod.jetbrains.remote
+
+import java.nio.file.Path
+
+interface GitpodCLIHelper {
+    suspend fun open(file: Path, shouldWait: Boolean)
+}

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

@@ -6,7 +6,6 @@ package io.gitpod.jetbrains.remote
 
 import com.intellij.codeWithMe.ClientId
 import com.intellij.ide.BrowserUtil
-import com.intellij.ide.CommandLineProcessor
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.client.ClientSession
 import com.intellij.openapi.client.ClientSessionsManager
@@ -40,6 +39,7 @@ class GitpodCLIService : RestService() {
 
     private val manager = service<GitpodManager>()
     private val portsService = service<GitpodPortsService>()
+    private val cliHelperService = service<GitpodCLIHelper>()
 
     override fun getServiceName() = SERVICE_NAME
 
@@ -71,7 +71,7 @@ class GitpodCLIService : RestService() {
             return withClient(request, context) {
                 GlobalScope.launch {
                     withContext(Dispatchers.IO) {
-                        CommandLineProcessor.doOpenFileOrProject(file, shouldWait).future.get()
+                        cliHelperService.open(file, shouldWait)
                     }
                 }
             }

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

@@ -0,0 +1,16 @@
+// Copyright (c) 2022 Gitpod GmbH. All rights reserved.
+// Licensed under the GNU Affero General Public License (AGPL).
+// See License-AGPL.txt in the project root for license information.
+
+package io.gitpod.jetbrains.remote.latest
+
+import com.intellij.ide.CommandLineProcessor
+import io.gitpod.jetbrains.remote.GitpodCLIHelper
+import java.nio.file.Path
+
+@Suppress("UnstableApiUsage")
+class GitpodCLIHelperImpl : GitpodCLIHelper  {
+    override suspend fun open(file :Path, shouldWait: Boolean) {
+        CommandLineProcessor.doOpenFileOrProject(file, shouldWait).future.await()
+    }
+}

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

@@ -104,8 +104,7 @@ class GitpodPortForwardingService(private val session: ClientProjectSession) {
                         hostPort,
                         PortType.TCP,
                         setOf(FORWARDED_PORT_LABEL),
-                        hostPort,
-                        ClientPortPickingStrategy.REASSIGN_WHEN_BUSY
+                        ClientPortAttributes(hostPort, ClientPortPickingStrategy.REASSIGN_WHEN_BUSY),
                     ) {
                         this.name = port.name
                         this.description = port.description

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

@@ -0,0 +1,16 @@
+// Copyright (c) 2022 Gitpod GmbH. All rights reserved.
+// Licensed under the GNU Affero General Public License (AGPL).
+// See License-AGPL.txt in the project root for license information.
+
+package io.gitpod.jetbrains.remote.stable
+
+import com.intellij.ide.CommandLineProcessor
+import io.gitpod.jetbrains.remote.GitpodCLIHelper
+import java.nio.file.Path
+
+@Suppress("UnstableApiUsage")
+class GitpodCLIHelperImpl : GitpodCLIHelper  {
+    override suspend fun open(file :Path, shouldWait: Boolean) {
+        CommandLineProcessor.doOpenFileOrProject(file, shouldWait).future.get()
+    }
+}

components/ide/jetbrains/backend-plugin/src/main/resources-latest/META-INF/extensions.xml

@@ -7,6 +7,7 @@
 <idea-plugin>
     <extensions defaultExtensionNs="com.intellij">
         <applicationService serviceInterface="io.gitpod.jetbrains.remote.GitpodIgnoredPortsForNotificationService" serviceImplementation="io.gitpod.jetbrains.remote.latest.GitpodIgnoredPortsForNotificationServiceImpl" preload="true"/>
-        <projectService serviceImplementation="io.gitpod.jetbrains.remote.latest.GitpodPortForwardingService" preload="true" client="guest"/>
+        <applicationService serviceInterface="io.gitpod.jetbrains.remote.GitpodCLIHelper" serviceImplementation="io.gitpod.jetbrains.remote.latest.GitpodCLIHelperImpl" preload="true"/>
+        <projectService serviceImplementation="io.gitpod.jetbrains.remote.latest.GitpodPortForwardingService" preload="true" client="remote"/>
     </extensions>
 </idea-plugin>

components/ide/jetbrains/backend-plugin/src/main/resources-stable/META-INF/extensions.xml

@@ -7,5 +7,6 @@
 <idea-plugin>
     <extensions defaultExtensionNs="com.intellij">
         <applicationService serviceInterface="io.gitpod.jetbrains.remote.GitpodIgnoredPortsForNotificationService" serviceImplementation="io.gitpod.jetbrains.remote.stable.GitpodIgnoredPortsForNotificationServiceImpl" preload="true"/>
+        <applicationService serviceInterface="io.gitpod.jetbrains.remote.GitpodCLIHelper" serviceImplementation="io.gitpod.jetbrains.remote.stable.GitpodCLIHelperImpl" preload="true"/>
     </extensions>
 </idea-plugin>

components/ide/jetbrains/backend-plugin/src/main/resources/META-INF/plugin.xml

@@ -29,9 +29,9 @@
         <notificationGroup id="Gitpod Notifications" displayType="BALLOON" isLogByDefault="false"/>
         <httpRequestHandler implementation="io.gitpod.jetbrains.remote.GitpodCLIService"/>
         <projectService serviceImplementation="io.gitpod.jetbrains.remote.GitpodClientProjectSessionTracker"
-                        client="guest" preload="true"/>
+                        client="remote" preload="true"/>
         <projectService serviceImplementation="io.gitpod.jetbrains.remote.GitpodProjectManager" preload="true"/>
-        <projectService serviceImplementation="io.gitpod.jetbrains.remote.GitpodTerminalService" client="guest"
+        <projectService serviceImplementation="io.gitpod.jetbrains.remote.GitpodTerminalService" client="remote"
                         preload="true"/>
         <gateway.customization.name
                 implementation="io.gitpod.jetbrains.remote.GitpodGatewayClientCustomizationProvider"/>