int x,y format fields inside anonymous class was incorrect

Signed-off-by: Rob Stryker <stryker@redhat.com>
robstryker · Apr 11, 2024 · b706657 · b706657
1 parent 6410e65
commit b706657
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/org.eclipse.jdt.core.javac/src/org/eclipse/jdt/core/dom/JavacConverter.java b/org.eclipse.jdt.core.javac/src/org/eclipse/jdt/core/dom/JavacConverter.java
@@ -684,6 +684,11 @@ private FieldDeclaration convertFieldDeclaration(JCVariableDecl javac, ASTNode p
 					.filter(x -> ((FieldDeclaration)x).getType().getStartPosition() == javac.vartype.getStartPosition())
 					.forEach(x -> sameStartPosition.add((ASTNode)x));
 		}
+		if( parent instanceof AnonymousClassDeclaration decl) {
+			decl.bodyDeclarations().stream().filter(x -> x instanceof FieldDeclaration)
+					.filter(x -> ((FieldDeclaration)x).getType().getStartPosition() == javac.vartype.getStartPosition())
+					.forEach(x -> sameStartPosition.add((ASTNode)x));
+		}
 		if( sameStartPosition.size() >= 1 ) {
 			FieldDeclaration fd = (FieldDeclaration)sameStartPosition.get(0);
 			if( fd != null ) {
@@ -1132,7 +1137,7 @@ private AnonymousClassDeclaration createAnonymousClassDeclaration(JCClassDecl ja
 		if (javacAnon.getMembers() != null) {
 			List<JCTree> members = javacAnon.getMembers();
 			for( int i = 0; i < members.size(); i++ ) {
-				ASTNode decl = convertBodyDeclaration(members.get(i), parent);
+				ASTNode decl = convertBodyDeclaration(members.get(i), anon);
 				if( decl != null ) {
 					anon.bodyDeclarations().add(decl);
 				}