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

avoid unnecessary reads of file content during indexing

Browse Source
This commit is contained in:
Dmitry Jemerov
2015-11-30 16:16:54 +01:00
parent f9306d9c3c
commit 05a62c5892
3 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/KotlinBinaryClassCache.kt
+3 -3
View File
@@ -25,7 +25,7 @@ import com.intellij.openapi.vfs.VirtualFile
class KotlinBinaryClassCache : Disposable {
private class RequestCache {
internal lateinit var virtualFile: VirtualFile
internal var virtualFile: VirtualFile? = null
internal var modificationStamp: Long = 0
internal var virtualFileKotlinClass: VirtualFileKotlinClass? = null
@@ -53,7 +53,7 @@ class KotlinBinaryClassCache : Disposable {
companion object {
fun getKotlinBinaryClass(file: VirtualFile): KotlinJvmBinaryClass? {
fun getKotlinBinaryClass(file: VirtualFile, fileContent: ByteArray? = null): KotlinJvmBinaryClass? {
if (file.fileType !== JavaClassFileType.INSTANCE) return null
val service = ServiceManager.getService(KotlinBinaryClassCache::class.java)
@@ -65,7 +65,7 @@ class KotlinBinaryClassCache : Disposable {
else {
val aClass = ApplicationManager.getApplication().runReadAction(Computable {
//noinspection deprecation
VirtualFileKotlinClass.create(file)
VirtualFileKotlinClass.create(file, fileContent)
})
return requestCache.cache(file, aClass)
compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/VirtualFileKotlinClass.kt
+2 -2
View File
@@ -54,12 +54,12 @@ public class VirtualFileKotlinClass private constructor(
private val perfCounter = PerformanceCounter.create("Binary class from Kotlin file")
@Deprecated("Use KotlinBinaryClassCache")
fun create(file: VirtualFile): VirtualFileKotlinClass? {
fun create(file: VirtualFile, fileContent: ByteArray?): VirtualFileKotlinClass? {
return perfCounter.time {
assert(file.getFileType() == JavaClassFileType.INSTANCE) { "Trying to read binary data from a non-class file $file" }
try {
val byteContent = file.contentsToByteArray(false)
val byteContent = fileContent ?: file.contentsToByteArray(false)
if (!byteContent.isEmpty()) {
return@time FileBasedKotlinClass.create(byteContent) {
name, header, innerClasses ->