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

Preserve comments for extracted block expr in 'extract_function' assist

Browse source
This commit is contained in:
roife 2024-01-10 15:00:35 +08:00
parent ae6e737724
commit bc54775c9d
1 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
crates/ide-assists/src/handlers/extract_function.rs
View file

@ -25,7 +25,7 @@ use syntax::{
edit::{AstNodeEdit, IndentLevel}, edit::{AstNodeEdit, IndentLevel},
AstNode, HasGenericParams, AstNode, HasGenericParams,
}, },
match_ast, ted, SyntaxElement, match_ast, ted, AstToken, SyntaxElement,
SyntaxKind::{self, COMMENT}, SyntaxKind::{self, COMMENT},
SyntaxNode, SyntaxToken, TextRange, TextSize, TokenAtOffset, WalkEvent, T, SyntaxNode, SyntaxToken, TextRange, TextSize, TokenAtOffset, WalkEvent, T,
}; };
@ -1733,8 +1733,23 @@ fn make_body(
ast::Expr::BlockExpr(block) => { ast::Expr::BlockExpr(block) => {
// If the extracted expression is itself a block, there is no need to wrap it inside another block. // If the extracted expression is itself a block, there is no need to wrap it inside another block.
let block = block.dedent(old_indent); let block = block.dedent(old_indent);
// Recreate the block for formatting consistency with other extracted functions. let elements = block.stmt_list().map_or_else(
make::block_expr(block.statements(), block.tail_expr()) || Either::Left(iter::empty()),
|stmt_list| {
let elements = stmt_list.syntax().children_with_tokens().filter_map(
|node_or_token| match &node_or_token {
syntax::NodeOrToken::Node(node) => {
ast::Stmt::cast(node.clone()).map(|_| node_or_token)
}
syntax::NodeOrToken::Token(token) => {
ast::Comment::cast(token.clone()).map(|_| node_or_token)
}
},
);
Either::Right(elements)
},
);
make::hacky_block_expr(elements, block.tail_expr())
} }
_ => { _ => {
let expr = expr.dedent(old_indent).indent(IndentLevel(1)); let expr = expr.dedent(old_indent).indent(IndentLevel(1));