From 05d70cee37535fd32fea38c3779f11545643ab2f Mon Sep 17 00:00:00 2001 From: Yaroslav Lepenkin Date: Wed, 10 May 2017 13:43:09 +0300 Subject: [PATCH] space between annotation and type is normalized (IDEA-172599) --- .../formatter/java/JavaSpacePropertyProcessor.java | 2 +- .../psi/formatter/java/JavaFormatterTest.java | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) 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 04b7dde8d807..7527a88791e6 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 @@ -1149,7 +1149,7 @@ public class JavaSpacePropertyProcessor extends JavaElementVisitor { @Override public void visitModifierList(PsiModifierList list) { if (myType1 == JavaElementType.ANNOTATION && myType2 == JavaTokenType.FINAL_KEYWORD) { - myResult = Spacing.createSpacing(1, Integer.MAX_VALUE, 0, false, mySettings.KEEP_BLANK_LINES_IN_CODE); + myResult = Spacing.createSpacing(1, 1, 0, false, mySettings.KEEP_BLANK_LINES_IN_CODE); } else if (myType1 == JavaTokenType.END_OF_LINE_COMMENT) { myResult = Spacing.createSpacing(0, Integer.MAX_VALUE, 1, mySettings.KEEP_LINE_BREAKS, mySettings.KEEP_BLANK_LINES_IN_CODE); diff --git a/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterTest.java b/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterTest.java index ee1b6fa7c8ee..bce3557c244c 100644 --- a/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterTest.java +++ b/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterTest.java @@ -3364,5 +3364,18 @@ public void testSCR260() throws Exception { " break;\n" + "}"); } + + public void testAnnotationAndFinalInsideParamList() { + doClassTest( + "public class Test {\n" + + " void test(@Nullable final String childFallbackProvider) {\n" + + " }\n" + + "}", + "public class Test {\n" + + " void test(@Nullable final String childFallbackProvider) {\n" + + " }\n" + + "}" + ); + } }