diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaMemberScope.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaMemberScope.kt index 5fff0609bef..018e19b47c3 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaMemberScope.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaMemberScope.kt @@ -292,7 +292,7 @@ public abstract class LazyJavaMemberScope( //TODO: use nameFilter protected fun computeDescriptors(kindFilter: (JetScope.DescriptorKind) -> Boolean, - nameFilter: (String) -> kotlin.Boolean): List { + nameFilter: (String) -> Boolean): List { val result = LinkedHashSet() if (kindFilter(JetScope.DescriptorKind.CLASSIFIER)) { @@ -321,7 +321,7 @@ public abstract class LazyJavaMemberScope( protected open fun addExtraDescriptors(result: MutableSet, kindFilter: (JetScope.DescriptorKind) -> Boolean, - nameFilter: (String) -> kotlin.Boolean) { + nameFilter: (String) -> Boolean) { // Do nothing } diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaStaticScope.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaStaticScope.kt index 4f9ed827d9c..433e0a599bf 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaStaticScope.kt +++ b/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, kindFilter: (JetScope.DescriptorKind) -> Boolean, - nameFilter: (String) -> kotlin.Boolean) { + nameFilter: (String) -> Boolean) { result.addAll(deserializedPackageScope().getDescriptors(kindFilter, nameFilter)) } diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/JetScope.kt b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/JetScope.kt index 3cd8db20410..fa722dd764d 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/JetScope.kt +++ b/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) -> kotlin.Boolean = { true }): Collection + nameFilter: (String) -> Boolean = { true }): Collection /** * Adds receivers to the list in order of locality, so that the closest (the most local) receiver goes first