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

[formatter] keep final on the same line with annotation

Browse Source
This commit is contained in:
Yaroslav Lepenkin
2017-01-17 20:01:40 +03:00
parent fe7c5dcd8e
commit 4222bc2608
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/psi/formatter/java/JavaSpacePropertyProcessor.java
+1 -1
View File
@@ -1149,7 +1149,7 @@ public class JavaSpacePropertyProcessor extends JavaElementVisitor {
@Override
public void visitModifierList(PsiModifierList list) {
if (myType1 == JavaElementType.ANNOTATION && myType2 == JavaTokenType.FINAL_KEYWORD) {
myResult = Spacing.createSpacing(1, Integer.MAX_VALUE, 1, false, mySettings.KEEP_BLANK_LINES_IN_CODE);
myResult = Spacing.createSpacing(1, Integer.MAX_VALUE, 0, false, mySettings.KEEP_BLANK_LINES_IN_CODE);
}
else if (myType1 == JavaTokenType.END_OF_LINE_COMMENT) {
myResult = Spacing.createSpacing(0, Integer.MAX_VALUE, 1, mySettings.KEEP_LINE_BREAKS, mySettings.KEEP_BLANK_LINES_IN_CODE);
java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterSpaceTest.java
+9
View File
@@ -652,4 +652,13 @@ public class JavaFormatterSpaceTest extends AbstractJavaFormatterTest {
"int x = (1 + 2 + 3) * (1 + 2 + 2) * (1 + 2);"
);
}
public void testKeepFinalOnLine() {
doClassTest(
"public static void bar(@NonNls final String[] args) {\n" +
"}",
"public static void bar(@NonNls final String[] args) {\n" +
"}");
}
}
java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterTest.java
+1 -2
View File
@@ -3283,8 +3283,7 @@ public void testSCR260() throws Exception {
" list.clear();\n" +
" }\n" +
"};",
"@SuppressWarnings(\"unchecked\")\n" +
"final List<String> list = new ArrayList<String>();\n" +
"@SuppressWarnings(\"unchecked\") final List<String> list = new ArrayList<String>();\n" +
"new Runnable() {\n" +
" @Override\n" +
" public void run() {\n" +