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 390116c3793c..391a8fd86d8c 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 @@ -1139,14 +1139,8 @@ public class JavaSpacePropertyProcessor extends JavaElementVisitor { createParenthSpace(mySettings.CALL_PARAMETERS_LPAREN_ON_NEXT_LINE, mySettings.SPACE_WITHIN_EMPTY_METHOD_CALL_PARENTHESES); } else if (myRole2 == ChildRole.RPARENTH) { - PsiExpression[] arguments = list.getExpressions(); - if (JavaFormatterUtil.hasMultilineArguments(arguments) && JavaFormatterUtil.isMultilineExceptArguments(arguments)) { - myResult = Spacing.createSpacing(0, 0, 1, mySettings.KEEP_LINE_BREAKS, 0); - } - else { - createParenthSpace(mySettings.CALL_PARAMETERS_RPAREN_ON_NEXT_LINE, - myRole1 == ChildRole.COMMA || mySettings.SPACE_WITHIN_METHOD_CALL_PARENTHESES); - } + createParenthSpace(mySettings.CALL_PARAMETERS_RPAREN_ON_NEXT_LINE, + myRole1 == ChildRole.COMMA || mySettings.SPACE_WITHIN_METHOD_CALL_PARENTHESES); } else if (myRole1 == ChildRole.LPARENTH) { createParenthSpace(mySettings.CALL_PARAMETERS_LPAREN_ON_NEXT_LINE, mySettings.SPACE_WITHIN_METHOD_CALL_PARENTHESES); diff --git a/java/java-tests/testData/psi/formatter/java/ParametersAlignment_after.java b/java/java-tests/testData/psi/formatter/java/ParametersAlignment_after.java index cf135bfa6837..0e0dee8f9cf8 100644 --- a/java/java-tests/testData/psi/formatter/java/ParametersAlignment_after.java +++ b/java/java-tests/testData/psi/formatter/java/ParametersAlignment_after.java @@ -7,7 +7,6 @@ class Foo { settings, indentOptions, child2.getTextRange(), - false - ); + false); } } \ No newline at end of file diff --git a/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterIndentationTest.java b/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterIndentationTest.java index ec41ee6842ff..02882bf2420e 100644 --- a/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterIndentationTest.java +++ b/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterIndentationTest.java @@ -343,8 +343,7 @@ public class JavaFormatterIndentationTest extends AbstractJavaFormatterTest { " @Override\n" + " public void run() {\n" + " }\n" + - " }\n" + - ");" + " });" ); doMethodTest( @@ -367,8 +366,7 @@ public class JavaFormatterIndentationTest extends AbstractJavaFormatterTest { " @Override\n" + " public void run() {\n" + " }\n" + - " }\n" + - ");" + " });" ); } @@ -395,8 +393,7 @@ public class JavaFormatterIndentationTest extends AbstractJavaFormatterTest { " @Override\n" + " public void run() {\n" + " }\n" + - " }\n" + - ");" + " });" ); doMethodTest( @@ -419,8 +416,7 @@ public class JavaFormatterIndentationTest extends AbstractJavaFormatterTest { " @Override\n" + " public void run() {\n" + " }\n" + - " }\n" + - ");" + " });" ); doMethodTest( diff --git a/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterWrapTest.java b/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterWrapTest.java index 4482dd7985ae..512a7ef3c158 100644 --- a/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterWrapTest.java +++ b/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterWrapTest.java @@ -146,6 +146,22 @@ public class JavaFormatterWrapTest extends AbstractJavaFormatterTest { ); } + public void testIDEA123074() { + getSettings().CALL_PARAMETERS_WRAP = CommonCodeStyleSettings.WRAP_ALWAYS; + String before = "final GeoZone geoZone1 = new GeoZone(APPROACHING, new Polygon(point(\"0.0\", \"0.0\"), point(\"10.0\", \"0.0\")," + + "point(\"10.0\", \"10.0\"), point(\"0.0\", \"10.0\")));"; + String after = "final GeoZone geoZone1 = new GeoZone(APPROACHING,\n" + + " new Polygon(point(\"0.0\",\n" + + " \"0.0\"),\n" + + " point(\"10.0\",\n" + + " \"0.0\"),\n" + + " point(\"10.0\",\n" + + " \"10.0\"),\n" + + " point(\"0.0\",\n" + + " \"10.0\")));"; + doMethodTest(before, after); + } + public void testMethodAnnotationFollowedBySingleLineComment() { // Inspired by IDEA-22808 getSettings().METHOD_ANNOTATION_WRAP = CommonCodeStyleSettings.WRAP_ALWAYS;