diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyImportScope.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyImportScope.kt index 32bde3c6d78..8e227bf7713 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyImportScope.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyImportScope.kt @@ -167,7 +167,11 @@ public class LazyImportScope(private val resolveSession: ResolveSession, throw IllegalStateException("Recursion while resolving many imports: " + directive.getText()) } - descriptors.addAll(getImportScope(directive, LookupMode.EVERYTHING).getDescriptors(kindFilter, nameFilter)) + val importPath = directive.getImportPath() ?: continue + val importedName = importPath.getImportedName() + if (importedName == null || nameFilter(importedName)) { + descriptors.addAll(getImportScope(directive, LookupMode.EVERYTHING).getDescriptors(kindFilter, nameFilter)) + } } descriptors