about summary refs log tree commit diff
path: root/editors/code
diff options
context:
space:
mode:
authorLukas Wirth <lukastw97@gmail.com>2021-05-10 21:03:50 +0200
committerLukas Wirth <lukastw97@gmail.com>2021-05-10 21:14:59 +0200
commit6a8d47e7f05545de335107262ceca2ef1742888f (patch)
treecc0296591c62cd3e1bb67f083a3869b6bee71e1b /editors/code
parent07cea5e709f8232b27de646cee67bf1d3f7279c9 (diff)
downloadrust-6a8d47e7f05545de335107262ceca2ef1742888f.tar.gz
rust-6a8d47e7f05545de335107262ceca2ef1742888f.zip
Give MergeBehaviour variants better names
Diffstat (limited to 'editors/code')
-rw-r--r--editors/code/package.json12
1 files changed, 6 insertions, 6 deletions
diff --git a/editors/code/package.json b/editors/code/package.json
index 0cc265aa4fe..f35d30898f7 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -382,17 +382,17 @@
                 "$generated-start": false,
                 "rust-analyzer.assist.importMergeBehavior": {
                     "markdownDescription": "The strategy to use when inserting new imports or merging imports.",
-                    "default": "full",
+                    "default": "crate",
                     "type": "string",
                     "enum": [
                         "none",
-                        "full",
-                        "last"
+                        "crate",
+                        "module"
                     ],
                     "enumDescriptions": [
-                        "No merging",
-                        "Merge all layers of the import trees",
-                        "Only merge the last layer of the import trees"
+                        "Do not merge imports at all.",
+                        "Merge imports from the same crate into a single `use` statement.",
+                        "Merge imports from the same module into a single `use` statement."
                     ]
                 },
                 "rust-analyzer.assist.importPrefix": {