diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/DeclarationProviderFactoryService.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/DeclarationProviderFactoryService.kt index 4dc0fa516c9..7b51359d104 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/DeclarationProviderFactoryService.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/DeclarationProviderFactoryService.kt @@ -44,28 +44,25 @@ public abstract class DeclarationProviderFactoryService { filesScope: GlobalSearchScope ): DeclarationProviderFactory { return ServiceManager.getService(project, javaClass())!! - .create(project, storageManager, syntheticFiles, SyntheticFilesFilteringScope.filter(syntheticFiles, filesScope)) + .create(project, storageManager, syntheticFiles, filteringScope(syntheticFiles, filesScope)) } + private fun filteringScope(syntheticFiles: Collection, baseScope: GlobalSearchScope): GlobalSearchScope { + if (syntheticFiles.isEmpty()) { + return baseScope + } + return SyntheticFilesFilteringScope(syntheticFiles, baseScope) + } } - class SyntheticFilesFilteringScope(syntheticFiles: Collection, baseScope: GlobalSearchScope) : - DelegatingGlobalSearchScope(baseScope) { - val originals = syntheticFiles.map { - it.getOriginalFile().getVirtualFile() - }.filterNotNullTo(HashSet()) - override fun contains(file: VirtualFile): Boolean { - return super.contains(file) && file !in originals - } + private class SyntheticFilesFilteringScope(syntheticFiles: Collection, baseScope: GlobalSearchScope) + : DelegatingGlobalSearchScope(baseScope) { - class object { - fun filter(syntheticFiles: Collection, baseScope: GlobalSearchScope): GlobalSearchScope { - if (syntheticFiles.isEmpty()) { - return baseScope - } - return SyntheticFilesFilteringScope(syntheticFiles, baseScope) - } - } + private val originals = syntheticFiles + .map { it.getOriginalFile().getVirtualFile() } + .filterNotNullTo(HashSet()) + + override fun contains(file: VirtualFile) = super.contains(file) && file !in originals } }