Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'editors/code/package.json')
-rw-r--r--editors/code/package.json39
1 files changed, 25 insertions, 14 deletions
diff --git a/editors/code/package.json b/editors/code/package.json
index 745e0da4ef..70687238c8 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -2009,19 +2009,30 @@
"markdownDescription": "How imports should be grouped into use statements.",
"default": "crate",
"type": "string",
- "enum": [
- "preserve",
- "crate",
- "module",
- "item",
- "one"
- ],
- "enumDescriptions": [
- "Do not change the granularity of any imports and preserve the original structure written by the developer.",
- "Merge imports from the same crate into a single use statement. Conversely, imports from different crates are split into separate statements.",
- "Merge imports from the same module into a single use statement. Conversely, imports from different modules are split into separate statements.",
- "Flatten imports so that each has its own use statement.",
- "Merge all imports into a single use statement as long as they have the same visibility and attributes."
+ "anyOf": [
+ {
+ "enum": [
+ "crate",
+ "module",
+ "item",
+ "one"
+ ],
+ "enumDescriptions": [
+ "Merge imports from the same crate into a single use statement. Conversely, imports from different crates are split into separate statements.",
+ "Merge imports from the same module into a single use statement. Conversely, imports from different modules are split into separate statements.",
+ "Flatten imports so that each has its own use statement.",
+ "Merge all imports into a single use statement as long as they have the same visibility and attributes."
+ ]
+ },
+ {
+ "enum": [
+ "preserve"
+ ],
+ "enumDescriptions": [
+ "Deprecated - unless `enforceGranularity` is `true`, the style of the current file is preferred over this setting. Behaves like `item`."
+ ],
+ "deprecated": true
+ }
]
}
}
@@ -2789,7 +2800,7 @@
"rust-analyzer.runnables.extraTestBinaryArgs": {
"markdownDescription": "Additional arguments to be passed through Cargo to launched tests, benchmarks, or\ndoc-tests.\n\nUnless the launched target uses a\n[custom test harness](https://doc.rust-lang.org/cargo/reference/cargo-targets.html#the-harness-field),\nthey will end up being interpreted as options to\n[`rustc`’s built-in test harness (“libtest”)](https://doc.rust-lang.org/rustc/tests/index.html#cli-arguments).",
"default": [
- "--show-output"
+ "--nocapture"
],
"type": "array",
"items": {