Fix search for methods in classes in jars

Fixes 1

Signed-off-by: David Thompson <[email protected]>

Author: datho7561

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

@@ -143,7 +143,7 @@ public void locateMatches(MatchLocator locator, IJavaProject javaProject, Possib
 		org.eclipse.jdt.core.ICompilationUnit[] unitArray = new org.eclipse.jdt.core.ICompilationUnit[possibleMatches.length];
 
 		Map<org.eclipse.jdt.core.ICompilationUnit, PossibleMatch> cuToMatch = new HashMap<>();
-		for (int i = 0; i < possibleMatches.length; i++) {
+		for (int i = start; i < start + length; i++) {
 			var currentPossibleMatch = possibleMatches[i];
 			locator.currentPossibleMatch = currentPossibleMatch;
 			if (!skipMatch(locator, javaProject, currentPossibleMatch)) {
@@ -565,10 +565,25 @@ private void locateMatchesForBinary(PossibleMatch possibleMatch, MatchLocator lo
 				ILog.get().error(ce.getMessage(), ce);
 			}
 			if (info != null) {
+				// Redoes the getMethodBinding logic to avoid requiring a CompilationUnitScope
+				if (locator.patternLocator instanceof MethodLocator methodLocator) {
+					methodLocator.matchLocator = new DOMMatchLocator(locator.pattern, locator.requestor, locator.scope, locator.progressMonitor);
+					methodLocator.matchLocator.lookupEnvironment = locator.lookupEnvironment;
+				}
+				/**
+				 * @see MatchLocator#process(PossibleMatch, boolean)
+				 */
+				boolean oldMayBeGeneric = locator.patternLocator.mayBeGeneric;
+				locator.patternLocator.mayBeGeneric = false;
 				try {
 					new ClassFileMatchLocator().locateMatches(locator, classFile, info);
 				} catch (CoreException e) {
 					ILog.get().error(e.getMessage(), e);
+				} finally {
+					locator.patternLocator.mayBeGeneric = oldMayBeGeneric;
+					if (locator.patternLocator instanceof MethodLocator methodLocator) {
+						methodLocator.matchLocator = locator;
+					}
 				}
 			}
 		} else if (possibleMatch.openable instanceof ModularClassFile modularClassFile) { // no source

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

@@ -12,12 +12,17 @@
 
 import java.util.HashSet;
 import java.util.Set;
+import java.util.stream.Stream;
 
 import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.jdt.core.compiler.CharOperation;
 import org.eclipse.jdt.core.dom.IModuleBinding;
 import org.eclipse.jdt.core.search.IJavaSearchScope;
 import org.eclipse.jdt.core.search.SearchPattern;
 import org.eclipse.jdt.core.search.SearchRequestor;
+import org.eclipse.jdt.internal.compiler.lookup.MethodBinding;
+import org.eclipse.jdt.internal.compiler.lookup.ReferenceBinding;
+import org.eclipse.jdt.internal.compiler.lookup.TypeBinding;
 
 public class DOMMatchLocator extends MatchLocator {
 
@@ -34,4 +39,34 @@ public void registerModuleBinding(IModuleBinding binding) {
 		}
 	}
 
+	@Override
+	public MethodBinding getMethodBinding(MethodPattern methodPattern) {
+		char[][] compositeTypeName = Stream.of(methodPattern.declaringType.getFullyQualifiedName().split("\\.")).map(String::toCharArray).toArray(char[][]::new);
+		ReferenceBinding typeRefBinding = lookupEnvironment.askForType(compositeTypeName, lookupEnvironment.module);
+		for (MethodBinding method : typeRefBinding.methods()) {
+			int numParams = method.parameters.length;
+			if (numParams != methodPattern.parameterCount) {
+				continue;
+			}
+			for (int i = 0; i < numParams; i++) {
+				StringBuilder patternParam = new StringBuilder();
+				if (methodPattern.parameterQualifications[i] != null && methodPattern.parameterQualifications[i].length > 0) {
+					patternParam.append(methodPattern.parameterQualifications[i]);
+					patternParam.append('.');
+				}
+				patternParam.append(methodPattern.parameterSimpleNames[i]);
+				char[] patternParamChar = patternParam.toString().replaceAll("\\.", "/").toCharArray();
+				TypeBinding typeBinding = method.parameters[i];
+				char[] potentialMatchParamType = typeBinding.constantPoolName();
+				if (!CharOperation.equals(patternParamChar, potentialMatchParamType)) {
+					continue;
+				}
+			}
+			if (CharOperation.equals(method.selector, methodPattern.selector)) {
+				return method;
+			}
+		}
+		return null;
+	}
+
 }