MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-18 09:34:34 +07:00
Code Issues Packages Projects Releases Wiki Activity

cleanup, don't cache matchers

Browse Source
This commit is contained in:
peter
2012-04-27 20:18:08 +02:00
parent d2dbbe50b8
commit f9de08d149
10 changed files with 25 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionContributor.java
+2 -3
View File
@@ -241,7 +241,7 @@ public class JavaCompletionContributor extends CompletionContributor {
public static void addAllClasses(CompletionParameters parameters,
final CompletionResultSet result,
final InheritorsHolder inheritors) {
if (!isClassNamePossible(parameters.getPosition()) || !mayStartClassName(result, parameters.isRelaxedMatching())) return;
if (!isClassNamePossible(parameters.getPosition()) || !mayStartClassName(result)) return;
if (mayShowAllClasses(parameters)) {
JavaClassNameCompletionContributor.addAllClasses(parameters, parameters.getInvocationCount() <= 2, result.getPrefixMatcher(), new Consumer<LookupElement>() {
@@ -385,14 +385,13 @@ public class JavaCompletionContributor extends CompletionContributor {
return Registry.is("show.all.classes.on.first.completion") || parameters.getInvocationCount() >= 2;
}
public static boolean mayStartClassName(CompletionResultSet result, final boolean relaxedMatching) {
public static boolean mayStartClassName(CompletionResultSet result) {
String prefix = result.getPrefixMatcher().getPrefix();
if (StringUtil.isEmpty(prefix)) {
return false;
}
return StringUtil.isCapitalized(prefix) ||
relaxedMatching ||
CodeInsightSettings.getInstance().COMPLETION_CASE_SENSITIVE == CodeInsightSettings.NONE;
}
java/java-impl/src/com/intellij/codeInsight/completion/JavaNoVariantsDelegator.java
+1 -1
View File
@@ -63,7 +63,7 @@ public class JavaNoVariantsDelegator extends CompletionContributor {
suggestCollectionUtilities(parameters, result, position);
if (parameters.getInvocationCount() <= 1 &&
JavaCompletionContributor.mayStartClassName(result, false) &&
JavaCompletionContributor.mayStartClassName(result) &&
JavaCompletionContributor.isClassNamePossible(position)) {
suggestNonImportedClasses(parameters, result);
return;
java/java-impl/src/com/intellij/codeInsight/completion/XmlBasicToClassNameDelegator.java
+1 -1
View File
@@ -28,7 +28,7 @@ public class XmlBasicToClassNameDelegator extends AbstractBasicToClassNameDelega
@Override
protected boolean isClassNameCompletionSupported(CompletionResultSet result, PsiFile file, PsiElement position) {
if (!JavaCompletionContributor.mayStartClassName(result, false)) return false;
if (!JavaCompletionContributor.mayStartClassName(result)) return false;
return file.getLanguage().isKindOf(StdLanguages.XML);
}