1 files changed, 14 insertions, 3 deletions

diff --git a/crates/ra_parser/src/grammar/expressions/atom.rs b/crates/ra_parser/src/grammar/expressions/atom.rs
index a23977bfb..8dc7e44a9 100644
--- a/crates/ra_parser/src/grammar/expressions/atom.rs
+++ b/crates/ra_parser/src/grammar/expressions/atom.rs
@@ -51,6 +51,7 @@ pub(super) const ATOM_EXPR_FIRST: TokenSet =
         BREAK_KW,
         CONTINUE_KW,
         LIFETIME,
+        ASYNC_KW,
     ]);
 
 const EXPR_RECOVERY_SET: TokenSet = token_set![LET_KW];
@@ -68,6 +69,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,10 +94,10 @@ pub(super) fn atom_expr(p: &mut Parser, r: Restrictions) -> Option<(CompletedMar
                 }
             }
         }
-
-        ASYNC_KW if la == L_CURLY => {
+        ASYNC_KW if la == L_CURLY || (la == MOVE_KW && p.nth(2) == L_CURLY) => {
             let m = p.start();
             p.bump();
+            p.eat(MOVE_KW);
             block_expr(p, Some(m))
         }
         MATCH_KW => match_expr(p),
@@ -190,10 +192,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) {