Clean up LSP options

Author: clayreimann

src/vscode/lsp-interop.ts

@@ -1,5 +1,6 @@
 import { workspace, ExtensionContext, Disposable } from "vscode";
 import { LanguageClient, LanguageClientOptions, ServerOptions } from "vscode-languageclient";
+import { absolutePath } from "../helpers/AbsolutePath";
 import * as config from "./config-helpers";
 import { LangaugeServerMode } from "./config-helpers";
 
@@ -21,6 +22,21 @@ function currentClientOptions(): Partial<LanguageClientOptions> {
         documentSelector: ["swift", "cpp", "c", "objective-c", "objective-cpp"],
         synchronize: undefined,
       };
+    case LangaugeServerMode.SourceKite:
+      return {
+        initializationOptions: {
+          isLSPServerTracingOn: config.isLSPTracingOn(),
+          skProtocolProcess: absolutePath(
+            workspace.getConfiguration().get("swift.path.sourcekite")
+          ),
+          skProtocolProcessAsShellCmd: workspace
+            .getConfiguration()
+            .get<boolean>("swift.path.sourcekiteDockerMode"),
+          skCompilerOptions: workspace.getConfiguration().get("sde.sourcekit.compilerOptions"),
+          toolchainPath:
+            workspace.getConfiguration("sourcekit-lsp").get<string>("toolchainPath") || null,
+        },
+      };
     default:
       return {};
   }
@@ -49,14 +65,6 @@ function startLSPClient(context: ExtensionContext) {
         workspace.createFileSystemWatcher(".build/*.yaml"),
       ],
     },
-    initializationOptions: {
-      //   isLSPServerTracingOn: config.isLSPTracingOn(), // used by sourcekite
-      //   skProtocolProcess, // used by sourcekite
-      //   skProtocolProcessAsShellCmd, // used by sourcekite
-      //   skCompilerOptions: workspace.getConfiguration().get("sde.sourcekit.compilerOptions"), // used by sourcekite
-      //   toolchainPath:
-      //     workspace.getConfiguration("sourcekit-lsp").get<string>("toolchainPath") || null,
-    },
     ...currentClientOptions(),
   };
   // Create the language client and start the client.