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

hacky_block_expr_with_comments

Browse source
This commit is contained in:
Jeroen Vannevel 2022-01-22 11:42:03 +00:00
parent 5d35e5882c
commit 96ab4c6e6c
2 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1524,9 +1524,7 @@ fn make_body(
println!("element: {:?}", element);
}
make::block_expr_full(elements, tail_expr)
// make::block_expr(parent.statements().into_iter(), tail_expr)
make::hacky_block_expr_with_comments(elements, tail_expr)
}
};

17
crates/syntax/src/ast/make.rs
View file

@ -329,17 +329,18 @@ pub fn block_expr(
ast_from_text(&format!("fn f() {}", buf))
}
pub fn block_expr_full(
stmts: impl IntoIterator<Item = crate::SyntaxElement>,
/// Ideally this function wouldn't exist since it involves manual indenting.
/// It differs from `make::block_expr` by also supporting comments.
///
/// FIXME: replace usages of this with the mutable syntax tree API
pub fn hacky_block_expr_with_comments(
elements: impl IntoIterator<Item = crate::SyntaxElement>,
tail_expr: Option<ast::Expr>,
) -> ast::BlockExpr {
let mut buf = "{\n".to_string();
for stmt in stmts.into_iter() {
match stmt {
rowan::NodeOrToken::Node(n) => {
println!("Node: {:?}", n.text());
format_to!(buf, " {}\n", n)
}
for node_or_token in elements.into_iter() {
match node_or_token {
rowan::NodeOrToken::Node(n) => format_to!(buf, " {}\n", n),
rowan::NodeOrToken::Token(t) if t.kind() == SyntaxKind::COMMENT => {
format_to!(buf, " {}\n", t)
}