From 549d8a0ecaec2add4171b71409a8c183b5c2ce02 Mon Sep 17 00:00:00 2001 From: peter Date: Thu, 28 Jun 2012 18:17:46 +0200 Subject: [PATCH] remove show.all.classes.on.first.completion from registry --- .../codeInsight/completion/JavaCompletionContributor.java | 7 +------ .../platform-resources-en/src/misc/registry.properties | 1 - .../lang/completion/GroovyCompletionContributor.java | 2 +- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionContributor.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionContributor.java index f76488c5d4b9..062b3f443994 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionContributor.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionContributor.java @@ -32,7 +32,6 @@ import com.intellij.openapi.editor.highlighter.HighlighterIterator; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Comparing; import com.intellij.openapi.util.Condition; -import com.intellij.openapi.util.registry.Registry; import com.intellij.openapi.util.text.StringUtil; import com.intellij.patterns.ElementPattern; import com.intellij.patterns.PatternCondition; @@ -262,7 +261,7 @@ public class JavaCompletionContributor extends CompletionContributor { return; } - if (mayShowAllClasses(parameters)) { + if (parameters.getInvocationCount() >= 2) { JavaClassNameCompletionContributor.addAllClasses(parameters, parameters.getInvocationCount() <= 2, result.getPrefixMatcher(), new Consumer() { @Override public void consume(LookupElement element) { @@ -408,10 +407,6 @@ public class JavaCompletionContributor extends CompletionContributor { return true; } - public static boolean mayShowAllClasses(CompletionParameters parameters) { - return Registry.is("show.all.classes.on.first.completion") || parameters.getInvocationCount() >= 2; - } - public static boolean mayStartClassName(CompletionResultSet result) { String prefix = result.getPrefixMatcher().getPrefix(); if (StringUtil.isEmpty(prefix)) { diff --git a/platform/platform-resources-en/src/misc/registry.properties b/platform/platform-resources-en/src/misc/registry.properties index 87b91b6c8cb4..2199c875a91d 100644 --- a/platform/platform-resources-en/src/misc/registry.properties +++ b/platform/platform-resources-en/src/misc/registry.properties @@ -198,7 +198,6 @@ ide.completion.middle.matching.description=Suggest items in completion that cont ide.goto.middle.matching=false ide.goto.middle.matching.description=Suggest items in goto actions that contain the entered string somewhere in the middle -show.all.classes.on.first.completion=false ide.enable.toolwindow.stack=false change.signature.awesome.mode=true diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionContributor.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionContributor.java index 6bc253f9d677..dc5145889225 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionContributor.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionContributor.java @@ -335,7 +335,7 @@ public class GroovyCompletionContributor extends CompletionContributor { if (isClassNamePossible(position) && JavaCompletionContributor.mayStartClassName(result)) { result.stopHere(); - if (JavaCompletionContributor.mayShowAllClasses(parameters)) { + if (parameters.getInvocationCount() >= 2) { addAllClasses(parameters, result, inheritors); } else { JavaCompletionContributor.advertiseSecondCompletion(position.getProject());