Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-11-15 09:27:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

removed unwrapping from indent

Browse source
This commit is contained in:
Jeroen Vannevel 2022-01-22 11:32:26 +00:00
parent ee862cec10
commit 5d35e5882c
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
crates/ide_assists/src/handlers/extract_function.rs
View file

@ -1506,14 +1506,16 @@ fn make_body(
let body_indent = IndentLevel(1);
let elements: Vec<SyntaxElement> = elements
.into_iter()
.map(|stmt| match stmt {
syntax::NodeOrToken::Node(n) => {
let ast_element = ast::Stmt::cast(n).unwrap();
let indented = ast_element.dedent(old_indent).indent(body_indent);
let ast_node = indented.syntax().clone_subtree();
syntax::NodeOrToken::try_from(ast_node).unwrap()
}
syntax::NodeOrToken::Token(t) => syntax::NodeOrToken::try_from(t).unwrap(),
.map(|node_or_token| match &node_or_token {
syntax::NodeOrToken::Node(node) => match ast::Stmt::cast(node.clone()) {
Some(stmt) => {
let indented = stmt.dedent(old_indent).indent(body_indent);
let ast_node = indented.syntax().clone_subtree();
syntax::NodeOrToken::Node(ast_node)
}
None => node_or_token,
},
_ => node_or_token,
})
.collect::<Vec<SyntaxElement>>();
let tail_expr = tail_expr.map(|expr| expr.dedent(old_indent).indent(body_indent));