[DOM Search] check current package for non-imported missing types

Signed-off-by: Rob Stryker <[email protected]>

Author: Rob Stryker

org.eclipse.jdt.core.javac/src/org/eclipse/jdt/core/dom/JdtCoreDomPackagePrivateUtility.java

@@ -19,5 +19,16 @@ public static IBinding findBindingForType(ASTNode node, String signature) {
 		}
 		return ret1;
 	}
+	
+	public static IBinding findUnresolvedBindingForType(ASTNode node, String signature) {
+		JavacBindingResolver jcbr = getJavacBindingResolverOrNull(node);
+		IBinding ret1 = jcbr instanceof JavacBindingResolver br2 ? br2.findBinding(signature) : null;
+		if( ret1 == null ) {
+			String sig2 = signature.replaceAll("\\.", "/");
+			ret1 = jcbr instanceof JavacBindingResolver br2 ? br2.findUnresolvedBinding(sig2) : null;
+		}
+		return ret1;
+	}
+
 
 }

org.eclipse.jdt.core.javac/src/org/eclipse/jdt/internal/core/search/PatternLocatorVisitor.java

@@ -33,6 +33,7 @@
 import org.eclipse.jdt.core.dom.MethodInvocation;
 import org.eclipse.jdt.core.dom.Name;
 import org.eclipse.jdt.core.dom.NameQualifiedType;
+import org.eclipse.jdt.core.dom.PackageDeclaration;
 import org.eclipse.jdt.core.dom.ParameterizedType;
 import org.eclipse.jdt.core.dom.QualifiedName;
 import org.eclipse.jdt.core.dom.QualifiedType;
@@ -303,4 +304,11 @@ public boolean visit(ImportDeclaration node) {
 		defaultVisitImplementation(node, (x,y) -> y.match(node, this.nodeSet, this.locator));
 		return true;
 	}
+	
+	@Override
+	public boolean visit(PackageDeclaration node) {
+		defaultVisitImplementation(node, (x,y) -> y.match(node, this.nodeSet, this.locator));
+		return true;
+	}
+
 }

org.eclipse.jdt.core.javac/src/org/eclipse/jdt/internal/core/search/matching/DOMTypeReferenceLocator.java

@@ -60,6 +60,7 @@ public class DOMTypeReferenceLocator extends DOMPatternLocator {
 	private List<IJavaElement> foundElements = new ArrayList<>();
 	private Set<org.eclipse.jdt.core.dom.Name> imports = new HashSet<>();
 	private MatchLocator matchLocator = null;
+	private String packageName;
 
 	public DOMTypeReferenceLocator(TypeReferenceLocator locator) {
 		super(locator.pattern);
@@ -147,6 +148,9 @@ public LocatorResponse match(org.eclipse.jdt.core.dom.ASTNode node, NodeSetWrapp
 			Name n = id.getName();
 			imports.add(n);
 		}
+		if( node instanceof PackageDeclaration pd) {
+			this.packageName = pd.getName().toString();
+		}
 		return toResponse(IMPOSSIBLE_MATCH);
 	}
 
@@ -213,6 +217,11 @@ public LocatorResponse match(Type node, NodeSetWrapper nodeSet, MatchLocator loc
 					r1 = matchTypeNodeReturnComponent(node, patternQualifiedString, fqqn, defaultLevel);
 					if( r1 != null ) return r1;
 				}
+				if( this.packageName != null ) {
+					String fqqn = this.packageName + "." + qualifiedNameFromNode;
+					r1 = matchTypeNodeReturnComponent(node, patternQualifiedString, fqqn, defaultLevel);
+					if( r1 != null ) return r1;
+				}
 			} else {
 				String[] qualifiedNameFromNodeSegments = qualifiedNameFromNode.split("\\.");
 				String[] qualifiedNamePatternSegments = patternQualifiedString.split("\\.");