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

Auto merge of #12228 - Veykril:configfix, r=Veykril

Browse source 
fix: Fix old config patching overwriting callable snippet config unconditionally
This commit is contained in:
bors 2022-05-12 15:55:50 +00:00
commit 1491013417
2 changed files with 3 additions and 1 deletions
Show stats 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 }} }));
} }