From b59521d5ed26aec30005cf6b72e1bbc43ee5ca4c Mon Sep 17 00:00:00 2001 From: peter Date: Mon, 13 Apr 2015 20:06:55 +0300 Subject: [PATCH] deprecate and don't use the long gone CodeInsightSettings.SHOW_STATIC_AFTER_INSTANCE (IDEA-138709) --- .../scope/JavaCompletionProcessor.java | 3 +-- .../JavaCodeInsightSettingsFacade.java | 2 ++ .../completion/DotCompletionTest.java | 17 +++--------- .../completion/NormalCompletionTest.groovy | 27 +++++++------------ .../SecondSmartTypeCompletionTest.java | 12 +-------- .../codeInsight/CodeInsightSettings.java | 6 +++++ .../groovy/lang/psi/util/GrStaticChecker.java | 5 ++-- 7 files changed, 26 insertions(+), 46 deletions(-) diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/scope/JavaCompletionProcessor.java b/java/java-impl/src/com/intellij/codeInsight/completion/scope/JavaCompletionProcessor.java index d62907af849e..37417ee18f5c 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/scope/JavaCompletionProcessor.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/scope/JavaCompletionProcessor.java @@ -15,7 +15,6 @@ */ package com.intellij.codeInsight.completion.scope; -import com.intellij.codeInsight.CodeInsightSettings; import com.intellij.codeInsight.completion.CompletionUtil; import com.intellij.codeInsight.daemon.ImplicitUsageProvider; import com.intellij.codeInspection.SuppressManager; @@ -131,7 +130,7 @@ public class JavaCompletionProcessor extends BaseScopeProcessor implements Eleme myNonInitializedFields.addAll(getNonInitializedFields(element)); } - myAllowStaticWithInstanceQualifier = !options.filterStaticAfterInstance || CodeInsightSettings.getInstance().SHOW_STATIC_AFTER_INSTANCE || + myAllowStaticWithInstanceQualifier = !options.filterStaticAfterInstance || SuppressManager.getInstance() .isSuppressedFor(element, AccessStaticViaInstanceBase.ACCESS_STATIC_VIA_INSTANCE); diff --git a/java/java-psi-api/src/com/intellij/codeInsight/JavaCodeInsightSettingsFacade.java b/java/java-psi-api/src/com/intellij/codeInsight/JavaCodeInsightSettingsFacade.java index 42178ffd10b2..7021f152bda1 100644 --- a/java/java-psi-api/src/com/intellij/codeInsight/JavaCodeInsightSettingsFacade.java +++ b/java/java-psi-api/src/com/intellij/codeInsight/JavaCodeInsightSettingsFacade.java @@ -19,6 +19,8 @@ import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.project.Project; public abstract class JavaCodeInsightSettingsFacade { + /** todo remove in IDEA 16 */ + @Deprecated public abstract boolean isShowStaticAfterInstance(); public static JavaCodeInsightSettingsFacade getInstance(Project project) { diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/completion/DotCompletionTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/completion/DotCompletionTest.java index e15953db7fb5..9b5bde7ae7b8 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/completion/DotCompletionTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/completion/DotCompletionTest.java @@ -16,7 +16,6 @@ package com.intellij.codeInsight.completion; import com.intellij.JavaTestUtil; -import com.intellij.codeInsight.CodeInsightSettings; import org.jetbrains.annotations.NotNull; /** @@ -49,18 +48,10 @@ public class DotCompletionTest extends LightCompletionTestCase { } public void testShowStatic() throws Exception { - CodeInsightSettings settings = CodeInsightSettings.getInstance(); - boolean oldSetting = settings.SHOW_STATIC_AFTER_INSTANCE; - settings.SHOW_STATIC_AFTER_INSTANCE = false; - try { - configureByFile("Dot4.java"); - assertEquals("", myPrefix); - assertContainsItems("foo"); - assertNotContainItems("a"); - } - finally { - settings.SHOW_STATIC_AFTER_INSTANCE = oldSetting; - } + configureByFile("Dot4.java"); + assertEquals("", myPrefix); + assertContainsItems("foo"); + assertNotContainItems("a"); } public void testImports() throws Exception { diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy b/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy index 5f5870b2d34c..9e51e2a5d79a 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy +++ b/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy @@ -1099,24 +1099,17 @@ public class ListUtils { } public void testSuggestMembersOfStaticallyImportedClassesUnqualifiedOnly() throws Exception { - def old = CodeInsightSettings.instance.SHOW_STATIC_AFTER_INSTANCE - CodeInsightSettings.instance.SHOW_STATIC_AFTER_INSTANCE = true - - try { - myFixture.addClass("""package foo; - public class Foo { - public static void foo() {} - public static void bar() {} - } - """) - configure() - assertOneElement(myFixture.getLookupElements()) - myFixture.type '\t' - checkResult() - } - finally { - CodeInsightSettings.instance.SHOW_STATIC_AFTER_INSTANCE = old + myFixture.addClass("""package foo; + public class Foo { + public static void foo() {} + public static void bar() {} } + """) + configure() + complete() + assertOneElement(myFixture.getLookupElements()) + myFixture.type '\t' + checkResult() } public void testInstanceMagicMethod() throws Exception { doTest() } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/completion/SecondSmartTypeCompletionTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/completion/SecondSmartTypeCompletionTest.java index 22ed4e891375..5708b69d4bfb 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/completion/SecondSmartTypeCompletionTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/completion/SecondSmartTypeCompletionTest.java @@ -1,7 +1,6 @@ package com.intellij.codeInsight.completion; import com.intellij.JavaTestUtil; -import com.intellij.codeInsight.CodeInsightSettings; import com.intellij.codeInsight.lookup.LookupElementDecorator; import com.intellij.codeInsight.lookup.LookupElementPresentation; import com.intellij.codeInsight.lookup.LookupItem; @@ -143,16 +142,7 @@ public class SecondSmartTypeCompletionTest extends LightFixtureCompletionTestCas public void testCastInstanceofedQualifier() throws Throwable { doTest(); } - public void testNoLeftRecursion() throws Throwable { - final boolean old = CodeInsightSettings.getInstance().SHOW_STATIC_AFTER_INSTANCE; - CodeInsightSettings.getInstance().SHOW_STATIC_AFTER_INSTANCE = true; - try { - doAntiTest(); - } - finally { - CodeInsightSettings.getInstance().SHOW_STATIC_AFTER_INSTANCE = old; - } - } + public void testNoLeftRecursion() { doAntiTest(); } public void testNoRedundantCasts() throws Throwable { configure(); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/CodeInsightSettings.java b/platform/lang-impl/src/com/intellij/codeInsight/CodeInsightSettings.java index 7a5ceb8ef1d0..dc353cf3abf1 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/CodeInsightSettings.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/CodeInsightSettings.java @@ -74,8 +74,14 @@ public class CodeInsightSettings implements PersistentStateComponent, C public boolean SELECT_AUTOPOPUP_SUGGESTIONS_BY_CHARS = false; public boolean AUTOCOMPLETE_ON_CODE_COMPLETION = true; public boolean AUTOCOMPLETE_ON_SMART_TYPE_COMPLETION = true; + + /** todo remove in IDEA 16 */ @Deprecated public boolean AUTOCOMPLETE_ON_CLASS_NAME_COMPLETION = false; + public boolean AUTOCOMPLETE_COMMON_PREFIX = true; + + /** todo remove in IDEA 16 */ + @Deprecated public boolean SHOW_STATIC_AFTER_INSTANCE = false; public boolean SHOW_FULL_SIGNATURES_IN_PARAMETER_INFO = false; diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/util/GrStaticChecker.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/util/GrStaticChecker.java index c9d17cb3afb3..c8d566162c6d 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/util/GrStaticChecker.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/util/GrStaticChecker.java @@ -15,7 +15,6 @@ */ package org.jetbrains.plugins.groovy.lang.psi.util; -import com.intellij.codeInsight.JavaCodeInsightSettingsFacade; import com.intellij.psi.*; import com.intellij.psi.util.InheritanceUtil; import com.intellij.psi.util.PsiTreeUtil; @@ -120,7 +119,7 @@ public class GrStaticChecker { return checkJavaLangClassMember(place, containingClass, member) || member.hasModifierProperty(PsiModifier.STATIC); } - return !isStatic || !filterStaticAfterInstanceQualifier || JavaCodeInsightSettingsFacade.getInstance(member.getProject()).isShowStaticAfterInstance(); + return !isStatic || !filterStaticAfterInstanceQualifier; } PsiElement qualifierResolved = ((GrReferenceExpression)qualifier).resolve(); @@ -142,7 +141,7 @@ public class GrStaticChecker { if (member instanceof PsiClass) { return false; } - return !isStatic || !filterStaticAfterInstanceQualifier || JavaCodeInsightSettingsFacade.getInstance(member.getProject()).isShowStaticAfterInstance(); + return !isStatic || !filterStaticAfterInstanceQualifier; } private static boolean checkJavaLangClassMember(PsiElement place, PsiClass containingClass, PsiModifierListOwner member) {