Merge #3824

3824: New config names r=matklad a=matklad

bors r+
🤖

Co-authored-by: Aleksey Kladov <[email protected]>

6 files changed, 131 insertions, 173 deletions

diff --git a/editors/code/package.json b/editors/code/package.json
index 946145df8..1f95cd130 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -177,81 +177,70 @@
             "type": "object",
             "title": "Rust Analyzer",
             "properties": {
-                "rust-analyzer.highlighting.semanticTokens": {
+                "rust-analyzer.diagnostics.enable": {
                     "type": "boolean",
-                    "default": false,
-                    "description": "Use proposed semantic tokens API for syntax highlighting"
+                    "default": true,
+                    "markdownDescription": "Whether to show native rust-analyzer diagnostics."
                 },
-                "rust-analyzer.featureFlags": {
-                    "type": "object",
-                    "default": {},
-                    "description": "Fine grained feature flags to disable annoying features",
-                    "properties": {
-                        "lsp.diagnostics": {
-                            "type": "boolean",
-                            "markdownDescription": "Whether to show diagnostics from `cargo check`"
-                        },
-                        "completion.insertion.add-call-parenthesis": {
-                            "type": "boolean",
-                            "description": "Whether to add parenthesis when completing functions"
-                        },
-                        "completion.insertion.add-argument-snippets": {
-                            "type": "boolean",
-                            "description": "Whether to add argument snippets when completing functions"
-                        },
-                        "completion.enable-postfix": {
-                            "type": "boolean",
-                            "markdownDescription": "Whether to show postfix snippets like `dbg`, `if`, `not`, etc."
-                        },
-                        "call-info.full": {
-                            "type": "boolean",
-                            "description": "Show function name and docs in parameter hints"
-                        },
-                        "notifications.workspace-loaded": {
-                            "type": "boolean",
-                            "markdownDescription": "Whether to show `workspace loaded` message"
-                        },
-                        "notifications.cargo-toml-not-found": {
-                            "type": "boolean",
-                            "markdownDescription": "Whether to show `can't find Cargo.toml` error message"
-                        }
-                    }
+                "rust-analyzer.lruCapacity": {
+                    "type": [
+                        "null",
+                        "integer"
+                    ],
+                    "default": null,
+                    "minimum": 0,
+                    "exclusiveMinimum": true,
+                    "description": "Number of syntax trees rust-analyzer keeps in memory."
                 },
-                "rust-analyzer.updates.channel": {
+                "rust-analyzer.files.watcher": {
                     "type": "string",
                     "enum": [
-                        "stable",
-                        "nightly"
-                    ],
-                    "default": "stable",
-                    "markdownEnumDescriptions": [
-                        "`\"stable\"` updates are shipped weekly, they don't contain cutting-edge features from VSCode proposed APIs but have less bugs in general",
-                        "`\"nightly\"` updates are shipped daily (extension updates automatically by downloading artifacts directly from GitHub), they contain cutting-edge features and latest bug fixes. These releases help us get your feedback very quickly and speed up rust-analyzer development **drastically**"
+                        "client",
+                        "notify"
                     ],
-                    "markdownDescription": "Choose `\"nightly\"` updates to get the latest features and bug fixes every day. While `\"stable\"` releases occur weekly and don't contain cutting-edge features from VSCode proposed APIs"
+                    "default": "client",
+                    "description": "Controls file watching implementation."
                 },
-                "rust-analyzer.updates.askBeforeDownload": {
+                "rust-analyzer.files.exclude": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    },
+                    "default": [],
+                    "description": "Paths to exclude from analysis."
+                },
+                "rust-analyzer.notifications.workspaceLoaded": {
                     "type": "boolean",
-                    "default": true,
-                    "description": "Whether to ask for permission before downloading any files from the Internet"
+                    "markdownDescription": "Whether to show `workspace loaded` message."
                 },
-                "rust-analyzer.serverPath": {
-                    "type": [
-                        "null",
-                        "string"
-                    ],
-                    "default": null,
-                    "description": "Path to rust-analyzer executable (points to bundled binary by default). If this is set, then \"rust-analyzer.updates.channel\" setting is not used"
+                "rust-analyzer.notifications.cargoTomlNotFound": {
+                    "type": "boolean",
+                    "markdownDescription": "Whether to show `can't find Cargo.toml` error message"
+                },
+                "rust-analyzer.cargo.noDefaultFeatures": {
+                    "type": "boolean",
+                    "default": false,
+                    "markdownDescription": "Do not activate the `default` feature"
+                },
+                "rust-analyzer.cargo.allFeatures": {
+                    "type": "boolean",
+                    "default": true,
+                    "description": "Activate all available features"
                 },
-                "rust-analyzer.excludeGlobs": {
+                "rust-analyzer.cargo.features": {
                     "type": "array",
                     "items": {
                         "type": "string"
                     },
                     "default": [],
-                    "description": "Paths to exclude from analysis"
+                    "description": "List of features to activate"
+                },
+                "rust-analyzer.cargo.loadOutDirsFromCheck": {
+                    "type": "boolean",
+                    "default": false,
+                    "markdownDescription": "Run `cargo check` on startup to get the correct value for package OUT_DIRs"
                 },
-                "rust-analyzer.rustfmtArgs": {
+                "rust-analyzer.rustfmt.extraArgs": {
                     "type": "array",
                     "items": {
                         "type": "string"
@@ -259,64 +248,28 @@
                     "default": [],
                     "description": "Additional arguments to rustfmt"
                 },
-                "rust-analyzer.useClientWatching": {
+                "rust-analyzer.checkOnSave.enable": {
                     "type": "boolean",
                     "default": true,
-                    "description": "client provided file watching instead of notify watching."
+                    "markdownDescription": "Run specified `cargo check` command for diagnostics on save"
                 },
-                "rust-analyzer.cargo-watch.enable": {
-                    "type": "boolean",
-                    "default": true,
-                    "markdownDescription": "Run specified `cargo-watch` command for diagnostics on save"
-                },
-                "rust-analyzer.cargo-watch.arguments": {
+                "rust-analyzer.checkOnSave.extraArgs": {
                     "type": "array",
                     "items": {
                         "type": "string"
                     },
-                    "markdownDescription": "`cargo-watch` arguments. (e.g: `--features=\"shumway,pdf\"` will run as `cargo watch -x \"check --features=\"shumway,pdf\"\"` )",
+                    "markdownDescription": "Extra arguments for `cargo check`",
                     "default": []
                 },
-                "rust-analyzer.cargo-watch.command": {
-                    "type": "string",
-                    "markdownDescription": "`cargo-watch` command. (e.g: `clippy` will run as `cargo watch -x clippy` )",
-                    "default": "check"
-                },
-                "rust-analyzer.cargo-watch.allTargets": {
-                    "type": "boolean",
-                    "markdownDescription": "Check all targets and tests (will be passed as `--all-targets`)",
-                    "default": true
-                },
-                "rust-analyzer.trace.server": {
+                "rust-analyzer.checkOnSave.command": {
                     "type": "string",
-                    "scope": "window",
-                    "enum": [
-                        "off",
-                        "messages",
-                        "verbose"
-                    ],
-                    "enumDescriptions": [
-                        "No traces",
-                        "Error only",
-                        "Full log"
-                    ],
-                    "default": "off",
-                    "description": "Trace requests to the rust-analyzer"
+                    "default": "check",
+                    "markdownDescription": "Cargo command to use for `cargo check`"
                 },
-                "rust-analyzer.trace.extension": {
-                    "description": "Enable logging of VS Code extensions itself",
+                "rust-analyzer.checkOnSave.allTargets": {
                     "type": "boolean",
-                    "default": false
-                },
-                "rust-analyzer.lruCapacity": {
-                    "type": [
-                        "null",
-                        "integer"
-                    ],
-                    "default": null,
-                    "minimum": 0,
-                    "exclusiveMinimum": true,
-                    "description": "Number of syntax trees rust-analyzer keeps in memory"
+                    "default": true,
+                    "markdownDescription": "Check all targets and tests (will be passed as `--all-targets`)"
                 },
                 "rust-analyzer.inlayHints.typeHints": {
                     "type": "boolean",
@@ -343,28 +296,76 @@
                     "exclusiveMinimum": true,
                     "description": "Maximum length for inlay hints"
                 },
-                "rust-analyzer.cargoFeatures.noDefaultFeatures": {
+                "rust-analyzer.completion.addCallParenthesis": {
                     "type": "boolean",
-                    "default": false,
-                    "markdownDescription": "Do not activate the `default` feature"
+                    "default": true,
+                    "description": "Whether to add parenthesis when completing functions"
                 },
-                "rust-analyzer.cargoFeatures.allFeatures": {
+                "rust-analyzer.completion.addCallArgumentSnippets": {
                     "type": "boolean",
                     "default": true,
-                    "description": "Activate all available features"
+                    "description": "Whether to add argument snippets when completing functions"
                 },
-                "rust-analyzer.cargoFeatures.features": {
-                    "type": "array",
-                    "items": {
-                        "type": "string"
-                    },
-                    "default": [],
-                    "description": "List of features to activate"
+                "rust-analyzer.completion.postfix.enable": {
+                    "type": "boolean",
+                    "default": true,
+                    "markdownDescription": "Whether to show postfix snippets like `dbg`, `if`, `not`, etc."
+                },
+                "rust-analyzer.callInfo.full": {
+                    "type": "boolean",
+                    "description": "Show function name and docs in parameter hints"
                 },
-                "rust-analyzer.cargoFeatures.loadOutDirsFromCheck": {
+                "rust-analyzer.highlighting.semanticTokens": {
                     "type": "boolean",
                     "default": false,
-                    "markdownDescription": "Run `cargo check` on startup to get the correct value for package OUT_DIRs"
+                    "description": "Use proposed semantic tokens API for syntax highlighting"
+                },
+                "rust-analyzer.updates.channel": {
+                    "type": "string",
+                    "enum": [
+                        "stable",
+                        "nightly"
+                    ],
+                    "default": "stable",
+                    "markdownEnumDescriptions": [
+                        "`\"stable\"` updates are shipped weekly, they don't contain cutting-edge features from VSCode proposed APIs but have less bugs in general",
+                        "`\"nightly\"` updates are shipped daily (extension updates automatically by downloading artifacts directly from GitHub), they contain cutting-edge features and latest bug fixes. These releases help us get your feedback very quickly and speed up rust-analyzer development **drastically**"
+                    ],
+                    "markdownDescription": "Choose `\"nightly\"` updates to get the latest features and bug fixes every day. While `\"stable\"` releases occur weekly and don't contain cutting-edge features from VSCode proposed APIs"
+                },
+                "rust-analyzer.updates.askBeforeDownload": {
+                    "type": "boolean",
+                    "default": true,
+                    "description": "Whether to ask for permission before downloading any files from the Internet"
+                },
+                "rust-analyzer.serverPath": {
+                    "type": [
+                        "null",
+                        "string"
+                    ],
+                    "default": null,
+                    "description": "Path to rust-analyzer executable (points to bundled binary by default). If this is set, then \"rust-analyzer.updates.channel\" setting is not used"
+                },
+                "rust-analyzer.trace.server": {
+                    "type": "string",
+                    "scope": "window",
+                    "enum": [
+                        "off",
+                        "messages",
+                        "verbose"
+                    ],
+                    "enumDescriptions": [
+                        "No traces",
+                        "Error only",
+                        "Full log"
+                    ],
+                    "default": "off",
+                    "description": "Trace requests to the rust-analyzer"
+                },
+                "rust-analyzer.trace.extension": {
+                    "description": "Enable logging of VS Code extensions itself",
+                    "type": "boolean",
+                    "default": false
                 }
             }
         },
diff --git a/editors/code/src/client.ts b/editors/code/src/client.ts
index 8ddc1cdca..3b1d00bca 100644
--- a/editors/code/src/client.ts
+++ b/editors/code/src/client.ts
@@ -5,30 +5,6 @@ import { Config } from './config';
 import { CallHierarchyFeature } from 'vscode-languageclient/lib/callHierarchy.proposed';
 import { SemanticTokensFeature, DocumentSemanticsTokensSignature } from 'vscode-languageclient/lib/semanticTokens.proposed';
 
-export function configToServerOptions(config: Config) {
-    return {
-        lruCapacity: config.lruCapacity,
-
-        inlayHintsType: config.inlayHints.typeHints,
-        inlayHintsParameter: config.inlayHints.parameterHints,
-        inlayHintsChaining: config.inlayHints.chainingHints,
-        inlayHintsMaxLength: config.inlayHints.maxLength,
-
-        cargoWatchEnable: config.cargoWatchOptions.enable,
-        cargoWatchArgs: config.cargoWatchOptions.arguments,
-        cargoWatchCommand: config.cargoWatchOptions.command,
-        cargoWatchAllTargets: config.cargoWatchOptions.allTargets,
-
-        excludeGlobs: config.excludeGlobs,
-        useClientWatching: config.useClientWatching,
-        featureFlags: config.featureFlags,
-        withSysroot: config.withSysroot,
-        cargoFeatures: config.cargoFeatures,
-        rustfmtArgs: config.rustfmtArgs,
-        vscodeLldb: vscode.extensions.getExtension("vadimcn.vscode-lldb") != null,
-    };
-}
-
 export async function createClient(config: Config, serverPath: string, cwd: string): Promise<lc.LanguageClient> {
     // '.' Is the fallback if no folder is open
     // TODO?: Workspace folders support Uri's (eg: file://test.txt).
@@ -48,7 +24,7 @@ export async function createClient(config: Config, serverPath: string, cwd: stri
 
     const clientOptions: lc.LanguageClientOptions = {
         documentSelector: [{ scheme: 'file', language: 'rust' }],
-        initializationOptions: configToServerOptions(config),
+        initializationOptions: vscode.workspace.getConfiguration("rust-analyzer"),
         traceOutputChannel,
         middleware: {
             // Workaround for https://github.com/microsoft/vscode-languageserver-node/issues/576
diff --git a/editors/code/src/commands/runnables.ts b/editors/code/src/commands/runnables.ts
index 357155163..2635a1440 100644
--- a/editors/code/src/commands/runnables.ts
+++ b/editors/code/src/commands/runnables.ts
@@ -66,6 +66,10 @@ export function debugSingle(ctx: Ctx): Cmd {
     return async (config: ra.Runnable) => {
         const editor = ctx.activeRustEditor;
         if (!editor) return;
+        if (!vscode.extensions.getExtension("vadimcn.vscode-lldb")) {
+            vscode.window.showErrorMessage("Install `vadimcn.vscode-lldb` extension for debugging");
+            return;
+        }
 
         const debugConfig = {
             type: "lldb",
diff --git a/editors/code/src/config.ts b/editors/code/src/config.ts
index c37c6276b..1f45f1de0 100644
--- a/editors/code/src/config.ts
+++ b/editors/code/src/config.ts
@@ -11,9 +11,8 @@ export class Config {
     private readonly rootSection = "rust-analyzer";
     private readonly requiresReloadOpts = [
         "serverPath",
-        "cargoFeatures",
-        "excludeGlobs",
-        "useClientWatching",
+        "cargo",
+        "files",
         "highlighting",
         "updates.channel",
     ]
@@ -71,17 +70,8 @@ export class Config {
     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 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<boolean>("inlayHints.typeHints")!,
@@ -91,21 +81,9 @@ export class Config {
         };
     }
 
-    get cargoWatchOptions() {
-        return {
-            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() {
+    get checkOnSave() {
         return {
-            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")!,
+            command: this.cfg.get<string>("checkOnSave.command")!,
         };
     }
 }
diff --git a/editors/code/src/ctx.ts b/editors/code/src/ctx.ts
index 86b5f3629..bd1c3de07 100644
--- a/editors/code/src/ctx.ts
+++ b/editors/code/src/ctx.ts
@@ -2,7 +2,7 @@ import * as vscode from 'vscode';
 import * as lc from 'vscode-languageclient';
 
 import { Config } from './config';
-import { createClient, configToServerOptions } from './client';
+import { createClient } from './client';
 import { isRustEditor, RustEditor } from './util';
 
 export class Ctx {
@@ -25,7 +25,6 @@ export class Ctx {
         const res = new Ctx(config, extCtx, client, serverPath);
         res.pushCleanup(client.start());
         await client.onReady();
-        client.onRequest('workspace/configuration', _ => [configToServerOptions(config)]);
         return res;
     }
 
diff --git a/editors/code/src/status_display.ts b/editors/code/src/status_display.ts
index 0f5f6ef99..f9cadc8a2 100644
--- a/editors/code/src/status_display.ts
+++ b/editors/code/src/status_display.ts
@@ -7,7 +7,7 @@ import { Ctx } from './ctx';
 const spinnerFrames = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
 
 export function activateStatusDisplay(ctx: Ctx) {
-    const statusDisplay = new StatusDisplay(ctx.config.cargoWatchOptions.command);
+    const statusDisplay = new StatusDisplay(ctx.config.checkOnSave.command);
     ctx.pushCleanup(statusDisplay);
     const client = ctx.client;
     if (client != null) {