From 7561efbf462cc30eddbd78be24317e6e641afad4 Mon Sep 17 00:00:00 2001 From: Yaroslav Lepenkin Date: Mon, 27 Mar 2017 19:14:32 +0300 Subject: [PATCH] [java formatter] space between enum constant and annotation --- .../formatter/java/JavaSpacePropertyProcessor.java | 3 +++ .../psi/formatter/java/JavaFormatterSpaceTest.java | 13 +++++++++++++ 2 files changed, 16 insertions(+) diff --git a/java/java-impl/src/com/intellij/psi/formatter/java/JavaSpacePropertyProcessor.java b/java/java-impl/src/com/intellij/psi/formatter/java/JavaSpacePropertyProcessor.java index 647a74dc6ae5..950c737fa177 100644 --- a/java/java-impl/src/com/intellij/psi/formatter/java/JavaSpacePropertyProcessor.java +++ b/java/java-impl/src/com/intellij/psi/formatter/java/JavaSpacePropertyProcessor.java @@ -1720,6 +1720,9 @@ public class JavaSpacePropertyProcessor extends JavaElementVisitor { else if (myRole2 == ChildRole.ANONYMOUS_CLASS) { myResult = getSpaceBeforeLBrace(myChild2, mySettings.SPACE_BEFORE_CLASS_LBRACE, null); } + else if (myRole1 == ChildRole.MODIFIER_LIST && myRole2 == ChildRole.NAME) { + createSpaceInCode(true); + } } @Override 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 511451afe66b..050ff72e14f1 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 @@ -660,5 +660,18 @@ public class JavaFormatterSpaceTest extends AbstractJavaFormatterTest { "public static void bar(@NonNls final String[] args) {\n" + "}"); } + + public void testEnumAnnotations() { + doTextTest("enum SampleEnum {\n" + + " @Annotation(\"1\")ONE,\n" + + " @Annotation(\"2\")TWO,\n" + + " @Annotation THREE\n" + + "}", + "enum SampleEnum {\n" + + " @Annotation(\"1\") ONE,\n" + + " @Annotation(\"2\") TWO,\n" + + " @Annotation THREE\n" + + "}"); + } } \ No newline at end of file