1 files changed, 22 insertions, 7 deletions

diff --git a/editors/code/package.json b/editors/code/package.json
index 43a5cc2b5..666016ae4 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -313,7 +313,7 @@
                 },
                 "rust-analyzer.updates.askBeforeDownload": {
                     "type": "boolean",
-                    "default": true,
+                    "default": false,
                     "description": "Whether to ask for permission before downloading any files from the Internet."
                 },
                 "rust-analyzer.server.path": {
@@ -389,7 +389,7 @@
                     "default": {},
                     "markdownDescription": "Optional settings passed to the debug engine. Example: `{ \"lldb\": { \"terminal\":\"external\"} }`"
                 },
-                "$generated-start": false,
+                "$generated-start": {},
                 "rust-analyzer.assist.importGranularity": {
                     "markdownDescription": "How imports should be grouped into use statements.",
                     "default": "crate",
@@ -418,13 +418,13 @@
                     "type": "string",
                     "enum": [
                         "plain",
-                        "by_self",
-                        "by_crate"
+                        "self",
+                        "crate"
                     ],
                     "enumDescriptions": [
                         "Insert import paths relative to the current module, using up to one `super` prefix if the parent module contains the requested item.",
-                        "Prefix all import paths with `self` if they don't begin with `self`, `super`, `crate` or a crate name.",
-                        "Force import paths to be absolute by always starting them with `crate` or the crate name they refer to."
+                        "Insert import paths relative to the current module, using up to one `super` prefix if the parent module contains the requested item. Prefixes `self` in front of the path if it starts with a module.",
+                        "Force import paths to be absolute by always starting them with `crate` or the extern crate name they come from."
                     ]
                 },
                 "rust-analyzer.assist.importGroup": {
@@ -432,6 +432,11 @@
                     "default": true,
                     "type": "boolean"
                 },
+                "rust-analyzer.assist.allowMergingIntoGlobImports": {
+                    "markdownDescription": "Whether to allow import insertion to merge new imports into single path glob imports like `use std::fmt::*;`.",
+                    "default": true,
+                    "type": "boolean"
+                },
                 "rust-analyzer.callInfo.full": {
                     "markdownDescription": "Show function name and docs in parameter hints.",
                     "default": true,
@@ -447,6 +452,16 @@
                     "default": false,
                     "type": "boolean"
                 },
+                "rust-analyzer.cargo.unsetTest": {
+                    "markdownDescription": "Unsets `#[cfg(test)]` for the specified crates.",
+                    "default": [
+                        "core"
+                    ],
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                },
                 "rust-analyzer.cargo.features": {
                     "markdownDescription": "List of features to activate.",
                     "default": [],
@@ -846,7 +861,7 @@
                         "Search for all symbols kinds"
                     ]
                 },
-                "$generated-end": false
+                "$generated-end": {}
             }
         },
         "problemPatterns": [