select DEVELOPER_DIR when installing a toolchain via Swiftly (#1895)

Author: matthewbastien

src/commands/installSwiftlyToolchain.ts

@@ -16,7 +16,12 @@ import * as vscode from "vscode";
 import { WorkspaceContext } from "../WorkspaceContext";
 import { SwiftLogger } from "../logging/SwiftLogger";
 import { Swiftly, SwiftlyProgressData } from "../toolchain/swiftly";
-import { askWhereToSetToolchain } from "../ui/ToolchainSelection";
+import { SwiftToolchain } from "../toolchain/toolchain";
+import {
+    askWhereToSetToolchain,
+    setToolchainPath,
+    showDeveloperDirQuickPick,
+} from "../ui/ToolchainSelection";
 
 /**
  * Installs a Swiftly toolchain and shows a progress notification to the user.
@@ -165,6 +170,12 @@ export async function promptToInstallSwiftlyToolchain(
         return;
     }
 
+    const xcodes = await SwiftToolchain.findXcodeInstalls();
+    const developerDir = await showDeveloperDirQuickPick(xcodes);
+    if (!developerDir) {
+        return;
+    }
+
     // Install the toolchain via Swiftly
     if (!(await installSwiftlyToolchainWithProgress(selected.toolchain.version.name, ctx.logger))) {
         return;
@@ -178,5 +189,14 @@ export async function promptToInstallSwiftlyToolchain(
         );
         return;
     }
-    await Swiftly.use(selected.toolchain.version.name);
+    await setToolchainPath(
+        {
+            category: "swiftly",
+            async onDidSelect() {
+                await Swiftly.use(selected.toolchain.version.name);
+            },
+        },
+        developerDir,
+        target
+    );
 }

src/ui/ToolchainSelection.ts

@@ -438,7 +438,7 @@ export async function showToolchainSelectionQuickPick(
  * @param xcodePaths An array of paths to available Xcode installations on the system
  * @returns The selected DEVELOPER_DIR or undefined if the user cancelled selection
  */
-async function showDeveloperDirQuickPick(xcodePaths: string[]): Promise<string | undefined> {
+export async function showDeveloperDirQuickPick(xcodePaths: string[]): Promise<string | undefined> {
     const selected = await vscode.window.showQuickPick<vscode.QuickPickItem>(
         SwiftToolchain.getXcodeDeveloperDir(configuration.swiftEnvironmentVariables).then(
             existingDeveloperDir => {
@@ -538,15 +538,16 @@ export async function askWhereToSetToolchain(): Promise<vscode.ConfigurationTarg
  * @param developerDir
  * @returns
  */
-async function setToolchainPath(
+export async function setToolchainPath(
     toolchain: {
         category: SwiftToolchainItem["category"];
         swiftFolderPath?: string;
         onDidSelect?: SwiftToolchainItem["onDidSelect"];
     },
-    developerDir?: string
+    developerDir?: string,
+    target?: vscode.ConfigurationTarget
 ): Promise<void> {
-    const target = await askWhereToSetToolchain();
+    target = target ?? (await askWhereToSetToolchain());
     if (!target) {
         return;
     }