fix(java): fix packageName error for static import

phodal · Apr 6, 2022 · 75aa5a8 · 75aa5a8
1 parent e262aa0
commit 75aa5a8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/chapi-ast-java/src/main/kotlin/chapi/ast/javaast/JavaFullIdentListener.kt b/chapi-ast-java/src/main/kotlin/chapi/ast/javaast/JavaFullIdentListener.kt
@@ -364,8 +364,11 @@ open class JavaFullIdentListener(
                     pkgName = imp.Source
                     clz = target
                 } else if (imp.UsageName.contains(methodName)) {
-                    pkgName = imp.Source
-                    clz = imp.Source.split(".").last()
+                    val splitImp = imp.Source.split(".")
+                    clz = splitImp.last()
+
+                    val maybePackageName = splitImp.dropLast(1).joinToString(".")
+                    pkgName = maybePackageName
                 }
             }
 

diff --git a/chapi-ast-java/src/test/kotlin/chapi/ast/javaast/JavaIdentCallAppTest.kt b/chapi-ast-java/src/test/kotlin/chapi/ast/javaast/JavaIdentCallAppTest.kt
@@ -178,5 +178,6 @@ public class BlogRepositoryImpl {
         val firstFunc = codeContainer.DataStructures[0].Functions[0]
         assertEquals(firstFunc.FunctionCalls[0].FunctionName, "generateBatchInsertSql")
         assertEquals(firstFunc.FunctionCalls[0].NodeName, "SqlGenerator")
+        assertEquals(firstFunc.FunctionCalls[0].Package, "infrastructure.utils")
     }
 }