5 files changed, 72 insertions, 86 deletions

diff --git a/editors/code/package.json b/editors/code/package.json
index eb5748515..1d113ebb6 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -73,10 +73,18 @@
                         "type": "string"
                     },
                     "args": {
-                        "type": "array"
+                        "type": "array",
+                        "items": {
+                            "type": "string"
+                        }
                     },
                     "env": {
-                        "type": "object"
+                        "type": "object",
+                        "patternProperties": {
+                            ".+": {
+                                "type": "string"
+                            }
+                        }
                     }
                 }
             }
diff --git a/editors/code/src/client.ts b/editors/code/src/client.ts
index 08d821dd0..82ca749f3 100644
--- a/editors/code/src/client.ts
+++ b/editors/code/src/client.ts
@@ -99,8 +99,10 @@ export async function createClient(config: Config, serverPath: string): Promise<
     // Note that while the CallHierarchyFeature is stable the LSP protocol is not.
     res.registerFeature(new CallHierarchyFeature(res));
 
-    if (config.highlightingSemanticTokens) {
-        res.registerFeature(new SemanticTokensFeature(res));
+    if (config.package.enableProposedApi) {
+        if (config.highlightingSemanticTokens) {
+            res.registerFeature(new SemanticTokensFeature(res));
+        }
     }
 
     return res;
diff --git a/editors/code/src/config.ts b/editors/code/src/config.ts
index be5296fcf..7668c20b7 100644
--- a/editors/code/src/config.ts
+++ b/editors/code/src/config.ts
@@ -1,29 +1,10 @@
 import * as vscode from 'vscode';
 import { log } from "./util";
 
-export interface InlayHintOptions {
-    typeHints: boolean;
-    parameterHints: boolean;
-    maxLength: number | null;
-}
-
-export interface CargoWatchOptions {
-    enable: boolean;
-    arguments: string[];
-    command: string;
-    allTargets: boolean;
-}
-
-export interface CargoFeatures {
-    noDefaultFeatures: boolean;
-    allFeatures: boolean;
-    features: string[];
-    loadOutDirsFromCheck: boolean;
-}
-
 export type UpdatesChannel = "stable" | "nightly";
 
 export const NIGHTLY_TAG = "nightly";
+
 export class Config {
     readonly extensionId = "matklad.rust-analyzer";
 
@@ -38,37 +19,30 @@ export class Config {
     ]
         .map(opt => `${this.rootSection}.${opt}`);
 
-    readonly packageJsonVersion: string = vscode
-        .extensions
-        .getExtension(this.extensionId)!
-        .packageJSON
-        .version;
-
-    readonly releaseTag: string | undefined = vscode
-        .extensions
-        .getExtension(this.extensionId)!
-        .packageJSON
-        .releaseTag ?? undefined;
+    readonly package: {
+        version: string;
+        releaseTag: string | undefined;
+        enableProposedApi: boolean | undefined;
+    } = vscode.extensions.getExtension(this.extensionId)!.packageJSON;
 
-    private cfg!: vscode.WorkspaceConfiguration;
+    readonly globalStoragePath: string;
 
-    constructor(private readonly ctx: vscode.ExtensionContext) {
-        vscode.workspace.onDidChangeConfiguration(this.onConfigChange, this, ctx.subscriptions);
-        this.refreshConfig();
+    constructor(ctx: vscode.ExtensionContext) {
+        this.globalStoragePath = ctx.globalStoragePath;
+        vscode.workspace.onDidChangeConfiguration(this.onDidChangeConfiguration, this, ctx.subscriptions);
+        this.refreshLogging();
     }
 
-    private refreshConfig() {
-        this.cfg = vscode.workspace.getConfiguration(this.rootSection);
-        const enableLogging = this.cfg.get("trace.extension") as boolean;
-        log.setEnabled(enableLogging);
+    private refreshLogging() {
+        log.setEnabled(this.traceExtension);
         log.debug(
-            "Extension version:", this.packageJsonVersion,
+            "Extension version:", this.package.version,
             "using configuration:", this.cfg
         );
     }
 
-    private async onConfigChange(event: vscode.ConfigurationChangeEvent) {
-        this.refreshConfig();
+    private async onDidChangeConfiguration(event: vscode.ConfigurationChangeEvent) {
+        this.refreshLogging();
 
         const requiresReloadOpt = this.requiresReloadOpts.find(
             opt => event.affectsConfiguration(opt)
@@ -86,49 +60,53 @@ export class Config {
         }
     }
 
-    get globalStoragePath(): string { return this.ctx.globalStoragePath; }
-
     // 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 serverPath() { return this.cfg.get("serverPath") as null | string; }
-    get channel() { return this.cfg.get<"stable" | "nightly">("updates.channel")!; }
-    get askBeforeDownload() { return this.cfg.get("updates.askBeforeDownload") as boolean; }
-    get highlightingSemanticTokens() { return this.cfg.get("highlighting.semanticTokens") 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 inlayHints(): InlayHintOptions {
+    private get cfg(): vscode.WorkspaceConfiguration {
+        return vscode.workspace.getConfiguration(this.rootSection);
+    }
+
+    get serverPath() { return this.cfg.get<null | string>("serverPath")!; }
+    get channel() { return this.cfg.get<UpdatesChannel>("updates.channel")!; }
+    get askBeforeDownload() { return this.cfg.get<boolean>("updates.askBeforeDownload")!; }
+    get highlightingSemanticTokens() { return this.cfg.get<boolean>("highlighting.semanticTokens")!; }
+    get highlightingOn() { return this.cfg.get<boolean>("highlightingOn")!; }
+    get rainbowHighlightingOn() { return this.cfg.get<boolean>("rainbowHighlightingOn")!; }
+    get lruCapacity() { return this.cfg.get<null | number>("lruCapacity")!; }
+    get excludeGlobs() { return this.cfg.get<string[]>("excludeGlobs")!; }
+    get useClientWatching() { return this.cfg.get<boolean>("useClientWatching")!; }
+    get featureFlags() { return this.cfg.get<Record<string, boolean>>("featureFlags")!; }
+    get rustfmtArgs() { return this.cfg.get<string[]>("rustfmtArgs")!; }
+    get loadOutDirsFromCheck() { return this.cfg.get<boolean>("loadOutDirsFromCheck")!; }
+    get traceExtension() { return this.cfg.get<boolean>("trace.extension")!; }
+
+    // for internal use
+    get withSysroot() { return this.cfg.get<boolean>("withSysroot", true)!; }
+
+    get inlayHints() {
         return {
-            typeHints: this.cfg.get("inlayHints.typeHints") as boolean,
-            parameterHints: this.cfg.get("inlayHints.parameterHints") as boolean,
-            maxLength: this.cfg.get("inlayHints.maxLength") as null | number,
+            typeHints: this.cfg.get<boolean>("inlayHints.typeHints")!,
+            parameterHints: this.cfg.get<boolean>("inlayHints.parameterHints")!,
+            maxLength: this.cfg.get<null | number>("inlayHints.maxLength")!,
         };
     }
-    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 loadOutDirsFromCheck() { return this.cfg.get("loadOutDirsFromCheck") as boolean; }
 
-    get cargoWatchOptions(): CargoWatchOptions {
+    get cargoWatchOptions() {
         return {
-            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,
+            enable: this.cfg.get<boolean>("cargo-watch.enable")!,
+            arguments: this.cfg.get<string[]>("cargo-watch.arguments")!,
+            allTargets: this.cfg.get<boolean>("cargo-watch.allTargets")!,
+            command: this.cfg.get<string>("cargo-watch.command")!,
         };
     }
 
-    get cargoFeatures(): CargoFeatures {
+    get 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[],
-            loadOutDirsFromCheck: this.cfg.get("cargoFeatures.loadOutDirsFromCheck") as boolean,
+            noDefaultFeatures: this.cfg.get<boolean>("cargoFeatures.noDefaultFeatures")!,
+            allFeatures: this.cfg.get<boolean>("cargoFeatures.allFeatures")!,
+            features: this.cfg.get<string[]>("cargoFeatures.features")!,
+            loadOutDirsFromCheck: this.cfg.get<boolean>("cargoFeatures.loadOutDirsFromCheck")!,
         };
     }
-
-    // for internal use
-    get withSysroot() { return this.cfg.get("withSysroot", true) as boolean; }
 }
diff --git a/editors/code/src/inlay_hints.ts b/editors/code/src/inlay_hints.ts
index b19b09ad5..17d0dfa33 100644
--- a/editors/code/src/inlay_hints.ts
+++ b/editors/code/src/inlay_hints.ts
@@ -134,8 +134,6 @@ class HintsUpdater implements Disposable {
 
             // No text documents changed, so we may try to use the cache
             if (!file.cachedDecorations) {
-                file.inlaysRequest?.cancel();
-
                 const hints = await this.fetchHints(file);
                 if (!hints) return;
 
diff --git a/editors/code/src/main.ts b/editors/code/src/main.ts
index 5d2da9a76..7b7c19dfc 100644
--- a/editors/code/src/main.ts
+++ b/editors/code/src/main.ts
@@ -110,9 +110,9 @@ async function bootstrap(config: Config, state: PersistentState): Promise<string
 }
 
 async function bootstrapExtension(config: Config, state: PersistentState): Promise<void> {
-    if (config.releaseTag === undefined) return;
+    if (config.package.releaseTag === undefined) return;
     if (config.channel === "stable") {
-        if (config.releaseTag === NIGHTLY_TAG) {
+        if (config.package.releaseTag === NIGHTLY_TAG) {
             vscode.window.showWarningMessage(`You are running a nightly version of rust-analyzer extension.
 To switch to stable, uninstall the extension and re-install it from the marketplace`);
         }
@@ -185,7 +185,7 @@ async function getServer(config: Config, state: PersistentState): Promise<string
         }
         return explicitPath;
     };
-    if (config.releaseTag === undefined) return "rust-analyzer";
+    if (config.package.releaseTag === undefined) return "rust-analyzer";
 
     let binaryName: string | undefined = undefined;
     if (process.arch === "x64" || process.arch === "x32") {
@@ -211,21 +211,21 @@ async function getServer(config: Config, state: PersistentState): Promise<string
         await state.updateServerVersion(undefined);
     }
 
-    if (state.serverVersion === config.packageJsonVersion) return dest;
+    if (state.serverVersion === config.package.version) return dest;
 
     if (config.askBeforeDownload) {
         const userResponse = await vscode.window.showInformationMessage(
-            `Language server version ${config.packageJsonVersion} for rust-analyzer is not installed.`,
+            `Language server version ${config.package.version} for rust-analyzer is not installed.`,
             "Download now"
         );
         if (userResponse !== "Download now") return dest;
     }
 
-    const release = await fetchRelease(config.releaseTag);
+    const release = await fetchRelease(config.package.releaseTag);
     const artifact = release.assets.find(artifact => artifact.name === binaryName);
     assert(!!artifact, `Bad release: ${JSON.stringify(release)}`);
 
     await download(artifact.browser_download_url, dest, "Downloading rust-analyzer server", { mode: 0o755 });
-    await state.updateServerVersion(config.packageJsonVersion);
+    await state.updateServerVersion(config.package.version);
     return dest;
 }