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

fix: Fix old config patching overwriting callable snippet config unconditionally

Browse Source
This commit is contained in:
Lukas Wirth
2022-05-12 17:55:25 +02:00
parent 135164f547
commit 252ffbf77a
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -595,6 +595,7 @@ impl Config {
.collect(); .collect();
patch_old_style::patch_json_for_outdated_configs(&mut json); patch_old_style::patch_json_for_outdated_configs(&mut json);
self.data = ConfigData::from_json(json, &mut errors); self.data = ConfigData::from_json(json, &mut errors);
tracing::debug!("deserialized config data: {:#?}", self.data);
self.snippets.clear(); self.snippets.clear();
for (name, def) in self.data.completion_snippets_custom.iter() { for (name, def) in self.data.completion_snippets_custom.iter() {
if def.prefix.is_empty() && def.postfix.is_empty() { if def.prefix.is_empty() && def.postfix.is_empty() {

3
crates/rust-analyzer/src/config/patch_old_style.rs
View File

@@ -117,7 +117,8 @@ pub(super) fn patch_json_for_outdated_configs(json: &mut Value) {
) { ) {
(Some(Value::Bool(true)), Some(Value::Bool(true))) => json!("fill_arguments"), (Some(Value::Bool(true)), Some(Value::Bool(true))) => json!("fill_arguments"),
(Some(Value::Bool(true)), _) => json!("add_parentheses"), (Some(Value::Bool(true)), _) => json!("add_parentheses"),
(_, _) => json!(null), (Some(Value::Bool(false)), Some(Value::Bool(false))) => json!("add_parentheses"),
(_, _) => return,
}; };
merge(json, json!({ "completion": { "callable": {"snippets": res }} })); merge(json, json!({ "completion": { "callable": {"snippets": res }} }));
} }