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

show only better matching classes, and only in basic completion

Browse Source
This commit is contained in:
peter
2013-07-15 18:28:22 +02:00
parent 30ac2cbb6c
commit e728e16657
3 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/completion/JavaNoVariantsDelegator.java
+4 -5
View File
@@ -51,14 +51,13 @@ public class JavaNoVariantsDelegator extends CompletionContributor {
if (empty) {
delegate(parameters, JavaCompletionSorting.addJavaSorting(parameters, result));
} else if (Registry.is("ide.completion.show.all.classes") || Registry.is("ide.completion.show.better.matching.classes")) {
if (parameters.getInvocationCount() <= 1 &&
} else if (Registry.is("ide.completion.show.better.matching.classes")) {
if (parameters.getCompletionType() == CompletionType.BASIC &&
parameters.getInvocationCount() <= 1 &&
JavaCompletionContributor.mayStartClassName(result) &&
JavaCompletionContributor.isClassNamePossible(parameters) &&
!JavaSmartCompletionContributor.AFTER_NEW.accepts(parameters.getPosition())) {
if (Registry.is("ide.completion.show.better.matching.classes")) {
result = result.withPrefixMatcher(new BetterPrefixMatcher(result.getPrefixMatcher(), BetterPrefixMatcher.getBestMatchingDegree(plainResults)));
}
result = result.withPrefixMatcher(new BetterPrefixMatcher(result.getPrefixMatcher(), BetterPrefixMatcher.getBestMatchingDegree(plainResults)));
suggestNonImportedClasses(parameters, result);
}
}
platform/platform-resources-en/src/misc/registry.properties
-1
View File
@@ -216,7 +216,6 @@ show.live.templates.in.completion=false
documentation.component.editor.font=false
find.usage.expand.all=false
ide.completion.show.all.classes=false
ide.completion.show.better.matching.classes=false
ide.completion.middle.matching=true
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyNoVariantsDelegator.java
+4 -6
View File
@@ -59,16 +59,14 @@ public class GroovyNoVariantsDelegator extends CompletionContributor {
if (empty) {
delegate(parameters, result);
} else if (Registry.is("ide.completion.show.all.classes") || Registry.is("ide.completion.show.better.matching.classes")) {
if (parameters.getInvocationCount() <= 1 &&
} else if (Registry.is("ide.completion.show.better.matching.classes")) {
if (parameters.getCompletionType() == CompletionType.BASIC &&
parameters.getInvocationCount() <= 1 &&
JavaCompletionContributor.mayStartClassName(result) &&
GroovyCompletionContributor.isClassNamePossible(parameters.getPosition()) &&
!MapArgumentCompletionProvider.isMapKeyCompletion(parameters) &&
!GroovySmartCompletionContributor.AFTER_NEW.accepts(parameters.getPosition())) {
if (Registry.is("ide.completion.show.better.matching.classes")) {
result = result.withPrefixMatcher(new BetterPrefixMatcher(result.getPrefixMatcher(), BetterPrefixMatcher.getBestMatchingDegree(plainResults)));
}
result = result.withPrefixMatcher(new BetterPrefixMatcher(result.getPrefixMatcher(), BetterPrefixMatcher.getBestMatchingDegree(plainResults)));
suggestNonImportedClasses(parameters, result);
}
}