Refactor Swiftly import and address comments

Author: roulpriya

package.json

@@ -1128,10 +1128,10 @@
             "order": 4,
             "scope": "machine-overridable"
           },
-          "swift.suppressSwiftlyInstallPrompt": {
+          "swift.disableSwiftlyInstallPrompt": {
             "type": "boolean",
             "default": false,
-            "markdownDescription": "Suppress the automatic Swiftly installation prompt when no Swift toolchain is found.",
+            "markdownDescription": "Disable the automatic Swiftly installation prompt when no Swift toolchain is found.",
             "order": 98,
             "scope": "application"
           },

src/FolderContext.ts

@@ -22,10 +22,12 @@ import { TestExplorer } from "./TestExplorer/TestExplorer";
 import { TestRunManager } from "./TestExplorer/TestRunManager";
 import { TestRunProxy } from "./TestExplorer/TestRunner";
 import { FolderOperation, WorkspaceContext } from "./WorkspaceContext";
+import { handleMissingSwiftly } from "./commands/installSwiftly";
 import configuration from "./configuration";
 import { SwiftLogger } from "./logging/SwiftLogger";
 import { PlaygroundProvider } from "./playgrounds/PlaygroundProvider";
 import { TaskQueue } from "./tasks/TaskQueue";
+import { Swiftly } from "./toolchain/swiftly";
 import { SwiftToolchain } from "./toolchain/toolchain";
 import { showToolchainError } from "./ui/ToolchainSelection";
 import { isPathInsidePath } from "./utilities/filesystem";
@@ -95,6 +97,23 @@ export class FolderContext implements vscode.Disposable {
         const statusItemText = `Loading Package (${FolderContext.uriName(folder)})`;
         workspaceContext.statusItem.start(statusItemText);
 
+        // Check if this folder has a .swift-version file and Swiftly is not installed
+        try {
+            const swiftVersionPath = vscode.Uri.joinPath(folder, ".swift-version");
+            await vscode.workspace.fs.stat(swiftVersionPath);
+
+            // File exists, check if Swiftly is installed
+            const swiftlyInstalled = await Swiftly.isInstalled();
+            if (!swiftlyInstalled) {
+                workspaceContext.logger.info(
+                    `Detected .swift-version file in ${FolderContext.uriName(folder)} without Swiftly, prompting for installation`
+                );
+                await handleMissingSwiftly(workspaceContext.logger);
+            }
+        } catch {
+            // .swift-version file doesn't exist, continue normally
+        }
+
         let toolchain: SwiftToolchain;
         try {
             toolchain = await SwiftToolchain.create(

src/commands/installSwiftly.ts

@@ -33,33 +33,41 @@ export async function promptForSwiftlyInstallation(
 ): Promise<SwiftlyInstallOptions | null> {
     const installMessage = `A .swift-version file was detected. Install Swiftly to automatically manage Swift toolchain versions for this project.`;
 
-    const selection = await vscode.window.showInformationMessage(
+    const selection = await vscode.window.showWarningMessage(
         installMessage,
         { modal: false },
         "Install Swiftly",
-        "Customize Directories",
-        "Don't Show Again",
-        "Cancel"
+        "Don't Show Again"
     );
 
     switch (selection) {
-        case "Install Swiftly":
-            return {}; // Use defaults
-
-        case "Customize Directories":
-            return await promptForDirectoryCustomization(logger);
+        case "Install Swiftly": {
+            // Ask if user wants to customize directories
+            const customizeSelection = await vscode.window.showInformationMessage(
+                "Do you want to customize the installation directories?",
+                { modal: false },
+                "Use Defaults",
+                "Customize Directories"
+            );
+
+            if (customizeSelection === "Customize Directories") {
+                return await promptForDirectoryCustomization(logger);
+            } else if (customizeSelection === "Use Defaults") {
+                return {}; // Use defaults
+            }
+            return null; // User closed the prompt
+        }
 
         case "Don't Show Again":
             // Set a workspace setting to suppress this prompt
             await vscode.workspace
                 .getConfiguration("swift")
-                .update("suppressSwiftlyInstallPrompt", true, vscode.ConfigurationTarget.Global);
+                .update("disableSwiftlyInstallPrompt", true, vscode.ConfigurationTarget.Global);
             logger?.info("Swiftly installation prompt suppressed by user");
             return null;
 
-        case "Cancel":
         default:
-            return null;
+            return null; // User closed the prompt
     }
 }
 
@@ -163,7 +171,7 @@ export async function installSwiftlyWithProgress(
  * @returns true if suppressed, false otherwise
  */
 export function isSwiftlyPromptSuppressed(): boolean {
-    return vscode.workspace.getConfiguration("swift").get("suppressSwiftlyInstallPrompt", false);
+    return vscode.workspace.getConfiguration("swift").get("disableSwiftlyInstallPrompt", false);
 }
 
 /**

src/extension.ts

@@ -36,7 +36,7 @@ import { SwiftLoggerFactory } from "./logging/SwiftLoggerFactory";
 import { PlaygroundProvider } from "./playgrounds/PlaygroundProvider";
 import { SwiftEnvironmentVariablesManager, SwiftTerminalProfileProvider } from "./terminal";
 import { SelectedXcodeWatcher } from "./toolchain/SelectedXcodeWatcher";
-import { checkForSwiftlyInstallation } from "./toolchain/swiftly";
+import { Swiftly, checkForSwiftlyInstallation } from "./toolchain/swiftly";
 import { SwiftToolchain } from "./toolchain/toolchain";
 import { LanguageStatusItems } from "./ui/LanguageStatusItems";
 import { getReadOnlyDocumentProvider } from "./ui/ReadOnlyDocumentProvider";
@@ -334,7 +334,6 @@ async function createActiveToolchain(
 ): Promise<SwiftToolchain | undefined> {
     // Check if there's a .swift-version file in the workspace and Swiftly is not installed
     if (await hasSwiftVersionFile()) {
-        const { Swiftly } = await import("./toolchain/swiftly");
         const swiftlyInstalled = await Swiftly.isInstalled();
 
         if (!swiftlyInstalled) {