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

Don't try to store "is Kotlin" state for non-local jars (EA-80264)

Browse Source
This commit is contained in:
Dmitry Jemerov
2017-04-27 12:54:27 +02:00
parent 184ff9542c
commit d46f222a12
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/IDEKotlinBinaryClassCache.kt
+8 -2
View File
@@ -20,6 +20,7 @@ import com.intellij.ide.highlighter.JavaClassFileType
import com.intellij.openapi.components.ServiceManager import com.intellij.openapi.components.ServiceManager
import com.intellij.openapi.util.Key import com.intellij.openapi.util.Key
import com.intellij.openapi.vfs.VirtualFile import com.intellij.openapi.vfs.VirtualFile
import com.intellij.openapi.vfs.VirtualFileWithId
import org.jetbrains.kotlin.load.kotlin.KotlinBinaryClassCache import org.jetbrains.kotlin.load.kotlin.KotlinBinaryClassCache
import org.jetbrains.kotlin.load.kotlin.KotlinJvmBinaryClass import org.jetbrains.kotlin.load.kotlin.KotlinJvmBinaryClass
import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader
@@ -53,7 +54,9 @@ object IDEKotlinBinaryClassCache {
val kotlinBinaryClass = KotlinBinaryClassCache.getKotlinBinaryClass(file, fileContent) val kotlinBinaryClass = KotlinBinaryClassCache.getKotlinBinaryClass(file, fileContent)
val isKotlinBinaryClass = kotlinBinaryClass != null val isKotlinBinaryClass = kotlinBinaryClass != null
attributeService.writeBooleanAttribute(KOTLIN_IS_COMPILED_FILE_ATTRIBUTE, file, isKotlinBinaryClass) if (file is VirtualFileWithId) {
attributeService.writeBooleanAttribute(KOTLIN_IS_COMPILED_FILE_ATTRIBUTE, file, isKotlinBinaryClass)
}
if (isKotlinBinaryClass) { if (isKotlinBinaryClass) {
val headerInfo = createHeaderInfo(kotlinBinaryClass) val headerInfo = createHeaderInfo(kotlinBinaryClass)
@@ -99,7 +102,10 @@ object IDEKotlinBinaryClassCache {
return userData return userData
} }
val isKotlinBinaryAttribute = attributeService.readBooleanAttribute(KOTLIN_IS_COMPILED_FILE_ATTRIBUTE, file) val isKotlinBinaryAttribute = if (file is VirtualFileWithId)
attributeService.readBooleanAttribute(KOTLIN_IS_COMPILED_FILE_ATTRIBUTE, file)
else
null
if (isKotlinBinaryAttribute != null) { if (isKotlinBinaryAttribute != null) {
val isKotlinBinary = isKotlinBinaryAttribute.value val isKotlinBinary = isKotlinBinaryAttribute.value