Fix testBug221081 and others

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

Author: robstryker

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

@@ -854,23 +854,6 @@ public void scan(JCTree tree) {
 				javac.genEndPos = false;
 				javac.lineDebugInfo = false;
 			}
-			boolean forceProblemDetection = (flags & ICompilationUnit.FORCE_PROBLEM_DETECTION) != 0;
-			boolean forceBindingRecovery = (flags & ICompilationUnit.ENABLE_BINDINGS_RECOVERY) != 0;
-			var aptPath = fileManager.getLocation(StandardLocation.ANNOTATION_PROCESSOR_PATH);
-			boolean aptPathForceAnalyze = (aptPath != null && aptPath.iterator().hasNext());
-			if (forceProblemDetection || forceBindingRecovery || aptPathForceAnalyze ) {
-				// Let's run analyze until it finishes without error
-				Throwable caught = null;
-				do {
-					caught = null;
-					try {
-						task.analyze();
-					} catch (Throwable t) {
-						caught = t;
-						ILog.get().error("Error while analyzing", t);
-					}
-				} while(caught != null);
-			}
 
 			Throwable cachedThrown = null;
 
@@ -999,6 +982,26 @@ public void postVisit(ASTNode node) {
 					ILog.get().error(thrown.getMessage(), thrown);
 				}
 			}
+
+			boolean forceProblemDetection = (flags & ICompilationUnit.FORCE_PROBLEM_DETECTION) != 0;
+			boolean forceBindingRecovery = (flags & ICompilationUnit.ENABLE_BINDINGS_RECOVERY) != 0;
+			var aptPath = fileManager.getLocation(StandardLocation.ANNOTATION_PROCESSOR_PATH);
+			boolean aptPathForceAnalyze = (aptPath != null && aptPath.iterator().hasNext());
+			if (forceProblemDetection || forceBindingRecovery || aptPathForceAnalyze ) {
+				// Let's run analyze until it finishes without error
+				Throwable caught = null;
+				do {
+					caught = null;
+					try {
+						task.analyze();
+					} catch (Throwable t) {
+						caught = t;
+						ILog.get().error("Error while analyzing", t);
+					}
+				} while(caught != null);
+			}
+
+
 			if (!resolveBindings) {
 				destroy(context);
 			}

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

@@ -114,9 +114,14 @@ public LocatorResponse match(Name name, NodeSetWrapper nodeSet, MatchLocator loc
 		if (this.fieldLocator.pattern.fineGrain != 0 ? matchesFineGrain(name) :
 			((this.fieldLocator.pattern.readAccess && DOMLocalVariableLocator.isRead(name))
 			|| (this.fieldLocator.pattern.writeAccess && DOMLocalVariableLocator.isWrite(name)))) {
-			int level = nodeSet.addMatch(name, getPossibleOrAccurateViaMustResolve());
-			if( level != IMPOSSIBLE_MATCH ) {
+			int possibleOrAccurate = getPossibleOrAccurateViaMustResolve();
+			if( possibleOrAccurate != IMPOSSIBLE_MATCH ) {
 				IBinding b = name.resolveBinding();
+				if( b != null && b instanceof IVariableBinding vb) {
+					if( !vb.isField() && !vb.isRecordComponent()) {
+						return toResponse(IMPOSSIBLE_MATCH);
+					}
+				}
 				if( b == null ) {
 					if( name instanceof SimpleName sn && name.getParent() instanceof QualifiedName qn && sn == qn.getQualifier()) {
 						boolean shadowed = methodHasShadowedVariable(name);
@@ -125,7 +130,7 @@ public LocatorResponse match(Name name, NodeSetWrapper nodeSet, MatchLocator loc
 					}
 				}
 			}
-			return toResponse(level, true);
+			return toResponse(possibleOrAccurate, true);
 		}
 		return toResponse(IMPOSSIBLE_MATCH);
 	}