fix: compiler errors (1)

fioan89 · fioan89 · commit aa24f034196f · 2025-02-24T23:44:33.000+02:00
- due to new API for remote environment model
diff --git a/src/main/kotlin/com/coder/toolbox/CoderRemoteEnvironment.kt b/src/main/kotlin/com/coder/toolbox/CoderRemoteEnvironment.kt
@@ -16,7 +16,6 @@ import com.jetbrains.toolbox.api.remoteDev.states.EnvironmentStateConsumer
 import com.jetbrains.toolbox.api.ui.ToolboxUi
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
-import java.util.concurrent.CompletableFuture
 
 /**
  * Represents an agent and workspace combination.
@@ -29,12 +28,12 @@ class CoderRemoteEnvironment(
     private var workspace: Workspace,
     private var agent: WorkspaceAgent,
     private var cs: CoroutineScope,
-) : AbstractRemoteProviderEnvironment() {
+) : AbstractRemoteProviderEnvironment("${workspace.name}.${agent.name}") {
     private var status = WorkspaceAndAgentStatus.from(workspace, agent)
 
     private val ui: ToolboxUi = serviceLocator.getService(ToolboxUi::class.java)
-    override fun getId(): String = "${workspace.name}.${agent.name}"
-    override fun getName(): String = "${workspace.name}.${agent.name}"
+
+    override var name: String = "${workspace.name}.${agent.name}"
 
     init {
         actionsList.add(
@@ -105,12 +104,11 @@ class CoderRemoteEnvironment(
      * The contents are provided by the SSH view provided by Toolbox, all we
      * have to do is provide it a host name.
      */
-    override fun getContentsView(): CompletableFuture<EnvironmentContentsView> =
-        CompletableFuture.completedFuture(EnvironmentView(client.url, workspace, agent))
+    override suspend fun getContentsView(): EnvironmentContentsView = EnvironmentView(client.url, workspace, agent)
 
     /**
-     * Does nothing.  In theory we could do something like start the workspace
-     * when you click into the workspace but you would still need to press
+     * Does nothing.  In theory, we could do something like start the workspace
+     * when you click into the workspace, but you would still need to press
      * "connect" anyway before the content is populated so there does not seem
      * to be much value.
      */
@@ -140,12 +138,12 @@ class CoderRemoteEnvironment(
         if (other == null) return false
         if (this === other) return true // Note the triple ===
         if (other !is CoderRemoteEnvironment) return false
-        if (getId() != other.getId()) return false
+        if (id != other.id) return false
         return true
     }
 
     /**
      * Companion to equals, for sets.
      */
-    override fun hashCode(): Int = getId().hashCode()
+    override fun hashCode(): Int = id.hashCode()
 }
diff --git a/src/main/kotlin/com/coder/toolbox/browser/BrowserUtil.kt b/src/main/kotlin/com/coder/toolbox/browser/BrowserUtil.kt
@@ -6,7 +6,7 @@ import org.zeroturnaround.exec.ProcessExecutor
 
 class BrowserUtil {
     companion object {
-        fun browse(url: String, errorHandler: (BrowserException) -> Unit) {
+        suspend fun browse(url: String, errorHandler: suspend (BrowserException) -> Unit) {
             val os = getOS()
             if (os == null) {
                 errorHandler(BrowserException("Failed to open the URL because we can't detect the OS"))
@@ -19,7 +19,7 @@ class BrowserUtil {
             }
         }
 
-        private fun linuxBrowse(url: String, errorHandler: (BrowserException) -> Unit) {
+        private suspend fun linuxBrowse(url: String, errorHandler: suspend (BrowserException) -> Unit) {
             try {
                 if (OS.LINUX.getDesktopEnvironment()?.uppercase()?.contains("GNOME") == true) {
                     exec("gnome-open", url)
@@ -36,15 +36,15 @@ class BrowserUtil {
             }
         }
 
-        private fun macBrowse(url: String, errorHandler: (BrowserException) -> Unit) {
+        private suspend fun macBrowse(url: String, errorHandler: suspend (BrowserException) -> Unit) {
             try {
                 exec("open", url)
             } catch (e: Exception) {
                 errorHandler(BrowserException("Failed to open URL because an error was encountered.", e))
             }
         }
 
-        private fun windowsBrowse(url: String, errorHandler: (BrowserException) -> Unit) {
+        private suspend fun windowsBrowse(url: String, errorHandler: suspend (BrowserException) -> Unit) {
             try {
                 exec("cmd", "start \"$url\"")
             } catch (e: Exception) {

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import org.zeroturnaround.exec.ProcessExecutor`
`6`	`6`
`7`	`7`	`class BrowserUtil {`
`8`	`8`	`companion object {`
`9`		`- fun browse(url: String, errorHandler: (BrowserException) -> Unit) {`
	`9`	`+ suspend fun browse(url: String, errorHandler: suspend (BrowserException) -> Unit) {`
`10`	`10`	`val os = getOS()`
`11`	`11`	`if (os == null) {`
`12`	`12`	`errorHandler(BrowserException("Failed to open the URL because we can't detect the OS"))`
`@@ -19,7 +19,7 @@ class BrowserUtil {`
`19`	`19`	`}`
`20`	`20`	`}`
`21`	`21`
`22`		`- private fun linuxBrowse(url: String, errorHandler: (BrowserException) -> Unit) {`
	`22`	`+ private suspend fun linuxBrowse(url: String, errorHandler: suspend (BrowserException) -> Unit) {`
`23`	`23`	`try {`
`24`	`24`	`if (OS.LINUX.getDesktopEnvironment()?.uppercase()?.contains("GNOME") == true) {`
`25`	`25`	`exec("gnome-open", url)`
`@@ -36,15 +36,15 @@ class BrowserUtil {`
`36`	`36`	`}`
`37`	`37`	`}`
`38`	`38`
`39`		`- private fun macBrowse(url: String, errorHandler: (BrowserException) -> Unit) {`
	`39`	`+ private suspend fun macBrowse(url: String, errorHandler: suspend (BrowserException) -> Unit) {`
`40`	`40`	`try {`
`41`	`41`	`exec("open", url)`
`42`	`42`	`} catch (e: Exception) {`
`43`	`43`	`errorHandler(BrowserException("Failed to open URL because an error was encountered.", e))`
`44`	`44`	`}`
`45`	`45`	`}`
`46`	`46`
`47`		`- private fun windowsBrowse(url: String, errorHandler: (BrowserException) -> Unit) {`
	`47`	`+ private suspend fun windowsBrowse(url: String, errorHandler: suspend (BrowserException) -> Unit) {`
`48`	`48`	`try {`
`49`	`49`	`exec("cmd", "start \"$url\"")`
`50`	`50`	`} catch (e: Exception) {`