language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-30 19:49:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

revert blocklike changes

Browse source
This commit is contained in:
jnyfah 2025-01-16 12:54:26 +01:00
parent e3deeec2f2
commit 2ac6cb1521
3 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
crates/parser/src/grammar.rs
View file

@ -204,9 +204,8 @@ impl BlockLike {
self == BlockLike::Block
}
fn is_blocklike(expr: &CompletedMarker, p: &Parser<'_>) -> bool {
matches!(expr.kind(), BLOCK_EXPR | IF_EXPR | WHILE_EXPR | FOR_EXPR | LOOP_EXPR | MATCH_EXPR)
|| (expr.last_token(p) == Some(T!['}']) && !matches!(expr.kind(), CLOSURE_EXPR))
fn is_blocklike(kind: SyntaxKind) -> bool {
matches!(kind, BLOCK_EXPR | IF_EXPR | WHILE_EXPR | FOR_EXPR | LOOP_EXPR | MATCH_EXPR)
}
}

10
crates/parser/src/grammar/expressions.rs
View file

@ -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, p) {
p.error(
"right curly brace `}` before `else` in a `let...else` statement not allowed",
)
if let Some(token) = expr.last_token(p) {
if token == T!['}'] {
p.error(
"right curly brace `}` before `else` in a `let...else` statement not allowed"
)
}
}
}

2
crates/parser/src/grammar/expressions/atom.rs
View file

@ -198,7 +198,7 @@ pub(super) fn atom_expr(
}
};
let blocklike =
if BlockLike::is_blocklike(&done, p) { BlockLike::Block } else { BlockLike::NotBlock };
if BlockLike::is_blocklike(done.kind()) { BlockLike::Block } else { BlockLike::NotBlock };
Some((done, blocklike))
}