Remove DarwinQuickPickTarget. We don't need it

Author: adam-fowler

src/commands.ts

@@ -431,31 +431,24 @@ function openInExternalEditor(packageNode: PackageNode) {
     }
 }
 
-interface DarwinQuickPickTarget extends vscode.QuickPickItem {
-    value: DarwinCompatibleTarget;
-    label: string;
-}
-
 /**
  * Switches the target SDK to the platform selected in a QuickPick UI.
  */
 async function switchPlatform() {
-    const onSelect = async (picked: DarwinQuickPickTarget) => {
-        const sdkForTarget = await SwiftToolchain.getSdkForTarget(picked.value);
-        if (sdkForTarget) {
-            configuration.sdk = sdkForTarget;
-        } else {
-            vscode.window.showErrorMessage("Unable to obtain requested SDK path");
-        }
-    };
-
-    await withQuickPick<DarwinQuickPickTarget>(
+    await withQuickPick(
         "Select a new target",
         [
             { value: DarwinCompatibleTarget.macOS, label: "macOS" },
             { value: DarwinCompatibleTarget.iOS, label: "iOS" },
         ],
-        onSelect
+        async picked => {
+            const sdkForTarget = await SwiftToolchain.getSdkForTarget(picked.value);
+            if (sdkForTarget) {
+                configuration.sdk = sdkForTarget;
+            } else {
+                vscode.window.showErrorMessage("Unable to obtain requested SDK path");
+            }
+        }
     );
 }
 

src/toolchain/toolchain.ts

@@ -14,6 +14,7 @@
 
 import * as fs from "fs/promises";
 import * as path from "path";
+import { normalize } from "path";
 import * as plist from "plist";
 import * as vscode from "vscode";
 import configuration from "../configuration";
@@ -103,6 +104,30 @@ export class SwiftToolchain {
         return stdout.trimEnd();
     }
 
+    /**
+     * @param target Target to obtain the SDK path for
+     * @returns path to the SDK for the target
+     */
+    public static async getSdkForTarget(
+        target: DarwinCompatibleTarget
+    ): Promise<string | undefined> {
+        let sdkType: string;
+        switch (target) {
+            case DarwinCompatibleTarget.macOS:
+                // macOS is the default target, so lets not update the SDK
+                return undefined;
+            case DarwinCompatibleTarget.iOS:
+                sdkType = "iphoneos";
+                break;
+        }
+
+        // Include custom variables so that non-standard XCode installs can be better supported.
+        const { stdout } = await execFile("xcrun", ["--sdk", sdkType, "--show-sdk-path"], {
+            env: { ...process.env, ...configuration.swiftEnvironmentVariables },
+        });
+        return path.join(stdout.trimEnd());
+    }
+
     /**
      * Get list of Xcode versions intalled on mac
      * @returns Folders for each Xcode install
@@ -233,30 +258,6 @@ export class SwiftToolchain {
         return undefined;
     }
 
-    /**
-     * @param target Target to obtain the SDK path for
-     * @returns path to the SDK for the target
-     */
-    public static async getSdkForTarget(
-        target: DarwinCompatibleTarget
-    ): Promise<string | undefined> {
-        let sdkType: string;
-        switch (target) {
-            case DarwinCompatibleTarget.macOS:
-                sdkType = "macosx";
-                break;
-            case DarwinCompatibleTarget.iOS:
-                sdkType = "iphoneos";
-                break;
-        }
-
-        // Include custom variables so that non-standard XCode installs can be better supported.
-        const { stdout } = await execFile("xcrun", ["--sdk", sdkType, "--show-sdk-path"], {
-            env: { ...process.env, ...configuration.swiftEnvironmentVariables },
-        });
-        return path.join(stdout.trimEnd());
-    }
-
     /**
      * @returns path to custom SDK
      */