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

fix: Handle the final statement in SyntaxFactory::block_expr properly

Browse source 
This caused a bug that was rather tricky to hunt down!
This commit is contained in:
Giga Bowser 2024-11-14 15:57:58 -05:00
parent d881208d1b
commit 59cd717602
1 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
crates/syntax/src/ast/syntax_factory/constructors.rs
View file

@ -58,22 +58,31 @@ impl SyntaxFactory {
tail_expr: Option<ast::Expr>,
) -> ast::BlockExpr {
let stmts = stmts.into_iter().collect_vec();
let input = stmts.iter().map(|it| it.syntax().clone()).collect_vec();
let mut input = stmts.iter().map(|it| it.syntax().clone()).collect_vec();
let ast = make::block_expr(stmts, tail_expr.clone()).clone_for_update();
if let Some((mut mapping, stmt_list)) = self.mappings().zip(ast.stmt_list()) {
if let Some(mut mapping) = self.mappings() {
let stmt_list = ast.stmt_list().unwrap();
let mut builder = SyntaxMappingBuilder::new(stmt_list.syntax().clone());
if let Some(input) = tail_expr {
builder.map_node(
input.syntax().clone(),
stmt_list.tail_expr().unwrap().syntax().clone(),
);
} else if let Some(ast_tail) = stmt_list.tail_expr() {
// The parser interpreted the last statement (probably a statement with a block) as an Expr
let last_stmt = input.pop().unwrap();
builder.map_node(last_stmt, ast_tail.syntax().clone());
}
builder.map_children(
input.into_iter(),
stmt_list.statements().map(|it| it.syntax().clone()),
);
if let Some((input, output)) = tail_expr.zip(stmt_list.tail_expr()) {
builder.map_node(input.syntax().clone(), output.syntax().clone());
}
builder.finish(&mut mapping);
}