From ccb7ba551720d3092504f56ed45e9437da7b234e Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Sat, 1 Nov 2014 00:45:07 +0300 Subject: [PATCH] More efficient treatment of single class imports --- .../org/jetbrains/jet/lang/resolve/lazy/LazyImportScope.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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