From d44b1eeb7ed69534d1b3b2c5fd883b7d42a438a1 Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Fri, 6 Nov 2015 16:31:27 +0300 Subject: [PATCH] KT-9884 Completion in Evaluate Expression crashes #KT-9884 Fixed --- .../org/jetbrains/kotlin/idea/caches/resolve/resolutionApi.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/resolutionApi.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/resolutionApi.kt index 646de8946bc..f47218462fd 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/resolutionApi.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/resolutionApi.kt @@ -23,6 +23,7 @@ import org.jetbrains.kotlin.analyzer.AnalysisResult import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.descriptors.ModuleDescriptor import org.jetbrains.kotlin.idea.resolve.ResolutionFacade +import org.jetbrains.kotlin.idea.stubindex.KotlinSourceFilterScope import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.resolve.BindingContext @@ -91,7 +92,7 @@ public fun ResolutionFacade.resolveImportReference( // see com.intellij.psi.impl.file.impl.ResolveScopeManagerImpl.getInherentResolveScope public fun getResolveScope(file: KtFile): GlobalSearchScope { if (file is KtCodeFragment) { - file.forcedResolveScope?.let { return it } + file.forcedResolveScope?.let { return KotlinSourceFilterScope.kotlinSourceAndClassFiles(it, file.project) } } return when (file.getModuleInfo()) {