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 4

Merge #1081

Browse source 
1081: Async closure syntax r=matklad a=robojumper

Fixes #1080.

Also fixes an error introduced by #1072 where something like `async move "foo"` in expression position would trigger the assertion in `block_expr`.

Co-authored-by: robojumper <robojumper@gmail.com>
This commit is contained in:
bors[bot] 2019-04-01 10:57:06 +00:00
commit 6e4865de73
4 changed files with 66 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -68,6 +68,7 @@ pub(super) fn atom_expr(p: &mut Parser, r: Restrictions) -> Option<(CompletedMar
L_BRACK => array_expr(p),
PIPE => lambda_expr(p),
MOVE_KW if la == PIPE => lambda_expr(p),
ASYNC_KW if la == PIPE || (la == MOVE_KW && p.nth(2) == PIPE) => lambda_expr(p),
IF_KW => if_expr(p),
LOOP_KW => loop_expr(p, None),
@ -92,7 +93,7 @@ pub(super) fn atom_expr(p: &mut Parser, r: Restrictions) -> Option<(CompletedMar
}
}
}
ASYNC_KW if la == L_CURLY || la == MOVE_KW => {
ASYNC_KW if la == L_CURLY || (la == MOVE_KW && p.nth(2) == L_CURLY) => {
let m = p.start();
p.bump();
p.eat(MOVE_KW);
@ -190,10 +191,19 @@ fn array_expr(p: &mut Parser) -> CompletedMarker {
// || -> i32 { 92 };
// |x| x;
// move |x: i32,| x;
// async || {};
// move || {};
// async move || {};
// }
fn lambda_expr(p: &mut Parser) -> CompletedMarker {
assert!(p.at(PIPE) || (p.at(MOVE_KW) && p.nth(1) == PIPE));
assert!(
p.at(PIPE)
|| (p.at(MOVE_KW) && p.nth(1) == PIPE)
|| (p.at(ASYNC_KW) && p.nth(1) == PIPE)
|| (p.at(ASYNC_KW) && p.nth(1) == MOVE_KW && p.nth(2) == PIPE)
);
let m = p.start();
p.eat(ASYNC_KW);
p.eat(MOVE_KW);
params::param_list_opt_types(p);
if opt_fn_ret_type(p) {

2
crates/ra_parser/src/grammar/items.rs
View file

@ -82,7 +82,7 @@ pub(super) fn maybe_item(p: &mut Parser, m: Marker, flavor: ItemFlavor) -> Resul
// test_err async_without_semicolon
// fn foo() { let _ = async {} }
has_mods |= p.eat(CONST_KW);
if p.at(ASYNC_KW) && p.nth(1) != L_CURLY && p.nth(1) != MOVE_KW {
if p.at(ASYNC_KW) && p.nth(1) != L_CURLY && p.nth(1) != MOVE_KW && p.nth(1) != PIPE {
p.eat(ASYNC_KW);
has_mods = true;
}