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

KT-9884 Completion in Evaluate Expression crashes

Browse Source 
#KT-9884 Fixed
This commit is contained in:
Valentin Kipyatkov
2015-11-06 16:31:27 +03:00
parent ac4cf540a4
commit d44b1eeb7e
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/resolutionApi.kt
+2 -1
View File
@@ -23,6 +23,7 @@ import org.jetbrains.kotlin.analyzer.AnalysisResult
import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
import org.jetbrains.kotlin.descriptors.ModuleDescriptor import org.jetbrains.kotlin.descriptors.ModuleDescriptor
import org.jetbrains.kotlin.idea.resolve.ResolutionFacade import org.jetbrains.kotlin.idea.resolve.ResolutionFacade
import org.jetbrains.kotlin.idea.stubindex.KotlinSourceFilterScope
import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.BindingContext
@@ -91,7 +92,7 @@ public fun ResolutionFacade.resolveImportReference(
// see com.intellij.psi.impl.file.impl.ResolveScopeManagerImpl.getInherentResolveScope // see com.intellij.psi.impl.file.impl.ResolveScopeManagerImpl.getInherentResolveScope
public fun getResolveScope(file: KtFile): GlobalSearchScope { public fun getResolveScope(file: KtFile): GlobalSearchScope {
if (file is KtCodeFragment) { if (file is KtCodeFragment) {
file.forcedResolveScope?.let { return it } file.forcedResolveScope?.let { return KotlinSourceFilterScope.kotlinSourceAndClassFiles(it, file.project) }
} }
return when (file.getModuleInfo()) { return when (file.getModuleInfo()) {