fixing missing erasure matches

konveyor · Jul 11, 2024 · dabd3e5 · dabd3e5
1 parent 7902cac
commit dabd3e5
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/...r-bundle.core/src/main/java/io/konveyor/tackle/core/internal/symbol/CustomASTVisitor.java b/...r-bundle.core/src/main/java/io/konveyor/tackle/core/internal/symbol/CustomASTVisitor.java
@@ -1,16 +1,16 @@
 package io.konveyor.tackle.core.internal.symbol;
 
+import static org.eclipse.jdt.ls.core.internal.JavaLanguageServerPlugin.logInfo;
+
+import org.eclipse.jdt.core.dom.ASTNode;
 import org.eclipse.jdt.core.dom.ASTVisitor;
 import org.eclipse.jdt.core.dom.ClassInstanceCreation;
 import org.eclipse.jdt.core.dom.ConstructorInvocation;
-import org.eclipse.jdt.core.dom.ASTNode;
 import org.eclipse.jdt.core.dom.IMethodBinding;
 import org.eclipse.jdt.core.dom.ITypeBinding;
 import org.eclipse.jdt.core.dom.MethodInvocation;
 import org.eclipse.jdt.core.search.SearchMatch;
 
-import static org.eclipse.jdt.ls.core.internal.JavaLanguageServerPlugin.logInfo;
-
 /*
  * SearchEngine we use often gives us more matches than needed when
  * query contains a * and/or contains a fqn. e.g. java.io.paths.get* 
@@ -78,6 +78,10 @@ public boolean visit(MethodInvocation node) {
                 // get fqn of the method being called
                 ITypeBinding declaringClass = binding.getDeclaringClass();
                 if (declaringClass != null) {
+                    // Handle Erasure results
+                    if (declaringClass.getErasure() != null) {
+                        declaringClass = declaringClass.getErasure();
+                    }
                     String fullyQualifiedName = declaringClass.getQualifiedName() + "." + binding.getName();
                     // match fqn with query pattern
                     if (fullyQualifiedName.matches(this.query)) {

diff --git a/...zer-bundle.core/src/main/java/io/konveyor/tackle/core/internal/symbol/SymbolProvider.java b/...zer-bundle.core/src/main/java/io/konveyor/tackle/core/internal/symbol/SymbolProvider.java
@@ -188,6 +188,13 @@ default boolean queryQualificationMatches(String query, ICompilationUnit unit, L
             // for a query, java.io.paths.File*, queryQualification is java.io.paths
             queryQualification = query.substring(0, dotIndex);
         }
+        String packageQueryQualification = "";
+        int packageDotIndex = queryQualification.lastIndexOf('.');
+        if (packageDotIndex > 0) {
+            // for a query, java.io.paths.File*, queryQualification is java.io.paths
+            packageQueryQualification = queryQualification.substring(0, packageDotIndex);
+        }
+
         // check if the match was found in the same package as the query was looking for
         if (queryQualification != "" && location.getUri().contains(queryQualification.replaceAll(".", "/"))) {
             return true;
@@ -196,7 +203,7 @@ default boolean queryQualificationMatches(String query, ICompilationUnit unit, L
             try {
                 // check if the package declaration on the unit matches query
                 for (IPackageDeclaration packageDecl : unit.getPackageDeclarations()) {
-                    if (queryQualification != "" && packageDecl.getElementName().matches(queryQualification)) {
+                    if (packageQueryQualification!= "" && packageDecl.getElementName().matches(packageQueryQualification)) {
                         return true;
                     }
                 }