Toolchain path is one folder up from swift bin path (#606)

* Toolchain path is one folder up from swift bin path

Previously it was two folders up and swift executables were assumed to be in a usr/bin folder relative to the toolchain folder. It looks like this cannot be assumed so the toolchain path is now one folder up instead.

I have also verified that sourcekit-lsp is happy with this as a valid toolchain path

* Remove unnecessary check

Author: adam-fowler

src/debugger/lldb.ts

@@ -27,6 +27,7 @@ import { SwiftToolchain } from "../toolchain/toolchain";
  * @returns Library path for LLDB
  */
 export async function getLLDBLibPath(toolchain: SwiftToolchain): Promise<Result<string>> {
+    // can't use toolchain path here as LLDB is not in macOS toolchain path
     const executable = path.join(toolchain.swiftFolderPath, "lldb");
     let pathHint = path.dirname(toolchain.swiftFolderPath);
     try {

src/sourcekit-lsp/LanguageClientManager.ts

@@ -413,16 +413,13 @@ export class LanguageClientManager {
             configuration.path.length > 0 &&
             serverPathConfig !== toolchainSourceKitLSP
         ) {
-            // if configuration has custom swift path then set toolchain path
-            if (configuration.path) {
-                // eslint-disable-next-line @typescript-eslint/naming-convention
-                sourcekit.options = {
-                    env: {
-                        ...sourcekit.options?.env,
-                        SOURCEKIT_TOOLCHAIN_PATH: this.workspaceContext.toolchain.toolchainPath,
-                    },
-                };
-            }
+            // eslint-disable-next-line @typescript-eslint/naming-convention
+            sourcekit.options = {
+                env: {
+                    ...sourcekit.options?.env,
+                    SOURCEKIT_TOOLCHAIN_PATH: this.workspaceContext.toolchain.toolchainPath,
+                },
+            };
         }
 
         const serverOptions: langclient.ServerOptions = sourcekit;

src/toolchain/Sanitizer.ts

@@ -25,12 +25,12 @@ export class Sanitizer {
         }
     }
 
-    /** Return runtime environment variables */
+    /** Return runtime environment variables for macOS */
     get runtimeEnvironment(): Record<string, string> | undefined {
         if (!this.toolchain.toolchainPath) {
             return undefined;
         }
-        const lib = `/usr/lib/swift/clang/lib/darwin/libclang_rt.${this.clangName}_osx_dynamic.dylib`;
+        const lib = `/lib/swift/clang/lib/darwin/libclang_rt.${this.clangName}_osx_dynamic.dylib`;
         const libFullPath = path.join(this.toolchain.toolchainPath, lib);
         return { DYLD_INSERT_LIBRARIES: libFullPath };
     }

src/toolchain/toolchain.ts

@@ -82,11 +82,11 @@ export function getDarwinTargetTriple(target: DarwinCompatibleTarget): string |
 
 export class SwiftToolchain {
     constructor(
-        public swiftFolderPath: string,
-        public toolchainPath: string,
-        public swiftVersionString: string,
-        public swiftVersion: Version,
-        public runtimePath?: string,
+        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
+        public swiftVersionString: string, // Swift version as a string, including description
+        public swiftVersion: Version, // Swift version as semVar variable
+        public runtimePath?: string, // runtime library included in output from `swift -print-target-info`
         private defaultTarget?: string,
         private defaultSDK?: string,
         private customSDK?: string,
@@ -179,7 +179,7 @@ export class SwiftToolchain {
     public getToolchainExecutable(exe: string): string {
         // should we add `.exe` at the end of the executable name
         const windowsExeSuffix = process.platform === "win32" ? ".exe" : "";
-        return `${this.toolchainPath}/usr/bin/${exe}${windowsExeSuffix}`;
+        return `${this.toolchainPath}/bin/${exe}${windowsExeSuffix}`;
     }
 
     logDiagnostics(channel: SwiftOutputChannel) {
@@ -286,10 +286,10 @@ export class SwiftToolchain {
                         env: configuration.swiftEnvironmentVariables,
                     });
                     const swift = stdout.trimEnd();
-                    return path.dirname(path.dirname(path.dirname(swift)));
+                    return path.dirname(path.dirname(swift));
                 }
                 default: {
-                    return path.dirname(path.dirname(swiftPath));
+                    return path.dirname(swiftPath);
                 }
             }
         } catch {