2 files changed, 18 insertions, 12 deletions

diff --git a/editors/code/src/config.ts b/editors/code/src/config.ts
index fe9f3b4a8..ebe4de1ea 100644
--- a/editors/code/src/config.ts
+++ b/editors/code/src/config.ts
@@ -93,7 +93,9 @@ export class Config {
         return this.cfg.get<T>(path)!;
     }
 
-    get serverPath() { return this.get<null | string>("serverPath"); }
+    get serverPath() {
+        return this.get<null | string>("server.path") ?? this.get<null | string>("serverPath");
+    }
     get serverExtraEnv() { return this.get<Env | null>("server.extraEnv") ?? {}; }
     get channel() { return this.get<UpdatesChannel>("updates.channel"); }
     get askBeforeDownload() { return this.get<boolean>("updates.askBeforeDownload"); }
diff --git a/editors/code/src/main.ts b/editors/code/src/main.ts
index 60907dfd4..694da9409 100644
--- a/editors/code/src/main.ts
+++ b/editors/code/src/main.ts
@@ -167,6 +167,7 @@ async function bootstrapExtension(config: Config, state: PersistentState): Promi
         }
         return;
     };
+    if (serverPath(config) !== null) return;
 
     const now = Date.now();
     if (config.package.releaseTag === NIGHTLY_TAG) {
@@ -278,7 +279,7 @@ async function patchelf(dest: PathLike): Promise<void> {
 }
 
 async function getServer(config: Config, state: PersistentState): Promise<string | undefined> {
-    const explicitPath = process.env.__RA_LSP_SERVER_DEBUG ?? config.serverPath;
+    const explicitPath = serverPath(config);
     if (explicitPath) {
         if (explicitPath.startsWith("~/")) {
             return os.homedir() + explicitPath.slice("~".length);
@@ -287,16 +288,15 @@ async function getServer(config: Config, state: PersistentState): Promise<string
     };
     if (config.package.releaseTag === null) return "rust-analyzer";
 
-    let platform: string | undefined;
-    if ((process.arch === "x64" || process.arch === "ia32") && process.platform === "win32") {
-        platform = "x86_64-pc-windows-msvc";
-    } else if (process.arch === "x64" && process.platform === "linux") {
-        platform = "x86_64-unknown-linux-gnu";
-    } else if (process.arch === "x64" && process.platform === "darwin") {
-        platform = "x86_64-apple-darwin";
-    } else if (process.arch === "arm64" && process.platform === "darwin") {
-        platform = "aarch64-apple-darwin";
-    }
+    const platforms: { [key: string]: string } = {
+        "ia32 win32": "x86_64-pc-windows-msvc",
+        "x64 win32": "x86_64-pc-windows-msvc",
+        "x64 linux": "x86_64-unknown-linux-gnu",
+        "x64 darwin": "x86_64-apple-darwin",
+        "arm64 win32": "aarch64-pc-windows-msvc",
+        "arm64 darwin": "aarch64-apple-darwin",
+    };
+    const platform = platforms[`${process.arch} ${process.platform}`];
     if (platform === undefined) {
         vscode.window.showErrorMessage(
             "Unfortunately we don't ship binaries for your platform yet. " +
@@ -352,6 +352,10 @@ async function getServer(config: Config, state: PersistentState): Promise<string
     return dest;
 }
 
+function serverPath(config: Config): string | null {
+    return process.env.__RA_LSP_SERVER_DEBUG ?? config.serverPath;
+}
+
 async function isNixOs(): Promise<boolean> {
     try {
         const contents = await fs.readFile("/etc/os-release");