Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-27 05:23:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix: Handle empty checkOnSave/target values

Browse source 
This fixes a regression introduced by #13290, in which failing to set
`checkOnSave/target` (or `checkOnSave/targets`) would lead to an invalid
config.
This commit is contained in:
Isobel Redelmeier 2022-11-21 16:40:32 -05:00
parent 26562973b3
commit b116fe9be0
No known key found for this signature in database
GPG key ID: F2D647B6DA04BA3B
3 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -182,7 +182,7 @@ config_data! {
/// `["aarch64-apple-darwin", "x86_64-apple-darwin"]`. /// `["aarch64-apple-darwin", "x86_64-apple-darwin"]`.
/// ///
/// Aliased as `"checkOnSave.targets"`. /// Aliased as `"checkOnSave.targets"`.
checkOnSave_target | checkOnSave_targets: CheckOnSaveTargets = "[]", checkOnSave_target | checkOnSave_targets: Option<CheckOnSaveTargets> = "null",
/// Toggles the additional completions that automatically add imports when completed. /// Toggles the additional completions that automatically add imports when completed.
/// Note that your client must specify the `additionalTextEdits` LSP client capability to truly have this feature enabled. /// Note that your client must specify the `additionalTextEdits` LSP client capability to truly have this feature enabled.
@ -1153,10 +1153,15 @@ impl Config {
} }
Some(_) | None => FlycheckConfig::CargoCommand { Some(_) | None => FlycheckConfig::CargoCommand {
command: self.data.checkOnSave_command.clone(), command: self.data.checkOnSave_command.clone(),
target_triples: match &self.data.checkOnSave_target.0[..] { target_triples: self
[] => self.data.cargo_target.clone().into_iter().collect(), .data
targets => targets.into(), .checkOnSave_target
}, .clone()
.and_then(|targets| match &targets.0[..] {
[] => None,
targets => Some(targets.into()),
})
.unwrap_or_else(|| self.data.cargo_target.clone().into_iter().collect()),
all_targets: self.data.checkOnSave_allTargets, all_targets: self.data.checkOnSave_allTargets,
no_default_features: self no_default_features: self
.data .data
@ -2126,8 +2131,11 @@ fn field_props(field: &str, ty: &str, doc: &[&str], default: &str) -> serde_json
"The command will be executed in the project root." "The command will be executed in the project root."
], ],
}, },
"CheckOnSaveTargets" => set! { "Option<CheckOnSaveTargets>" => set! {
"anyOf": [ "anyOf": [
{
"type": "null"
},
{ {
"type": "string", "type": "string",
}, },

2
docs/user/generated_config.adoc
View file

@ -190,7 +190,7 @@ cargo check --workspace --message-format=json --all-targets
``` ```
. .
-- --
[[rust-analyzer.checkOnSave.target]]rust-analyzer.checkOnSave.target (default: `[]`):: [[rust-analyzer.checkOnSave.target]]rust-analyzer.checkOnSave.target (default: `null`)::
+ +
-- --
Check for specific targets. Defaults to `#rust-analyzer.cargo.target#` if empty. Check for specific targets. Defaults to `#rust-analyzer.cargo.target#` if empty.

5
editors/code/package.json
View file

@ -640,8 +640,11 @@
}, },
"rust-analyzer.checkOnSave.target": { "rust-analyzer.checkOnSave.target": {
"markdownDescription": "Check for specific targets. Defaults to `#rust-analyzer.cargo.target#` if empty.\n\nCan be a single target, e.g. `\"x86_64-unknown-linux-gnu\"` or a list of targets, e.g.\n`[\"aarch64-apple-darwin\", \"x86_64-apple-darwin\"]`.\n\nAliased as `\"checkOnSave.targets\"`.", "markdownDescription": "Check for specific targets. Defaults to `#rust-analyzer.cargo.target#` if empty.\n\nCan be a single target, e.g. `\"x86_64-unknown-linux-gnu\"` or a list of targets, e.g.\n`[\"aarch64-apple-darwin\", \"x86_64-apple-darwin\"]`.\n\nAliased as `\"checkOnSave.targets\"`.",
"default": [], "default": null,
"anyOf": [ "anyOf": [
{
"type": "null"
},
{ {
"type": "string" "type": "string"
}, },