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

Require semi after exprs

Browse source
This commit is contained in:
Aleksey Kladov 2018-08-25 16:04:47 +03:00
parent a80c07bdff
commit 367e523442
4 changed files with 70 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

11
crates/libsyntax2/src/grammar/expressions/mod.rs
View file

@ -51,10 +51,15 @@ pub(crate) fn block(p: &mut Parser) {
// fn foo() { pub 92; } //FIXME
items::MaybeItem::None => {
let is_blocklike = expressions::expr_stmt(p) == BlockLike::Block;
if p.eat(SEMI) || (is_blocklike && !p.at(R_CURLY)) {
m.complete(p, EXPR_STMT);
} else {
if p.at(R_CURLY) {
m.abandon(p);
} else {
if is_blocklike {
p.eat(SEMI);
} else {
p.expect(SEMI);
}
m.complete(p, EXPR_STMT);
}
}
}