Fix: Detect missing errors for } braces before else in let...else statements #18908
Conversation
rustbot
added
the
S-waiting-on-review
| @@ -134,10 +134,12 @@ pub(super) fn let_stmt(p: &mut Parser<'_>, with_semi: Semicolon) { | |||
| // test_err let_else_right_curly_brace | |||
| // fn func() { let Some(_) = {Some(1)} else { panic!("h") };} | |||
| if let Some(expr) = expr_after_eq { | |||
| if BlockLike::is_blocklike(expr.kind()) { | |||
There was a problem hiding this comment.
I think we should actually change how BlockLike works, it should be checking the syntax kind and the last token (for the kinds where the node is conditionally a block). That way we likely fix a bunch of bugs in other places where BlockLike is used
There was a problem hiding this comment.
checking the last token in BlockLike breaks some closure parsing because closures with block bodies will being considered block-like
eg: fn main() { || -> i32 { 92 }(); } the closure is considered blocklike even though the { 92 } part is the body of the closure, not a standalone block expression.
one way to handle this tho would be explicitly excluding CLOSURE_EXPR when checking for trailing braces
There was a problem hiding this comment.
Ah I see, let's keep it as is for now then actually. There might be other problems like that then.
There was a problem hiding this comment.
Ah, forgot to mention something, adding more tests would be nice :) (the fixture posted in the issue ideally). Just throw that in https://github.com/rust-lang/rust-analyzer/tree/master/crates/parser/test_data/parser/ok as a new .rs file, then running the tests with env var UPDATE_EXPECT=1 set should generate the corresponding syntax tree file
@Veykril All test passed apart from |
fixes #18345 - rust-analyzer fails to emit errors for let...else statements when the initializer expression ends in a block-like construct
CompletedMarkerto store the position where the node was completed.last_tokenfunction that walks back through the parsing events from the completion position to find the last emitted token.