mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #12209 - Veykril:config-fix, r=Veykril

Browse Source 
fix: Fix config patching failing when appending suffixes
This commit is contained in:
bors 2022-05-10 19:15:06 +00:00
commit b350a1bf6f
1 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,13 +11,16 @@ macro_rules! patch {
($(
$($src:ident).+ -> $($dst:ident).+ ;
)+) => { $(
if let Some(it) = copy.pointer(concat!($("/", stringify!($src)),+)).cloned() {
let mut last = it;
for segment in [$(stringify!($dst)),+].into_iter().rev() {
last = Value::Object(serde_json::Map::from_iter(std::iter::once((segment.to_string(), last))));
}
match copy.pointer(concat!($("/", stringify!($src)),+)).cloned() {
Some(Value::Object(_)) | None => (),
Some(it) => {
let mut last = it;
for segment in [$(stringify!($dst)),+].into_iter().rev() {
last = Value::Object(serde_json::Map::from_iter(std::iter::once((segment.to_string(), last))));
}
merge(json, last);
merge(json, last);
},
}
)+ };
}
@ -36,7 +39,6 @@ macro_rules! patch {
cargo.runBuildScripts -> cargo.runBuildScripts.overrideCommand;
cargo.runBuildScriptsCommand -> cargo.runBuildScripts.overrideCommand;
cargo.useRustcWrapperForBuildScripts -> cargo.runBuildScripts.useRustcWrapper;
completion.snippets -> completion.snippets.custom;
diagnostics.enableExperimental -> diagnostics.experimental.enable;
experimental.procAttrMacros -> procMacro.attributes.enable;
highlighting.strings -> semanticHighlighting.strings.enable;
@ -66,6 +68,22 @@ macro_rules! patch {
rustfmt.enableRangeFormatting -> rustfmt.rangeFormatting.enable;
}
// completion.snippets -> completion.snippets.custom;
if let Some(Value::Object(obj)) = copy.pointer("/completion/snippets").cloned() {
if obj.len() != 1 || obj.get("custom").is_none() {
merge(
json,
json! {{
"completion": {
"snippets": {
"custom": obj
},
},
}},
);
}
}
// callInfo_full -> signatureInfo_detail, signatureInfo_documentation_enable
if let Some(Value::Bool(b)) = copy.pointer("/callInfo/full") {
let sig_info = match b {