Auto merge of #12504 - rust-lang:Veykril-patch-1, r=Veykril

fix: Fix config patching for callable snippets

Closes https://github.com/rust-lang/rust-analyzer/issues/12498
This commit is contained in:
bors 2022-06-11 11:41:26 +00:00
commit 37b01f9f39

View file

@ -117,7 +117,7 @@ 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"),
(Some(Value::Bool(false)), Some(Value::Bool(false))) => json!("add_parentheses"), (Some(Value::Bool(false)), Some(Value::Bool(false))) => json!("none"),
(_, _) => return, (_, _) => return,
}; };
merge(json, json!({ "completion": { "callable": {"snippets": res }} })); merge(json, json!({ "completion": { "callable": {"snippets": res }} }));