New config in package.json

2 files changed, 166 insertions, 146 deletions

diff --git a/crates/rust-analyzer/src/config.rs b/crates/rust-analyzer/src/config.rs
index f4c154058..b19421c16 100644
--- a/crates/rust-analyzer/src/config.rs
+++ b/crates/rust-analyzer/src/config.rs
@@ -18,13 +18,13 @@ pub struct Config {
     pub client_caps: ClientCapsConfig,
 
     pub with_sysroot: bool,
+    // TODO: verify that it means what I think it means
     pub publish_diagnostics: bool,
-    pub use_client_watching: bool,
     // TODO: move to experimental capabilities
     pub vscode_lldb: bool,
     pub lru_capacity: Option<usize>,
     pub proc_macro_srv: Option<String>,
-    pub exclude_globs: Vec<String>,
+    pub files: FilesConfig,
     pub notifications: NotificationsConfig,
 
     pub cargo: CargoConfig,
@@ -37,6 +37,18 @@ pub struct Config {
 }
 
 #[derive(Debug, Clone)]
+pub struct FilesConfig {
+    watcher: FilesWatcher,
+    exclude: Vec<String>,
+}
+
+#[derive(Debug, Clone)]
+enum FilesWatcher {
+    Client,
+    Notify,
+}
+
+#[derive(Debug, Clone)]
 pub struct NotificationsConfig {
     pub workspace_loaded: bool,
     pub cargo_toml_not_found: bool,
@@ -67,11 +79,10 @@ impl Default for Config {
 
             with_sysroot: true,
             publish_diagnostics: true,
-            use_client_watching: false,
             vscode_lldb: false,
             lru_capacity: None,
             proc_macro_srv: None,
-            exclude_globs: Vec::new(),
+            files: FilesConfig { watcher: FilesWatcher::Notify, exclude: Vec::new() },
             notifications: NotificationsConfig {
                 workspace_loaded: true,
                 cargo_toml_not_found: true,
@@ -112,39 +123,43 @@ impl Config {
 
         set(value, "/withSysroot", &mut self.with_sysroot);
         set(value, "/featureFlags/lsp.diagnostics", &mut self.publish_diagnostics);
-        set(value, "/useClientWatching", &mut self.use_client_watching);
         set(value, "/vscodeLldb", &mut self.vscode_lldb);
         set(value, "/lruCapacity", &mut self.lru_capacity);
-        set(value, "/excludeGlobs", &mut self.exclude_globs);
-        set(value, "/featureFlags/notifications.workspace-loaded", &mut self.notifications.workspace_loaded);
-        set(value, "/featureFlags/notifications.cargo-toml-not-found", &mut self.notifications.cargo_toml_not_found);
-
-        set(value, "/cargoFeatures/noDefaultFeatures", &mut self.cargo.no_default_features);
-        set(value, "/cargoFeatures/allFeatures", &mut self.cargo.all_features);
-        set(value, "/cargoFeatures/features", &mut self.cargo.features);
-        set(value, "/cargoFeatures/loadOutDirsFromCheck", &mut self.cargo.load_out_dirs_from_check);
+        if let Some(watcher) =  get::<String>(value, "/files/watcher") {
+            self.files.watcher = match watcher.as_str() {
+                "client" => FilesWatcher::Client,
+                "notify"| _ => FilesWatcher::Notify,
+            }
+        }
+        set(value, "/notifications/workspaceLoaded", &mut self.notifications.workspace_loaded);
+        set(value, "/notifications/cargoTomlNotFound", &mut self.notifications.cargo_toml_not_found);
+
+        set(value, "/cargo/noDefaultFeatures", &mut self.cargo.no_default_features);
+        set(value, "/cargo/allFeatures", &mut self.cargo.all_features);
+        set(value, "/cargo/features", &mut self.cargo.features);
+        set(value, "/cargo/loadOutDirsFromCheck", &mut self.cargo.load_out_dirs_from_check);
         if let RustfmtConfig::Rustfmt { extra_args } = &mut self.rustfmt {
-            set(value, "/rustfmtArgs", extra_args);
+            set(value, "/rustfmt/extraArgs", extra_args);
         }
-        if let Some(false) = get(value, "cargo_watch_enable") {
+        if let Some(false) = get(value, "/checkOnSave/enable") {
             self.check = None
         } else {
             if let Some(FlycheckConfig::CargoCommand { command, extra_args, all_targets }) = &mut self.check
             {
-                set(value, "/cargoWatchArgs", extra_args);
-                set(value, "/cargoWatchCommand", command);
-                set(value, "/cargoWatchAllTargets", all_targets);
+                set(value, "/checkOnSave/extraArgs", extra_args);
+                set(value, "/checkOnSave/command", command);
+                set(value, "/checkOnSave/allTargets", all_targets);
             }
         };
 
-        set(value, "/inlayHintsType", &mut self.inlay_hints.type_hints);
-        set(value, "/inlayHintsParameter", &mut self.inlay_hints.parameter_hints);
-        set(value, "/inlayHintsChaining", &mut self.inlay_hints.chaining_hints);
-        set(value, "/inlayHintsMaxLength", &mut self.inlay_hints.max_length);
-        set(value, "/featureFlags/completion.enable-postfix", &mut self.completion.enable_postfix_completions);
-        set(value, "/featureFlags/completion.insertion.add-call-parenthesis", &mut self.completion.add_call_parenthesis);
-        set(value, "/featureFlags/completion.insertion.add-argument-snippets", &mut self.completion.add_call_argument_snippets);
-        set(value, "/featureFlags/call-info.full", &mut self.call_info_full);
+        set(value, "/inlayHints/typeHints", &mut self.inlay_hints.type_hints);
+        set(value, "/inlayHints/parameterHints", &mut self.inlay_hints.parameter_hints);
+        set(value, "/inlayHints/chainingHints", &mut self.inlay_hints.chaining_hints);
+        set(value, "/inlayHints/maxLength", &mut self.inlay_hints.max_length);
+        set(value, "/completion/postfix/enable", &mut self.completion.enable_postfix_completions);
+        set(value, "/completion/addCallParenthesis", &mut self.completion.add_call_parenthesis);
+        set(value, "/completion/addCallArgumentSnippets", &mut self.completion.add_call_argument_snippets);
+        set(value, "/callInfo/full", &mut self.call_info_full);
 
         log::info!("Config::update() = {:#?}", self);
 
diff --git a/editors/code/package.json b/editors/code/package.json
index 946145df8..df8adfe0e 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -177,81 +177,71 @@
             "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"
+                        "client",
+                        "notify"
                     ],
-                    "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"
+                    "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.excludeGlobs": {
+                "rust-analyzer.cargo.allFeatures": {
+                    "type": "boolean",
+                    "default": true,
+                    "description": "Activate all available features"
+                },
+                "rust-analyzer.cargo.features": {
                     "type": "array",
                     "items": {
                         "type": "string"
                     },
                     "default": [],
-                    "description": "Paths to exclude from analysis"
+                    "description": "List of features to activate"
                 },
-                "rust-analyzer.rustfmtArgs": {
+                "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.rustfmt.extraArgs": {
                     "type": "array",
                     "items": {
                         "type": "string"
@@ -259,65 +249,30 @@
                     "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",
                     "default": true,
@@ -343,29 +298,79 @@
                     "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
+                },
             }
         },
         "problemPatterns": [