Merge branch 'main' into impl-progress-while-downloading-cli

fioan89 · fioan89 · commit 46ca7a73ec43 · 2025-06-18T22:08:11.000+03:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,7 @@
 - `Stop` action is now available for running workspaces that have an out of date template.
 - outdated and stopped workspaces are now updated and started when handling URI
 - show errors when the Toolbox is visible again after being minimized.
+- URI handling now installs the exact build number if it is available for the workspace.
 
 ## 0.3.0 - 2025-06-10
 
diff --git a/gradle.properties b/gradle.properties
@@ -1,3 +1,3 @@
-version=0.3.0
+version=0.3.1
 group=com.coder.toolbox
 name=coder-toolbox
diff --git a/src/main/kotlin/com/coder/toolbox/util/CoderProtocolHandler.kt b/src/main/kotlin/com/coder/toolbox/util/CoderProtocolHandler.kt
@@ -382,16 +382,16 @@ open class CoderProtocolHandler(
             return null
         }
 
-        val matchingBuildNumber = availableVersions.firstOrNull { it.contains(buildNumber) } != null
-        if (!matchingBuildNumber) {
+        val buildNumberIsNotAvailable = availableVersions.firstOrNull { it.contains(buildNumber) } == null
+        if (buildNumberIsNotAvailable) {
             val selectedIde = availableVersions.maxOf { it }
             context.logAndShowInfo(
                 "$productCode-$buildNumber not available",
                 "$productCode-$buildNumber is not available, we've selected the latest $selectedIde"
             )
             return selectedIde
         }
-        return null
+        return "$productCode-$buildNumber"
     }
 
     private fun installJBClient(selectedIde: String, environmentId: String): Job = context.cs.launch {

Original file line number	Diff line number	Diff line change
`@@ -382,16 +382,16 @@ open class CoderProtocolHandler(`
`382`	`382`	`return null`
`383`	`383`	`}`
`384`	`384`
`385`		`- val matchingBuildNumber = availableVersions.firstOrNull { it.contains(buildNumber) } != null`
`386`		`- if (!matchingBuildNumber) {`
	`385`	`+ val buildNumberIsNotAvailable = availableVersions.firstOrNull { it.contains(buildNumber) } == null`
	`386`	`+ if (buildNumberIsNotAvailable) {`
`387`	`387`	`val selectedIde = availableVersions.maxOf { it }`
`388`	`388`	`context.logAndShowInfo(`
`389`	`389`	`"$productCode-$buildNumber not available",`
`390`	`390`	`"$productCode-$buildNumber is not available, we've selected the latest $selectedIde"`
`391`	`391`	`)`
`392`	`392`	`return selectedIde`
`393`	`393`	`}`
`394`		`- return null`
	`394`	`+ return "$productCode-$buildNumber"`
`395`	`395`	`}`
`396`	`396`
`397`	`397`	`private fun installJBClient(selectedIde: String, environmentId: String): Job = context.cs.launch {`