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-148214 After expanding indents restore only alignments which can be moved in the middle of line (isAllowBackwardShift == true)

Browse Source
This commit is contained in:
Yaroslav Lepenkin
2015-12-02 18:46:53 +03:00
parent ee83a5c47e
commit caa3770f0d
2 changed files with 33 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterMultilineMethodCallParamsTest.java
+29
View File
@@ -126,6 +126,35 @@ public class JavaFormatterMultilineMethodCallParamsTest extends AbstractJavaForm
");\n"
);
}
public void testMethodBracketsAlignment() {
getSettings().ALIGN_MULTILINE_METHOD_BRACKETS = true;
doTextTest(
"public class Foo {\n" +
" private IntPredicate example1() {\n" +
" return Boo.combine(Boo.p1(),\n" +
" Boo.p2());\n" +
" }\n" +
" \n" +
" private boolean example2() {\n" +
" return IntStream.range(0, 4).allMatch(Boo.combine(Boo.p1(),\n" +
" Boo.p2()));\n" +
" }\n" +
"}",
"public class Foo {\n" +
" private IntPredicate example1() {\n" +
" return Boo.combine(Boo.p1(),\n" +
" Boo.p2());\n" +
" }\n" +
"\n" +
" private boolean example2() {\n" +
" return IntStream.range(0, 4).allMatch(Boo.combine(Boo.p1(),\n" +
" Boo.p2()));\n" +
" }\n" +
"}"
);
}
}
platform/lang-impl/src/com/intellij/formatting/FormatProcessor.java
+4 -1
View File
@@ -1650,7 +1650,10 @@ public class FormatProcessor {
private void restoreAlignments(MultiMap<Alignment, LeafBlockWrapper> blocks) {
for (Alignment alignment : blocks.keySet()) {
Set<LeafBlockWrapper> toRealign = ((AlignmentImpl)alignment).getOffsetResponsibleBlocks();
AlignmentImpl alignmentImpl = (AlignmentImpl)alignment;
if (!alignmentImpl.isAllowBackwardShift()) continue;
Set<LeafBlockWrapper> toRealign = alignmentImpl.getOffsetResponsibleBlocks();
arrangeSpaces(toRealign);
LeafBlockWrapper rightMostBlock = getRightMostBlock(toRealign);