fix(ts): fix some order issues

phodal · Nov 17, 2022 · ded0de5 · ded0de5
1 parent 6d92ebb
commit ded0de5
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 4 deletions.
diff --git a/chapi-ast-typescript/src/main/antlr/TypeScriptLexer.g4 b/chapi-ast-typescript/src/main/antlr/TypeScriptLexer.g4
@@ -186,7 +186,7 @@ Import:                         'import';
 
 Implements:                     'implements' ;
 Let:                            'let' ;
-Private:                        'private' ;
+Private:                        'private';
 Public:                         'public' ;
 Interface:                      'interface' ;
 Package:                        'package' ;

diff --git a/chapi-ast-typescript/src/main/antlr/TypeScriptParser.g4 b/chapi-ast-typescript/src/main/antlr/TypeScriptParser.g4
@@ -351,7 +351,7 @@ constructSignature
     ;
 
 callSignature
-    : typeParameters? '(' parameterList? ','? ')' (':' (typePredicateWithOperatorTypeRef | typeRef))? eos?
+    : typeParameters? '(' parameterList? ','? ')' (':' (typePredicateWithOperatorTypeRef | typeRef))?
     ;
 
 indexSignature
@@ -443,8 +443,8 @@ constructorDeclaration
 propertyMemberDeclaration
     : propertyMemberBase (getAccessor | setAccessor)                                                # GetterSetterDeclarationExpression
     | abstractDeclaration                                                                           # AbstractMemberDeclaration
-    | propertyMemberBase propertyName  '!'? '?'? typeAnnotation? initializer?                       # PropertyDeclarationExpression
     | propertyMemberBase propertyName callSignature ( ('{' functionBody '}') | eos)                 # MethodDeclarationExpression
+    | propertyMemberBase propertyName '!'? '?'? typeAnnotation? initializer?                       # PropertyDeclarationExpression
     ;
 
 abstractDeclaration

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
@@ -245,7 +245,7 @@ class TypeScriptFullIdentListener(node: TSIdentify) : TypeScriptAstListener() {
                     )
                 }
                 else -> {
-                    println("handleClassBodyElements -> childElementType : ${childCtx.javaClass.simpleName}")
+//                    println("handleClassBodyElements -> childElementType : ${childCtx.javaClass.simpleName}")
                 }
             }
         }

diff --git a/chapi-ast-typescript/src/test/kotlin/chapi/ast/typescriptast/TypeScriptRegressionTest.kt b/chapi-ast-typescript/src/test/kotlin/chapi/ast/typescriptast/TypeScriptRegressionTest.kt
@@ -2,6 +2,7 @@ package chapi.ast.typescriptast
 
 import org.junit.jupiter.api.Disabled
 import org.junit.jupiter.api.Test
+import kotlin.test.assertEquals
 
 class TypeScriptRegressionTest {
 
@@ -146,4 +147,19 @@ export type CaseQuery = (
 );"""
         TypeScriptAnalyser().analysis(code, "index.tsx")
     }
+
+    @Test
+    fun private_issue() {
+        val code = """
+export class PopupDirective {
+  private openPopup(): void {
+   
+  }
+}
+"""
+        val codeFile = TypeScriptAnalyser().analysis(code, "index.tsx")
+        assertEquals(codeFile.DataStructures.size, 1)
+        assertEquals(codeFile.DataStructures[0].Functions.size, 1)
+        assertEquals(codeFile.DataStructures[0].Functions[0].Name, "openPopup")
+    }
 }