Name filters filter by Name instead of String

compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaPackageImpl.kt

@@ -23,13 +23,14 @@ import org.jetbrains.jet.lang.resolve.name.FqName
 import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaElementCollectionFromPsiArrayUtil.classes
 import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaElementCollectionFromPsiArrayUtil.packages
 import org.jetbrains.jet.lang.resolve.java.structure.JavaClass
+import org.jetbrains.jet.lang.resolve.name.Name
 
 public class JavaPackageImpl(psiPackage: PsiPackage) : JavaElementImpl<PsiPackage>(psiPackage), JavaPackage {
 
-    override fun getClasses(nameFilter: (String) -> Boolean): MutableCollection<JavaClass> {
+    override fun getClasses(nameFilter: (Name) -> Boolean): MutableCollection<JavaClass> {
         val psiClasses = getPsi().getClasses().filter {
             val name = it.getName()
-            name != null && nameFilter(name)
+            name != null && nameFilter(Name.identifier(name))
         }
         return classes(psiClasses)
     }

compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyImportScope.kt

@@ -174,7 +174,7 @@ public class LazyImportScope(private val resolveSession: ResolveSession,
     override fun getDeclarationsByLabel(labelName: Name): Collection<DeclarationDescriptor> = listOf()
 
     override fun getDescriptors(kindFilter: (JetScope.DescriptorKind) -> Boolean,
-                                nameFilter: (String) -> Boolean) = collectFromImports(LookupMode.EVERYTHING, JetScopeSelectorUtil.ALL_DESCRIPTORS_SCOPE_SELECTOR)
+                                nameFilter: (Name) -> Boolean) = collectFromImports(LookupMode.EVERYTHING, JetScopeSelectorUtil.ALL_DESCRIPTORS_SCOPE_SELECTOR)
 
     override fun getImplicitReceiversHierarchy() = listOf<ReceiverParameterDescriptor>()
 

compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/AbstractLazyMemberScope.kt

@@ -121,7 +121,7 @@ public abstract class AbstractLazyMemberScope<D : DeclarationDescriptor, DP : De
     override fun getDeclarationsByLabel(labelName: Name) = setOf<DeclarationDescriptor>()
 
     override fun getDescriptors(kindFilter: (JetScope.DescriptorKind) -> Boolean,
-                                nameFilter: (String) -> Boolean): Collection<DeclarationDescriptor> {
+                                nameFilter: (Name) -> Boolean): Collection<DeclarationDescriptor> {
         val result = LinkedHashSet(descriptorsFromDeclaredElements())
         result.addAll(extraDescriptors())
         return result

compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeImpl.kt

@@ -95,7 +95,7 @@ public class WritableScopeImpl(scope: JetScope,
     }
 
     override fun getDescriptors(kindFilter: (JetScope.DescriptorKind) -> Boolean,
-                                nameFilter: (String) -> Boolean): Collection<DeclarationDescriptor> {
+                                nameFilter: (Name) -> Boolean): Collection<DeclarationDescriptor> {
         checkMayRead()
         changeLockLevel(WritableScope.LockLevel.READING)
 

compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WriteThroughScope.kt

@@ -165,7 +165,7 @@ public class WriteThroughScope(outerScope: JetScope, private val writableWorker:
     }
 
     override fun getDescriptors(kindFilter: (JetScope.DescriptorKind) -> Boolean,
-                                nameFilter: (String) -> Boolean): Collection<DeclarationDescriptor> {
+                                nameFilter: (Name) -> Boolean): Collection<DeclarationDescriptor> {
         checkMayRead()
 
         if (_allDescriptors == null) {

core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaClassMemberScope.kt

@@ -230,7 +230,7 @@ public class LazyJavaClassMemberScope(
             DescriptorUtils.getDispatchReceiverParameterIfNeeded(getContainingDeclaration())
 
     override fun getClassifier(name: Name): ClassifierDescriptor? = nestedClasses(name)
-    override fun getClassNames(nameFilter: (String) -> Boolean): Collection<Name> = nestedClassIndex().keySet() + enumEntryIndex().keySet()
+    override fun getClassNames(nameFilter: (Name) -> Boolean): Collection<Name> = nestedClassIndex().keySet() + enumEntryIndex().keySet()
 
     // TODO
     override fun getImplicitReceiversHierarchy(): List<ReceiverParameterDescriptor> = listOf()

core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaMemberScope.kt

@@ -288,16 +288,16 @@ public abstract class LazyJavaMemberScope(
     override fun getOwnDeclaredDescriptors() = getDescriptors()
 
     override fun getDescriptors(kindFilter: (JetScope.DescriptorKind) -> Boolean,
-                                nameFilter: (String) -> Boolean) = allDescriptors()
+                                nameFilter: (Name) -> Boolean) = allDescriptors()
 
     //TODO: use nameFilter
     protected fun computeDescriptors(kindFilter: (JetScope.DescriptorKind) -> Boolean,
-                                     nameFilter: (String) -> Boolean): List<DeclarationDescriptor> {
+                                     nameFilter: (Name) -> Boolean): List<DeclarationDescriptor> {
         val result = LinkedHashSet<DeclarationDescriptor>()
 
         if (kindFilter(JetScope.DescriptorKind.CLASSIFIER)) {
             for (name in getClassNames(nameFilter)) {
-                if (nameFilter(name.asString())) {
+                if (nameFilter(name)) {
                     // Null signifies that a class found in Java is not present in Kotlin (e.g. package class)
                     result.addIfNotNull(getClassifier(name))
                 }
@@ -323,11 +323,11 @@ public abstract class LazyJavaMemberScope(
 
     protected open fun addExtraDescriptors(result: MutableSet<DeclarationDescriptor>,
                                            kindFilter: (JetScope.DescriptorKind) -> Boolean,
-                                           nameFilter: (String) -> Boolean) {
+                                           nameFilter: (Name) -> Boolean) {
         // Do nothing
     }
 
-    protected abstract fun getClassNames(nameFilter: (String) -> Boolean): Collection<Name>
+    protected abstract fun getClassNames(nameFilter: (Name) -> Boolean): Collection<Name>
 
     override fun toString() = "Lazy scope for ${getContainingDeclaration()}"
     

core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaStaticScope.kt

@@ -102,7 +102,7 @@ public class LazyPackageFragmentScopeForJavaPackage(
 
     override fun addExtraDescriptors(result: MutableSet<DeclarationDescriptor>,
                                      kindFilter: (JetScope.DescriptorKind) -> Boolean,
-                                     nameFilter: (String) -> Boolean) {
+                                     nameFilter: (Name) -> Boolean) {
         result.addAll(deserializedPackageScope().getDescriptors(kindFilter, nameFilter))
     }
 
@@ -111,7 +111,7 @@ public class LazyPackageFragmentScopeForJavaPackage(
         override fun getAllMethodNames(): Collection<Name> = getClassNames({ true })
     }
 
-    override fun getClassNames(nameFilter: (String) -> Boolean): Collection<Name> {
+    override fun getClassNames(nameFilter: (Name) -> Boolean): Collection<Name> {
         return jPackage.getClasses(nameFilter).stream()
                 .filter { c -> c.getOriginKind() != JavaClass.OriginKind.KOTLIN_LIGHT_CLASS }
                 .map { c -> c.getName() }.toList()
@@ -134,7 +134,7 @@ public class LazyPackageFragmentScopeForJavaPackage(
     override fun getAllPropertyNames() = listOf<Name>()
 
     // we don't use implementation from super which caches all descriptors and does not use filters
-    override fun getDescriptors(kindFilter: (JetScope.DescriptorKind) -> Boolean, nameFilter: (String) -> Boolean): Collection<DeclarationDescriptor> {
+    override fun getDescriptors(kindFilter: (JetScope.DescriptorKind) -> Boolean, nameFilter: (Name) -> Boolean): Collection<DeclarationDescriptor> {
         return computeDescriptors(kindFilter, nameFilter)
     }
 }
@@ -164,7 +164,7 @@ public class LazyJavaStaticClassScope(
         return super.getAllFunctionNames()
     }
 
-    override fun getClassNames(nameFilter: (String) -> Boolean): Collection<Name> = listOf()
+    override fun getClassNames(nameFilter: (Name) -> Boolean): Collection<Name> = listOf()
     override fun getClassifier(name: Name): ClassifierDescriptor? = null
 
     override fun getSubPackages(): Collection<FqName> = listOf()

core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaPackage.kt

@@ -17,9 +17,10 @@
 package org.jetbrains.jet.lang.resolve.java.structure
 
 import org.jetbrains.jet.lang.resolve.name.FqName
+import org.jetbrains.jet.lang.resolve.name.Name
 
 public trait JavaPackage : JavaElement {
-    public fun getClasses(nameFilter: (String) -> Boolean): Collection<JavaClass>
+    public fun getClasses(nameFilter: (Name) -> Boolean): Collection<JavaClass>
 
     public fun getSubPackages(): Collection<JavaPackage>
 

core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/EnumEntrySyntheticClassDescriptor.java

@@ -258,7 +258,7 @@ public class EnumEntrySyntheticClassDescriptor extends ClassDescriptorBase {
         @Override
         public Collection<DeclarationDescriptor> getDescriptors(
                 @NotNull Function1<? super DescriptorKind, ? extends Boolean> kindFilter,
-                @NotNull Function1<? super String, ? extends Boolean> nameFilter
+                @NotNull Function1<? super Name, ? extends Boolean> nameFilter
         ) {
             return allDescriptors.invoke();
         }

core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/SubpackagesScope.kt

@@ -36,7 +36,7 @@ public class SubpackagesScope(private val containingDeclaration: PackageViewDesc
     }
 
     override fun getDescriptors(kindFilter: (JetScope.DescriptorKind) -> Boolean,
-                                nameFilter: (String) -> Boolean): Collection<DeclarationDescriptor> {
+                                nameFilter: (Name) -> Boolean): Collection<DeclarationDescriptor> {
         val subFqNames = containingDeclaration.getModule().getPackageFragmentProvider().getSubPackagesOf(containingDeclaration.getFqName())
         val result = ArrayList<DeclarationDescriptor>(subFqNames.size())
         for (subFqName in subFqNames) {

core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/AbstractScopeAdapter.kt

@@ -59,7 +59,7 @@ public abstract class AbstractScopeAdapter : JetScope {
     }
 
     override fun getDescriptors(kindFilter: (JetScope.DescriptorKind) -> Boolean,
-                                nameFilter: (String) -> Boolean): Collection<DeclarationDescriptor> {
+                                nameFilter: (Name) -> Boolean): Collection<DeclarationDescriptor> {
         return workerScope.getDescriptors(kindFilter, nameFilter)
     }
 

core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/ChainedScope.kt

@@ -60,7 +60,7 @@ public class ChainedScope(private val containingDeclaration: DeclarationDescript
     override fun getDeclarationsByLabel(labelName: Name) = scopeChain.flatMap { it.getDeclarationsByLabel(labelName) }
 
     override fun getDescriptors(kindFilter: (JetScope.DescriptorKind) -> Boolean,
-                                nameFilter: (String) -> Boolean): Collection<DeclarationDescriptor> {
+                                nameFilter: (Name) -> Boolean): Collection<DeclarationDescriptor> {
         val result = HashSet<DeclarationDescriptor>()
         scopeChain.flatMapTo(result) { it.getDescriptors(kindFilter, nameFilter) }
         return result

core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/FilteringScope.kt

@@ -38,7 +38,7 @@ public class FilteringScope(private val workerScope: JetScope, private val predi
     override fun getLocalVariable(name: Name) = filterDescriptor(workerScope.getLocalVariable(name))
 
     override fun getDescriptors(kindFilter: (JetScope.DescriptorKind) -> Boolean,
-                                nameFilter: (String) -> Boolean) = workerScope.getDescriptors(kindFilter, nameFilter).filter(predicate)
+                                nameFilter: (Name) -> Boolean) = workerScope.getDescriptors(kindFilter, nameFilter).filter(predicate)
 
     override fun getImplicitReceiversHierarchy() = workerScope.getImplicitReceiversHierarchy()
 

core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/InnerClassesScopeWrapper.kt

@@ -27,7 +27,7 @@ public class InnerClassesScopeWrapper(override val workerScope: JetScope) : Abst
     override fun getDeclarationsByLabel(labelName: Name) = workerScope.getDeclarationsByLabel(labelName).filterIsInstance(javaClass<ClassDescriptor>())
 
     override fun getDescriptors(kindFilter: (JetScope.DescriptorKind) -> Boolean,
-                                nameFilter: (String) -> Boolean): List<ClassDescriptor> {
+                                nameFilter: (Name) -> Boolean): List<ClassDescriptor> {
         if (!kindFilter(JetScope.DescriptorKind.CLASSIFIER)) return listOf()
         return workerScope.getDescriptors({ it == JetScope.DescriptorKind.CLASSIFIER }, nameFilter).filterIsInstance(javaClass<ClassDescriptor>())
     }

core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/JetScope.kt

@@ -51,7 +51,7 @@ public trait JetScope {
      * (that means that the implementation is not obliged to use the filters but may do so when it gives any performance advantage).
      */
     public fun getDescriptors(kindFilter: (JetScope.DescriptorKind) -> Boolean = DescriptorKind.ALL,
-                              nameFilter: (String) -> Boolean = { true }): Collection<DeclarationDescriptor>
+                              nameFilter: (Name) -> Boolean = { true }): Collection<DeclarationDescriptor>
 
     /**
      * Adds receivers to the list in order of locality, so that the closest (the most local) receiver goes first
@@ -100,7 +100,7 @@ public trait JetScope {
     }
 
     class object {
-        public val ALL_NAME_FILTER: (String) -> Boolean = { true }
+        public val ALL_NAME_FILTER: (Name) -> Boolean = { true }
     }
 }
 

core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/JetScopeImpl.kt

@@ -35,7 +35,7 @@ public abstract class JetScopeImpl : JetScope {
     override fun getDeclarationsByLabel(labelName: Name): Collection<DeclarationDescriptor> = listOf()
 
     override fun getDescriptors(kindFilter: (JetScope.DescriptorKind) -> Boolean,
-                                nameFilter: (String) -> Boolean): Collection<DeclarationDescriptor> = listOf()
+                                nameFilter: (Name) -> Boolean): Collection<DeclarationDescriptor> = listOf()
 
     override fun getImplicitReceiversHierarchy(): List<ReceiverParameterDescriptor> = listOf()
 

core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/StaticScopeForKotlinClass.kt

@@ -38,7 +38,7 @@ public class StaticScopeForKotlinClass(
     }
 
     override fun getDescriptors(kindFilter: (JetScope.DescriptorKind) -> Boolean,
-                                nameFilter: (String) -> Boolean) = functions
+                                nameFilter: (Name) -> Boolean) = functions
 
     override fun getOwnDeclaredDescriptors() = functions
 

core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/SubstitutingScope.kt

@@ -85,7 +85,7 @@ public class SubstitutingScope(private val workerScope: JetScope, private val su
     }
 
     override fun getDescriptors(kindFilter: (JetScope.DescriptorKind) -> Boolean,
-                                nameFilter: (String) -> Boolean) = _allDescriptors
+                                nameFilter: (Name) -> Boolean) = _allDescriptors
 
     override fun getOwnDeclaredDescriptors() = substitute(workerScope.getOwnDeclaredDescriptors())
 

core/descriptors/src/org/jetbrains/jet/lang/types/ErrorUtils.java

@@ -127,7 +127,7 @@ public class ErrorUtils {
         @Override
         public Collection<DeclarationDescriptor> getDescriptors(
                 @NotNull Function1<? super DescriptorKind, ? extends Boolean> kindFilter,
-                @NotNull Function1<? super String, ? extends Boolean> nameFilter
+                @NotNull Function1<? super Name, ? extends Boolean> nameFilter
         ) {
             return Collections.emptyList();
         }
@@ -208,7 +208,7 @@ public class ErrorUtils {
         @Override
         public Collection<DeclarationDescriptor> getDescriptors(
                 @NotNull Function1<? super DescriptorKind, ? extends Boolean> kindFilter,
-                @NotNull Function1<? super String, ? extends Boolean> nameFilter
+                @NotNull Function1<? super Name, ? extends Boolean> nameFilter
         ) {
             throw new IllegalStateException();
         }

core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedMemberScope.kt

@@ -120,7 +120,7 @@ public abstract class DeserializedMemberScope protected(
     protected abstract fun addNonDeclaredDescriptors(result: MutableCollection<DeclarationDescriptor>)
 
     override fun getDescriptors(kindFilter: (JetScope.DescriptorKind) -> Boolean,
-                                nameFilter: (String) -> Boolean): Collection<DeclarationDescriptor> = allDescriptors.invoke()
+                                nameFilter: (Name) -> Boolean): Collection<DeclarationDescriptor> = allDescriptors.invoke()
 
     override fun getImplicitReceiversHierarchy(): List<ReceiverParameterDescriptor> {
         val receiver = getImplicitReceiver()

idea/src/org/jetbrains/jet/plugin/codeInsight/TipsManager.kt

@@ -30,19 +30,20 @@ import org.jetbrains.jet.lang.types.expressions.ExpressionTypingUtils
 import java.util.*
 import org.jetbrains.jet.lang.resolve.bindingContextUtil.getDataFlowInfo
 import org.jetbrains.jet.lang.resolve.descriptorUtil.isExtension
+import org.jetbrains.jet.lang.resolve.name.Name
 
 public object TipsManager{
 
     public fun getReferenceVariants(expression: JetSimpleNameExpression,
                                     context: BindingContext,
-                                    nameFilter: (String) -> Boolean,
+                                    nameFilter: (Name) -> Boolean,
                                     visibilityFilter: (DeclarationDescriptor) -> Boolean): Collection<DeclarationDescriptor> {
         return getReferenceVariants(expression, context, nameFilter).filter(visibilityFilter)
     }
 
     private fun getReferenceVariants(expression: JetSimpleNameExpression,
                                      context: BindingContext,
-                                     nameFilter: (String) -> Boolean): Collection<DeclarationDescriptor> {
+                                     nameFilter: (Name) -> Boolean): Collection<DeclarationDescriptor> {
         val receiverExpression = expression.getReceiverExpression()
         val parent = expression.getParent()
         val resolutionScope = context[BindingContext.RESOLUTION_SCOPE, expression] ?: return listOf()
@@ -105,7 +106,7 @@ public object TipsManager{
 
     public fun getPackageReferenceVariants(expression: JetSimpleNameExpression,
                                            context: BindingContext,
-                                           nameFilter: (String) -> Boolean): Collection<DeclarationDescriptor> {
+                                           nameFilter: (Name) -> Boolean): Collection<DeclarationDescriptor> {
         val resolutionScope = context[BindingContext.RESOLUTION_SCOPE, expression] ?: return listOf()
         return excludeNonPackageDescriptors(resolutionScope.getDescriptors({ it == JetScope.DescriptorKind.PACKAGE }, nameFilter))
     }

idea/src/org/jetbrains/jet/plugin/completion/CompletionSession.kt

@@ -87,10 +87,7 @@ abstract class CompletionSessionBase(protected val configuration: CompletionSess
     protected abstract fun doComplete()
 
     protected fun getReferenceVariants(): Collection<DeclarationDescriptor> {
-        return TipsManager.getReferenceVariants(jetReference!!.expression,
+        return TipsManager.getReferenceVariants(jetReference!!.expression, bindingContext!!, prefixMatcher.asNameFilter(), { isVisibleDescriptor(it) })
-                                                bindingContext!!,
-                                                { prefixMatcher.prefixMatches(it) },
-                                                { isVisibleDescriptor(it) })
     }
 
     protected fun shouldRunTopLevelCompletion(): Boolean {

idea/src/org/jetbrains/jet/plugin/completion/CompletionUtils.kt

@@ -28,6 +28,8 @@ import org.jetbrains.jet.lang.descriptors.PackageFragmentDescriptor
 import org.jetbrains.jet.lang.descriptors.ClassKind
 import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor
 import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers
+import com.intellij.codeInsight.completion.PrefixMatcher
+import org.jetbrains.jet.lang.resolve.name.Name
 
 enum class ItemPriority {
     MULTIPLE_ARGUMENTS_ITEM
@@ -76,3 +78,5 @@ private fun qualifierName(descriptor: DeclarationDescriptor): String? = when (de
     is PackageFragmentDescriptor -> IdeDescriptorRenderers.SOURCE_CODE.renderFqName(descriptor.fqName)
     else -> null
 }
+
+fun PrefixMatcher.asNameFilter() = { (name: Name) -> !name.isSpecial() && prefixMatches(name.getIdentifier()) }

idea/src/org/jetbrains/jet/plugin/completion/PackageDirectiveCompletion.kt

@@ -53,7 +53,7 @@ object PackageDirectiveCompletion {
             val resolveSession = ref.expression.getLazyResolveSession()
             val bindingContext = resolveSession.resolveToElement(ref.expression)
 
-            val variants = TipsManager.getPackageReferenceVariants(ref.expression, bindingContext, { prefixMatcher.prefixMatches(it) })
+            val variants = TipsManager.getPackageReferenceVariants(ref.expression, bindingContext, prefixMatcher.asNameFilter())
             for (variant in variants) {
                 val lookupElement = KotlinLookupElementFactory.createLookupElement(resolveSession, variant)
                 if (!lookupElement.getLookupString().contains(DUMMY_IDENTIFIER)) {

idea/src/org/jetbrains/jet/plugin/parameterInfo/JetFunctionParameterInfoHandler.java

@@ -399,13 +399,12 @@ public class JetFunctionParameterInfoHandler implements ParameterInfoHandlerWith
             }
         };
 
-        Name refName = callNameExpression.getReferencedNameAsName();
+        final Name refName = callNameExpression.getReferencedNameAsName();
 
-        final String refNameString = refName.isSpecial() ? null : refName.asString();
+        Function1<Name, Boolean> nameFilter = new Function1<Name, Boolean>() {
-        Function1<String, Boolean> nameFilter = new Function1<String, Boolean>() {
             @Override
-            public Boolean invoke(String s) {
+            public Boolean invoke(Name name) {
-                return refNameString == null || s.equals(refNameString);
+                return name.equals(refName);
             }
         };
         Collection<DeclarationDescriptor> variants = TipsManager.INSTANCE$.getReferenceVariants(callNameExpression, bindingContext, nameFilter, visibilityFilter);