azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More efficient treatment of single class imports

Browse Source
This commit is contained in:
Valentin Kipyatkov
2014-11-01 00:45:07 +03:00
parent e14529eff7
commit ccb7ba5517
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyImportScope.kt
+5 -1
View File
@@ -167,7 +167,11 @@ public class LazyImportScope(private val resolveSession: ResolveSession,
throw IllegalStateException("Recursion while resolving many imports: " + directive.getText()) 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 descriptors