azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "idea: do not call prefix matcher in loop if prefix is empty"

Browse Source 
This reverts commit b0f98711a0.
This commit is contained in:
Stepan Koltsov
2012-06-18 20:42:08 +04:00
parent 3533107cfe
commit 996a3d0475
1 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/completion/JetCompletionContributor.java
+5 -13
View File
@@ -349,23 +349,15 @@ public class JetCompletionContributor extends CompletionContributor {
(JetFile)reference.getExpression().getContainingFile()) (JetFile)reference.getExpression().getContainingFile())
.getBindingContext(); .getBindingContext();
final PrefixMatcher prefixMatcher = result.getPrefixMatcher(); class PrefixMatcherNamePredicate extends NamePredicate {
@Override
NamePredicate namePredicate; public boolean matches(@NotNull Name name) {
if (prefixMatcher.getPrefix().length() == 0) { return result.getPrefixMatcher().prefixMatches(name.getName());
namePredicate = NamePredicate.all();
} else {
class PrefixMatcherNamePredicate extends NamePredicate {
@Override
public boolean matches(@NotNull Name name) {
return prefixMatcher.prefixMatches(name.getName());
}
} }
namePredicate = new PrefixMatcherNamePredicate();
} }
Collection<DeclarationDescriptor> descriptors = TipsManager.getReferenceVariants( Collection<DeclarationDescriptor> descriptors = TipsManager.getReferenceVariants(
reference.getExpression(), bindingContext, namePredicate); reference.getExpression(), bindingContext, new PrefixMatcherNamePredicate());
Collection<DeclarationDescriptor> checkedDescriptors = Collections2.filter(descriptors, new Predicate<DeclarationDescriptor>() { Collection<DeclarationDescriptor> checkedDescriptors = Collections2.filter(descriptors, new Predicate<DeclarationDescriptor>() {
@Override @Override