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

[#1083] Try block syntax: fix tests

Browse source
This commit is contained in:
Andrey Tkachenko 2019-06-06 16:26:54 +04:00
parent 281c9eeaff
commit 505b8d873f
6 changed files with 41 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

14
crates/ra_parser/src/grammar/expressions/atom.rs
View file

@ -76,7 +76,7 @@ pub(super) fn atom_expr(p: &mut Parser, r: Restrictions) -> Option<(CompletedMar
T![loop] => loop_expr(p, None),
T![for] => for_expr(p, None),
T![while] => while_expr(p, None),
T![try] => try_expr(p, None),
T![try] => try_block_expr(p, None),
LIFETIME if la == T![:] => {
let m = p.start();
label(p);
@ -118,7 +118,9 @@ pub(super) fn atom_expr(p: &mut Parser, r: Restrictions) -> Option<(CompletedMar
}
};
let blocklike = match done.kind() {
IF_EXPR | WHILE_EXPR | FOR_EXPR | LOOP_EXPR | MATCH_EXPR | BLOCK_EXPR | TRY_BLOCK_EXPR => BlockLike::Block,
IF_EXPR | WHILE_EXPR | FOR_EXPR | LOOP_EXPR | MATCH_EXPR | BLOCK_EXPR | TRY_BLOCK_EXPR => {
BlockLike::Block
}
_ => BlockLike::NotBlock,
};
Some((done, blocklike))
@ -494,13 +496,11 @@ fn break_expr(p: &mut Parser, r: Restrictions) -> CompletedMarker {
m.complete(p, BREAK_EXPR)
}
// test try_expr
// test try_block_expr
// fn foo() {
// try {
//
// }
// let _ = try {};
// }
fn try_expr(p: &mut Parser, m: Option<Marker>) -> CompletedMarker {
fn try_block_expr(p: &mut Parser, m: Option<Marker>) -> CompletedMarker {
assert!(p.at(T![try]));
let m = m.unwrap_or_else(|| p.start());
p.bump();