Refactoring the code

Author: roulpriya

src/commands.ts

@@ -51,8 +51,10 @@ import { generateLaunchConfigurations } from "./commands/generateLaunchConfigura
 import { runTest } from "./commands/runTest";
 import { generateSourcekitConfiguration } from "./commands/generateSourcekitConfiguration";
 import { SwiftLogger } from "./logging/SwiftLogger";
-import { installSwiftlyToolchain } from "./commands/installSwiftlyToolchain";
-import { installSwiftlySnapshotToolchain } from "./commands/installSwiftlySnapshotToolchain";
+import {
+    installSwiftlyToolchain,
+    installSwiftlySnapshotToolchain,
+} from "./commands/installSwiftlyToolchain";
 
 /**
  * References:

src/commands/installSwiftlySnapshotToolchain.ts

@@ -13,28 +13,85 @@
 //===----------------------------------------------------------------------===//
 
 import * as vscode from "vscode";
+import { QuickPickItem } from "vscode";
 import { WorkspaceContext } from "../WorkspaceContext";
 import {
-    Swiftly,
-    SwiftlyProgressData,
     AvailableToolchain,
-    isStableVersion,
     isSnapshotVersion,
+    isStableVersion,
+    Swiftly,
+    SwiftlyProgressData,
 } from "../toolchain/swiftly";
 import { showReloadExtensionNotification } from "../ui/ReloadExtension";
 
+interface SwiftlyToolchainItem extends QuickPickItem {
+    toolchain: AvailableToolchain;
+}
+
+async function downloadAndInstallToolchain(selected: SwiftlyToolchainItem, ctx: WorkspaceContext) {
+    try {
+        await vscode.window.withProgress(
+            {
+                location: vscode.ProgressLocation.Notification,
+                title: `Installing Swift ${selected.toolchain.version.name}`,
+                cancellable: false,
+            },
+            async progress => {
+                progress.report({ message: "Starting installation..." });
+
+                let lastProgress = 0;
+
+                await Swiftly.installToolchain(
+                    selected.toolchain.version.name,
+                    (progressData: SwiftlyProgressData) => {
+                        if (
+                            progressData.step?.percent !== undefined &&
+                            progressData.step.percent > lastProgress
+                        ) {
+                            const increment = progressData.step.percent - lastProgress;
+                            progress.report({
+                                increment,
+                                message:
+                                    progressData.step.text ??
+                                    `${progressData.step.percent}% complete`,
+                            });
+                            lastProgress = progressData.step.percent;
+                        }
+                    },
+                    ctx.logger
+                );
+
+                progress.report({
+                    increment: 100 - lastProgress,
+                    message: "Installation complete",
+                });
+            }
+        );
+        void showReloadExtensionNotification(
+            `Swift ${selected.toolchain.version.name} has been installed and activated. Visual Studio Code needs to be reloaded.`
+        );
+    } catch (error) {
+        ctx.logger?.error(`Failed to install Swift ${selected.toolchain.version.name}: ${error}`);
+        void vscode.window.showErrorMessage(
+            `Failed to install Swift ${selected.toolchain.version.name}: ${error}`
+        );
+    }
+}
+
 /**
  * Shows a quick pick dialog to install available Swiftly toolchains
  */
 export async function installSwiftlyToolchain(ctx: WorkspaceContext): Promise<void> {
     if (!Swiftly.isSupported()) {
+        ctx.logger?.warn("Swiftly is not supported on this platform.");
         void vscode.window.showErrorMessage(
             "Swiftly is not supported on this platform. Only macOS and Linux are supported."
         );
         return;
     }
 
     if (!(await Swiftly.isInstalled())) {
+        ctx.logger?.warn("Swiftly is not installed.");
         void vscode.window.showErrorMessage(
             "Swiftly is not installed. Please install Swiftly first from https://www.swift.org/install/"
         );
@@ -50,7 +107,7 @@ export async function installSwiftlyToolchain(ctx: WorkspaceContext): Promise<vo
         return;
     }
 
-    const uninstalledToolchains = availableToolchains.filter(toolchain => !toolchain.isInstalled);
+    const uninstalledToolchains = availableToolchains.filter(toolchain => !toolchain.installed);
 
     if (uninstalledToolchains.length === 0) {
         void vscode.window.showInformationMessage(
@@ -64,6 +121,9 @@ export async function installSwiftlyToolchain(ctx: WorkspaceContext): Promise<vo
         uninstalledToolchains.filter(toolchain => toolchain.version.type === "stable")
     );
 
+    ctx.logger.debug(
+        `Available toolchains for installation: ${sortedToolchains.map(t => t.version.name).join(", ")}`
+    );
     const quickPickItems = sortedToolchains.map(toolchain => ({
         label: `$(cloud-download) ${toolchain.version.name}`,
         toolchain: toolchain,
@@ -79,54 +139,69 @@ export async function installSwiftlyToolchain(ctx: WorkspaceContext): Promise<vo
         return;
     }
 
-    try {
-        await vscode.window.withProgress(
-            {
-                location: vscode.ProgressLocation.Notification,
-                title: `Installing Swift ${selected.toolchain.version.name}`,
-                cancellable: false,
-            },
-            async progress => {
-                progress.report({ message: "Starting installation..." });
-
-                let lastProgress = 0;
+    await downloadAndInstallToolchain(selected, ctx);
+}
 
-                await Swiftly.installToolchain(
-                    selected.toolchain.version.name,
-                    (progressData: SwiftlyProgressData) => {
-                        if (
-                            progressData.step?.percent !== undefined &&
-                            progressData.step.percent > lastProgress
-                        ) {
-                            const increment = progressData.step.percent - lastProgress;
-                            progress.report({
-                                increment,
-                                message:
-                                    progressData.step.text ||
-                                    `${progressData.step.percent}% complete`,
-                            });
-                            lastProgress = progressData.step.percent;
-                        }
-                    },
-                    ctx.logger
-                );
+/**
+ * Shows a quick pick dialog to install available Swiftly snapshot toolchains
+ */
+export async function installSwiftlySnapshotToolchain(ctx: WorkspaceContext): Promise<void> {
+    if (!Swiftly.isSupported()) {
+        void vscode.window.showErrorMessage(
+            "Swiftly is not supported on this platform. Only macOS and Linux are supported."
+        );
+        return;
+    }
 
-                progress.report({
-                    increment: 100 - lastProgress,
-                    message: "Installation complete",
-                });
-            }
+    if (!(await Swiftly.isInstalled())) {
+        void vscode.window.showErrorMessage(
+            "Swiftly is not installed. Please install Swiftly first from https://www.swift.org/install/"
         );
+        return;
+    }
 
-        void showReloadExtensionNotification(
-            `Swift ${selected.toolchain.version} has been installed and selected as the active toolchain. Visual Studio Code needs to be reloaded.`
+    const availableToolchains = await Swiftly.listAvailable(ctx.logger);
+
+    if (availableToolchains.length === 0) {
+        void vscode.window.showInformationMessage(
+            "No toolchains are available for installation via Swiftly."
         );
-    } catch (error) {
-        ctx.logger?.error(`Failed to install Swift ${selected.toolchain.version.name}: ${error}`);
-        void vscode.window.showErrorMessage(
-            `Failed to install Swift ${selected.toolchain.version.name}: ${error}`
+        return;
+    }
+
+    // Filter for only uninstalled snapshot toolchains
+    const uninstalledSnapshotToolchains = availableToolchains.filter(
+        toolchain => !toolchain.installed && toolchain.version.type === "snapshot"
+    );
+
+    if (uninstalledSnapshotToolchains.length === 0) {
+        void vscode.window.showInformationMessage(
+            "All available snapshot toolchains are already installed."
         );
+        return;
     }
+
+    // Sort toolchains with most recent versions first
+    const sortedToolchains = sortToolchainsByVersion(uninstalledSnapshotToolchains);
+
+    const quickPickItems = sortedToolchains.map(toolchain => ({
+        label: `$(cloud-download) ${toolchain.version.name}`,
+        description: "snapshot",
+        detail: `Install snapshot version • Date: ${toolchain.version.type === "snapshot" ? toolchain.version.date || "Unknown" : "Unknown"} • Branch: ${toolchain.version.type === "snapshot" ? toolchain.version.branch || "Unknown" : "Unknown"}`,
+        toolchain: toolchain,
+    }));
+
+    const selected = await vscode.window.showQuickPick(quickPickItems, {
+        title: "Install Swift Snapshot Toolchain via Swiftly",
+        placeHolder: "Pick a Swift snapshot toolchain to install",
+        canPickMany: false,
+    });
+
+    if (!selected) {
+        return;
+    }
+
+    await downloadAndInstallToolchain(selected, ctx);
 }
 
 /**