Fix test564049_009

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

Author: robstryker

org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/core/compiler/IProblem.java

@@ -1671,9 +1671,9 @@ public interface IProblem {
 	int NullExpressionReference = Internal + 672;
 	/** @since 3.9 */
 	int PotentialNullExpressionReference = Internal + 673;
-	/** @since 3.42*/
+	/** @since 3.43*/
 	int LocalMustBeEffectivelyFinal = Internal + 674;
-	/** @since 3.42*/
+	/** @since 3.43*/
 	int ResourceLocalMustBeEffectivelyFinal = Internal + 675;
 
 	/**
@@ -2615,7 +2615,7 @@ public interface IProblem {
 	int RecordErasureIncompatibilityInCanonicalConstructor = TypeRelated + 1768;
 	/** @since 3.41 */
 	int CompactConstructorOnlyInRecords = TypeRelated + 1769;
-	/** @since 3.42 */
+	/** @since 3.43 */
 	int RecordAccessorMissingOverrideAnnotation = TypeRelated + 1770;
 	/* records - end */
 

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

@@ -784,6 +784,29 @@ public String findImportForString(String s) {
 			if( simpleNameMatch != -1 ) {
 				return simpleNameMatch;
 			}
+			if( node instanceof Type t) {
+				String qualifiedNameFromNode = getQualifiedNameFromType(t);
+				char[] qualifiedPattern = getQualifiedPattern(trp.simpleName,trp.qualification);
+				if( qualifiedNameFromNode != null && qualNameFromBinding.endsWith(qualifiedNameFromNode)) {
+					// Might be a rare situation where two top-level classes defined in same file?
+					int level3 = resolveLevelForTypeSourceName(qualifiedPattern, qualifiedNameFromNode.toCharArray(), typeBinding);
+					if( level3 != IMPOSSIBLE_MATCH ) {
+						return level3;
+					}
+				} else {
+					org.eclipse.jdt.core.dom.CompilationUnit cu = findCompilationUnitAncestor(node);
+					String pkg = cu.getPackage() == null ? null : cu.getPackage().getName().toString();
+					if( pkg != null ) {
+						if( qualNameFromBinding.startsWith(pkg + ".")) {
+							String suffix = qualNameFromBinding.substring(pkg.length() + 1);
+							int level3 = resolveLevelForTypeSourceName(qualifiedPattern, suffix.toCharArray(), typeBinding);
+							if( level3 != IMPOSSIBLE_MATCH ) {
+								return level3;
+							}
+						}
+					}
+				}
+			}
 		}
 		if( newLevel == ACCURATE_MATCH ) {
 			if( trp.hasTypeArguments() ) {