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

Merge #1636

Browse source 
1636: fix block parse problem r=matklad a=bravomikekilo

try to fix [issue-1598](https://github.com/rust-analyzer/rust-analyzer/issues/1598).

Co-authored-by: bravomikekilo <bmk1221@126.com>
This commit is contained in:
bors[bot] 2019-08-13 12:46:47 +00:00
commit 978e3e384b
3 changed files with 81 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
crates/ra_parser/src/grammar/expressions.rs
View file

@ -359,11 +359,14 @@ fn lhs(
return Some((m.complete(p, RANGE_EXPR), BlockLike::NotBlock));
}
_ => {
// test expression_after_block
// fn foo() {
// let mut p = F{x: 5};
// {p}.x = 10;
// }
//
let (lhs, blocklike) = atom::atom_expr(p, r)?;
return Some((
postfix_expr(p, lhs, !(r.prefer_stmt && blocklike.is_block())),
blocklike,
));
return Some(postfix_expr(p, lhs, blocklike, !(r.prefer_stmt && blocklike.is_block())));
}
};
expr_bp(p, r, 255, dollar_lvl);
@ -376,8 +379,9 @@ fn postfix_expr(
// Calls are disallowed if the type is a block and we prefer statements because the call cannot be disambiguated from a tuple
// E.g. `while true {break}();` is parsed as
// `while true {break}; ();`
mut block_like: BlockLike,
mut allow_calls: bool,
) -> CompletedMarker {
) -> (CompletedMarker, BlockLike) {
loop {
lhs = match p.current() {
// test stmt_postfix_expr_ambiguity
@ -417,9 +421,10 @@ fn postfix_expr(
T![as] => cast_expr(p, lhs),
_ => break,
};
allow_calls = true
allow_calls = true;
block_like = BlockLike::NotBlock;
}
lhs
(lhs, block_like)
}
// test call_expr