From 2b7a5073592e90da9f623a8b6cea98a9a96997af Mon Sep 17 00:00:00 2001 From: Yaroslav Lepenkin Date: Mon, 29 Sep 2014 19:18:32 +0400 Subject: [PATCH] return ChildRole.COMMA for comma between fields in anonymous class (IDEA-130275) --- .../source/tree/java/AnonymousClassElementBase.java | 3 +++ .../psi/formatter/java/JavaFormatterSpaceTest.java | 10 ++++++++++ 2 files changed, 13 insertions(+) diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/AnonymousClassElementBase.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/AnonymousClassElementBase.java index c52bf6f41214..161c80c92466 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/AnonymousClassElementBase.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/AnonymousClassElementBase.java @@ -85,6 +85,9 @@ public abstract class AnonymousClassElementBase extends ClassElement { else if (i == JavaTokenType.RBRACE) { return getChildRole(child, ChildRole.RBRACE); } + else if (i == JavaTokenType.COMMA) { + return ChildRole.COMMA; + } else { return ChildRoleBase.NONE; } diff --git a/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterSpaceTest.java b/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterSpaceTest.java index c01395b66869..0debdda7b434 100644 --- a/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterSpaceTest.java +++ b/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterSpaceTest.java @@ -579,4 +579,14 @@ public class JavaFormatterSpaceTest extends AbstractJavaFormatterTest { doMethodTest(before, "Test.class"); } + public void testMultipleFieldDeclaration_InAnonymousClass() { + doMethodTest( + "new Object() {\n" + + "boolean one, two;\n" + + "};", + "new Object() {\n" + + " boolean one, two;\n" + + "};" + ); + } }