Fixes JavaSearchMultipleProjectsTests.testPackageReference1

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

Author: robstryker

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

@@ -10,12 +10,14 @@
  *******************************************************************************/
 package org.eclipse.jdt.internal.core.search.matching;
 
+import org.eclipse.jdt.core.IJavaElement;
 import org.eclipse.jdt.core.dom.ASTNode;
 import org.eclipse.jdt.core.dom.IBinding;
 import org.eclipse.jdt.core.dom.IPackageBinding;
 import org.eclipse.jdt.core.dom.Name;
 import org.eclipse.jdt.core.dom.PackageDeclaration;
 import org.eclipse.jdt.internal.core.search.LocatorResponse;
+import org.eclipse.jdt.internal.javac.dom.JavacPackageBinding;
 
 public class DOMPackageReferenceLocator extends DOMPatternLocator {
 
@@ -44,7 +46,30 @@ public LocatorResponse resolveLevel(org.eclipse.jdt.core.dom.ASTNode node, IBind
 			String n = ipb.getName();
 			String patternName = new String(this.locator.pattern.pkgName);
 			if (patternName.equals(n)) {
-				return toResponse(ACCURATE_MATCH);
+				if( this.locator.pattern.focus == null ) {
+					// good enough
+					return toResponse(ACCURATE_MATCH);
+				}
+
+				// We have a focus of a specific package fragment.
+				// We want to make sure the class in this node is
+				// actually from this fragment, and not a similar package
+				// in a different project.
+				ASTNode working = node;
+				Name fullName = null;
+				while( working instanceof Name fn) {
+					fullName = fn;
+					working = working.getParent();
+				}
+				if( fullName != null ) {
+					String typeName = fullName.toString();
+					IJavaElement je = binding instanceof JavacPackageBinding jpb ? jpb.findJavaElementForClass(typeName) : ipb.getJavaElement();
+					if( je != null && !this.locator.pattern.focus.equals(je)) {
+						return toResponse(IMPOSSIBLE_MATCH);
+					}
+					// If we can't find a java element, let's give some leeway
+					return toResponse(ACCURATE_MATCH);
+				}
 			}
 		}
 		if (binding == null) {

org.eclipse.jdt.core.javac/src/org/eclipse/jdt/internal/javac/dom/JavacPackageBinding.java

@@ -11,8 +11,11 @@
 package org.eclipse.jdt.internal.javac.dom;
 
 import java.util.Arrays;
+import java.util.List;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
+import org.eclipse.jdt.core.ICompilationUnit;
 import org.eclipse.jdt.core.IJavaElement;
 import org.eclipse.jdt.core.IPackageFragment;
 import org.eclipse.jdt.core.JavaModelException;
@@ -99,6 +102,47 @@ public IJavaElement getJavaElement() {
 		}
 	}
 
+	public IJavaElement findJavaElementForClass(String fqqn) {
+		if (this.resolver.javaProject == null) {
+			return null;
+		}
+		String qnInternal = this.getQualifiedNameInternal();
+		if( fqqn.length() <= qnInternal.length() ) {
+			// Not a type name
+			return null;
+		}
+		try {
+			List<IPackageFragment> ret = Arrays.stream(this.resolver.javaProject.getAllPackageFragmentRoots())
+				.map(root -> root.getPackageFragment(qnInternal))
+				.filter(Objects::nonNull)
+				.filter(IPackageFragment::exists)
+				.collect(Collectors.toList());
+			int s = ret.size();
+			if( s == 1 ) {
+				return ret.get(0);
+			}
+
+			String relative = qnInternal == null || qnInternal.isEmpty() ? fqqn : fqqn.substring(qnInternal.length() + 1);
+			String relativePackage = relative != null && relative.contains(".") ? relative.substring(0, relative.lastIndexOf(".")) : null;
+			String cuName = relative != null && relative.contains(".") ? relative.substring(relative.lastIndexOf(".") + 1) : relative;
+			String soughtFile = cuName + ".java";
+			for( int i = 0; i < s; i++ ) {
+				IPackageFragment pf = ret.get(i);
+				if( relativePackage == null ) {
+					ICompilationUnit cu = pf.getCompilationUnit(soughtFile);
+					if( cu != null && cu.exists()) {
+						return pf;
+					}
+				}
+			}
+			// TODO need to make sure the package is accessible in the module. :|
+			return s == 0 ? null : ret.get(0);
+		} catch (JavaModelException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+			return null;
+		}
+	}
 	@Override
 	public IModuleBinding getModule() {
 		return this.getPackageSymbol() != null ?