diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-04-07 08:01:45 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2020-04-07 08:01:45 +0100 |
commit | 27285f93acffbeca45c7656f65d66539a2f7fcb4 (patch) | |
tree | 90509c8dc18ae5869bcd8108fb34370a7a496522 /editors/code | |
parent | d3ccc80a2d00f719949a85be938cf445ec5d35bf (diff) | |
parent | 501c5b45acdc2ad3e6b4572425d40104923e7a75 (diff) |
Merge #3874
3874: Better config scheme & defaults r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'editors/code')
-rw-r--r-- | editors/code/package.json | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/editors/code/package.json b/editors/code/package.json index 60ca0c69c..8ae8ea414 100644 --- a/editors/code/package.json +++ b/editors/code/package.json | |||
@@ -251,11 +251,15 @@ | |||
251 | "description": "Additional arguments to rustfmt" | 251 | "description": "Additional arguments to rustfmt" |
252 | }, | 252 | }, |
253 | "rust-analyzer.rustfmt.overrideCommand": { | 253 | "rust-analyzer.rustfmt.overrideCommand": { |
254 | "type": "array", | 254 | "type": [ |
255 | "null", | ||
256 | "array" | ||
257 | ], | ||
255 | "items": { | 258 | "items": { |
256 | "type": "string" | 259 | "type": "string", |
260 | "minItems": 1 | ||
257 | }, | 261 | }, |
258 | "default": [], | 262 | "default": null, |
259 | "markdownDescription": "Advanced option, fully override the command rust-analyzer uses for formatting." | 263 | "markdownDescription": "Advanced option, fully override the command rust-analyzer uses for formatting." |
260 | }, | 264 | }, |
261 | "rust-analyzer.checkOnSave.enable": { | 265 | "rust-analyzer.checkOnSave.enable": { |
@@ -277,11 +281,15 @@ | |||
277 | "markdownDescription": "Cargo command to use for `cargo check`" | 281 | "markdownDescription": "Cargo command to use for `cargo check`" |
278 | }, | 282 | }, |
279 | "rust-analyzer.checkOnSave.overrideCommand": { | 283 | "rust-analyzer.checkOnSave.overrideCommand": { |
280 | "type": "array", | 284 | "type": [ |
285 | "null", | ||
286 | "array" | ||
287 | ], | ||
281 | "items": { | 288 | "items": { |
282 | "type": "string" | 289 | "type": "string", |
290 | "minItems": 1 | ||
283 | }, | 291 | }, |
284 | "default": [], | 292 | "default": null, |
285 | "markdownDescription": "Advanced option, fully override the command rust-analyzer uses for checking. The command should include `--message=format=json` or similar option." | 293 | "markdownDescription": "Advanced option, fully override the command rust-analyzer uses for checking. The command should include `--message=format=json` or similar option." |
286 | }, | 294 | }, |
287 | "rust-analyzer.checkOnSave.allTargets": { | 295 | "rust-analyzer.checkOnSave.allTargets": { |