Fix connection not running from editor

code-asher · code-asher · commit 069277c5a905 · 2023-12-18T20:24:24.000-09:00
I think we could get it working with the same trick as the IDE resolving
job but it seems like there is no need for the launches anyway?
diff --git a/src/main/kotlin/com/coder/gateway/CoderRemoteConnectionHandle.kt b/src/main/kotlin/com/coder/gateway/CoderRemoteConnectionHandle.kt
@@ -31,8 +31,6 @@ import com.jetbrains.gateway.ssh.SshDeployFlowUtil
 import com.jetbrains.gateway.ssh.SshMultistagePanelContext
 import com.jetbrains.gateway.ssh.deploy.DeployException
 import com.jetbrains.rd.util.lifetime.LifetimeDefinition
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
 import net.schmizz.sshj.common.SSHException
 import net.schmizz.sshj.connection.ConnectionException
 import java.awt.Dimension
@@ -48,7 +46,7 @@ import javax.net.ssl.SSLHandshakeException
 class CoderRemoteConnectionHandle {
     private val recentConnectionsService = service<CoderRecentWorkspaceConnectionsService>()
 
-    suspend fun connect(getParameters: (indicator: ProgressIndicator) -> Map<String, String>) {
+    fun connect(getParameters: (indicator: ProgressIndicator) -> Map<String, String>) {
         val clientLifetime = LifetimeDefinition()
         clientLifetime.launchUnderBackgroundProgress(CoderGatewayBundle.message("gateway.connector.coder.connection.provider.title")) {
             try {
@@ -79,13 +77,11 @@ class CoderRemoteConnectionHandle {
                         indicator.text = CoderGatewayBundle.message("gateway.connector.coder.connecting.failed.retry", humanizeDuration(remainingMs))
                     },
                 )
-                GlobalScope.launch {
-                    logger.info("Deploying and starting IDE with $context")
-                    // At this point JetBrains takes over with their own UI.
-                    @Suppress("UnstableApiUsage") SshDeployFlowUtil.fullDeployCycle(
-                        clientLifetime, context, Duration.ofMinutes(10)
-                    )
-                }
+                logger.info("Deploying and starting IDE with $context")
+                // At this point JetBrains takes over with their own UI.
+                @Suppress("UnstableApiUsage") SshDeployFlowUtil.fullDeployCycle(
+                    clientLifetime, context, Duration.ofMinutes(10)
+                )
                 recentConnectionsService.addRecentConnection(parameters.toRecentWorkspaceConnection())
             } catch (e: Exception) {
                 if (isCancellation(e)) {
diff --git a/src/main/kotlin/com/coder/gateway/views/CoderGatewayRecentWorkspaceConnectionsView.kt b/src/main/kotlin/com/coder/gateway/views/CoderGatewayRecentWorkspaceConnectionsView.kt
@@ -212,10 +212,8 @@ class CoderGatewayRecentWorkspaceConnectionsView(private val setContentCallback:
                     row {
                         icon(product.icon)
                         cell(ActionLink(connectionDetails.projectPath!!) {
-                            cs.launch {
-                                CoderRemoteConnectionHandle().connect{ connectionDetails.toWorkspaceParams() }
-                                GatewayUI.getInstance().reset()
-                            }
+                            CoderRemoteConnectionHandle().connect{ connectionDetails.toWorkspaceParams() }
+                            GatewayUI.getInstance().reset()
                         })
                         label("").resizableColumn().align(AlignX.FILL)
                         label("Last opened: ${connectionDetails.lastOpened}").applyToComponent {
diff --git a/src/main/kotlin/com/coder/gateway/views/steps/CoderLocateRemoteProjectStepView.kt b/src/main/kotlin/com/coder/gateway/views/steps/CoderLocateRemoteProjectStepView.kt
@@ -67,7 +67,6 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.async
 import kotlinx.coroutines.cancel
-import kotlinx.coroutines.cancelAndJoin
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
@@ -340,18 +339,16 @@ class CoderLocateRemoteProjectStepView(private val setNextButtonEnabled: (Boolea
             logger.warn("No workspace was selected. Please go back to the previous step and select a workspace")
             return false
         }
-        cs.launch {
-            CoderRemoteConnectionHandle().connect{
-                selectedIDE
-                    .toWorkspaceParams()
-                    .withWorkspaceHostname(CoderCLIManager.getHostName(deploymentURL, selectedWorkspace))
-                    .withProjectPath(tfProject.text)
-                    .withWebTerminalLink("${terminalLink.url}")
-                    .withConfigDirectory(wizardModel.configDirectory)
-                    .withName(selectedWorkspace.name)
-            }
-            GatewayUI.getInstance().reset()
+        CoderRemoteConnectionHandle().connect{
+            selectedIDE
+                .toWorkspaceParams()
+                .withWorkspaceHostname(CoderCLIManager.getHostName(deploymentURL, selectedWorkspace))
+                .withProjectPath(tfProject.text)
+                .withWebTerminalLink("${terminalLink.url}")
+                .withConfigDirectory(wizardModel.configDirectory)
+                .withName(selectedWorkspace.name)
         }
+        GatewayUI.getInstance().reset()
         return true
     }
 
