Make sure the "async" identifier can be used without being interpreted as async arrow function

Author: Maxim

src/res_core.ml

@@ -237,6 +237,11 @@ let rec goToClosing closingToken state =
 (* Madness *)
 let isEs6ArrowExpression ~inTernary p =
   Parser.lookahead p (fun state ->
+      let () =
+        match state.Parser.token with
+        | Lident "async" -> Parser.next state
+        | _ -> ()
+      in
       match state.Parser.token with
       | Lident _ | Underscore -> (
         Parser.next state;
@@ -2014,7 +2019,10 @@ and parseOperandExpr ~context p =
       let expr = parseUnaryExpr p in
       let loc = mkLoc startPos p.prevEndPos in
       Ast_helper.Exp.assert_ ~loc expr
-    | Lident "async" -> parseAsyncExpression p
+    | Lident "async"
+      when isEs6ArrowExpression ~inTernary:(context = TernaryTrueBranchExpr) p
+      ->
+      parseAsyncArrowExpression p
     | Lident "await" -> parseAwaitExpression p
     | Lazy ->
       Parser.next p;
@@ -2736,8 +2744,8 @@ and parseBracedOrRecordExpr p =
     let expr = parseRecordExpr ~startPos [] p in
     Parser.expect Rbrace p;
     expr
-  | Lident "async" ->
-    let expr = parseAsyncExpression p in
+  | Lident "async" when isEs6ArrowExpression ~inTernary:false p ->
+    let expr = parseAsyncArrowExpression p in
     let expr = parseExprBlock ~first:expr p in
     Parser.expect Rbrace p;
     let loc = mkLoc startPos p.prevEndPos in
@@ -3105,7 +3113,7 @@ and parseExprBlock ?first p =
   Parser.eatBreadcrumb p;
   overParseConstrainedOrCoercedOrArrowExpression p blockExpr
 
-and parseAsyncExpression p =
+and parseAsyncArrowExpression p =
   let startPos = p.Parser.startPos in
   match p.token with
   | Lident "async" ->

tests/parsing/grammar/expressions/async.res

@@ -12,4 +12,16 @@ let fetch = {
 let fetch2 = {
     async (. url) => browserFetch(. url)
     async (. url) => browserFetch2(. url)
+}
+
+// don't parse async es6 arrow
+let async = {
+    let f = async()
+    ()->async
+    async()
+    async.async
+
+    {async: async[async]}
+
+    result->async->mapAsync(a => doStuff(a))
 }

tests/parsing/grammar/expressions/expected/async.res.txt

@@ -12,4 +12,12 @@ let fetch2 =
     [@async ][@bs ]);
     (((fun url -> ((browserFetch2 url)[@bs ])))
     [@async ][@bs ]))
+  [@ns.braces ])
+let async =
+  ((let f = async () in
+    () |. async;
+    async ();
+    async.async;
+    { async = (async.(async)) };
+    (result |. async) |. (mapAsync (fun a -> doStuff a)))
   [@ns.braces ])