From 5a01186d94d1faccc240bb9a66b6e67a0f671f6e Mon Sep 17 00:00:00 2001 From: Rustam Vishnyakov Date: Fri, 17 Nov 2017 19:22:38 +0300 Subject: [PATCH] Fix Code style API usages in Tests/JavaDoc --- .../psi/formatter/java/AbstractJavaBlock.java | 2 +- .../java/codeInsight/JoinLinesTest.java | 149 +++++++++--------- .../autodetect/DetectIndentAndTypeTest.java | 4 +- 3 files changed, 79 insertions(+), 76 deletions(-) diff --git a/java/java-impl/src/com/intellij/psi/formatter/java/AbstractJavaBlock.java b/java/java-impl/src/com/intellij/psi/formatter/java/AbstractJavaBlock.java index f9ff0993035b..279c21623c58 100644 --- a/java/java-impl/src/com/intellij/psi/formatter/java/AbstractJavaBlock.java +++ b/java/java-impl/src/com/intellij/psi/formatter/java/AbstractJavaBlock.java @@ -811,7 +811,7 @@ public abstract class AbstractJavaBlock extends AbstractBlock implements JavaBlo * * @param child variable declaration child node which alignment is to be defined * @return alignment to use for the given node - * @see CodeStyleSettings#ALIGN_GROUP_FIELD_DECLARATIONS + * @see CommonCodeStyleSettings#ALIGN_GROUP_FIELD_DECLARATIONS */ private boolean shouldAlignFieldInColumns(@NotNull ASTNode child) { // The whole idea of variable declarations alignment is that complete declaration blocks which children are to be aligned hold diff --git a/java/java-tests/testSrc/com/intellij/java/codeInsight/JoinLinesTest.java b/java/java-tests/testSrc/com/intellij/java/codeInsight/JoinLinesTest.java index 1fc884aa30c8..a6e2a1b72c51 100644 --- a/java/java-tests/testSrc/com/intellij/java/codeInsight/JoinLinesTest.java +++ b/java/java-tests/testSrc/com/intellij/java/codeInsight/JoinLinesTest.java @@ -21,8 +21,6 @@ import com.intellij.lang.java.JavaLanguage; import com.intellij.openapi.actionSystem.IdeActions; import com.intellij.openapi.editor.actionSystem.EditorActionHandler; import com.intellij.openapi.editor.actionSystem.EditorActionManager; -import com.intellij.openapi.fileTypes.StdFileTypes; -import com.intellij.psi.codeStyle.CodeStyleSettings; import com.intellij.psi.codeStyle.CodeStyleSettingsManager; import com.intellij.psi.codeStyle.CommonCodeStyleSettings; import com.intellij.testFramework.LightCodeInsightTestCase; @@ -43,81 +41,81 @@ public class JoinLinesTest extends LightCodeInsightTestCase { public void testLiteralSCR4989() { doTest(); } public void testSCR3493() { - CodeStyleSettings settings = CodeStyleSettingsManager.getSettings(getProject()); - boolean use_tab_character = settings.useTabCharacter(null); - boolean smart_tabs = settings.isSmartTabs(null); + CommonCodeStyleSettings settings = getJavaSettings(); + boolean use_tab_character = settings.getIndentOptions().USE_TAB_CHARACTER; + boolean smart_tabs = settings.getIndentOptions().SMART_TABS; try { - settings.getIndentOptions(StdFileTypes.JAVA).USE_TAB_CHARACTER = true; - settings.getIndentOptions(StdFileTypes.JAVA).SMART_TABS = true; + settings.getIndentOptions().USE_TAB_CHARACTER = true; + settings.getIndentOptions().SMART_TABS = true; doTest(); } finally { - settings.getIndentOptions(StdFileTypes.JAVA).USE_TAB_CHARACTER = use_tab_character; - settings.getIndentOptions(StdFileTypes.JAVA).SMART_TABS = smart_tabs; + settings.getIndentOptions().USE_TAB_CHARACTER = use_tab_character; + settings.getIndentOptions().SMART_TABS = smart_tabs; } } public void testSCR3493a() { - CodeStyleSettings settings = CodeStyleSettingsManager.getSettings(getProject()); - boolean use_tab_character = settings.useTabCharacter(null); - boolean smart_tabs = settings.isSmartTabs(null); + CommonCodeStyleSettings settings = getJavaSettings(); + boolean use_tab_character = settings.getIndentOptions().USE_TAB_CHARACTER; + boolean smart_tabs = settings.getIndentOptions().SMART_TABS; try { - settings.getIndentOptions(StdFileTypes.JAVA).USE_TAB_CHARACTER = true; - settings.getIndentOptions(StdFileTypes.JAVA).SMART_TABS = true; + settings.getIndentOptions().USE_TAB_CHARACTER = true; + settings.getIndentOptions().SMART_TABS = true; doTest(); } finally { - settings.getIndentOptions(StdFileTypes.JAVA).USE_TAB_CHARACTER = use_tab_character; - settings.getIndentOptions(StdFileTypes.JAVA).SMART_TABS = smart_tabs; + settings.getIndentOptions().USE_TAB_CHARACTER = use_tab_character; + settings.getIndentOptions().SMART_TABS = smart_tabs; } } public void testSCR3493b() { - CodeStyleSettings settings = CodeStyleSettingsManager.getSettings(getProject()); - boolean use_tab_character = settings.useTabCharacter(null); - boolean smart_tabs = settings.isSmartTabs(null); + CommonCodeStyleSettings settings = getJavaSettings(); + boolean use_tab_character = settings.getIndentOptions().USE_TAB_CHARACTER;; + boolean smart_tabs = settings.getIndentOptions().SMART_TABS; try { - settings.getIndentOptions(StdFileTypes.JAVA).USE_TAB_CHARACTER = true; - settings.getIndentOptions(StdFileTypes.JAVA).SMART_TABS = true; + settings.getIndentOptions().USE_TAB_CHARACTER = true; + settings.getIndentOptions().SMART_TABS = true; doTest(); } finally { - settings.getIndentOptions(StdFileTypes.JAVA).USE_TAB_CHARACTER = use_tab_character; - settings.getIndentOptions(StdFileTypes.JAVA).SMART_TABS = smart_tabs; + settings.getIndentOptions().USE_TAB_CHARACTER = use_tab_character; + settings.getIndentOptions().SMART_TABS = smart_tabs; } } public void testSCR3493c() { - CodeStyleSettings settings = CodeStyleSettingsManager.getSettings(getProject()); - boolean use_tab_character = settings.useTabCharacter(null); - boolean smart_tabs = settings.isSmartTabs(null); + CommonCodeStyleSettings settings = getJavaSettings(); + boolean use_tab_character = settings.getIndentOptions().USE_TAB_CHARACTER; + boolean smart_tabs = settings.getIndentOptions().SMART_TABS; try { - settings.getIndentOptions(StdFileTypes.JAVA).USE_TAB_CHARACTER = true; - settings.getIndentOptions(StdFileTypes.JAVA).SMART_TABS = true; + settings.getIndentOptions().USE_TAB_CHARACTER = true; + settings.getIndentOptions().SMART_TABS = true; doTest(); } finally { - settings.getIndentOptions(StdFileTypes.JAVA).USE_TAB_CHARACTER = use_tab_character; - settings.getIndentOptions(StdFileTypes.JAVA).SMART_TABS = smart_tabs; + settings.getIndentOptions().USE_TAB_CHARACTER = use_tab_character; + settings.getIndentOptions().SMART_TABS = smart_tabs; } } public void testSCR3493d() { - CodeStyleSettings settings = CodeStyleSettingsManager.getSettings(getProject()); - boolean use_tab_character = settings.useTabCharacter(null); - boolean smart_tabs = settings.isSmartTabs(null); + CommonCodeStyleSettings settings = getJavaSettings(); + boolean use_tab_character = settings.getIndentOptions().USE_TAB_CHARACTER; + boolean smart_tabs = settings.getIndentOptions().SMART_TABS; try { - settings.getIndentOptions(StdFileTypes.JAVA).USE_TAB_CHARACTER = true; - settings.getIndentOptions(StdFileTypes.JAVA).SMART_TABS = true; + settings.getIndentOptions().USE_TAB_CHARACTER = true; + settings.getIndentOptions().SMART_TABS = true; doTest(); } finally { - settings.getIndentOptions(StdFileTypes.JAVA).USE_TAB_CHARACTER = use_tab_character; - settings.getIndentOptions(StdFileTypes.JAVA).SMART_TABS = smart_tabs; + settings.getIndentOptions().USE_TAB_CHARACTER = use_tab_character; + settings.getIndentOptions().SMART_TABS = smart_tabs; } } public void testSCR3493e() { - CodeStyleSettings settings = CodeStyleSettingsManager.getSettings(getProject()); - boolean use_tab_character = settings.useTabCharacter(null); - boolean smart_tabs = settings.isSmartTabs(null); + CommonCodeStyleSettings settings = getJavaSettings(); + boolean use_tab_character = settings.getIndentOptions().USE_TAB_CHARACTER; + boolean smart_tabs = settings.getIndentOptions().SMART_TABS; try { - settings.getIndentOptions(StdFileTypes.JAVA).USE_TAB_CHARACTER = true; - settings.getIndentOptions(StdFileTypes.JAVA).SMART_TABS = true; + settings.getIndentOptions().USE_TAB_CHARACTER = true; + settings.getIndentOptions().SMART_TABS = true; doTest(); } finally { - settings.getIndentOptions(StdFileTypes.JAVA).USE_TAB_CHARACTER = use_tab_character; - settings.getIndentOptions(StdFileTypes.JAVA).SMART_TABS = smart_tabs; + settings.getIndentOptions().USE_TAB_CHARACTER = use_tab_character; + settings.getIndentOptions().SMART_TABS = smart_tabs; } } public void testSCR5959() { @@ -138,49 +136,54 @@ public class JoinLinesTest extends LightCodeInsightTestCase { public void testDeclarationWithInitializer() {doTest(); } public void testUnwrapCodeBlock1() { - CodeStyleSettings settings = CodeStyleSettingsManager.getSettings(getProject()); - boolean use_tab_character = settings.useTabCharacter(null); - boolean smart_tabs = settings.isSmartTabs(null); + CommonCodeStyleSettings settings = getJavaSettings(); + boolean use_tab_character = settings.getIndentOptions().USE_TAB_CHARACTER; + boolean smart_tabs = settings.getIndentOptions().SMART_TABS; int old = settings.IF_BRACE_FORCE; try { - settings.getIndentOptions(StdFileTypes.JAVA).USE_TAB_CHARACTER = true; - settings.getIndentOptions(StdFileTypes.JAVA).SMART_TABS = true; - settings.getCommonSettings(JavaLanguage.INSTANCE).IF_BRACE_FORCE = CommonCodeStyleSettings.FORCE_BRACES_IF_MULTILINE; + settings.getIndentOptions().USE_TAB_CHARACTER = true; + settings.getIndentOptions().SMART_TABS = true; + settings.IF_BRACE_FORCE = CommonCodeStyleSettings.FORCE_BRACES_IF_MULTILINE; doTest(); } finally { - settings.getIndentOptions(StdFileTypes.JAVA).USE_TAB_CHARACTER = use_tab_character; - settings.getIndentOptions(StdFileTypes.JAVA).SMART_TABS = smart_tabs; - settings.getCommonSettings(JavaLanguage.INSTANCE).IF_BRACE_FORCE = old; + settings.getIndentOptions().USE_TAB_CHARACTER = use_tab_character; + settings.getIndentOptions().SMART_TABS = smart_tabs; + settings.IF_BRACE_FORCE = old; } } public void testUnwrapCodeBlock2() { - CodeStyleSettings settings = CodeStyleSettingsManager.getSettings(getProject()); - boolean use_tab_character = settings.useTabCharacter(null); - boolean smart_tabs = settings.isSmartTabs(null); + CommonCodeStyleSettings settings = getJavaSettings(); + boolean use_tab_character = settings.getIndentOptions().USE_TAB_CHARACTER; + boolean smart_tabs = settings.getIndentOptions().SMART_TABS; int old = settings.IF_BRACE_FORCE; try { - settings.getIndentOptions(StdFileTypes.JAVA).USE_TAB_CHARACTER = true; - settings.getIndentOptions(StdFileTypes.JAVA).SMART_TABS = true; - settings.getCommonSettings(JavaLanguage.INSTANCE).IF_BRACE_FORCE = CommonCodeStyleSettings.FORCE_BRACES_ALWAYS; + settings.getIndentOptions().USE_TAB_CHARACTER = true; + settings.getIndentOptions().SMART_TABS = true; + settings.IF_BRACE_FORCE = CommonCodeStyleSettings.FORCE_BRACES_ALWAYS; doTest(); } finally { - settings.getIndentOptions(StdFileTypes.JAVA).USE_TAB_CHARACTER = use_tab_character; - settings.getIndentOptions(StdFileTypes.JAVA).SMART_TABS = smart_tabs; - settings.getCommonSettings(JavaLanguage.INSTANCE).IF_BRACE_FORCE = old; + settings.getIndentOptions().USE_TAB_CHARACTER = use_tab_character; + settings.getIndentOptions().SMART_TABS = smart_tabs; + settings.IF_BRACE_FORCE = old; } } + @NotNull + protected CommonCodeStyleSettings getJavaSettings() { + return CodeStyleSettingsManager.getSettings(getProject()).getCommonSettings(JavaLanguage.INSTANCE); + } + public void testAssignmentExpression() { doTest(); } public void testReformatInsertsNewlines() { - CodeStyleSettings settings = CodeStyleSettingsManager.getSettings(getProject()); + CommonCodeStyleSettings settings = getJavaSettings(); final Element root = new Element("fake"); settings.writeExternal(root); try { - settings.getIndentOptions(StdFileTypes.JAVA).USE_TAB_CHARACTER = true; - settings.getIndentOptions(StdFileTypes.JAVA).SMART_TABS = true; + settings.getIndentOptions().USE_TAB_CHARACTER = true; + settings.getIndentOptions().SMART_TABS = true; settings.IF_BRACE_FORCE = CommonCodeStyleSettings.FORCE_BRACES_ALWAYS; settings.METHOD_BRACE_STYLE = CommonCodeStyleSettings.NEXT_LINE; doTest(); @@ -190,7 +193,7 @@ public class JoinLinesTest extends LightCodeInsightTestCase { } public void testForceBrace() { - CodeStyleSettings settings = CodeStyleSettingsManager.getSettings(getProject()); + CommonCodeStyleSettings settings = getJavaSettings(); int old = settings.IF_BRACE_FORCE; try { settings.IF_BRACE_FORCE = CommonCodeStyleSettings.FORCE_BRACES_ALWAYS; @@ -201,8 +204,8 @@ public class JoinLinesTest extends LightCodeInsightTestCase { } public void testWrongWrapping() { - CodeStyleSettings settings = CodeStyleSettingsManager.getSettings(getProject()); - settings.setDefaultRightMargin(80); + CommonCodeStyleSettings settings = getJavaSettings(); + settings.RIGHT_MARGIN = 80; settings.CALL_PARAMETERS_WRAP = CommonCodeStyleSettings.WRAP_AS_NEEDED; settings.ALIGN_MULTILINE_PARAMETERS_IN_CALLS = true; doTest(); @@ -210,9 +213,9 @@ public class JoinLinesTest extends LightCodeInsightTestCase { public void testSubsequentJoiningAndUnexpectedTextRemoval() { // Inspired by IDEA-65342 - CodeStyleSettings settings = CodeStyleSettingsManager.getSettings(getProject()); - settings.setDefaultRightMargin(50); - settings.getCommonSettings(JavaLanguage.INSTANCE).CALL_PARAMETERS_WRAP = CommonCodeStyleSettings.WRAP_AS_NEEDED; + CommonCodeStyleSettings settings = getJavaSettings(); + settings.RIGHT_MARGIN = 50; + settings.CALL_PARAMETERS_WRAP = CommonCodeStyleSettings.WRAP_AS_NEEDED; doTest(2); } @@ -223,7 +226,7 @@ public class JoinLinesTest extends LightCodeInsightTestCase { } public void testJoiningMethodCallWhenItDoesntFit() { - CommonCodeStyleSettings settings = CodeStyleSettingsManager.getSettings(getProject()).getCommonSettings(JavaLanguage.INSTANCE); + CommonCodeStyleSettings settings = getJavaSettings(); settings.METHOD_CALL_CHAIN_WRAP = CommonCodeStyleSettings.WRAP_AS_NEEDED; settings.RIGHT_MARGIN = 20; doTest(); @@ -232,7 +235,7 @@ public class JoinLinesTest extends LightCodeInsightTestCase { public void testMultipleBlockComments() { doTest(); } public void testPreserveSpaceIfOnNewLineOptionEnabled() { - CommonCodeStyleSettings settings = CodeStyleSettingsManager.getSettings(getProject()).getCommonSettings(JavaLanguage.INSTANCE); + CommonCodeStyleSettings settings = getJavaSettings(); settings.CATCH_ON_NEW_LINE = true; doTest(); } diff --git a/java/java-tests/testSrc/com/intellij/java/psi/codeStyle/autodetect/DetectIndentAndTypeTest.java b/java/java-tests/testSrc/com/intellij/java/psi/codeStyle/autodetect/DetectIndentAndTypeTest.java index 38db528ea8f9..5861c6ea43b6 100644 --- a/java/java-tests/testSrc/com/intellij/java/psi/codeStyle/autodetect/DetectIndentAndTypeTest.java +++ b/java/java-tests/testSrc/com/intellij/java/psi/codeStyle/autodetect/DetectIndentAndTypeTest.java @@ -83,7 +83,7 @@ public class DetectIndentAndTypeTest extends LightPlatformCodeInsightFixtureTest public void testContinuationTab_AsTabSize() { CommonCodeStyleSettings common = mySettings.getCommonSettings(JavaLanguage.INSTANCE); - mySettings.ALIGN_MULTILINE_BINARY_OPERATION = false; + common.ALIGN_MULTILINE_BINARY_OPERATION = false; CommonCodeStyleSettings.IndentOptions indentOptions = common.getIndentOptions(); assert indentOptions != null; @@ -106,7 +106,7 @@ public class DetectIndentAndTypeTest extends LightPlatformCodeInsightFixtureTest public void testContinuationTabs_AsDoubleTabSize() { CommonCodeStyleSettings common = mySettings.getCommonSettings(JavaLanguage.INSTANCE); - mySettings.ALIGN_MULTILINE_BINARY_OPERATION = false; + common.ALIGN_MULTILINE_BINARY_OPERATION = false; CommonCodeStyleSettings.IndentOptions indentOptions = common.getIndentOptions(); assert indentOptions != null;