Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 30 additions & 3 deletions crates/ide/src/typing.rs
Original file line number Diff line number Diff line change
Expand Up @@ -175,9 +175,21 @@ fn on_opening_bracket_typed(
}
}

// If it's a statement in a block, we don't know how many statements should be included
if ast::ExprStmt::can_cast(expr.syntax().parent()?.kind()) {
return None;
if let Some(parent) = expr.syntax().parent().and_then(ast::Expr::cast) {
let mut node = expr.syntax().clone();
let all_prev_sib_attr = loop {
match node.prev_sibling() {
Some(sib) if sib.kind().is_trivia() || sib.kind() == SyntaxKind::ATTR => {
node = sib
}
Some(_) => break false,
None => break true,
};
};

if all_prev_sib_attr {
expr = parent;
}
}

// Insert the closing bracket right after the expression.
Expand Down Expand Up @@ -824,6 +836,21 @@ fn f() {
0 => {()},
1 => (),
}
}
"#,
);
type_char(
'{',
r#"
fn main() {
#[allow(unreachable_code)]
$0g();
}
"#,
r#"
fn main() {
#[allow(unreachable_code)]
{g()};
}
"#,
);
Expand Down