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

Simplify KotlinCacheService#isFileInScope()

Browse Source
This commit is contained in:
Pavel V. Talanov
2014-06-24 18:48:41 +04:00
parent f4bd022907
commit f7351a72de
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/caches/resolve/KotlinCacheService.kt
+6 -2
View File
@@ -36,6 +36,7 @@ import org.jetbrains.jet.plugin.project.TargetPlatformDetector
import java.util.HashSet import java.util.HashSet
import org.jetbrains.jet.analyzer.AnalyzerFacade import org.jetbrains.jet.analyzer.AnalyzerFacade
import org.jetbrains.jet.lang.psi.JetCodeFragment import org.jetbrains.jet.lang.psi.JetCodeFragment
import org.jetbrains.jet.plugin.stubindex.JetSourceFilterScope
private val LOG = Logger.getInstance(javaClass<KotlinCacheService>()) private val LOG = Logger.getInstance(javaClass<KotlinCacheService>())
@@ -147,8 +148,11 @@ class KotlinCacheService(val project: Project) {
} }
private fun isFileInScope(jetFile: JetFile): Boolean { private fun isFileInScope(jetFile: JetFile): Boolean {
val project = jetFile.getProject() val virtualFile = jetFile.getVirtualFile()
return JetFilesProvider.getInstance(project).isFileInScope(jetFile, GlobalSearchScope.allScope(project)) if (virtualFile == null) {
return false
}
return virtualFile in JetSourceFilterScope.kotlinSources(GlobalSearchScope.allScope(project))
} }
public fun <T> get(extension: CacheExtension<T>): T { public fun <T> get(extension: CacheExtension<T>): T {