From 952fc236948ce8a63e7f7ee49878aa2ffd011298 Mon Sep 17 00:00:00 2001 From: Lukas Wirth Date: Mon, 19 Apr 2021 19:43:26 +0200 Subject: Replace SyntaxRewriter with ted in exppand_macro::expand_macro_recur --- crates/ide/src/expand_macro.rs | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/crates/ide/src/expand_macro.rs b/crates/ide/src/expand_macro.rs index be0ee03bf..eebae5ebe 100644 --- a/crates/ide/src/expand_macro.rs +++ b/crates/ide/src/expand_macro.rs @@ -3,9 +3,7 @@ use std::iter; use hir::Semantics; use ide_db::RootDatabase; use syntax::{ - algo::{find_node_at_offset, SyntaxRewriter}, - ast, AstNode, NodeOrToken, SyntaxKind, - SyntaxKind::*, + algo::find_node_at_offset, ast, ted, AstNode, NodeOrToken, SyntaxKind, SyntaxKind::*, SyntaxNode, WalkEvent, T, }; @@ -46,26 +44,23 @@ fn expand_macro_recur( sema: &Semantics, macro_call: &ast::MacroCall, ) -> Option { - let mut expanded = sema.expand(macro_call)?; + let expanded = sema.expand(macro_call)?.clone_for_update(); let children = expanded.descendants().filter_map(ast::MacroCall::cast); - let mut rewriter = SyntaxRewriter::default(); + let mut replacements = Vec::new(); - for child in children.into_iter() { + for child in children { if let Some(new_node) = expand_macro_recur(sema, &child) { - // Replace the whole node if it is root - // `replace_descendants` will not replace the parent node - // but `SyntaxNode::descendants include itself + // check if the whole original syntax is replaced if expanded == *child.syntax() { - expanded = new_node; - } else { - rewriter.replace(child.syntax(), &new_node) + return Some(new_node); } + replacements.push((child, new_node)); } } - let res = rewriter.rewrite(&expanded); - Some(res) + replacements.into_iter().rev().for_each(|(old, new)| ted::replace(old.syntax(), new)); + Some(expanded) } // FIXME: It would also be cool to share logic here and in the mbe tests, -- cgit v1.2.3