fix(ts): fix await issue

phodal · Nov 17, 2022 · db90510 · db90510
1 parent 9a8d927
commit db90510
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/chapi-ast-typescript/src/main/antlr/TypeScriptParser.g4 b/chapi-ast-typescript/src/main/antlr/TypeScriptParser.g4
@@ -878,13 +878,11 @@ singleExpression
     | iteratorBlock                                                          # IteratorsExpression // ECMAScript 6
     | generatorBlock                                                         # GeneratorsExpression // ECMAScript 6
     | generatorFunctionDeclaration                                           # GeneratorsFunctionExpression // ECMAScript 6
-    | yieldStatement                                                         # YieldExpression // ECMAScript 6
-    | Await singleExpression                                                 # AwaitExpression
 
     // TODO: careful use those
     | singleExpression '(' (argumentList ','?)? ')'                          # ArgumentsExpression
     //  RealtionExpression will have conflict
-    | singleExpression '<' typeArgumentList '>' '(' (argumentList ','?)? ')'# ArgumentsExpression
+    | singleExpression '<' typeArgumentList '>' '(' (argumentList ','?)? ')' # ArgumentsExpression
 
     // respect precedence by order of sub-rules
     | singleExpression assignmentOperator singleExpression                   # AssignmentExpression
@@ -922,6 +920,8 @@ singleExpression
 
     | This                                                                   # ThisExpression
     | Super                                                                  # SuperExpression
+    | yieldStatement                                                         # YieldExpression // ECMAScript 6
+    | Await singleExpression                                                 # AwaitExpression
     | typeArguments? identifierName singleExpression?                        # IdentifierExpression
     | typeArguments expressionSequence?                                      # GenericTypes
     | literal                                                                # LiteralExpression