language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-02 06:41:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge #8586

Browse source 
8586: Replace SyntaxRewriter usage with ted in eager::eager_macro_recur r=Veykril a=Veykril



Co-authored-by: Lukas Wirth <lukastw97@gmail.com>
This commit is contained in:
bors[bot] 2021-04-19 18:03:56 +00:00 • committed by GitHub
commit b6a7276c54
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

18
crates/hir_expand/src/eager.rs
View file

@ -29,7 +29,7 @@ use base_db::CrateId;
use mbe::ExpandResult;
use parser::FragmentKind;
use std::sync::Arc;
use syntax::{algo::SyntaxRewriter, SyntaxNode};
use syntax::{ted, SyntaxNode};
#[derive(Debug)]
pub struct ErrorEmitted {
@ -192,10 +192,10 @@ fn eager_macro_recur(
macro_resolver: &dyn Fn(ast::Path) -> Option<MacroDefId>,
mut diagnostic_sink: &mut dyn FnMut(mbe::ExpandError),
) -> Result<SyntaxNode, ErrorEmitted> {
let original = curr.value.clone();
let original = curr.value.clone().clone_for_update();
let children = curr.value.descendants().filter_map(ast::MacroCall::cast);
let mut rewriter = SyntaxRewriter::default();
let children = original.descendants().filter_map(ast::MacroCall::cast);
let mut replacements = Vec::new();
// Collect replacement
for child in children {
@ -214,6 +214,7 @@ fn eager_macro_recur(
.into();
db.parse_or_expand(id.as_file())
.expect("successful macro expansion should be parseable")
.clone_for_update()
}
MacroDefKind::Declarative(_)
| MacroDefKind::BuiltIn(..)
@ -227,15 +228,14 @@ fn eager_macro_recur(
}
};
// check if the whole original sytnax is replaced
// Note that SyntaxRewriter cannot replace the root node itself
// check if the whole original syntax is replaced
if child.syntax() == &original {
return Ok(insert);
}
rewriter.replace(child.syntax(), &insert);
replacements.push((child, insert));
}
let res = rewriter.rewrite(&original);
Ok(res)
replacements.into_iter().rev().for_each(|(old, new)| ted::replace(old.syntax(), new));
Ok(original)
}