From 19f9f27675f08c1f069f760018e97967c3550929 Mon Sep 17 00:00:00 2001
From: Valentin Kipyatkov <valentin@jetbrains.com>
Date: Sun, 2 Nov 2014 15:29:40 +0300
Subject: [PATCH] No double-filtering

---
 .../jet/plugin/completion/CompletionSession.kt   |  6 +-----
 .../plugin/completion/smart/SmartCompletion.kt   |  3 +--
 .../JetFunctionParameterInfoHandler.java         | 16 +++++-----------
 3 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/idea/src/org/jetbrains/jet/plugin/completion/CompletionSession.kt b/idea/src/org/jetbrains/jet/plugin/completion/CompletionSession.kt
index 9915c8668a3..10121cc00ff 100644
--- a/idea/src/org/jetbrains/jet/plugin/completion/CompletionSession.kt
+++ b/idea/src/org/jetbrains/jet/plugin/completion/CompletionSession.kt
@@ -211,11 +211,7 @@ class SmartCompletionSession(configuration: CompletionSessionConfiguration, para
 
                 val filter = result.declarationFilter
                 if (filter != null) {
-                    getReferenceVariants(DESCRIPTOR_KIND_MASK).forEach {
-                        if (prefixMatcher.prefixMatches(it.getName().asString())) {
-                            collector.addElements(filter(it))
-                        }
-                    }
+                    getReferenceVariants(DESCRIPTOR_KIND_MASK).forEach { collector.addElements(filter(it)) }
 
                     flushToResultSet()
 
diff --git a/idea/src/org/jetbrains/jet/plugin/completion/smart/SmartCompletion.kt b/idea/src/org/jetbrains/jet/plugin/completion/smart/SmartCompletion.kt
index 5ac9c06d8e3..e86fc9396a6 100644
--- a/idea/src/org/jetbrains/jet/plugin/completion/smart/SmartCompletion.kt
+++ b/idea/src/org/jetbrains/jet/plugin/completion/smart/SmartCompletion.kt
@@ -107,8 +107,7 @@ class SmartCompletion(val expression: JetSimpleNameExpression,
 
         fun filterDeclaration(descriptor: DeclarationDescriptor): Collection<LookupElement> {
             val result = ArrayList<LookupElement>()
-            if (!itemsToSkip.contains(descriptor)
-                    && descriptor !is SamConstructorDescriptor /* SAM-constructor is added explicitly and is not needed here */) {
+            if (!itemsToSkip.contains(descriptor)) {
                 val types = typesWithSmartCasts(descriptor)
                 val nonNullTypes = types.map { it.makeNotNullable() }
                 val classifier = { (expectedInfo: ExpectedInfo) ->
diff --git a/idea/src/org/jetbrains/jet/plugin/parameterInfo/JetFunctionParameterInfoHandler.java b/idea/src/org/jetbrains/jet/plugin/parameterInfo/JetFunctionParameterInfoHandler.java
index e737ae9da51..1d5ec90ea78 100644
--- a/idea/src/org/jetbrains/jet/plugin/parameterInfo/JetFunctionParameterInfoHandler.java
+++ b/idea/src/org/jetbrains/jet/plugin/parameterInfo/JetFunctionParameterInfoHandler.java
@@ -413,19 +413,13 @@ public class JetFunctionParameterInfoHandler implements ParameterInfoHandlerWith
         Collection<Pair<? extends DeclarationDescriptor, ResolveSessionForBodies>> itemsToShow = new ArrayList<Pair<? extends DeclarationDescriptor, ResolveSessionForBodies>>();
         for (DeclarationDescriptor variant : variants) {
             if (variant instanceof FunctionDescriptor) {
-                FunctionDescriptor functionDescriptor = (FunctionDescriptor) variant;
-                if (functionDescriptor.getName().equals(refName)) {
-                    //todo: renamed functions?
-                    itemsToShow.add(Pair.create(functionDescriptor, resolveSession));
-                }
+                //todo: renamed functions?
+                itemsToShow.add(Pair.create((FunctionDescriptor) variant, resolveSession));
             }
             else if (variant instanceof ClassDescriptor) {
-                ClassDescriptor classDescriptor = (ClassDescriptor) variant;
-                if (classDescriptor.getName().equals(refName)) {
-                    //todo: renamed classes?
-                    for (ConstructorDescriptor constructorDescriptor : classDescriptor.getConstructors()) {
-                        itemsToShow.add(Pair.create(constructorDescriptor, resolveSession));
-                    }
+                //todo: renamed classes?
+                for (ConstructorDescriptor constructorDescriptor : ((ClassDescriptor) variant).getConstructors()) {
+                    itemsToShow.add(Pair.create(constructorDescriptor, resolveSession));
                 }
             }
         }