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 d3070f1bdee3..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" + "}"; 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 e2a807a64dd0..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 @@ -1832,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; 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;