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

Minor, remove unused parameter of LazyImportResolver.collectFromImports

Browse Source
This commit is contained in:
Alexander Udalov
2018-10-26 18:47:23 +02:00
parent c069371591
commit 4136fd1dbb
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LazyImportScope.kt
+8 -12
View File
@@ -99,20 +99,16 @@ open class LazyImportResolver<I : KtImportInfo>(
} }
} }
fun <D : DeclarationDescriptor> collectFromImports( fun <D : DeclarationDescriptor> collectFromImports(name: Name, descriptorsSelector: (ImportingScope) -> Collection<D>): Collection<D> =
name: Name, components.storageManager.compute {
descriptorsSelector: (ImportingScope, Name) -> Collection<D>
): Collection<D> {
return components.storageManager.compute {
var descriptors: Collection<D>? = null var descriptors: Collection<D>? = null
for (directive in indexedImports.importsForName(name)) { for (directive in indexedImports.importsForName(name)) {
val descriptorsForImport = descriptorsSelector(getImportScope(directive), name) val descriptorsForImport = descriptorsSelector(getImportScope(directive))
descriptors = descriptors.concat(descriptorsForImport) descriptors = descriptors.concat(descriptorsForImport)
} }
descriptors ?: emptySet<D>() descriptors.orEmpty()
} }
}
fun getImportScope(directive: KtImportInfo): ImportingScope { fun getImportScope(directive: KtImportInfo): ImportingScope {
return importedScopesProvider(directive) ?: ImportingScope.Empty return importedScopesProvider(directive) ?: ImportingScope.Empty
@@ -257,15 +253,15 @@ class LazyImportScope(
override fun getContributedVariables(name: Name, location: LookupLocation): Collection<VariableDescriptor> { override fun getContributedVariables(name: Name, location: LookupLocation): Collection<VariableDescriptor> {
if (filteringKind == FilteringKind.INVISIBLE_CLASSES) return listOf() if (filteringKind == FilteringKind.INVISIBLE_CLASSES) return listOf()
return importResolver.collectFromImports(name) { scope, _ -> scope.getContributedVariables(name, location) }.ifEmpty { return importResolver.collectFromImports(name) { scope -> scope.getContributedVariables(name, location) }.ifEmpty {
secondaryImportResolver?.collectFromImports(name) { scope, _ -> scope.getContributedVariables(name, location) }.orEmpty() secondaryImportResolver?.collectFromImports(name) { scope -> scope.getContributedVariables(name, location) }.orEmpty()
} }
} }
override fun getContributedFunctions(name: Name, location: LookupLocation): Collection<FunctionDescriptor> { override fun getContributedFunctions(name: Name, location: LookupLocation): Collection<FunctionDescriptor> {
if (filteringKind == FilteringKind.INVISIBLE_CLASSES) return listOf() if (filteringKind == FilteringKind.INVISIBLE_CLASSES) return listOf()
return importResolver.collectFromImports(name) { scope, _ -> scope.getContributedFunctions(name, location) }.ifEmpty { return importResolver.collectFromImports(name) { scope -> scope.getContributedFunctions(name, location) }.ifEmpty {
secondaryImportResolver?.collectFromImports(name) { scope, _ -> scope.getContributedFunctions(name, location) }.orEmpty() secondaryImportResolver?.collectFromImports(name) { scope -> scope.getContributedFunctions(name, location) }.orEmpty()
} }
} }