Fix testDeclarationOfAccessedFields2 and 3

Signed-off-by: Rob Stryker <stryker@redhat.com>
robstryker · Nov 12, 2024 · 6dd1174 · 6dd1174
1 parent d9eaece
commit 6dd1174
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/FieldLocator.java b/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/FieldLocator.java
@@ -118,7 +118,7 @@ public int match(FieldDeclaration node, MatchingNodeSet nodeSet) {
 }
 @Override
 public int match(VariableDeclaration node, MatchingNodeSet nodeSet, MatchLocator locator) {
-	if (!this.pattern.findDeclarations) {
+	if (!this.pattern.findDeclarations && !this.isDeclarationOfAccessedFieldsPattern) {
 		return IMPOSSIBLE_MATCH;
 	}
 	if (node.getLocationInParent() != org.eclipse.jdt.core.dom.FieldDeclaration.FRAGMENTS_PROPERTY) {
@@ -132,7 +132,7 @@ public int match(VariableDeclaration node, MatchingNodeSet nodeSet, MatchLocator
 				referencesLevel = this.pattern.mustResolve ? POSSIBLE_MATCH : ACCURATE_MATCH;
 
 	int declarationsLevel = IMPOSSIBLE_MATCH;
-	if (this.pattern.findDeclarations &&
+	if ((this.pattern.findDeclarations || this.isDeclarationOfAccessedFieldsPattern) &&
 		matchesName(this.pattern.name, node.getName().getIdentifier().toCharArray()) &&
 		this.pattern instanceof FieldPattern fieldPattern &&
 		matchesTypeReference(fieldPattern.typeSimpleName, ((org.eclipse.jdt.core.dom.FieldDeclaration)node.getParent()).getType())) {
@@ -273,7 +273,7 @@ protected void matchReportReference(ASTNode reference, IJavaElement element, Bin
 }
 @Override
 public int match(Name name, MatchingNodeSet nodeSet, MatchLocator locator) {
-	if (this.pattern.findDeclarations) {
+	if (this.pattern.findDeclarations || this.isDeclarationOfAccessedFieldsPattern) {
 		return IMPOSSIBLE_MATCH; // already caught by match(VariableDeclaration)
 	}