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-167425] formatter: fixed misplaced rbrace position

Browse Source
This commit is contained in:
Yaroslav Lepenkin
2017-05-15 14:39:41 +03:00
parent c8f26555b9
commit c8b6a6500b
2 changed files with 13 additions and 1 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 -1
View File
@@ -1138,7 +1138,8 @@ public class JavaSpacePropertyProcessor extends JavaElementVisitor {
}
else if (myRole2 == ChildRole.TYPE
&& myChild1.getLastChildNode() != null
&& myChild1.getLastChildNode().getElementType() == JavaElementType.ANNOTATION) {
&& myChild1.getLastChildNode().getElementType() == JavaElementType.ANNOTATION
|| myRole1 == ChildRole.MODIFIER_LIST && myRole2 == ChildRole.RBRACE) {
createSpaceProperty(true, mySettings.KEEP_LINE_BREAKS, 0);
}
else {
java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterTest.java
+11
View File
@@ -3377,5 +3377,16 @@ public void testSCR260() throws Exception {
"}"
);
}
public void testPreserveRbraceOnItsLine() {
doClassTest(
"class SomeTest {\n" +
" @Test\n" +
"}",
"class SomeTest {\n" +
" @Test\n" +
"}"
);
}
}