Fix testStringAnyStrings01 and 3 others

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

Author: robstryker

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

@@ -1207,8 +1207,18 @@ private IBinding resolveNameImpl(Name name) {
 					if (parameterizedType != null) {
 						return parameterizedType;
 					}
-
 				}
+
+//				IBinding ret = resolveNameToJavac(name, tree);
+//				if (ret != null) {
+//					return ret;
+//				}
+//
+//				// That didn't work... checking field access
+//				IBinding fieldAccessBinding = this.getFieldAccessBinding(jcfa);
+//				if( fieldAccessBinding != null ) {
+//					return fieldAccessBinding;
+//				}
 			}
 		}
 		if( tree != null ) {

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

@@ -201,13 +201,17 @@ private boolean visitType(Type node) {
 	@Override
 	public boolean visit(SimpleType type) {
 		visitType(type);
+		LocatorResponse resp = defaultVisitImplementationWithFunc(type, (x,y) -> y.match(type, this.nodeSet, this.locator), DOMASTNodeUtils::getBinding);
 		Name n = type.getName();
 		if( n instanceof QualifiedName qn ) {
 			Name qualifier = qn.getQualifier();
-			if( qualifier instanceof SimpleName sn1 ) {
-				sn1.accept(this);
-			} else if( qualifier instanceof QualifiedName qn1) {
-				qn1.accept(this);
+			boolean replacementIsChild = resp.replacementNodeFound() && (resp.replacement() == qn.getQualifier() || resp.replacement() == qn.getName());
+			if( !replacementIsChild ) {
+				if( qualifier instanceof SimpleName sn1 ) {
+					sn1.accept(this);
+				} else if( qualifier instanceof QualifiedName qn1) {
+					qn1.accept(this);
+				}
 			}
 		}
 		for (var ann : (List<Annotation>)type.annotations() ) {

org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/JavaSearchModuleImportTest.java

@@ -14,7 +14,7 @@
 package org.eclipse.jdt.core.tests.model;
 
 import java.io.IOException;
-
+import junit.framework.Test;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.jdt.core.ICompilationUnit;
 import org.eclipse.jdt.core.IJavaProject;
@@ -28,8 +28,6 @@
 import org.eclipse.jdt.core.search.SearchMatch;
 import org.eclipse.jdt.core.search.SearchPattern;
 
-import junit.framework.Test;
-
 public class JavaSearchModuleImportTest extends AbstractJavaSearchTests {
 
 	public JavaSearchModuleImportTest(String name) {
@@ -88,6 +86,32 @@ public void testModuleImport() throws CoreException, IOException {
 					lib/mod.one.jar mod.one [No source] EXACT_MATCH""");
 	}
 
+
+	/*
+	 * Fails on Javac.
+	 * Behavior diverges at DiskIndex.readCategoryTable
+	 * A lot of weird stuff happening in writeCategories.writeCategories
+	 * when the index is for /JavaSearchBugs23. The list of categories to write
+	 * is only 5 elements instead of 9 via jdt. The relevant missing entry is moduleRef
+	 *
+	 * For jdt, the list of matching categories looks like:
+	 *  metaIndexQSTQ -> 59
+	 *	ref -> 88
+	 *	constructorRef -> 151
+	 *	superRef -> 172
+	 *	constructorDecl -> 258
+	 *	moduleRef -> 317
+	 *	typeDecl -> 334
+	 *	metaIndexQTQ -> 390
+	 *	metaIndexSTQ -> 459
+	 *
+	 * While for javac it looks like:
+	 * 	ref -> 59
+	 *  superRef -> 106
+	 *  typeDecl -> 192
+	 *  constructorDecl -> 248
+	 *  metaIndexQTQ -> 307
+	 */
 	public void testModuleImportPatternReferences() throws CoreException, IOException {
 			SearchPattern pattern = SearchPattern.createPattern("*od.*", IJavaSearchConstants.MODULE, REFERENCES, SearchPattern.R_EXACT_MATCH);
 			search(pattern, getJavaSearchScope(), this.resultCollector);

org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/JavaSearchTests.java

@@ -38,10 +38,13 @@
 import org.eclipse.jdt.core.search.SearchPattern;
 import org.eclipse.jdt.core.search.SearchRequestor;
 import org.eclipse.jdt.core.search.TypeNameRequestor;
+import org.eclipse.jdt.core.tests.javac.JavacFailReason;
 import org.eclipse.jdt.core.tests.util.Util;
 import org.eclipse.jdt.internal.compiler.impl.CompilerOptions;
 import org.eclipse.jdt.internal.core.JarPackageFragmentRoot;
 import org.eclipse.jdt.internal.core.JavaModelStatus;
+import org.junit.Ignore;
+import org.junit.experimental.categories.Category;
 
 /**
  * Tests the Java search engine where results are JavaElements and source positions.
@@ -3681,6 +3684,10 @@ public void testEnum02() throws CoreException {
 		"src/e1/Team.java e1.Team.FREDERIC [FREDERIC]",
 		this.resultCollector);
 }
+
+@Category(value=Ignore.class) @JavacFailReason(cause=JavacFailReason.VALID_ALTERNATIVE_IMPL)
+// No API available to tell where an anonymous constructor's closing parenthesis is.
+// Off by one error with added space.
 public void testEnum03() throws CoreException {
 	IType type = getCompilationUnit("JavaSearch15", "src", "e1", "Team.java").getType("Team");
 	IMethod method = type.getMethod("Team", new String[] { "I" });