From c013a7a1308a2333f591dfa7081f54df354a7a1a Mon Sep 17 00:00:00 2001 From: Denis Zhdanov Date: Mon, 11 Jul 2011 17:20:09 +0400 Subject: [PATCH] IDEA-71823 Problem with Code Style 'Space after comma' code style setting is respected for java method call arguments --- .../psi/formatter/java/JavaSpacePropertyProcessor.java | 2 +- .../psi/formatter/java/JavaFormatterSpaceTest.java | 10 ++++++++++ 2 files changed, 11 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 41aeb88de04e..0f3f7cb93e7b 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 @@ -1112,7 +1112,7 @@ public class JavaSpacePropertyProcessor extends JavaElementVisitor { createParenthSpace(mySettings.CALL_PARAMETERS_LPAREN_ON_NEXT_LINE, mySettings.SPACE_WITHIN_METHOD_CALL_PARENTHESES); } else if (myRole1 == ChildRole.COMMA) { - createSpaceInCode(true); + createSpaceInCode(mySettings.SPACE_AFTER_COMMA); } else if (myRole2 == ChildRole.COMMA) { createSpaceInCode(false); 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 731d0bd8a2b6..2d7efac3b575 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 @@ -356,4 +356,14 @@ public class JavaFormatterSpaceTest extends AbstractJavaFormatterTest { doMethodTest("try (R r = null) { }", "try (R r=null) { }"); } + + public void testBetweenMethodCallArguments() throws Exception { + // Inspired by IDEA-71823 + getSettings().SPACE_AFTER_COMMA = false; + + doMethodTest( + "foo(1, 2, 3);", + "foo(1,2,3);" + ); + } }