From 2224f95294bd2b1fca5d9dc88bb5ef14d2440007 Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Tue, 23 Jan 2018 17:50:29 +0300 Subject: [PATCH] Minor. Avoid wrapping GlobalSearchScope.EMPTY_SCOPE --- .../lazy/declarations/DeclarationProviderFactoryService.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/DeclarationProviderFactoryService.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/DeclarationProviderFactoryService.kt index 14cf0ad43f8..45458b8131b 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/DeclarationProviderFactoryService.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/DeclarationProviderFactoryService.kt @@ -50,7 +50,7 @@ abstract class DeclarationProviderFactoryService { } private fun filteringScope(syntheticFiles: Collection, baseScope: GlobalSearchScope): GlobalSearchScope { - if (syntheticFiles.isEmpty()) { + if (syntheticFiles.isEmpty() || baseScope == GlobalSearchScope.EMPTY_SCOPE) { return baseScope } return SyntheticFilesFilteringScope(syntheticFiles, baseScope)