rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup editing API

Browse Source
This commit is contained in:
Aleksey Kladov
2020-02-29 13:49:43 +01:00
parent b53ff214aa
commit 5f8b37563e
5 changed files with 36 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
crates/ra_syntax/src/ast/edit.rs
View File

@@ -276,7 +276,7 @@ pub fn replace_descendants<N: AstNode, D: AstNode>(
.into_iter()
.map(|(from, to)| (from.syntax().clone().into(), to.syntax().clone().into()))
.collect::<FxHashMap<SyntaxElement, _>>();
let new_syntax = algo::replace_descendants(parent.syntax(), &|n| map.get(n).cloned());
let new_syntax = algo::replace_descendants(parent.syntax(), |n| map.get(n).cloned());
N::cast(new_syntax).unwrap()
}
@@ -331,7 +331,7 @@ impl IndentLevel {
)
})
.collect();
algo::replace_descendants(&node, &|n| replacements.get(n).cloned())
algo::replace_descendants(&node, |n| replacements.get(n).cloned())
}
pub fn decrease_indent<N: AstNode>(self, node: N) -> N {
@@ -359,7 +359,7 @@ impl IndentLevel {
)
})
.collect();
algo::replace_descendants(&node, &|n| replacements.get(n).cloned())
algo::replace_descendants(&node, |n| replacements.get(n).cloned())
}
}
@@ -389,7 +389,7 @@ fn insert_children<N: AstNode>(
position: InsertPosition<SyntaxElement>,
to_insert: impl IntoIterator<Item = SyntaxElement>,
) -> N {
let new_syntax = algo::insert_children(parent.syntax(), position, &mut to_insert.into_iter());
let new_syntax = algo::insert_children(parent.syntax(), position, to_insert);
N::cast(new_syntax).unwrap()
}
@@ -404,8 +404,7 @@ fn replace_children<N: AstNode>(
to_replace: RangeInclusive<SyntaxElement>,
to_insert: impl IntoIterator<Item = SyntaxElement>,
) -> N {
let new_syntax =
algo::replace_children(parent.syntax(), to_replace, &mut to_insert.into_iter());
let new_syntax = algo::replace_children(parent.syntax(), to_replace, to_insert);
N::cast(new_syntax).unwrap()
}