10 files changed, 42 insertions, 43 deletions

diff --git a/editors/code/src/commands/index.ts b/editors/code/src/commands/index.ts
index d05f40d67..bebd99ca9 100644
--- a/editors/code/src/commands/index.ts
+++ b/editors/code/src/commands/index.ts
@@ -16,7 +16,7 @@ export * from './ssr';
 
 export function collectGarbage(ctx: Ctx): Cmd {
     return async () => {
-        ctx.client?.sendRequest<null>('rust-analyzer/collectGarbage', null);
+        await ctx.client?.sendRequest<null>('rust-analyzer/collectGarbage', null);
     };
 }
 
diff --git a/editors/code/src/commands/ssr.ts b/editors/code/src/commands/ssr.ts
index 6287bf47b..9b814612a 100644
--- a/editors/code/src/commands/ssr.ts
+++ b/editors/code/src/commands/ssr.ts
@@ -14,9 +14,9 @@ export function ssr(ctx: Ctx): Cmd {
                 if (x.includes('==>>')) {
                     return null;
                 }
-                return "Enter request: pattern ==>> template"
+                return "Enter request: pattern ==>> template";
             }
-        }
+        };
         const request = await vscode.window.showInputBox(options);
 
         if (!request) return;
diff --git a/editors/code/src/config.ts b/editors/code/src/config.ts
index c3fa788c7..347c989c4 100644
--- a/editors/code/src/config.ts
+++ b/editors/code/src/config.ts
@@ -22,7 +22,7 @@ export class Config {
         "cargoFeatures",
         "cargo-watch",
     ]
