From a575c7e5b5c3cc3157648df54d50a5adb479b48b Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Tue, 4 Jun 2019 17:53:42 +0900 Subject: [PATCH] Minor: Fix NPE in BinaryModuleInfo, handle empty scopes --- .../kotlin/idea/caches/project/IdeaModuleInfos.kt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/project/IdeaModuleInfos.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/project/IdeaModuleInfos.kt index 50a06ee7fcf..d91d8836211 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/project/IdeaModuleInfos.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/project/IdeaModuleInfos.kt @@ -435,7 +435,14 @@ interface BinaryModuleInfo : IdeaModuleInfo { val sourcesModuleInfo: SourceForBinaryModuleInfo? fun binariesScope(): GlobalSearchScope { val contentScope = contentScope() - return KotlinSourceFilterScope.libraryClassFiles(contentScope, contentScope.project!!) + if (contentScope === GlobalSearchScope.EMPTY_SCOPE) { + return contentScope + } + + val project = contentScope.project + ?: error("Project is empty for scope $contentScope (${contentScope.javaClass.name})") + + return KotlinSourceFilterScope.libraryClassFiles(contentScope, project) } }