Fix testTypeReference35 and others

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

Author: robstryker

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

@@ -755,15 +755,29 @@ public ITypeBinding getTypeDeclaration() {
 			@Override
 			public IPackageBinding getPackage() {
 				if (type instanceof SimpleType simpleType && simpleType.getName() instanceof SimpleName) {
-					return JavacBindingResolver.this.converter.domToJavac
-						.values()
-						.stream()
-						.filter(CompilationUnit.class::isInstance)
-						.map(CompilationUnit.class::cast)
-						.map(CompilationUnit::getPackage)
-						.map(PackageDeclaration::resolveBinding)
-						.findAny()
-						.orElse(bindings.getPackageBinding(Symtab.instance(context).rootPackage));
+					Collection<JCTree> jctr = JavacBindingResolver.this.converter.domToJavac.values();
+					Iterator<JCTree> jcit = jctr.iterator();
+					while(jcit.hasNext()) {
+						Object o = jcit.next();
+						if( o instanceof CompilationUnit cuuu ) {
+							// Should this even be here? Migrated from prior version
+							PackageDeclaration pd = cuuu.getPackage();
+							if( pd != null ) {
+								IPackageBinding pack = pd.resolveBinding();
+								if( pack != null )
+									return pack;
+							}
+						}
+						if( o instanceof JCCompilationUnit jcuu) {
+							JCPackageDecl jcpd = jcuu.getPackage();
+							if( jcpd != null ) {
+								JavacPackageBinding pckbind = bindings.getPackageBinding(jcpd.packge);
+								if( pckbind != null ) {
+									return pckbind;
+								}
+							}
+						}
+					}
 				}
 				return bindings.getPackageBinding(Symtab.instance(context).rootPackage);
 			}

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

@@ -28,6 +28,7 @@
 import org.eclipse.jdt.core.compiler.CharOperation;
 import org.eclipse.jdt.core.dom.ASTNode;
 import org.eclipse.jdt.core.dom.ASTVisitor;
+import org.eclipse.jdt.core.dom.AbstractTypeDeclaration;
 import org.eclipse.jdt.core.dom.AnnotationTypeMemberDeclaration;
 import org.eclipse.jdt.core.dom.BreakStatement;
 import org.eclipse.jdt.core.dom.CastExpression;
@@ -428,8 +429,29 @@ private String getQualifiedNameFromType(Type query) {
 			return getQualifiedNameFromType(ptt.getType());
 		}
 		if( query instanceof SimpleType st) {
-			String fqqn = fqqnFromImport(st.getName().toString());
-			return fqqn != null ? fqqn : st.getName().toString();
+			String stName = st.getName().toString();
+			if( stName.contains(".")) {
+				return stName;
+			}
+			String fqqn = fqqnFromImport(stName);
+			if( fqqn != null ) {
+				return fqqn;
+			}
+			// Check if node's top level type has class of sought name
+			org.eclipse.jdt.core.dom.CompilationUnit cu = findCompilationUnitAncestor(query);
+			if( cu != null ) {
+				List<AbstractTypeDeclaration> types = cu.types();
+				if( types != null ) {
+					for( AbstractTypeDeclaration ad : types ) {
+						if( ad.getName().toString().equals(stName)) {
+							if( cu.getPackage() != null ) {
+								String pkg = cu.getPackage().getName().toString();
+								return pkg + "." + stName;
+							}
+						}
+					}
+				}
+			}
 		}
 		return null;
 	}
@@ -721,7 +743,8 @@ private int resolveLevelForTypeBinding(org.eclipse.jdt.core.dom.ASTNode node, IT
 		}
 
 		if (trp.focus != null) {
-			return Objects.equals(typeBinding.getJavaElement(), locator.pattern.focus) ?
+			IJavaElement je = typeBinding.getJavaElement();
+			return Objects.equals(je, locator.pattern.focus) ?
 					ACCURATE_MATCH : IMPOSSIBLE_MATCH;
 		}
 		IImportDiscovery importDiscovery = new IImportDiscovery() {
@@ -937,6 +960,16 @@ private boolean hasImportAncestor(ASTNode node) {
 		return false;
 	}
 
+	private org.eclipse.jdt.core.dom.CompilationUnit findCompilationUnitAncestor(ASTNode node) {
+		ASTNode working = node;
+		while(working != null) {
+			if( working instanceof org.eclipse.jdt.core.dom.CompilationUnit wk)
+				return wk;
+			working = working.getParent();
+		}
+		return null;
+	}
+
 	@Override
 	public void reportSearchMatch(MatchLocator locator, ASTNode node, SearchMatch match) throws CoreException {
 		IResource resource = match.getResource();