From 25381bebe663ebd1c6364507593b2650e176511d Mon Sep 17 00:00:00 2001 From: Matthew Bastien Date: Tue, 20 May 2025 15:01:49 -0400 Subject: [PATCH] only use the "swift.switchPlatformAvailable" context key to enable the "swift.switchPlatform" command --- package.json | 2 +- src/contextKeys.ts | 7 ++++--- src/extension.ts | 2 -- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 51e1db369..bff0692ad 100644 --- a/package.json +++ b/package.json @@ -908,7 +908,7 @@ }, { "command": "swift.switchPlatform", - "when": "swift.isActivated && isMac && swift.switchPlatformAvailable" + "when": "swift.switchPlatformAvailable" }, { "command": "swift.insertFunctionComment", diff --git a/src/contextKeys.ts b/src/contextKeys.ts index 890d5b081..a520ab582 100644 --- a/src/contextKeys.ts +++ b/src/contextKeys.ts @@ -110,9 +110,10 @@ function createContextKeys(): ContextKeys { this.createNewProjectAvailable = toolchainVersion.isGreaterThanOrEqual( new Version(5, 8, 0) ); - this.switchPlatformAvailable = toolchainVersion.isGreaterThanOrEqual( - new Version(6, 1, 0) - ); + this.switchPlatformAvailable = + process.platform === "darwin" + ? toolchainVersion.isGreaterThanOrEqual(new Version(6, 1, 0)) + : false; }, get isActivated() { diff --git a/src/extension.ts b/src/extension.ts index f3a759b49..f1df772ee 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -243,8 +243,6 @@ async function createActiveToolchain( } catch (error) { outputChannel.log("Failed to discover Swift toolchain"); outputChannel.log(`${error}`); - contextKeys.createNewProjectAvailable = false; - contextKeys.switchPlatformAvailable = false; return undefined; } }