Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2025-01-14 14:13:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove InsertPos::Before variant in Syntax Rewriter

Browse source
This commit is contained in:
Lukas Wirth 2020-10-24 21:57:58 +02:00
parent aca2735d1e
commit 45860d5207
1 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
crates/syntax/src/algo.rs
View file

@ -292,7 +292,7 @@ fn _replace_children(
#[derive(Debug, PartialEq, Eq, Hash)] #[derive(Debug, PartialEq, Eq, Hash)]
enum InsertPos { enum InsertPos {
FirstChildOf(SyntaxNode), FirstChildOf(SyntaxNode),
Before(SyntaxElement), // Before(SyntaxElement),
After(SyntaxElement), After(SyntaxElement),
} }
@ -328,10 +328,15 @@ impl<'a> SyntaxRewriter<'a> {
before: &T, before: &T,
what: &U, what: &U,
) { ) {
self.insertions let before = before.clone().into();
.entry(InsertPos::Before(before.clone().into())) let pos = match before.prev_sibling_or_token() {
.or_insert_with(Vec::new) Some(sibling) => InsertPos::After(sibling),
.push(what.clone().into()); None => match before.parent() {
Some(parent) => InsertPos::FirstChildOf(parent),
None => return,
},
};
self.insertions.entry(pos).or_insert_with(Vec::new).push(what.clone().into());
} }
pub fn insert_after<T: Clone + Into<SyntaxElement>, U: Clone + Into<SyntaxElement>>( pub fn insert_after<T: Clone + Into<SyntaxElement>, U: Clone + Into<SyntaxElement>>(
&mut self, &mut self,
@ -361,10 +366,15 @@ impl<'a> SyntaxRewriter<'a> {
before: &T, before: &T,
what: U, what: U,
) { ) {
self.insertions let before = before.clone().into();
.entry(InsertPos::Before(before.clone().into())) let pos = match before.prev_sibling_or_token() {
.or_insert_with(Vec::new) Some(sibling) => InsertPos::After(sibling),
.extend(what); None => match before.parent() {
Some(parent) => InsertPos::FirstChildOf(parent),
None => return,
},
};
self.insertions.entry(pos).or_insert_with(Vec::new).extend(what);
} }
pub fn insert_many_after< pub fn insert_many_after<
T: Clone + Into<SyntaxElement>, T: Clone + Into<SyntaxElement>,
@ -440,7 +450,7 @@ impl<'a> SyntaxRewriter<'a> {
.map(element_to_node_or_parent) .map(element_to_node_or_parent)
.chain(self.insertions.keys().map(|pos| match pos { .chain(self.insertions.keys().map(|pos| match pos {
InsertPos::FirstChildOf(it) => it.clone(), InsertPos::FirstChildOf(it) => it.clone(),
InsertPos::Before(it) | InsertPos::After(it) => element_to_node_or_parent(it), InsertPos::After(it) => element_to_node_or_parent(it),
})) }))
// If we only have one replacement/insertion, we must return its parent node, since `rewrite` does // If we only have one replacement/insertion, we must return its parent node, since `rewrite` does
// not replace the node passed to it. // not replace the node passed to it.
@ -477,9 +487,6 @@ impl<'a> SyntaxRewriter<'a> {
acc: &mut Vec<NodeOrToken<rowan::GreenNode, rowan::GreenToken>>, acc: &mut Vec<NodeOrToken<rowan::GreenNode, rowan::GreenToken>>,
element: &SyntaxElement, element: &SyntaxElement,
) { ) {
if let Some(elements) = self.insertions(&InsertPos::Before(element.clone())) {
acc.extend(elements.map(element_to_green));
}
if let Some(replacement) = self.replacement(&element) { if let Some(replacement) = self.replacement(&element) {
match replacement { match replacement {
Replacement::Single(element) => acc.push(element_to_green(element)), Replacement::Single(element) => acc.push(element_to_green(element)),