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

deprecate and don't use the long gone CodeInsightSettings.SHOW_STATIC_AFTER_INSTANCE (IDEA-138709)

Browse Source
This commit is contained in:
peter
2015-04-13 20:29:50 +03:00
parent 51c1681b3c
commit b59521d5ed
7 changed files with 26 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/completion/scope/JavaCompletionProcessor.java
+1 -2
View File
@@ -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);
java/java-psi-api/src/com/intellij/codeInsight/JavaCodeInsightSettingsFacade.java
+2
View File
@@ -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) {
java/java-tests/testSrc/com/intellij/codeInsight/completion/DotCompletionTest.java
+4 -13
View File
@@ -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 {
java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy
+10 -17
View File
@@ -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() }
java/java-tests/testSrc/com/intellij/codeInsight/completion/SecondSmartTypeCompletionTest.java
+1 -11
View File
@@ -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();
platform/lang-impl/src/com/intellij/codeInsight/CodeInsightSettings.java
+6
View File
@@ -74,8 +74,14 @@ public class CodeInsightSettings implements PersistentStateComponent<Element>, 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;
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/util/GrStaticChecker.java
+2 -3
View File
@@ -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) {