rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Allow fully overriding check and fmt commands

Browse Source
This commit is contained in:
Aleksey Kladov
2020-04-02 14:30:28 +02:00
parent 7a4ebd2c8d
commit 8a788c764f
2 changed files with 33 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
crates/rust-analyzer/src/config.rs
View File

@@ -133,13 +133,30 @@ impl Config {
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 {
if let Some(mut args) = get::<Vec<String>>(value, "/rustfmt/overrideCommand") {
if !args.is_empty() {
let command = args.remove(0);
self.rustfmt = RustfmtConfig::CustomCommand {
command,
args,
}
}
} else if let RustfmtConfig::Rustfmt { extra_args } = &mut self.rustfmt {
set(value, "/rustfmt/extraArgs", extra_args);
}
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
if let Some(mut args) = get::<Vec<String>>(value, "/checkOnSave/overrideCommand") {
if !args.is_empty() {
let command = args.remove(0);
self.check = Some(FlycheckConfig::CustomCommand {
command,
args,
})
}
} else if let Some(FlycheckConfig::CargoCommand { command, extra_args, all_targets }) = &mut self.check
{
set(value, "/checkOnSave/extraArgs", extra_args);
set(value, "/checkOnSave/command", command);

14
editors/code/package.json
View File

@@ -248,6 +248,13 @@
"default": [],
"description": "Additional arguments to rustfmt"
},
"rust-analyzer.rustfmt.overrideCommand": {
"type": "array",
"items": {
"type": "string"
},
"markdownDescription": "Advanced option, fully override the command rust-analyzer uses for formatting."
},
"rust-analyzer.checkOnSave.enable": {
"type": "boolean",
"default": true,
@@ -266,6 +273,13 @@
"default": "check",
"markdownDescription": "Cargo command to use for `cargo check`"
},
"rust-analyzer.checkOnSave.overrideCommand": {
"type": "array",
"items": {
"type": "string"
},
"markdownDescription": "Advanced option, fully override the command rust-analyzer uses for checking. The command must include `--message=format=json`."
},
"rust-analyzer.checkOnSave.allTargets": {
"type": "boolean",
"default": true,