fix(ts): fix array type error issues

phodal · Nov 17, 2022 · c133707 · c133707
1 parent 2782a01
commit c133707
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/chapi-ast-typescript/src/main/antlr/TypeScriptParser.g4 b/chapi-ast-typescript/src/main/antlr/TypeScriptParser.g4
@@ -598,6 +598,7 @@ arrayElement
 bindingElement
     : bindingPattern
     | Identifier
+    | singleExpression
     ;
 
 
@@ -729,7 +730,7 @@ multipleExportElements
 // Variable Statement
 
 variableStatement
-    : accessibilityModifier? ReadOnly? varModifier (bindingPatternBlock | variableDeclarationList) SemiColon?
+    : accessibilityModifier? ReadOnly? varModifier (bindingPatternBlock | variableDeclarationList) eos?
     ;
 
 varModifier
@@ -747,8 +748,9 @@ variableDeclarationList
     ;
 
 variableDeclaration
-//    : ( identifierName | arrayLiteral | objectLiteral) typeAnnotation? ('=' typeParameters? singleExpression)? // ECMAScript 6: Array & Object Matching
-    : identifierName typeAnnotation? ('=' typeParameters? singleExpression)? // ECMAScript 6: Array & Object Matching
+    :  identifierName typeAnnotation? ('=' typeParameters? singleExpression)? // ECMAScript 6: Array & Object Matching
+    | arrayLiteral
+    | objectLiteral
     ;
 
 
@@ -1016,6 +1018,8 @@ identifierOrKeyWord
 
 identifierName
     : reservedWord
+    | Lodash
+    | Dollar
     | Identifier
     ;