Keep line breaks works for Polyadic expressions (IDEA-153329)

This commit is contained in:
Yaroslav Lepenkin
2016-03-28 14:18:19 +03:00
parent 4722816635
commit 55e53ea631
2 changed files with 9 additions and 4 deletions
@@ -1463,10 +1463,6 @@ public class JavaSpacePropertyProcessor extends JavaElementVisitor {
if (!space && !canStickChildrenTogether(myChild1, myChild2)) {
space = true;
}
if (!keepLineBreaks && myRole2 == ChildRoleBase.NONE) {
keepLineBreaks = true;
}
myResult = Spacing.createSpacing(space ? 1 : 0, space ? 1 : 0, 0, keepLineBreaks, keepBlankLines);
}
}
@@ -644,4 +644,13 @@ public class JavaFormatterSpaceTest extends AbstractJavaFormatterTest {
);
}
public void testKeepLineBreaksWorks_InsidePolyExpression() {
getSettings().KEEP_LINE_BREAKS = false;
doMethodTest(
"int x = (1 + 2 + 3) *\n" +
" (1 + 2 + 2) * (1 + 2);",
"int x = (1 + 2 + 3) * (1 + 2 + 2) * (1 + 2);"
);
}
}