Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2025-01-14 14:13:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix cargo check config with custom command

Browse source
This commit is contained in:
Josh Mcguigan 2020-04-06 21:41:31 -07:00
parent c859a6480a
commit 8f7fceeb9c
1 changed files with 25 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
crates/rust-analyzer/src/config.rs
View file

@ -131,37 +131,47 @@ impl Config {
set(value, "/cargo/allFeatures", &mut self.cargo.all_features); set(value, "/cargo/allFeatures", &mut self.cargo.all_features);
set(value, "/cargo/features", &mut self.cargo.features); set(value, "/cargo/features", &mut self.cargo.features);
set(value, "/cargo/loadOutDirsFromCheck", &mut self.cargo.load_out_dirs_from_check); set(value, "/cargo/loadOutDirsFromCheck", &mut self.cargo.load_out_dirs_from_check);
if let Some(mut args) = get::<Vec<String>>(value, "/rustfmt/overrideCommand") { match get::<Vec<String>>(value, "/rustfmt/overrideCommand") {
if !args.is_empty() { Some(mut args) if !args.is_empty() => {
let command = args.remove(0); let command = args.remove(0);
self.rustfmt = RustfmtConfig::CustomCommand { self.rustfmt = RustfmtConfig::CustomCommand {
command, command,
args, args,
} }
} }
} else if let RustfmtConfig::Rustfmt { extra_args } = &mut self.rustfmt { _ => {
if let RustfmtConfig::Rustfmt { extra_args } = &mut self.rustfmt {
set(value, "/rustfmt/extraArgs", extra_args); set(value, "/rustfmt/extraArgs", extra_args);
} }
}
};
if let Some(false) = get(value, "/checkOnSave/enable") { if let Some(false) = get(value, "/checkOnSave/enable") {
// check is disabled
self.check = None; self.check = None;
} else { } else {
if let Some(mut args) = get::<Vec<String>>(value, "/checkOnSave/overrideCommand") { // check is enabled
if !args.is_empty() { match get::<Vec<String>>(value, "/checkOnSave/overrideCommand") {
// first see if the user has completely overridden the command
Some(mut args) if !args.is_empty() => {
let command = args.remove(0); let command = args.remove(0);
self.check = Some(FlycheckConfig::CustomCommand { self.check = Some(FlycheckConfig::CustomCommand {
command, command,
args, args,
}); });
} }
// otherwise configure command customizations
} else if let Some(FlycheckConfig::CargoCommand { command, extra_args, all_targets }) = &mut self.check _ => {
if let Some(FlycheckConfig::CargoCommand { command, extra_args, all_targets })
= &mut self.check
{ {
set(value, "/checkOnSave/extraArgs", extra_args); set(value, "/checkOnSave/extraArgs", extra_args);
set(value, "/checkOnSave/command", command); set(value, "/checkOnSave/command", command);
set(value, "/checkOnSave/allTargets", all_targets); set(value, "/checkOnSave/allTargets", all_targets);
} }
}
}; };
}
set(value, "/inlayHints/typeHints", &mut self.inlay_hints.type_hints); set(value, "/inlayHints/typeHints", &mut self.inlay_hints.type_hints);
set(value, "/inlayHints/parameterHints", &mut self.inlay_hints.parameter_hints); set(value, "/inlayHints/parameterHints", &mut self.inlay_hints.parameter_hints);