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

Introduced JavaCodeStyleBean, added to some tests

Browse Source
This commit is contained in:
Rustam Vishnyakov
2018-05-31 19:29:31 +03:00
parent 442e52156c
commit 2a4523827f
3 changed files with 84 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/psi/codeStyle/JavaCodeStyleBean.java
-6
View File
@@ -944,12 +944,6 @@ public class JavaCodeStyleBean extends CodeStyleBean {
public void setPlaceAssignmentSignOnNextLine(boolean value) {getCommonSettings().PLACE_ASSIGNMENT_SIGN_ON_NEXT_LINE = value;}
public WrapType getLabeledStatementWrap() {
return intToWrapType(getCommonSettings().LABELED_STATEMENT_WRAP);
}
public void setLabeledStatementWrap(WrapType value) {getCommonSettings().LABELED_STATEMENT_WRAP = wrapTypeToInt(value);}
public boolean isWrapComments() {
return getCommonSettings().WRAP_COMMENTS;
}
java/java-tests/testSrc/com/intellij/java/psi/formatter/java/AbstractJavaFormatterTest.java
+13 -1
View File
@@ -16,6 +16,7 @@
package com.intellij.java.psi.formatter.java;
import com.intellij.JavaTestUtil;
import com.intellij.application.options.CodeStyle;
import com.intellij.codeInsight.actions.ReformatCodeProcessor;
import com.intellij.formatting.FormatterTestUtils.Action;
import com.intellij.lang.java.JavaLanguage;
@@ -54,6 +55,8 @@ import static com.intellij.formatting.FormatterTestUtils.Action.REFORMAT;
* @since Apr 27, 2010 6:26:29 PM
*/
public abstract class AbstractJavaFormatterTest extends LightIdeaTestCase {
private JavaCodeStyleBean myCodeStyleBean;
@NotNull
public static String shiftIndentInside(@NotNull String initial, final int i, boolean shiftEmptyLines) {
StringBuilder result = new StringBuilder(initial.length());
@@ -83,6 +86,15 @@ public abstract class AbstractJavaFormatterTest extends LightIdeaTestCase {
return result.toString();
}
@NotNull
public JavaCodeStyleBean getCodeStyleBean() {
if (myCodeStyleBean == null) {
myCodeStyleBean = new JavaCodeStyleBean();
myCodeStyleBean.setRootSettings(CodeStyle.getSettings(getProject()));
}
return myCodeStyleBean;
}
public static JavaCodeStyleSettings getJavaSettings() {
return getSettings().getRootSettings().getCustomSettings(JavaCodeStyleSettings.class);
}
@@ -99,7 +111,7 @@ public abstract class AbstractJavaFormatterTest extends LightIdeaTestCase {
}
public static CommonCodeStyleSettings getSettings() {
CodeStyleSettings rootSettings = CodeStyleSettingsManager.getSettings(getProject());
CodeStyleSettings rootSettings = CodeStyle.getSettings(getProject());
return rootSettings.getCommonSettings(JavaLanguage.INSTANCE);
}
java/java-tests/testSrc/com/intellij/java/psi/formatter/java/JavaFormatterTest.kt
+71 -65
View File
@@ -2,6 +2,7 @@
package com.intellij.java.psi.formatter.java
import com.intellij.application.options.CodeStyle
import com.intellij.formatting.WrapType
import com.intellij.lang.java.JavaLanguage
import com.intellij.openapi.command.CommandProcessor
import com.intellij.openapi.command.WriteCommandAction
@@ -27,7 +28,7 @@ import org.jetbrains.annotations.NonNls
*/
class JavaFormatterTest : AbstractJavaFormatterTest() {
fun testPaymentManager() {
AbstractJavaFormatterTest.getSettings().KEEP_LINE_BREAKS = false
codeStyleBean.isKeepLineBreaks = false
doTest("paymentManager.java", "paymentManager_after.java")
}
@@ -47,7 +48,6 @@ class JavaFormatterTest : AbstractJavaFormatterTest() {
fun testLabel1() {
val settings = AbstractJavaFormatterTest.getSettings()
settings.LABELED_STATEMENT_WRAP = CommonCodeStyleSettings.WRAP_ALWAYS
settings.rootSettings.getIndentOptions(StdFileTypes.JAVA).LABEL_INDENT_ABSOLUTE = true
settings.rootSettings.getIndentOptions(StdFileTypes.JAVA).LABEL_INDENT_SIZE = 0
@@ -60,21 +60,25 @@ class JavaFormatterTest : AbstractJavaFormatterTest() {
}
fun testNullMethodParameter() {
val settings = AbstractJavaFormatterTest.getSettings()
settings.CALL_PARAMETERS_WRAP = CommonCodeStyleSettings.WRAP_ALWAYS
settings.ALIGN_MULTILINE_PARAMETERS_IN_CALLS = true
codeStyleBean.apply{
callParametersWrap = WrapType.ALWAYS
isAlignMultilineParametersInCalls = true
}
doTest("NullMethodParameter.java", "NullMethodParameter_after.java")
}
fun test_DoNot_JoinLines_If_KeepLineBreaksIsOn() {
AbstractJavaFormatterTest.getSettings().KEEP_LINE_BREAKS = true
AbstractJavaFormatterTest.getSettings().METHOD_ANNOTATION_WRAP = CommonCodeStyleSettings.DO_NOT_WRAP
codeStyleBean.apply {
isKeepLineBreaks = true
methodAnnotationWrap = WrapType.NONE
}
doTextTest(
"public class Test<Param> {\n" +
" @SuppressWarnings(\"unchecked\")\n" +
" void executeParallel(Param... params) {\n" +
" }\n" +
"}",
"public class Test<Param> {\n" +
" @SuppressWarnings(\"unchecked\")\n" +
" void executeParallel(Param... params) {\n" +
@@ -84,8 +88,10 @@ class JavaFormatterTest : AbstractJavaFormatterTest() {
}
fun test_DoNot_JoinLines_If_KeepLineBreaksIsOn_WithMultipleAnnotations() {
AbstractJavaFormatterTest.getSettings().KEEP_LINE_BREAKS = true
AbstractJavaFormatterTest.getSettings().METHOD_ANNOTATION_WRAP = CommonCodeStyleSettings.DO_NOT_WRAP
codeStyleBean.apply {
isKeepLineBreaks = true
methodAnnotationWrap = WrapType.NONE
}
doTextTest(
"public class Test<Param> {\n" +
" @Override @SuppressWarnings(\"unchecked\")\n" +
@@ -119,8 +125,7 @@ class JavaFormatterTest : AbstractJavaFormatterTest() {
}
fun testJavaDoc() {
val settings = AbstractJavaFormatterTest.getSettings()
settings.BLANK_LINES_AROUND_FIELD = 1
codeStyleBean.blankLinesAroundField = 1
doTest("JavaDoc.java", "JavaDoc_after.java")
}
@@ -147,9 +152,10 @@ class JavaFormatterTest : AbstractJavaFormatterTest() {
}
fun testAlignMultiLine() {
val settings = AbstractJavaFormatterTest.getSettings()
settings.ALIGN_MULTILINE_PARENTHESIZED_EXPRESSION = true
settings.ALIGN_MULTILINE_BINARY_OPERATION = true
codeStyleBean.apply {
isAlignMultilineParenthesizedExpression = true
isAlignMultilineBinaryOperation = true
}
doTest()
}
@@ -158,10 +164,11 @@ class JavaFormatterTest : AbstractJavaFormatterTest() {
}
fun testSynchronizedBlock() {
val settings = AbstractJavaFormatterTest.getSettings()
settings.SPACE_BEFORE_SYNCHRONIZED_PARENTHESES = false
settings.SPACE_WITHIN_SYNCHRONIZED_PARENTHESES = false
settings.SPACE_BEFORE_SYNCHRONIZED_LBRACE = false
codeStyleBean.apply {
isSpaceBeforeSynchronizedParentheses = false
isSpaceWithinSynchronizedParentheses = false
isSpaceBeforeSynchronizedLeftBrace = false
}
doTest()
}
@@ -219,26 +226,27 @@ class JavaFormatterTest : AbstractJavaFormatterTest() {
}
fun testTernaryExpression() {
val settings = AbstractJavaFormatterTest.getSettings()
settings.ALIGN_MULTILINE_TERNARY_OPERATION = true
codeStyleBean.isAlignMultilineTernaryOperation = true
doTest()
settings.ALIGN_MULTILINE_TERNARY_OPERATION = false
codeStyleBean.isAlignMultilineTernaryOperation = false
doTest("TernaryExpression.java", "TernaryExpression_DoNotAlign_after.java")
}
fun testAlignAssignment() {
val settings = AbstractJavaFormatterTest.getSettings()
settings.ALIGN_MULTILINE_ASSIGNMENT = true
settings.ALIGN_MULTILINE_BINARY_OPERATION = true
codeStyleBean.apply {
isAlignMultilineAssignment = true
isAlignMultilineBinaryOperation = true
}
doTest()
}
fun testAlignFor() {
val settings = AbstractJavaFormatterTest.getSettings()
settings.ALIGN_MULTILINE_BINARY_OPERATION = true
settings.ALIGN_MULTILINE_FOR = true
codeStyleBean.apply {
isAlignMultilineBinaryOperation = true
isAlignMultilineFor = true
}
doTest()
}
@@ -263,26 +271,33 @@ class JavaFormatterTest : AbstractJavaFormatterTest() {
}
fun test2() {
val settings = AbstractJavaFormatterTest.getSettings()
settings.ALIGN_MULTILINE_PARAMETERS_IN_CALLS = true
codeStyleBean.isAlignMultilineParametersInCalls = true
doTest()
}
fun testBlocks() {
val settings = AbstractJavaFormatterTest.getSettings()
settings.KEEP_LINE_BREAKS = false
codeStyleBean.isKeepLineBreaks = false
doTest()
}
@Throws(IncorrectOperationException::class)
fun testBinaryOperation() {
val settings = AbstractJavaFormatterTest.getSettings()
@NonNls val text = "class Foo {\n" + " void foo () {\n" + " xxx = aaa + bbb \n" + " + ccc + eee + ddd;\n" + " }\n" + "}"
settings.ALIGN_MULTILINE_BINARY_OPERATION = true
settings.ALIGN_MULTILINE_ASSIGNMENT = true
codeStyleBean.apply {
isAlignMultilineBinaryOperation = true
isAlignMultilineAssignment = true
}
doTextTest(text, "class Foo {\n" +
" void foo() {\n" +
" xxx = aaa + bbb\n" +
" + ccc + eee + ddd;\n" +
" }\n" +
"}")
codeStyleBean.apply {
isAlignMultilineBinaryOperation = true
isAlignMultilineAssignment = false
}
doTextTest(text, "class Foo {\n" +
" void foo() {\n" +
" xxx = aaa + bbb\n" +
@@ -290,18 +305,10 @@ class JavaFormatterTest : AbstractJavaFormatterTest() {
" }\n" +
"}")
settings.ALIGN_MULTILINE_BINARY_OPERATION = true
settings.ALIGN_MULTILINE_ASSIGNMENT = false
doTextTest(text, "class Foo {\n" +
" void foo() {\n" +
" xxx = aaa + bbb\n" +
" + ccc + eee + ddd;\n" +
" }\n" +
"}")
settings.ALIGN_MULTILINE_BINARY_OPERATION = false
settings.ALIGN_MULTILINE_ASSIGNMENT = true
codeStyleBean.apply {
isAlignMultilineBinaryOperation = false
isAlignMultilineAssignment = true
}
doTextTest(text, "class Foo {\n" +
" void foo() {\n" +
" xxx = aaa + bbb\n" +
@@ -309,9 +316,11 @@ class JavaFormatterTest : AbstractJavaFormatterTest() {
" }\n" +
"}")
codeStyleBean.apply {
isAlignMultilineAssignment = false
isAlignMultilineBinaryOperation = false
}
settings.ALIGN_MULTILINE_ASSIGNMENT = false
settings.ALIGN_MULTILINE_BINARY_OPERATION = false
doTextTest(text, "class Foo {\n" +
" void foo() {\n" +
" xxx = aaa + bbb\n" +
@@ -319,9 +328,6 @@ class JavaFormatterTest : AbstractJavaFormatterTest() {
" }\n" +
"}")
settings.ALIGN_MULTILINE_ASSIGNMENT = false
settings.ALIGN_MULTILINE_BINARY_OPERATION = false
doTextTest(text, "class Foo {\n" +
" void foo() {\n" +
" xxx = aaa + bbb\n" +
@@ -330,7 +336,7 @@ class JavaFormatterTest : AbstractJavaFormatterTest() {
"}")
settings.ALIGN_MULTILINE_BINARY_OPERATION = true
codeStyleBean.isAlignMultilineBinaryOperation = true
doTextTest("class Foo {\n" + " void foo () {\n" + " xxx = aaa + bbb \n" + " - ccc + eee + ddd;\n" + " }\n" + "}",
"class Foo {\n" +
@@ -378,10 +384,10 @@ class JavaFormatterTest : AbstractJavaFormatterTest() {
}
fun testStringBinaryOperation() {
val settings = AbstractJavaFormatterTest.getSettings()
settings.ALIGN_MULTILINE_ASSIGNMENT = false
settings.ALIGN_MULTILINE_BINARY_OPERATION = false
codeStyleBean.apply {
isAlignMultilineAssignment = false
isAlignMultilineBinaryOperation = false
}
doTextTest("class Foo {\n" + " void foo () {\n" + "String s = \"abc\" +\n" + "\"def\";" + " }\n" + "}",
@@ -1012,15 +1018,15 @@ class JavaFormatterTest : AbstractJavaFormatterTest() {
}
fun testAssertStatementWrapping() {
AbstractJavaFormatterTest.getSettings().ASSERT_STATEMENT_WRAP = CommonCodeStyleSettings.WRAP_AS_NEEDED
AbstractJavaFormatterTest.getSettings().BINARY_OPERATION_WRAP = CommonCodeStyleSettings.DO_NOT_WRAP
AbstractJavaFormatterTest.getSettings().RIGHT_MARGIN = 40
codeStyleBean.assertStatementWrap = WrapType.NORMAL
codeStyleBean.binaryOperationWrap = WrapType.NONE
codeStyleBean.rightMargin = 40
val facade = LightIdeaTestCase.getJavaFacade()
val effectiveLanguageLevel = LanguageLevelProjectExtension.getInstance(facade.project).languageLevel
try {
LanguageLevelProjectExtension.getInstance(facade.project).languageLevel = LanguageLevel.JDK_1_5
AbstractJavaFormatterTest.getSettings().ASSERT_STATEMENT_COLON_ON_NEXT_LINE = false
codeStyleBean.isAssertStatementColonOnNextLine = false
doTextTest("class Foo {\n" +
" void foo() {\n" +
" assert methodWithVeryVeryLongName() : foo;\n" +
@@ -1035,7 +1041,7 @@ class JavaFormatterTest : AbstractJavaFormatterTest() {
" }\n" +
"}\n")
AbstractJavaFormatterTest.getSettings().ASSERT_STATEMENT_COLON_ON_NEXT_LINE = true
codeStyleBean.isAssertStatementColonOnNextLine = true
doTextTest("class Foo {\n" +
" void foo() {\n" +
" assert methodWithVeryVeryLongName() : foo;\n" +
@@ -3552,7 +3558,7 @@ public class Test {
}
fun testBlankLinesBeforeClassEnd_afterField () {
AbstractJavaFormatterTest.getSettings().BLANK_LINES_BEFORE_CLASS_END = 2;
codeStyleBean.blankLinesBeforeClassEnd = 2
doTextTest(
"""
public class Test {
@@ -3576,7 +3582,7 @@ public class Test {
fun testBlankLinesBeforeClassEnd_afterInnerClass () {
AbstractJavaFormatterTest.getSettings().BLANK_LINES_BEFORE_CLASS_END = 2;
codeStyleBean.blankLinesBeforeClassEnd = 2
doTextTest(
"""
public class Test {