fix(ts): align erros

phodal · Nov 17, 2022 · 9a8d927 · 9a8d927
1 parent 1d6feaa
commit 9a8d927
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/chapi-ast-typescript/src/main/antlr/TypeScriptParser.g4 b/chapi-ast-typescript/src/main/antlr/TypeScriptParser.g4
@@ -923,6 +923,7 @@ singleExpression
     | This                                                                   # ThisExpression
     | Super                                                                  # SuperExpression
     | typeArguments? identifierName singleExpression?                        # IdentifierExpression
+    | typeArguments expressionSequence?                                      # GenericTypes
     | literal                                                                # LiteralExpression
     | arrayLiteral                                                           # ArrayLiteralExpression
     | objectLiteral                                                          # ObjectLiteralExpression

diff --git a/chapi-ast-typescript/src/main/kotlin/chapi/ast/typescriptast/TypeScriptFullIdentListener.kt b/chapi-ast-typescript/src/main/kotlin/chapi/ast/typescriptast/TypeScriptFullIdentListener.kt
@@ -622,14 +622,14 @@ class TypeScriptFullIdentListener(node: TSIdentify) : TypeScriptAstListener() {
         when (ctx) {
             is IdentifierExpressionContext -> {
                 currentExprIdent = ctx.identifierName().text
-//
-//                if (ctx.singleExpression() != null) {
-//                    parseSingleExpression(ctx.singleExpression())
-//                }
+
+                if (ctx.singleExpression() != null) {
+                    parseSingleExpression(ctx.singleExpression())
+                }
+            }
+            is TypeScriptParser.GenericTypesContext -> {
+                parseExpressionSequence(ctx.expressionSequence())
             }
-//            is TypeScriptParser.GenericTypesContext -> {
-//                parseExpressionSequence(ctx.expressionSequence())
-//            }
             is TypeScriptParser.ArgumentsExpressionContext -> {
                 argumentsExpressionToCall(ctx)
             }