language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-27 20:42:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

add is_blocklike func on BlockLike

Browse source
This commit is contained in:
XFFXFF 2023-03-07 08:24:05 +08:00
parent 98990affe5
commit 6e97527eae
3 changed files with 14 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -121,27 +121,22 @@ pub(super) fn stmt(p: &mut Parser<'_>, semicolon: Semicolon) {
types::ascription(p);
}
let mut is_block_like_expr_after_eq = false;
let mut expr_after_eq: Option<CompletedMarker> = None;
if p.eat(T![=]) {
// test let_stmt_init
// fn f() { let x = 92; }
let expr = expressions::expr(p);
if let Some(expr) = expr {
is_block_like_expr_after_eq = match expr.kind() {
IF_EXPR | WHILE_EXPR | FOR_EXPR | LOOP_EXPR | MATCH_EXPR | BLOCK_EXPR => true,
_ => false,
};
}
expr_after_eq = expressions::expr(p);
}
if p.at(T![else]) {
// test_err let_else_right_curly_brace
// fn func() { let Some(_) = {Some(1)} else { panic!("h") };}
if is_block_like_expr_after_eq {
p.error(
"right curly brace `}` before `else` in a `let...else` statement not allowed",
)
if let Some(expr) = expr_after_eq {
if BlockLike::is_blocklike(expr.kind()) {
p.error(
"right curly brace `}` before `else` in a `let...else` statement not allowed",
)
}
}
// test let_else