From 996a3d04755677f35b7f83679486012df146b452 Mon Sep 17 00:00:00 2001
From: Stepan Koltsov <stepan.koltsov@jetbrains.com>
Date: Mon, 18 Jun 2012 20:42:08 +0400
Subject: [PATCH] Revert "idea: do not call prefix matcher in loop if prefix is
 empty"

This reverts commit b0f98711a0845d80a29f9a622650372997c700b7.
---
 .../completion/JetCompletionContributor.java   | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/idea/src/org/jetbrains/jet/plugin/completion/JetCompletionContributor.java b/idea/src/org/jetbrains/jet/plugin/completion/JetCompletionContributor.java
index 82f329bf01e..172bf2ea97c 100644
--- a/idea/src/org/jetbrains/jet/plugin/completion/JetCompletionContributor.java
+++ b/idea/src/org/jetbrains/jet/plugin/completion/JetCompletionContributor.java
@@ -349,23 +349,15 @@ public class JetCompletionContributor extends CompletionContributor {
                 (JetFile)reference.getExpression().getContainingFile())
                 .getBindingContext();
 
-        final PrefixMatcher prefixMatcher = result.getPrefixMatcher();
-
-        NamePredicate namePredicate;
-        if (prefixMatcher.getPrefix().length() == 0) {
-            namePredicate = NamePredicate.all();
-        } else {
-            class PrefixMatcherNamePredicate extends NamePredicate {
-                @Override
-                public boolean matches(@NotNull Name name) {
-                    return prefixMatcher.prefixMatches(name.getName());
-                }
+        class PrefixMatcherNamePredicate extends NamePredicate {
+            @Override
+            public boolean matches(@NotNull Name name) {
+                return result.getPrefixMatcher().prefixMatches(name.getName());
             }
-            namePredicate = new PrefixMatcherNamePredicate();
         }
 
         Collection<DeclarationDescriptor> descriptors = TipsManager.getReferenceVariants(
-                reference.getExpression(), bindingContext, namePredicate);
+                reference.getExpression(), bindingContext, new PrefixMatcherNamePredicate());
 
         Collection<DeclarationDescriptor> checkedDescriptors = Collections2.filter(descriptors, new Predicate<DeclarationDescriptor>() {
             @Override