From f7351a72de5db6f039a0a669a74ac5eaa937084e Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Tue, 24 Jun 2014 18:48:41 +0400 Subject: [PATCH] Simplify KotlinCacheService#isFileInScope() --- .../jet/plugin/caches/resolve/KotlinCacheService.kt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/idea/src/org/jetbrains/jet/plugin/caches/resolve/KotlinCacheService.kt b/idea/src/org/jetbrains/jet/plugin/caches/resolve/KotlinCacheService.kt index fd097ddb5ea..69f8c6efdc0 100644 --- a/idea/src/org/jetbrains/jet/plugin/caches/resolve/KotlinCacheService.kt +++ b/idea/src/org/jetbrains/jet/plugin/caches/resolve/KotlinCacheService.kt @@ -36,6 +36,7 @@ import org.jetbrains.jet.plugin.project.TargetPlatformDetector import java.util.HashSet import org.jetbrains.jet.analyzer.AnalyzerFacade import org.jetbrains.jet.lang.psi.JetCodeFragment +import org.jetbrains.jet.plugin.stubindex.JetSourceFilterScope private val LOG = Logger.getInstance(javaClass()) @@ -147,8 +148,11 @@ class KotlinCacheService(val project: Project) { } private fun isFileInScope(jetFile: JetFile): Boolean { - val project = jetFile.getProject() - return JetFilesProvider.getInstance(project).isFileInScope(jetFile, GlobalSearchScope.allScope(project)) + val virtualFile = jetFile.getVirtualFile() + if (virtualFile == null) { + return false + } + return virtualFile in JetSourceFilterScope.kotlinSources(GlobalSearchScope.allScope(project)) } public fun get(extension: CacheExtension): T {