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

Provide more info for EA-89216

Browse Source
This commit is contained in:
Zalim Bashorov
2017-05-25 23:31:52 +03:00
parent 753b714544
commit 13aeb171bd
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/framework/KotlinJavaScriptLibraryDetectionUtil.kt
+15 -4
View File
@@ -25,6 +25,7 @@ import com.intellij.openapi.vfs.VirtualFile
import org.jetbrains.kotlin.idea.caches.JarUserDataManager import org.jetbrains.kotlin.idea.caches.JarUserDataManager
import org.jetbrains.kotlin.js.JavaScript import org.jetbrains.kotlin.js.JavaScript
import org.jetbrains.kotlin.utils.KotlinJavascriptMetadataUtils import org.jetbrains.kotlin.utils.KotlinJavascriptMetadataUtils
import java.util.zip.ZipException
object KotlinJavaScriptLibraryDetectionUtil { object KotlinJavaScriptLibraryDetectionUtil {
@JvmStatic fun isKotlinJavaScriptLibrary(library: Library): Boolean { @JvmStatic fun isKotlinJavaScriptLibrary(library: Library): Boolean {
@@ -51,10 +52,20 @@ object KotlinJavaScriptLibraryDetectionUtil {
return false return false
} }
private fun isJsFileWithMetadata(file: VirtualFile): Boolean = private fun isJsFileWithMetadata(file: VirtualFile): Boolean {
!file.isDirectory && if (!file.isDirectory && JavaScript.EXTENSION == file.extension) {
JavaScript.EXTENSION == file.extension && val content = try {
KotlinJavascriptMetadataUtils.hasMetadata(String(file.contentsToByteArray(false))) file.contentsToByteArray(false)
}
catch (e: ZipException) {
throw RuntimeException("file:${file.path} isDirectory: ${file.isDirectory}, exists: ${file.exists()}", e)
}
return KotlinJavascriptMetadataUtils.hasMetadata(String(content))
}
return false
}
object HasKotlinJSMetadataInJar : JarUserDataManager.JarBooleanPropertyCounter(HasKotlinJSMetadataInJar::class.simpleName!!) { object HasKotlinJSMetadataInJar : JarUserDataManager.JarBooleanPropertyCounter(HasKotlinJSMetadataInJar::class.simpleName!!) {
override fun hasProperty(file: VirtualFile) = KotlinJavaScriptLibraryDetectionUtil.isJsFileWithMetadata(file) override fun hasProperty(file: VirtualFile) = KotlinJavaScriptLibraryDetectionUtil.isJsFileWithMetadata(file)