MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-123074 Code formatting. Closing brace.

Browse Source
This commit is contained in:
Yaroslav Lepenkin
2014-04-25 18:41:15 +04:00
parent 1dab5da5db
commit 0c4028d53b
4 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/psi/formatter/java/JavaSpacePropertyProcessor.java
+2 -8
View File
@@ -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);
java/java-tests/testData/psi/formatter/java/ParametersAlignment_after.java
+1 -2
View File
@@ -7,7 +7,6 @@ class Foo {
settings,
indentOptions,
child2.getTextRange(),
false
);
false);
}
}
java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterIndentationTest.java
+4 -8
View File
@@ -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(
java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterWrapTest.java
+16
View File
@@ -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;