diff options
Diffstat (limited to 'java/java-tests/testSrc/com/intellij/psi')
6 files changed, 127 insertions, 77 deletions
diff --git a/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterAlignmentTest.java b/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterAlignmentTest.java index c0902414d277..ac4aaa2bda42 100644 --- a/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterAlignmentTest.java +++ b/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterAlignmentTest.java @@ -350,7 +350,7 @@ public class JavaFormatterAlignmentTest extends AbstractJavaFormatterTest { public void testChainedMethodCalls_WithChopDownIfLongOption() throws Exception { getSettings().ALIGN_MULTILINE_CHAINED_METHODS = true; getSettings().METHOD_CALL_CHAIN_WRAP = CommonCodeStyleSettings.WRAP_ON_EVERY_ITEM; // it's equal to "Chop down if long" - getSettings().getRootSettings().RIGHT_MARGIN = 50; + getSettings().RIGHT_MARGIN = 50; String before = "a.current.current.getThis().getThis().getThis().getThis().getThis();"; doMethodTest( @@ -362,14 +362,14 @@ public class JavaFormatterAlignmentTest extends AbstractJavaFormatterTest { " .getThis();" ); - getSettings().getRootSettings().RIGHT_MARGIN = 80; + getSettings().RIGHT_MARGIN = 80; doMethodTest(before, before); } public void testChainedMethodCalls_WithWrapIfNeededOption() throws Exception { getSettings().ALIGN_MULTILINE_CHAINED_METHODS = false; getSettings().METHOD_CALL_CHAIN_WRAP = CommonCodeStyleSettings.WRAP_AS_NEEDED; - getSettings().getRootSettings().RIGHT_MARGIN = 50; + getSettings().RIGHT_MARGIN = 50; String before = "a.current.current.getThis().getThis().getThis().getThis();"; @@ -387,7 +387,7 @@ public class JavaFormatterAlignmentTest extends AbstractJavaFormatterTest { " .getThis().getThis();" ); - getSettings().getRootSettings().RIGHT_MARGIN = 75; + getSettings().RIGHT_MARGIN = 75; doMethodTest(before, before); } } diff --git a/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterBracesTest.java b/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterBracesTest.java index 52dc555c981b..582fc3a81a6a 100644 --- a/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterBracesTest.java +++ b/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterBracesTest.java @@ -158,7 +158,7 @@ public class JavaFormatterBracesTest extends AbstractJavaFormatterTest { public void testSimpleMethodsInOneLineEvenIfExceedsRightMargin() { getSettings().KEEP_SIMPLE_METHODS_IN_ONE_LINE = true; - getSettings().getRootSettings().RIGHT_MARGIN = 90; + getSettings().RIGHT_MARGIN = 90; String text = "public class Repr2 {\n" + " public void start() { System.out.println(\"kfjsdkfjsdkfjskdjfslkdjfklsdjfklsdjfksjdfkljsdkfjsd!\"); }\n" + "}"; @@ -242,4 +242,51 @@ public class JavaFormatterBracesTest extends AbstractJavaFormatterTest { doMethodTest(singleLine, multiLine); doMethodTest(multiLine, multiLine); } + + public void testMethodBraceOnNextLineIfWrapped() { + getSettings().METHOD_BRACE_STYLE = CommonCodeStyleSettings.NEXT_LINE_IF_WRAPPED; + getSettings().METHOD_PARAMETERS_WRAP = CommonCodeStyleSettings.WRAP_AS_NEEDED; + getSettings().RIGHT_MARGIN = 50; + doClassTest( + "public static void main(int state, int column, int width, int rate) {\n" + + "}\n", + "public static void main(int state, int column,\n" + + " int width, int rate)\n" + + "{\n" + + "}\n" + ); + } + + public void testIDEA127110() { + getSettings().KEEP_SIMPLE_BLOCKS_IN_ONE_LINE = true; + getSettings().BRACE_STYLE = CommonCodeStyleSettings.NEXT_LINE_IF_WRAPPED; + doMethodTest( + "if ( 1 > 2) {\n" + + "\n" + + "} else {\n" + + "\n" + + "}\n" + + "\n" + + "try {\n" + + "\n" + + "} catch ( Exception e) {\n" + + "\n" + + "} finally {\n" + + "\n" + + "}", + "if (1 > 2) {\n" + + "\n" + + "} else {\n" + + "\n" + + "}\n" + + "\n" + + "try {\n" + + "\n" + + "} catch (Exception e) {\n" + + "\n" + + "} finally {\n" + + "\n" + + "}" + ); + } } diff --git a/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterInEditorTest.java b/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterInEditorTest.java index ed79f2f60bc6..5749fe80b549 100644 --- a/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterInEditorTest.java +++ b/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterInEditorTest.java @@ -17,6 +17,7 @@ package com.intellij.psi.formatter.java; import com.intellij.lang.java.JavaLanguage; import com.intellij.psi.codeStyle.CodeStyleManager; +import com.intellij.psi.codeStyle.CommonCodeStyleSettings; import com.intellij.testFramework.LightPlatformCodeInsightTestCase; import org.jetbrains.annotations.NotNull; @@ -32,8 +33,9 @@ public class JavaFormatterInEditorTest extends LightPlatformCodeInsightTestCase public void testCaretPositionOnLongLineWrapping() throws IOException { // Inspired by IDEA-70242 - getCurrentCodeStyleSettings().getCommonSettings(JavaLanguage.INSTANCE).WRAP_LONG_LINES = true; - getCurrentCodeStyleSettings().RIGHT_MARGIN = 40; + CommonCodeStyleSettings javaCommonSettings = getCurrentCodeStyleSettings().getCommonSettings(JavaLanguage.INSTANCE); + javaCommonSettings.WRAP_LONG_LINES = true; + javaCommonSettings.RIGHT_MARGIN = 40; doTest( "import static java.util.concurrent.atomic.AtomicInteger.*;\n" + "\n" + diff --git a/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterTest.java b/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterTest.java index c00db0fc77ad..0831f555fa29 100644 --- a/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterTest.java +++ b/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterTest.java @@ -15,6 +15,7 @@ */ package com.intellij.psi.formatter.java; +import com.intellij.lang.java.JavaLanguage; import com.intellij.openapi.command.CommandProcessor; import com.intellij.openapi.command.WriteCommandAction; import com.intellij.openapi.fileTypes.StdFileTypes; @@ -664,7 +665,7 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest { public void testParametersAlignment() throws Exception { final CommonCodeStyleSettings settings = getSettings(); settings.ALIGN_MULTILINE_PARAMETERS_IN_CALLS = true; - settings.getRootSettings().RIGHT_MARGIN = 140; + settings.RIGHT_MARGIN = 140; doTest(); } @@ -903,7 +904,7 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest { public void testBraceOnNewLineIfWrapped() throws Exception { getSettings().BINARY_OPERATION_WRAP = CommonCodeStyleSettings.WRAP_AS_NEEDED; getSettings().BRACE_STYLE = CommonCodeStyleSettings.NEXT_LINE_IF_WRAPPED; - getSettings().getRootSettings().RIGHT_MARGIN = 35; + getSettings().RIGHT_MARGIN = 35; getSettings().ALIGN_MULTILINE_BINARY_OPERATION = true; doTextTest("class Foo {\n" + @@ -928,7 +929,7 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest { } public void testFirstArgumentWrapping() throws Exception { - getSettings().getRootSettings().RIGHT_MARGIN = 20; + getSettings().RIGHT_MARGIN = 20; getSettings().CALL_PARAMETERS_WRAP = CommonCodeStyleSettings.WRAP_AS_NEEDED; doTextTest("class Foo {\n" + " void foo() {\n" + " fooFooFooFoo(1);" + " }\n" + "}", "class Foo {\n" + " void foo() {\n" + " fooFooFooFoo(\n" + " 1);\n" + " }\n" + "}"); @@ -956,7 +957,7 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest { public void testAssertStatementWrapping() throws Exception { getSettings().ASSERT_STATEMENT_WRAP = CommonCodeStyleSettings.WRAP_AS_NEEDED; getSettings().BINARY_OPERATION_WRAP = CommonCodeStyleSettings.DO_NOT_WRAP; - getSettings().getRootSettings().RIGHT_MARGIN = 40; + getSettings().RIGHT_MARGIN = 40; final JavaPsiFacade facade = getJavaFacade(); final LanguageLevel effectiveLanguageLevel = LanguageLevelProjectExtension.getInstance(facade.getProject()).getLanguageLevel(); try { @@ -1001,7 +1002,7 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest { public void testAssertStatementWrapping2() throws Exception { getSettings().BINARY_OPERATION_WRAP = CommonCodeStyleSettings.DO_NOT_WRAP; getSettings().ASSERT_STATEMENT_WRAP = CommonCodeStyleSettings.WRAP_AS_NEEDED; - getSettings().getRootSettings().RIGHT_MARGIN = 37; + getSettings().RIGHT_MARGIN = 37; final CommonCodeStyleSettings.IndentOptions options = getSettings().getRootSettings().getIndentOptions(StdFileTypes.JAVA); options.INDENT_SIZE = 2; @@ -1044,7 +1045,7 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest { public void test() throws Exception { getSettings().getRootSettings().getIndentOptions(StdFileTypes.JAVA).INDENT_SIZE = 2; getSettings().getRootSettings().getIndentOptions(StdFileTypes.JAVA).CONTINUATION_INDENT_SIZE = 2; - getSettings().getRootSettings().RIGHT_MARGIN = 37; + getSettings().RIGHT_MARGIN = 37; getSettings().ALIGN_MULTILINE_EXTENDS_LIST = true; getSettings().EXTENDS_KEYWORD_WRAP = CommonCodeStyleSettings.WRAP_AS_NEEDED; @@ -1081,7 +1082,7 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest { public void testLBrace() throws Exception { getSettings().METHOD_BRACE_STYLE = CommonCodeStyleSettings.END_OF_LINE; - getSettings().getRootSettings().RIGHT_MARGIN = 14; + getSettings().RIGHT_MARGIN = 14; doTextTest("class Foo {\n" + " void foo() {\n" + " \n" + " }\n" + "}", "class Foo {\n" + " void foo() {\n" + "\n" + " }\n" + "}"); } @@ -1194,7 +1195,7 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest { public void testArrayInitializerWrapping() throws Exception { getSettings().ARRAY_INITIALIZER_WRAP = CommonCodeStyleSettings.WRAP_AS_NEEDED; getSettings().ALIGN_MULTILINE_ARRAY_INITIALIZER_EXPRESSION = false; - getSettings().getRootSettings().RIGHT_MARGIN = 37; + getSettings().RIGHT_MARGIN = 37; doTextTest("class Foo{\n" + " public int[] i = new int[]{1,2,3,4,5,6,7,8,9};\n" + @@ -1537,7 +1538,7 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest { getSettings().KEEP_CONTROL_STATEMENT_IN_ONE_LINE = true; getSettings().KEEP_SIMPLE_METHODS_IN_ONE_LINE = true; getSettings().ELSE_ON_NEW_LINE = false; - getSettings().getRootSettings().RIGHT_MARGIN = 110; + getSettings().RIGHT_MARGIN = 110; getSettings().KEEP_LINE_BREAKS = false; doTextTest("class Foo {\n" + " void foo() {\n" + @@ -1698,7 +1699,7 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest { public void testDoNotWrapLBrace() throws IncorrectOperationException { getSettings().BRACE_STYLE = CommonCodeStyleSettings.END_OF_LINE; - getSettings().getRootSettings().RIGHT_MARGIN = 66; + getSettings().RIGHT_MARGIN = 66; doTextTest("public class Test {\n" + " void foo(){\n" + " if (veryLongIdentifier1 == 1 && veryLongIdentifier2 == 2) {\n" + @@ -1718,7 +1719,7 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest { getSettings().ARRAY_INITIALIZER_WRAP = CommonCodeStyleSettings.WRAP_AS_NEEDED; getSettings().ARRAY_INITIALIZER_LBRACE_ON_NEXT_LINE = true; getSettings().ARRAY_INITIALIZER_RBRACE_ON_NEXT_LINE = true; - getSettings().getRootSettings().RIGHT_MARGIN = 40; + getSettings().RIGHT_MARGIN = 40; doTextTest("class Foo {\n" + " int[] a = new int[]{1,2,0x0052,0x0053,0x0054,0x0054,0x0054};\n" + "}", "class Foo {\n" + " int[] a = new int[]{\n" + " 1, 2, 0x0052, 0x0053,\n" + @@ -1768,7 +1769,7 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest { } public void testWrapExtendsList() throws Exception { - getSettings().getRootSettings().RIGHT_MARGIN = 50; + getSettings().RIGHT_MARGIN = 50; getSettings().EXTENDS_LIST_WRAP = CommonCodeStyleSettings.WRAP_ON_EVERY_ITEM; getSettings().EXTENDS_KEYWORD_WRAP = CommonCodeStyleSettings.WRAP_AS_NEEDED; @@ -1779,7 +1780,7 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest { } public void testWrapLongExpression() throws Exception { - getSettings().getRootSettings().RIGHT_MARGIN = 80; + getSettings().RIGHT_MARGIN = 80; getSettings().BINARY_OPERATION_WRAP = CommonCodeStyleSettings.WRAP_AS_NEEDED; getSettings().ALIGN_MULTILINE_BINARY_OPERATION = true; doTextTest("class Foo {\n" + @@ -1797,7 +1798,7 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest { } public void testDoNotWrapCallChainIfParametersWrapped() throws Exception { - getSettings().getRootSettings().RIGHT_MARGIN = 87; + getSettings().RIGHT_MARGIN = 87; getSettings().CALL_PARAMETERS_WRAP = CommonCodeStyleSettings.WRAP_AS_NEEDED; getSettings().METHOD_CALL_CHAIN_WRAP = CommonCodeStyleSettings.WRAP_AS_NEEDED; getSettings().ALIGN_MULTILINE_PARAMETERS_IN_CALLS = true; @@ -1831,7 +1832,7 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest { } public void testRightMargin_2() throws Exception { - getSettings().getRootSettings().RIGHT_MARGIN = 65; + getSettings().RIGHT_MARGIN = 65; getSettings().ASSIGNMENT_WRAP = CommonCodeStyleSettings.WRAP_AS_NEEDED; getSettings().PLACE_ASSIGNMENT_SIGN_ON_NEXT_LINE = true; getSettings().KEEP_LINE_BREAKS = false; @@ -1844,7 +1845,7 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest { } public void testRightMargin_3() throws Exception { - getSettings().getRootSettings().RIGHT_MARGIN = 65; + getSettings().RIGHT_MARGIN = 65; getSettings().ASSIGNMENT_WRAP = CommonCodeStyleSettings.WRAP_AS_NEEDED; getSettings().PLACE_ASSIGNMENT_SIGN_ON_NEXT_LINE = false; getSettings().KEEP_LINE_BREAKS = false; @@ -1902,12 +1903,12 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest { public void testWrapParamsOnEveryItem() throws Exception { CodeStyleSettings codeStyleSettings = CodeStyleSettingsManager.getSettings(getProject()); - int oldMargin = codeStyleSettings.RIGHT_MARGIN; + int oldMargin = codeStyleSettings.getCommonSettings(JavaLanguage.INSTANCE).RIGHT_MARGIN; boolean oldKeep = codeStyleSettings.KEEP_LINE_BREAKS; int oldWrap = codeStyleSettings.METHOD_PARAMETERS_WRAP; try { - codeStyleSettings.RIGHT_MARGIN = 80; + codeStyleSettings.setRightMargin(JavaLanguage.INSTANCE, 80); codeStyleSettings.KEEP_LINE_BREAKS = false; codeStyleSettings.METHOD_PARAMETERS_WRAP = CommonCodeStyleSettings.WRAP_ON_EVERY_ITEM; @@ -1932,7 +1933,7 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest { "}"); } finally { - codeStyleSettings.RIGHT_MARGIN = oldMargin; + codeStyleSettings.setRightMargin(JavaLanguage.INSTANCE, oldMargin); codeStyleSettings.KEEP_LINE_BREAKS = oldKeep; codeStyleSettings.METHOD_PARAMETERS_WRAP = oldWrap; } @@ -1942,10 +1943,10 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest { public void testCommentAfterDeclaration() throws Exception { CodeStyleSettings codeStyleSettings = CodeStyleSettingsManager.getSettings(getProject()); - int oldMargin = codeStyleSettings.RIGHT_MARGIN; + int oldMargin = codeStyleSettings.getDefaultRightMargin(); try { - codeStyleSettings.RIGHT_MARGIN = 20; + codeStyleSettings.setDefaultRightMargin(20); codeStyleSettings.ASSIGNMENT_WRAP = CommonCodeStyleSettings.WRAP_AS_NEEDED; doMethodTest( "int i=0; //comment comment", @@ -1955,7 +1956,7 @@ public class JavaFormatterTest extends AbstractJavaFormatterTest { } finally { - codeStyleSettings.RIGHT_MARGIN = oldMargin; + codeStyleSettings.setDefaultRightMargin(oldMargin); } } @@ -2106,7 +2107,7 @@ public void testSCR260() throws Exception { public void testSCR479() throws Exception { final CommonCodeStyleSettings settings = getSettings(); - settings.getRootSettings().RIGHT_MARGIN = 80; + settings.RIGHT_MARGIN = 80; settings.TERNARY_OPERATION_WRAP = CommonCodeStyleSettings.WRAP_AS_NEEDED; doTextTest("public class Foo {\n" + " public static void main(String[] args) {\n" + @@ -2190,7 +2191,7 @@ public void testSCR260() throws Exception { } public void test1607() throws Exception { - getSettings().getRootSettings().RIGHT_MARGIN = 30; + getSettings().RIGHT_MARGIN = 30; getSettings().METHOD_BRACE_STYLE = CommonCodeStyleSettings.NEXT_LINE; getSettings().KEEP_SIMPLE_METHODS_IN_ONE_LINE = true; getSettings().ALIGN_MULTILINE_PARAMETERS = true; @@ -2271,7 +2272,7 @@ public void testSCR260() throws Exception { getSettings().METHOD_CALL_CHAIN_WRAP = CommonCodeStyleSettings.WRAP_AS_NEEDED; getSettings().CALL_PARAMETERS_WRAP = CommonCodeStyleSettings.WRAP_AS_NEEDED; getSettings().ALIGN_MULTILINE_PARAMETERS_IN_CALLS = true; - getSettings().getRootSettings().RIGHT_MARGIN = 80; + getSettings().RIGHT_MARGIN = 80; getSettings().PREFER_PARAMETERS_WRAP = true; @@ -2392,7 +2393,7 @@ public void testSCR260() throws Exception { } public void test1980() throws Exception { - getSettings().getRootSettings().RIGHT_MARGIN = 144; + getSettings().RIGHT_MARGIN = 144; getSettings().TERNARY_OPERATION_WRAP = CommonCodeStyleSettings.WRAP_ON_EVERY_ITEM; getSettings().METHOD_CALL_CHAIN_WRAP = CommonCodeStyleSettings.WRAP_AS_NEEDED; getSettings().ALIGN_MULTILINE_TERNARY_OPERATION = true; @@ -2523,7 +2524,7 @@ public void testSCR260() throws Exception { public void testSCRIDEA_4783() throws IncorrectOperationException { getSettings().ASSIGNMENT_WRAP = CommonCodeStyleSettings.WRAP_AS_NEEDED; getSettings().METHOD_CALL_CHAIN_WRAP = CommonCodeStyleSettings.WRAP_AS_NEEDED; - getSettings().getRootSettings().RIGHT_MARGIN = 80; + getSettings().RIGHT_MARGIN = 80; doTextTest("class Foo{\n" + " void foo() {\n" + @@ -2655,7 +2656,7 @@ public void testSCR260() throws Exception { doTextTest("class Foo {\n" + " void foo() {\n" + " while(true) foo();\n" + " }\n" + "}", "class Foo {\n" + " void foo() {\n" + " while (true) foo();\n" + " }\n" + "}"); - getSettings().getRootSettings().RIGHT_MARGIN = 17; + getSettings().RIGHT_MARGIN = 17; doTextTest("class Foo {\n" + " void foo() {\n" + " if (a) foo();\n" + " else bar();\n" + " }\n" + "}", "class Foo {\n" + @@ -2667,7 +2668,7 @@ public void testSCR260() throws Exception { " }\n" + "}"); - getSettings().getRootSettings().RIGHT_MARGIN = 30; + getSettings().RIGHT_MARGIN = 30; doTextTest("class Foo {\n" + " void foo() {\n" + " for (int i = 0; i < 10; i++) foo();\n" + " }\n" + "}", "class Foo {\n" + @@ -2677,12 +2678,12 @@ public void testSCR260() throws Exception { " }\n" + "}"); - getSettings().getRootSettings().RIGHT_MARGIN = 32; + getSettings().RIGHT_MARGIN = 32; doTextTest("class Foo {\n" + " void foo() {\n" + " for (int var : vars) foo();\n" + " }\n" + "}", "class Foo {\n" + " void foo() {\n" + " for (int var : vars)\n" + " foo();\n" + " }\n" + "}"); - getSettings().getRootSettings().RIGHT_MARGIN = 12; + getSettings().RIGHT_MARGIN = 12; doTextTest("class Foo {\n" + " void foo() {\n" + " do foo(); while (true);\n" + " }\n" + "}", "class Foo {\n" + " void foo() {\n" + " do\n" + @@ -2691,7 +2692,7 @@ public void testSCR260() throws Exception { " }\n" + "}"); - getSettings().getRootSettings().RIGHT_MARGIN = 23; + getSettings().RIGHT_MARGIN = 23; doTextTest("class Foo {\n" + " void foo() {\n" + " while(true) foo();\n" + " }\n" + "}", "class Foo {\n" + " void foo() {\n" + " while (true)\n" + " foo();\n" + " }\n" + "}"); @@ -2807,7 +2808,7 @@ public void testSCR260() throws Exception { public void testIDEADEV_12836() throws IncorrectOperationException { getSettings().SPECIAL_ELSE_IF_TREATMENT = true; - getSettings().getRootSettings().RIGHT_MARGIN = 80; + getSettings().RIGHT_MARGIN = 80; doTextTest("class Foo {\n" + "void foo(){\n" + "if (true){\n" + @@ -2886,7 +2887,7 @@ public void testSCR260() throws Exception { public void testIDEADEV_23551() throws IncorrectOperationException { getSettings().BINARY_OPERATION_WRAP = CommonCodeStyleSettings.WRAP_ON_EVERY_ITEM; - getSettings().getRootSettings().RIGHT_MARGIN = 60; + getSettings().RIGHT_MARGIN = 60; doTextTest("public class Wrapping {\n" + "public static void sample() {\n" + "System.out.println(\".\" + File.separator + \"..\" + File.separator + \"some-directory-name\" + File.separator + \"more-file-name\");\n" + diff --git a/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterWrapTest.java b/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterWrapTest.java index 512a7ef3c158..c06370b06743 100644 --- a/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterWrapTest.java +++ b/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterWrapTest.java @@ -32,7 +32,7 @@ import java.util.Calendar; public class JavaFormatterWrapTest extends AbstractJavaFormatterTest { @SuppressWarnings("SpellCheckingInspection") public void testWrappingAnnotationArrayParameters() { - getSettings().getRootSettings().RIGHT_MARGIN = 80; + getSettings().RIGHT_MARGIN = 80; getSettings().ARRAY_INITIALIZER_WRAP = CommonCodeStyleSettings.WRAP_AS_NEEDED; doTextTest( "@AttributeOverrides( { @AttributeOverride(name = \"id\", column = @Column(name = \"recovery_id\"))," + @@ -64,7 +64,7 @@ public class JavaFormatterWrapTest extends AbstractJavaFormatterTest { public void testAnnotationParamValueExceedingRightMargin() { // Inspired by IDEA-18051 - getSettings().getRootSettings().RIGHT_MARGIN = 80; + getSettings().RIGHT_MARGIN = 80; doTextTest( "package formatting;\n" + "\n" + @@ -128,7 +128,7 @@ public class JavaFormatterWrapTest extends AbstractJavaFormatterTest { public void testEnumConstantsWrapping() { // Inspired by IDEA-54667 getSettings().ENUM_CONSTANTS_WRAP = CommonCodeStyleSettings.WRAP_AS_NEEDED; - getSettings().getRootSettings().RIGHT_MARGIN = 80; + getSettings().RIGHT_MARGIN = 80; // Don't expect the constants to be placed on new line. doTextTest( @@ -177,8 +177,8 @@ public class JavaFormatterWrapTest extends AbstractJavaFormatterTest { public void testWrapCompoundStringLiteralThatEndsAtRightMargin() { // Inspired by IDEA-82398 - getSettings().getRootSettings().RIGHT_MARGIN = 30; - getSettings().getRootSettings().getCommonSettings(JavaLanguage.INSTANCE).WRAP_LONG_LINES = true; + getSettings().RIGHT_MARGIN = 30; + getSettings().WRAP_LONG_LINES = true; final String text = "class Test {\n" + " String s = \"first line \" +\n" + @@ -189,8 +189,8 @@ public class JavaFormatterWrapTest extends AbstractJavaFormatterTest { public void testWrapLongLine() { // Inspired by IDEA-55782 - getSettings().getRootSettings().RIGHT_MARGIN = 50; - getSettings().getRootSettings().getCommonSettings(JavaLanguage.INSTANCE).WRAP_LONG_LINES = true; + getSettings().RIGHT_MARGIN = 50; + getSettings().WRAP_LONG_LINES = true; doTextTest( "class TestClass {\n" + @@ -218,8 +218,8 @@ public class JavaFormatterWrapTest extends AbstractJavaFormatterTest { public void testWrapLongLineWithTabs() { // Inspired by IDEA-55782 - getSettings().getRootSettings().RIGHT_MARGIN = 20; - getSettings().getRootSettings().getCommonSettings(JavaLanguage.INSTANCE).WRAP_LONG_LINES = true; + getSettings().RIGHT_MARGIN = 20; + getSettings().WRAP_LONG_LINES = true; getIndentOptions().USE_TAB_CHARACTER = true; getIndentOptions().TAB_SIZE = 4; @@ -236,8 +236,8 @@ public class JavaFormatterWrapTest extends AbstractJavaFormatterTest { public void testWrapLongLineWithSelection() { // Inspired by IDEA-55782 - getSettings().getRootSettings().RIGHT_MARGIN = 20; - getSettings().getRootSettings().getCommonSettings(JavaLanguage.INSTANCE).WRAP_LONG_LINES = true; + getSettings().RIGHT_MARGIN = 20; + getSettings().WRAP_LONG_LINES = true; String initial = "class TestClass {\n" + @@ -264,7 +264,7 @@ public class JavaFormatterWrapTest extends AbstractJavaFormatterTest { @Bombed(user = "Roman Shevchenko", year = 2014, month = Calendar.MARCH, day = 14) public void testWrapMethodAnnotationBeforeParams() { // Inspired by IDEA-59536 - getSettings().getRootSettings().RIGHT_MARGIN = 90; + getSettings().RIGHT_MARGIN = 90; getSettings().METHOD_ANNOTATION_WRAP = CommonCodeStyleSettings.WRAP_AS_NEEDED; getSettings().METHOD_PARAMETERS_WRAP = CommonCodeStyleSettings.WRAP_AS_NEEDED; @@ -304,7 +304,7 @@ public class JavaFormatterWrapTest extends AbstractJavaFormatterTest { public void testResourceListWrap() { getSettings().KEEP_SIMPLE_BLOCKS_IN_ONE_LINE = true; - getSettings().getRootSettings().RIGHT_MARGIN = 40; + getSettings().RIGHT_MARGIN = 40; getSettings().RESOURCE_LIST_WRAP = CommonCodeStyleSettings.WRAP_AS_NEEDED; doMethodTest("try (MyResource r1 = null; MyResource r2 = null) { }", "try (MyResource r1 = null;\n" + @@ -323,7 +323,7 @@ public class JavaFormatterWrapTest extends AbstractJavaFormatterTest { public void testLineLongEnoughToExceedAfterFirstWrapping() { // Inspired by IDEA-103624 getSettings().WRAP_LONG_LINES = true; - getSettings().getRootSettings().RIGHT_MARGIN = 40; + getSettings().RIGHT_MARGIN = 40; getSettings().ALIGN_MULTILINE_PARAMETERS_IN_CALLS = true; doMethodTest( "test(1,\n" + @@ -344,7 +344,7 @@ public class JavaFormatterWrapTest extends AbstractJavaFormatterTest { public void testNoUnnecessaryWrappingIsPerformedForLongLine() { // Inspired by IDEA-103624 getSettings().WRAP_LONG_LINES = true; - getSettings().getRootSettings().RIGHT_MARGIN = 40; + getSettings().RIGHT_MARGIN = 40; getSettings().ALIGN_MULTILINE_PARAMETERS_IN_CALLS = true; String text = "test(1,\n" + @@ -359,7 +359,7 @@ public class JavaFormatterWrapTest extends AbstractJavaFormatterTest { public void testEnforceIndentMethodCallParamWrap() { getSettings().WRAP_LONG_LINES = true; - getSettings().getRootSettings().RIGHT_MARGIN = 140; + getSettings().RIGHT_MARGIN = 140; getSettings().PREFER_PARAMETERS_WRAP = true; getSettings().CALL_PARAMETERS_WRAP = CommonCodeStyleSettings.WRAP_ON_EVERY_ITEM; @@ -402,7 +402,7 @@ public class JavaFormatterWrapTest extends AbstractJavaFormatterTest { @SuppressWarnings("SpellCheckingInspection") public void testDoNotWrapMethodsWithMethodCallAsParameters() { getSettings().WRAP_LONG_LINES = true; - getSettings().getRootSettings().RIGHT_MARGIN = 140; + getSettings().RIGHT_MARGIN = 140; getSettings().PREFER_PARAMETERS_WRAP = true; getSettings().CALL_PARAMETERS_WRAP = CommonCodeStyleSettings.WRAP_ON_EVERY_ITEM; getSettings().CALL_PARAMETERS_RPAREN_ON_NEXT_LINE = true; diff --git a/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavadocFormatterTest.java b/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavadocFormatterTest.java index a1819a263617..ad3ad822d83e 100644 --- a/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavadocFormatterTest.java +++ b/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavadocFormatterTest.java @@ -28,8 +28,8 @@ import com.intellij.psi.codeStyle.CommonCodeStyleSettings; public class JavadocFormatterTest extends AbstractJavaFormatterTest { public void testRightMargin() throws Exception { - getSettings().getRootSettings().getCommonSettings(JavaLanguage.INSTANCE).WRAP_LONG_LINES = true; - getSettings().getRootSettings().RIGHT_MARGIN = 35;// | + getSettings().WRAP_LONG_LINES = true; + getSettings().RIGHT_MARGIN = 35; doTextTest( "/** Here is one-line java-doc comment */" + "class Foo {\n" + @@ -44,9 +44,9 @@ public class JavadocFormatterTest extends AbstractJavaFormatterTest { } public void testEA49739() throws Exception { - getSettings().getRootSettings().getCommonSettings(JavaLanguage.INSTANCE).WRAP_LONG_LINES = true; - getSettings().getRootSettings().RIGHT_MARGIN = 35; - getSettings().getRootSettings().WRAP_COMMENTS = true; + getSettings().WRAP_LONG_LINES = true; + getSettings().RIGHT_MARGIN = 35; + getSettings().WRAP_COMMENTS = true; doTextTest("class A {\n" + " /**\n" + " * @return a is one line javadoc\n" + @@ -70,7 +70,7 @@ public class JavadocFormatterTest extends AbstractJavaFormatterTest { getSettings().getRootSettings().WRAP_COMMENTS = true; getSettings().getRootSettings().ENABLE_JAVADOC_FORMATTING = true; getSettings().getRootSettings().JD_DO_NOT_WRAP_ONE_LINE_COMMENTS = true; - getSettings().getRootSettings().RIGHT_MARGIN = 35; + getSettings().RIGHT_MARGIN = 35; doTextTest( "/** Here is one-line java-doc comment */" + "class Foo {\n" + @@ -87,7 +87,7 @@ public class JavadocFormatterTest extends AbstractJavaFormatterTest { // Inspired by IDEA-61895 getSettings().getRootSettings().WRAP_COMMENTS = true; getSettings().getRootSettings().JD_PRESERVE_LINE_FEEDS = true; - getSettings().getRootSettings().RIGHT_MARGIN = 48; + getSettings().RIGHT_MARGIN = 48; doTextTest( "/**\n" + @@ -108,7 +108,7 @@ public class JavadocFormatterTest extends AbstractJavaFormatterTest { public void testSCR11296() throws Exception { final CommonCodeStyleSettings settings = getSettings(); - settings.getRootSettings().RIGHT_MARGIN = 50; + settings.RIGHT_MARGIN = 50; settings.getRootSettings().WRAP_COMMENTS = true; settings.getRootSettings().ENABLE_JAVADOC_FORMATTING = true; settings.getRootSettings().JD_P_AT_EMPTY_LINES = false; @@ -119,7 +119,7 @@ public class JavadocFormatterTest extends AbstractJavaFormatterTest { public void testSCR2632() throws Exception { getSettings().getRootSettings().ENABLE_JAVADOC_FORMATTING = true; getSettings().getRootSettings().WRAP_COMMENTS = true; - getSettings().getRootSettings().RIGHT_MARGIN = 20; + getSettings().RIGHT_MARGIN = 20; LanguageLevelProjectExtension.getInstance(getProject()).setLanguageLevel(LanguageLevel.JDK_1_7); doTextTest("/**\n" + " * <p />\n" + " * Another paragraph of the description placed after blank line.\n" + " */\n" + "class A{}", @@ -137,7 +137,7 @@ public class JavadocFormatterTest extends AbstractJavaFormatterTest { public void testSCR2632_JDK8_LanguageLevel() throws Exception { getSettings().getRootSettings().ENABLE_JAVADOC_FORMATTING = true; getSettings().getRootSettings().WRAP_COMMENTS = true; - getSettings().getRootSettings().RIGHT_MARGIN = 20; + getSettings().RIGHT_MARGIN = 20; LanguageLevelProjectExtension.getInstance(getProject()).setLanguageLevel(LanguageLevel.JDK_1_8); doTextTest("/**\n" + " * <p />\n" + " * Another paragraph of the description placed after blank line.\n" + " */\n" + "class A{}", @@ -355,7 +355,7 @@ public class JavadocFormatterTest extends AbstractJavaFormatterTest { public void testReturnTagAlignment() throws Exception { getSettings().getRootSettings().ENABLE_JAVADOC_FORMATTING = true; - getSettings().getRootSettings().RIGHT_MARGIN = 80; + getSettings().RIGHT_MARGIN = 80; getSettings().getRootSettings().JD_LEADING_ASTERISKS_ARE_ENABLED = true; getSettings().getRootSettings().WRAP_COMMENTS = true; getSettings().getRootSettings().getCommonSettings(JavaLanguage.INSTANCE).WRAP_LONG_LINES = true; @@ -383,7 +383,7 @@ public class JavadocFormatterTest extends AbstractJavaFormatterTest { public void testReturnTagAlignmentWithPreTagOnFirstLine() throws Exception { getSettings().getRootSettings().ENABLE_JAVADOC_FORMATTING = true; - getSettings().getRootSettings().RIGHT_MARGIN = 80; + getSettings().RIGHT_MARGIN = 80; getSettings().getRootSettings().JD_LEADING_ASTERISKS_ARE_ENABLED = true; getSettings().getRootSettings().WRAP_COMMENTS = true; getSettings().getRootSettings().getCommonSettings(JavaLanguage.INSTANCE).WRAP_LONG_LINES = true; @@ -410,7 +410,7 @@ public class JavadocFormatterTest extends AbstractJavaFormatterTest { public void testSeeTagAlignment() throws Exception { getSettings().getRootSettings().ENABLE_JAVADOC_FORMATTING = true; - getSettings().getRootSettings().RIGHT_MARGIN = 80; + getSettings().RIGHT_MARGIN = 80; getSettings().getRootSettings().JD_LEADING_ASTERISKS_ARE_ENABLED = true; getSettings().getRootSettings().WRAP_COMMENTS = true; getSettings().getRootSettings().getCommonSettings(JavaLanguage.INSTANCE).WRAP_LONG_LINES = true; @@ -437,7 +437,7 @@ public class JavadocFormatterTest extends AbstractJavaFormatterTest { public void testDummySinceTagAlignment() throws Exception { getSettings().getRootSettings().ENABLE_JAVADOC_FORMATTING = true; - getSettings().getRootSettings().RIGHT_MARGIN = 80; + getSettings().RIGHT_MARGIN = 80; getSettings().getRootSettings().JD_LEADING_ASTERISKS_ARE_ENABLED = true; getSettings().getRootSettings().WRAP_COMMENTS = true; getSettings().getRootSettings().getCommonSettings(JavaLanguage.INSTANCE).WRAP_LONG_LINES = true; @@ -464,7 +464,7 @@ public class JavadocFormatterTest extends AbstractJavaFormatterTest { public void testDummyDeprecatedTagAlignment() throws Exception { getSettings().getRootSettings().ENABLE_JAVADOC_FORMATTING = true; - getSettings().getRootSettings().RIGHT_MARGIN = 80; + getSettings().RIGHT_MARGIN = 80; getSettings().getRootSettings().JD_LEADING_ASTERISKS_ARE_ENABLED = true; getSettings().getRootSettings().WRAP_COMMENTS = true; getSettings().getRootSettings().getCommonSettings(JavaLanguage.INSTANCE).WRAP_LONG_LINES = true; @@ -490,7 +490,7 @@ public class JavadocFormatterTest extends AbstractJavaFormatterTest { } public void testJavadocFormattingIndependentOfMethodIndentation() { - getCurrentCodeStyleSettings().RIGHT_MARGIN = 50; + getCurrentCodeStyleSettings().setRightMargin(JavaLanguage.INSTANCE, 50); getCurrentCodeStyleSettings().ENABLE_JAVADOC_FORMATTING = true; getCurrentCodeStyleSettings().WRAP_COMMENTS = true; getCurrentCodeStyleSettings().JD_LEADING_ASTERISKS_ARE_ENABLED = true; @@ -529,7 +529,7 @@ public class JavadocFormatterTest extends AbstractJavaFormatterTest { } public void testJavadocAlignmentForInnerClasses() { - getCurrentCodeStyleSettings().RIGHT_MARGIN = 40; + getCurrentCodeStyleSettings().setRightMargin(JavaLanguage.INSTANCE, 40); getCurrentCodeStyleSettings().ENABLE_JAVADOC_FORMATTING = true; getCurrentCodeStyleSettings().WRAP_COMMENTS = true; getCurrentCodeStyleSettings().JD_LEADING_ASTERISKS_ARE_ENABLED = true; @@ -579,7 +579,7 @@ public class JavadocFormatterTest extends AbstractJavaFormatterTest { } public void testAlignmentWithNoTopClassMembersIndentation() { - getCurrentCodeStyleSettings().RIGHT_MARGIN = 40; + getCurrentCodeStyleSettings().setRightMargin(JavaLanguage.INSTANCE, 40); getCurrentCodeStyleSettings().WRAP_COMMENTS = true; getCurrentCodeStyleSettings().JD_LEADING_ASTERISKS_ARE_ENABLED = true; getCurrentCodeStyleSettings().getCommonSettings(JavaLanguage.INSTANCE).DO_NOT_INDENT_TOP_LEVEL_CLASS_MEMBERS = true; @@ -655,7 +655,7 @@ public class JavadocFormatterTest extends AbstractJavaFormatterTest { public void testDoNotWrapLongLineCommentWithSpaceInStart() throws Exception { getSettings().KEEP_FIRST_COLUMN_COMMENT = true; getSettings().WRAP_LONG_LINES = true; - getSettings().getRootSettings().RIGHT_MARGIN = 200; + getSettings().RIGHT_MARGIN = 200; String before = "public class JiraIssue {\n" + "\n" + " public static void main(String[] args) {\n" + |