check if the configured server binary exists and fall back to the bun…

…dled binary if it does not
JohnnyMorganz · Jan 13, 2025 · 1a8ba5f · 1a8ba5f
1 parent f0c5ca9
commit 1a8ba5f
Showing 1 changed file with 17 additions and 7 deletions.
diff --git a/editors/code/src/extension.ts b/editors/code/src/extension.ts
@@ -185,13 +185,23 @@ const startLanguageServer = async (context: vscode.ExtensionContext) => {
     .getConfiguration("luau-lsp.server")
     .get("path", "");
 
-  const serverBinPath = serverBinConfig
-    ? vscode.Uri.file(serverBinConfig).fsPath
-    : vscode.Uri.joinPath(
-        context.extensionUri,
-        "bin",
-        os.platform() === "win32" ? "server.exe" : "server",
-      ).fsPath;
+  const uri = vscode.Uri.file(serverBinConfig);
+  let serverBinPath;
+
+  if (await utils.exists(uri)) {
+    serverBinPath = uri.fsPath;
+  } else {
+    if (serverBinConfig !== "") {
+      vscode.window.showWarningMessage(
+        `Server binary at path \`${serverBinConfig}\` does not exist, falling back to bundled binary`,
+      );
+    }
+    serverBinPath = vscode.Uri.joinPath(
+      context.extensionUri,
+      "bin",
+      os.platform() === "win32" ? "server.exe" : "server",
+    ).fsPath;
+  }
 
   const run: Executable = {
     command: serverBinPath,