address review comments from adam

Author: matthewbastien

CHANGELOG.md

@@ -6,6 +6,7 @@
 
 - Suggest "Open Documentation" when toolchain not found ([#1939](https://github.com/swiftlang/vscode-swift/pull/1939))
 - Make sure all folder operation listeners get past folder add events ([#1945](https://github.com/swiftlang/vscode-swift/pull/1945))
+- Fixed an issue where `lldb-dap` could not be found in Command Line Tools toolchains ([#1936](https://github.com/swiftlang/vscode-swift/pull/1936))
 
 ## 2.14.0 - 2025-11-11
 
@@ -17,7 +18,6 @@
 ### Fixed 
 
 - Fixed an issue where the activation of the extension was held up while waiting on the debug configuration to update ([#1914](https://github.com/swiftlang/vscode-swift/pull/1914))
-- Fixed an issue where `lldb-dap` could not be found in Command Line Tools toolchains ([#1936](https://github.com/swiftlang/vscode-swift/pull/1936))
 
 ## 2.12.0 - 2025-10-29
 

src/toolchain/toolchain.ts

@@ -101,18 +101,20 @@ export function getDarwinTargetTriple(target: DarwinCompatibleTarget): string |
     }
 }
 
+/**
+ * Different entities which are used to manage toolchain installations. Possible values are:
+ *  - `xcrun`: An Xcode/CommandLineTools toolchain controlled via the `xcrun` and `xcode-select` utilities on macOS.
+ *  - `swiftly`: A toolchain managed by `swiftly`.
+ *  - `swiftenv`: A toolchain managed by `swiftenv`.
+ *  - `unknown`: This toolchain was installed via a method unknown to the extension.
+ */
+export type ToolchainManager = "xcrun" | "swiftly" | "swiftenv" | "unknown";
+
 export class SwiftToolchain {
     public swiftVersionString: string;
 
     constructor(
-        /**
-         * Which entity manages this toolchain. Possible managers are:
-         *  - `xcrun`: An Xcode/CommandLineTools toolchain controlled via the `xcrun` and `xcode-select` utilities on macOS.
-         *  - `swiftly`: A toolchain managed by `swiftly`.
-         *  - `swiftenv`: A toolchain managed by `swiftenv`.
-         *  - `unknown`: This toolchain was installed via a method unknown to the extension.
-         */
-        public manager: "xcrun" | "swiftly" | "swiftenv" | "unknown",
+        public manager: ToolchainManager,
         public swiftFolderPath: string, // folder swift executable in $PATH was found in
         public toolchainPath: string, // toolchain folder. One folder up from swift bin folder. This is to support toolchains without usr folder
         private targetInfo: SwiftTargetInfo,
@@ -538,7 +540,7 @@ export class SwiftToolchain {
         if (!(await fileExists(binary))) {
             return false;
         }
-        const objdumpOutput = await execFile("objdump", ["-h", binary]);
+        const objdumpOutput = await execFile("/usr/bin/objdump", ["-h", binary]);
         return objdumpOutput.stdout.includes("__xcrun_shim");
     }
 
@@ -552,7 +554,7 @@ export class SwiftToolchain {
         logger?: SwiftLogger
     ): Promise<{
         toolchainPath: string;
-        toolchainManager: "xcrun" | "swiftly" | "swiftenv" | "unknown";
+        toolchainManager: ToolchainManager;
     }> {
         try {
             // swift may be a symbolic link

test/unit-tests/toolchain/toolchain.test.ts

@@ -35,23 +35,15 @@ suite("SwiftToolchain Unit Test Suite", () => {
         mockFS.restore();
     });
 
-    suite("create()", () => {
-        suite("macOS", () => {
-            setup(() => {
-                mockedPlatform.setValue("darwin");
-            });
-        });
-    });
-
     suite("getLLDBDebugAdapter()", () => {
         function createSwiftToolchain(options: {
             manager?: "xcrun" | "swiftly" | "swiftenv" | "unknown";
-            swiftBinaryPath: string;
+            swiftFolderPath: string;
             toolchainPath: string;
         }): SwiftToolchain {
             return new SwiftToolchain(
                 options.manager ?? "unknown",
-                options.swiftBinaryPath,
+                options.swiftFolderPath,
                 options.toolchainPath,
                 /* targetInfo */ {
                     compilerVersion: "6.0.0",
@@ -84,7 +76,7 @@ suite("SwiftToolchain Unit Test Suite", () => {
                 });
                 const sut = createSwiftToolchain({
                     manager: "unknown",
-                    swiftBinaryPath:
+                    swiftFolderPath:
                         "/Library/Developer/Toolchains/swift-6.0.1-RELEASE.xctoolchain/usr/bin/swift",
                     toolchainPath:
                         "/Library/Developer/Toolchains/swift-6.0.1-RELEASE.xctoolchain/usr",
@@ -100,7 +92,7 @@ suite("SwiftToolchain Unit Test Suite", () => {
                     "/Library/Developer/Toolchains/swift-6.0.1-RELEASE.xctoolchain/usr/bin": {},
                 });
                 const sut = createSwiftToolchain({
-                    swiftBinaryPath:
+                    swiftFolderPath:
                         "/Library/Developer/Toolchains/swift-6.0.1-RELEASE.xctoolchain/usr/bin",
                     toolchainPath:
                         "/Library/Developer/Toolchains/swift-6.0.1-RELEASE.xctoolchain/usr",
@@ -133,7 +125,7 @@ suite("SwiftToolchain Unit Test Suite", () => {
                 });
                 const sut = createSwiftToolchain({
                     manager: "xcrun",
-                    swiftBinaryPath: "/usr/bin/swift",
+                    swiftFolderPath: "/usr/bin/swift",
                     toolchainPath:
                         "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr",
                 });
@@ -153,7 +145,7 @@ suite("SwiftToolchain Unit Test Suite", () => {
                 });
                 const sut = createSwiftToolchain({
                     manager: "xcrun",
-                    swiftBinaryPath: "/usr/bin/swift",
+                    swiftFolderPath: "/usr/bin/swift",
                     toolchainPath: "/Library/Developer/CommandLineTools/usr",
                 });
 
@@ -178,7 +170,7 @@ suite("SwiftToolchain Unit Test Suite", () => {
                     },
                 });
                 const sut = createSwiftToolchain({
-                    swiftBinaryPath: "/toolchains/swift-6.0.0/usr/bin",
+                    swiftFolderPath: "/toolchains/swift-6.0.0/usr/bin",
                     toolchainPath: "/toolchains/swift-6.0.0/usr",
                 });
 
@@ -192,7 +184,7 @@ suite("SwiftToolchain Unit Test Suite", () => {
                     "/toolchains/swift-6.0.0/usr/bin": {},
                 });
                 const sut = createSwiftToolchain({
-                    swiftBinaryPath: "/toolchains/swift-6.0.0/usr/bin",
+                    swiftFolderPath: "/toolchains/swift-6.0.0/usr/bin",
                     toolchainPath: "/toolchains/swift-6.0.0/usr",
                 });
 
@@ -217,7 +209,7 @@ suite("SwiftToolchain Unit Test Suite", () => {
                     },
                 });
                 const sut = createSwiftToolchain({
-                    swiftBinaryPath: "/toolchains/swift-6.0.0/usr/bin",
+                    swiftFolderPath: "/toolchains/swift-6.0.0/usr/bin",
                     toolchainPath: "/toolchains/swift-6.0.0/usr",
                 });
 
@@ -231,7 +223,7 @@ suite("SwiftToolchain Unit Test Suite", () => {
                     "/toolchains/swift-6.0.0/usr/bin": {},
                 });
                 const sut = createSwiftToolchain({
-                    swiftBinaryPath: "/toolchains/swift-6.0.0/usr/bin",
+                    swiftFolderPath: "/toolchains/swift-6.0.0/usr/bin",
                     toolchainPath: "/toolchains/swift-6.0.0/usr",
                 });