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

fix EA-66819 - IOE: VirtualDirectoryImpl.contentsToByteArray

Browse Source 
Changes: do not try to read content for virtual file in case it is really a directory
This commit is contained in:
Michael Nedzelsky
2015-03-19 21:58:16 +03:00
parent 5370073c05
commit dae42f7c76
1 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/framework/JsHeaderLibraryDetectionUtil.kt
+7 -12
View File
@@ -29,22 +29,17 @@ public object JsHeaderLibraryDetectionUtil {
platformStatic platformStatic
public fun isJsHeaderLibraryDetected(classesRoots: List<VirtualFile>): Boolean = public fun isJsHeaderLibraryDetected(classesRoots: List<VirtualFile>): Boolean =
isJsLibraryWithAcceptedFile(classesRoots) { isJsLibraryWithAcceptedFile(classesRoots) {
val extension = it.getExtension() JetFileType.EXTENSION == it.getExtension() || isJsFileWithMetadata(it)
JetFileType.EXTENSION == extension ||
JavaScript.EXTENSION == extension && KotlinJavascriptMetadataUtils.hasMetadata(String(it.contentsToByteArray(false)))
} }
platformStatic platformStatic
public fun isJsHeaderLibraryWithSources(classesRoots: List<VirtualFile>): Boolean = public fun isJsHeaderLibraryWithSources(classesRoots: List<VirtualFile>): Boolean =
isJsLibraryWithAcceptedFile(classesRoots) { JetFileType.EXTENSION == it.getExtension() } isJsLibraryWithAcceptedFile(classesRoots) { JetFileType.EXTENSION == it.getExtension() }
private fun isJsLibraryWithAcceptedFile(classesRoots: List<VirtualFile>, accept: (VirtualFile) -> Boolean): Boolean { private fun isJsLibraryWithAcceptedFile(classesRoots: List<VirtualFile>, accept: (VirtualFile) -> Boolean): Boolean =
return if (JavaRuntimeDetectionUtil.getJavaRuntimeVersion(classesRoots) != null) { JavaRuntimeDetectionUtil.getJavaRuntimeVersion(classesRoots) == null // Prevent clashing with java runtime
// Prevent clashing with java runtime && classesRoots.any { !VfsUtilCore.processFilesRecursively(it, { !accept(it) }) }
false
} private fun isJsFileWithMetadata(file: VirtualFile): Boolean =
else { !file.isDirectory() && JavaScript.EXTENSION == file.getExtension() && KotlinJavascriptMetadataUtils.hasMetadata(String(file.contentsToByteArray(false)))
classesRoots.firstOrNull<VirtualFile> { !VfsUtilCore.processFilesRecursively(it, { !accept(it) }) } != null
}
}
} }