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

Simplify

Browse source
This commit is contained in:
Aleksey Kladov 2020-01-15 17:56:25 +01:00
parent 448575aa4a
commit 8296d3208d
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
crates/ra_syntax/src/ast/edit.rs
View file

@ -23,8 +23,7 @@ impl ast::BinExpr {
pub fn replace_op(&self, op: SyntaxKind) -> Option<ast::BinExpr> { pub fn replace_op(&self, op: SyntaxKind) -> Option<ast::BinExpr> {
let op_node: SyntaxElement = self.op_details()?.0.into(); let op_node: SyntaxElement = self.op_details()?.0.into();
let to_insert: Option<SyntaxElement> = Some(tokens::op(op).into()); let to_insert: Option<SyntaxElement> = Some(tokens::op(op).into());
let replace_range = op_node.clone()..=op_node; Some(replace_children(self, single_node(op_node), to_insert.into_iter()))
Some(replace_children(self, replace_range, to_insert.into_iter()))
} }
} }
@ -43,8 +42,7 @@ impl ast::FnDef {
return insert_children(self, InsertPosition::Last, to_insert.into_iter()); return insert_children(self, InsertPosition::Last, to_insert.into_iter());
}; };
to_insert.push(body.syntax().clone().into()); to_insert.push(body.syntax().clone().into());
let replace_range = old_body_or_semi.clone()..=old_body_or_semi; replace_children(self, single_node(old_body_or_semi), to_insert.into_iter())
replace_children(self, replace_range, to_insert.into_iter())
} }
} }
@ -109,7 +107,7 @@ impl ast::ItemList {
let to_insert = iter::once(ws.ws().into()); let to_insert = iter::once(ws.ws().into());
match existing_ws { match existing_ws {
None => insert_children(self, InsertPosition::After(l_curly), to_insert), None => insert_children(self, InsertPosition::After(l_curly), to_insert),
Some(ws) => replace_children(self, ws.clone().into()..=ws.into(), to_insert), Some(ws) => replace_children(self, single_node(ws), to_insert),
} }
} }
} }
@ -352,6 +350,11 @@ fn insert_children<N: AstNode>(
N::cast(new_syntax).unwrap() N::cast(new_syntax).unwrap()
} }
fn single_node(element: impl Into<SyntaxElement>) -> RangeInclusive<SyntaxElement> {
let element = element.into();
element.clone()..=element
}
#[must_use] #[must_use]
fn replace_children<N: AstNode>( fn replace_children<N: AstNode>(
parent: &N, parent: &N,