language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-28 04:44:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix ordering problem between qualifying paths and substituting params

Browse source
This commit is contained in:
Florian Diebold 2020-01-10 18:26:18 +01:00 • committed by Florian Diebold
parent 12905e5b58
commit 15fc643e05
7 changed files with 206 additions and 126 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/ra_syntax/src/ast/edit.rs
View file

@ -236,8 +236,8 @@ pub fn replace_descendants<N: AstNode, D: AstNode>(
) -> N {
let map = replacement_map
.map(|(from, to)| (from.syntax().clone().into(), to.syntax().clone().into()))
.collect::<FxHashMap<_, _>>();
let new_syntax = algo::replace_descendants(parent.syntax(), &map);
.collect::<FxHashMap<SyntaxElement, _>>();
let new_syntax = algo::replace_descendants(parent.syntax(), &|n| map.get(n).cloned());
N::cast(new_syntax).unwrap()
}
@ -292,7 +292,7 @@ impl IndentLevel {
)
})
.collect();
algo::replace_descendants(&node, &replacements)
algo::replace_descendants(&node, &|n| replacements.get(n).cloned())
}
pub fn decrease_indent<N: AstNode>(self, node: N) -> N {
@ -320,7 +320,7 @@ impl IndentLevel {
)
})
.collect();
algo::replace_descendants(&node, &replacements)
algo::replace_descendants(&node, &|n| replacements.get(n).cloned())
}
}