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

Generalise syntax rewriting infrastructure to allow removal of nodes

Browse source
This commit is contained in:
Aleksey Kladov 2020-03-24 17:03:05 +01:00
parent 3bd119a4c1
commit 062f6e3bbe
7 changed files with 253 additions and 122 deletions
Download patch file Download diff file Expand all files Collapse all files

12
crates/ra_ide/src/expand_macro.rs
View file

@ -3,10 +3,9 @@
use hir::Semantics;
use ra_ide_db::RootDatabase;
use ra_syntax::{
algo::{find_node_at_offset, replace_descendants},
ast, AstNode, NodeOrToken, SyntaxElement, SyntaxKind, SyntaxNode, WalkEvent, T,
algo::{find_node_at_offset, SyntaxRewriter},
ast, AstNode, NodeOrToken, SyntaxKind, SyntaxNode, WalkEvent, T,
};
use rustc_hash::FxHashMap;
use crate::FilePosition;
@ -37,7 +36,7 @@ fn expand_macro_recur(
let mut expanded = sema.expand(macro_call)?;
let children = expanded.descendants().filter_map(ast::MacroCall::cast);
let mut replaces: FxHashMap<SyntaxElement, SyntaxElement> = FxHashMap::default();
let mut rewriter = SyntaxRewriter::default();
for child in children.into_iter() {
if let Some(new_node) = expand_macro_recur(sema, &child) {
@ -47,12 +46,13 @@ fn expand_macro_recur(
if expanded == *child.syntax() {
expanded = new_node;
} else {
replaces.insert(child.syntax().clone().into(), new_node.into());
rewriter.replace(child.syntax(), &new_node)
}
}
}
Some(replace_descendants(&expanded, |n| replaces.get(n).cloned()))
let res = rewriter.rewrite(&expanded);
Some(res)
}
// FIXME: It would also be cool to share logic here and in the mbe tests,