-    .map(opt => `${Config.rootSection}.${opt}`);
+        .map(opt => `${Config.rootSection}.${opt}`);
 
     private static readonly extensionVersion: string = (() => {
         const packageJsonVersion = vscode
@@ -76,7 +76,7 @@ export class Config {
     }
 
     /**
-     * Name of the binary artifact for `ra_lsp_server` that is published for
+     * Name of the binary artifact for `rust-analyzer` that is published for
      * `platform` on GitHub releases. (It is also stored under the same name when
      * downloaded by the extension).
      */
@@ -91,12 +91,12 @@ export class Config {
                     case "arm":
                     case "arm64": return null;
 
-                    default: return "ra_lsp_server-linux";
+                    default: return "rust-analyzer-linux";
                 }
             }
 
-            case "darwin": return "ra_lsp_server-mac";
-            case "win32":  return "ra_lsp_server-windows.exe";
+            case "darwin": return "rust-analyzer-mac";
+            case "win32": return "rust-analyzer-windows.exe";
 
             // Users on these platforms yet need to manually build from sources
             case "aix":
@@ -111,7 +111,7 @@ export class Config {
     }
 
     get serverSource(): null | BinarySource {
-        const serverPath = RA_LSP_DEBUG ?? this.cfg.get<null | string>("raLspServerPath");
+        const serverPath = RA_LSP_DEBUG ?? this.cfg.get<null | string>("serverPath");
 
         if (serverPath) {
             return {
@@ -126,7 +126,7 @@ export class Config {
 
         return {
             type: BinarySource.Type.GithubRelease,
-            dir:  this.ctx.globalStoragePath,
+            dir: this.ctx.globalStoragePath,
             file: prebuiltBinaryName,
             storage: this.ctx.globalState,
             version: Config.extensionVersion,
@@ -140,30 +140,30 @@ export class Config {
     // We don't do runtime config validation here for simplicity. More on stackoverflow:
     // https://stackoverflow.com/questions/60135780/what-is-the-best-way-to-type-check-the-configuration-for-vscode-extension
 
-    get highlightingOn()        { return this.cfg.get("highlightingOn") as boolean; }
+    get highlightingOn() { return this.cfg.get("highlightingOn") as boolean; }
     get rainbowHighlightingOn() { return this.cfg.get("rainbowHighlightingOn") as boolean; }
-    get lruCapacity()           { return this.cfg.get("lruCapacity") as null | number; }
-    get displayInlayHints()     { return this.cfg.get("displayInlayHints") as boolean; }
-    get maxInlayHintLength()    { return this.cfg.get("maxInlayHintLength") as number; }
-    get excludeGlobs()          { return this.cfg.get("excludeGlobs") as string[]; }
-    get useClientWatching()     { return this.cfg.get("useClientWatching") as boolean; }
-    get featureFlags()          { return this.cfg.get("featureFlags") as Record<string, boolean>; }
-    get rustfmtArgs()           { return this.cfg.get("rustfmtArgs") as string[]; }
-    
+    get lruCapacity() { return this.cfg.get("lruCapacity") as null | number; }
+    get displayInlayHints() { return this.cfg.get("displayInlayHints") as boolean; }
+    get maxInlayHintLength() { return this.cfg.get("maxInlayHintLength") as number; }
+    get excludeGlobs() { return this.cfg.get("excludeGlobs") as string[]; }
+    get useClientWatching() { return this.cfg.get("useClientWatching") as boolean; }
+    get featureFlags() { return this.cfg.get("featureFlags") as Record<string, boolean>; }
+    get rustfmtArgs() { return this.cfg.get("rustfmtArgs") as string[]; }
+
     get cargoWatchOptions(): CargoWatchOptions {
         return {
-            enable:     this.cfg.get("cargo-watch.enable") as boolean,
-            arguments:  this.cfg.get("cargo-watch.arguments") as string[],
+            enable: this.cfg.get("cargo-watch.enable") as boolean,
+            arguments: this.cfg.get("cargo-watch.arguments") as string[],
             allTargets: this.cfg.get("cargo-watch.allTargets") as boolean,
-            command:    this.cfg.get("cargo-watch.command") as string,
+            command: this.cfg.get("cargo-watch.command") as string,
         };
     }
 
     get cargoFeatures(): CargoFeatures {
         return {
             noDefaultFeatures: this.cfg.get("cargoFeatures.noDefaultFeatures") as boolean,
-            allFeatures:       this.cfg.get("cargoFeatures.allFeatures") as boolean,
-            features:          this.cfg.get("cargoFeatures.features") as string[],
+            allFeatures: this.cfg.get("cargoFeatures.allFeatures") as boolean,
+            features: this.cfg.get("cargoFeatures.features") as string[],
         };
     }
 
diff --git a/editors/code/src/highlighting.ts b/editors/code/src/highlighting.ts
index a2db04de8..c4d286aef 100644
--- a/editors/code/src/highlighting.ts
+++ b/editors/code/src/highlighting.ts
@@ -29,7 +29,7 @@ export function activateHighlighting(ctx: Ctx) {
                 highlighter.setHighlights(targetEditor, params.decorations);
             },
         );
-    };
+    }
 
     vscode.workspace.onDidChangeConfiguration(
         _ => highlighter.removeHighlights(),
diff --git a/editors/code/src/inlay_hints.ts b/editors/code/src/inlay_hints.ts
index f82df66ae..26705067a 100644
--- a/editors/code/src/inlay_hints.ts
+++ b/editors/code/src/inlay_hints.ts
@@ -29,13 +29,13 @@ export function activateInlayHints(ctx: Ctx) {
 
     ctx.pushCleanup({
         dispose() {
-            hintsUpdater.clear()
+            hintsUpdater.clear();
         }
-    })
+    });
 
     // XXX: we don't await this, thus Promise rejections won't be handled, but
     // this should never throw in fact...
-    hintsUpdater.setEnabled(ctx.config.displayInlayHints)
+    void hintsUpdater.setEnabled(ctx.config.displayInlayHints);
 }
 
 interface InlayHintsParams {
@@ -57,7 +57,7 @@ const typeHintDecorationType = vscode.window.createTextEditorDecorationType({
 const parameterHintDecorationType = vscode.window.createTextEditorDecorationType({
     before: {
         color: new vscode.ThemeColor('rust_analyzer.inlayHint'),
-    }
+    },
 });
 
 class HintsUpdater {
diff --git a/editors/code/src/installation/download_artifact.ts b/editors/code/src/installation/download_artifact.ts
index de655f8f4..9996c556f 100644
--- a/editors/code/src/installation/download_artifact.ts
+++ b/editors/code/src/installation/download_artifact.ts
@@ -15,7 +15,7 @@ import { throttle } from "throttle-debounce";
  * of the artifact as `displayName`.
  */
 export async function downloadArtifact(
-    {downloadUrl, releaseName}: ArtifactReleaseInfo,
+    { downloadUrl, releaseName }: ArtifactReleaseInfo,
     artifactFileName: string,
     installationDir: string,
     displayName: string,
@@ -23,7 +23,7 @@ export async function downloadArtifact(
     await fs.mkdir(installationDir).catch(err => assert.strictEqual(
         err?.code,
         "EEXIST",
-        `Couldn't create directory "${installationDir}" to download `+
+        `Couldn't create directory "${installationDir}" to download ` +
         `${artifactFileName} artifact: ${err.message}`
     ));
 
diff --git a/editors/code/src/installation/fetch_artifact_release_info.ts b/editors/code/src/installation/fetch_artifact_release_info.ts
index 7d497057a..71889e82a 100644
--- a/editors/code/src/installation/fetch_artifact_release_info.ts
+++ b/editors/code/src/installation/fetch_artifact_release_info.ts
@@ -14,7 +14,7 @@ export async function fetchArtifactReleaseInfo(
 ): Promise<null | ArtifactReleaseInfo> {
 
     const repoOwner = encodeURIComponent(repo.owner);
-    const repoName  = encodeURIComponent(repo.name);
+    const repoName = encodeURIComponent(repo.name);
 
     const apiEndpointPath = releaseTag
         ? `/repos/${repoOwner}/${repoName}/releases/tags/${releaseTag}`
@@ -28,8 +28,8 @@ export async function fetchArtifactReleaseInfo(
 
     // FIXME: handle non-ok response
     const response: GithubRelease = await fetch(requestUrl, {
-            headers: { Accept: "application/vnd.github.v3+json" }
-        })
+        headers: { Accept: "application/vnd.github.v3+json" }
+    })
         .then(res => res.json());
 
     const artifact = response.assets.find(artifact => artifact.name === artifactFileName);
diff --git a/editors/code/src/installation/server.ts b/editors/code/src/installation/server.ts
index 80cb719e3..63ab104a1 100644
--- a/editors/code/src/installation/server.ts
+++ b/editors/code/src/installation/server.ts
@@ -29,7 +29,7 @@ export async function ensureServerBinary(source: null | BinarySource): Promise<n
 
             vscode.window.showErrorMessage(
                 `Unable to run ${source.path} binary. ` +
-                `To use the pre-built language server, set "rust-analyzer.raLspServerPath" ` +
+                `To use the pre-built language server, set "rust-analyzer.serverPath" ` +
                 "value to `null` or remove it from the settings to use it by default."
             );
             return null;
@@ -43,7 +43,6 @@ export async function ensureServerBinary(source: null | BinarySource): Promise<n
             console.log("Installed version:", installedVersion, "required:", requiredVersion);
 
             if (isBinaryAvailable(prebuiltBinaryPath) && installedVersion == requiredVersion) {
-                // FIXME: check for new releases and notify the user to update if possible
                 return prebuiltBinaryPath;
             }
 
diff --git a/editors/code/src/main.ts b/editors/code/src/main.ts
index 0ad7ef1bb..a22e0bc66 100644
--- a/editors/code/src/main.ts
+++ b/editors/code/src/main.ts
@@ -11,7 +11,7 @@ import { Config } from './config';
 let ctx: Ctx | undefined;
 
 export async function activate(context: vscode.ExtensionContext) {
-    const config = new Config(context)
+    const config = new Config(context);
 
     const serverPath = await ensureServerBinary(config.serverSource);
     if (serverPath == null) {
@@ -33,7 +33,7 @@ export async function activate(context: vscode.ExtensionContext) {
             vscode.window.showInformationMessage('Reloading rust-analyzer...');
             // @DanTup maneuver
             // https://github.com/microsoft/vscode/issues/45774#issuecomment-373423895
-            await deactivate()
+            await deactivate();
             for (const sub of ctx.subscriptions) {
                 try {
                     sub.dispose();
@@ -41,9 +41,9 @@ export async function activate(context: vscode.ExtensionContext) {
                     console.error(e);
                 }
             }
-            await activate(context)
-        }
-    })
+            await activate(context);
+        };
+    });
 
     ctx.registerCommand('analyzerStatus', commands.analyzerStatus);
     ctx.registerCommand('collectGarbage', commands.collectGarbage);
@@ -54,7 +54,7 @@ export async function activate(context: vscode.ExtensionContext) {
     ctx.registerCommand('expandMacro', commands.expandMacro);
     ctx.registerCommand('run', commands.run);
     ctx.registerCommand('onEnter', commands.onEnter);
-    ctx.registerCommand('ssr', commands.ssr)
+    ctx.registerCommand('ssr', commands.ssr);
 
     // Internal commands which are invoked by the server.
     ctx.registerCommand('runSingle', commands.runSingle);
diff --git a/editors/code/src/status_display.ts b/editors/code/src/status_display.ts
index ed0d82166..0f5f6ef99 100644
--- a/editors/code/src/status_display.ts
+++ b/editors/code/src/status_display.ts
@@ -15,7 +15,7 @@ export function activateStatusDisplay(ctx: Ctx) {
             WorkDoneProgress.type,
             'rustAnalyzer/cargoWatcher',
             params => statusDisplay.handleProgressNotification(params)
-        ))
+        ));
     }
 }