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

CLI: utilize JRT path split (w/o magic number)

Browse Source
This commit is contained in:
Jinseong Jeon
2022-06-13 09:56:45 -07:00
committed by Ilya Kirillov
parent 13c7fde071
commit 911963bafd
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/modules/CoreJrtFileSystem.kt
+10 -10
View File
@@ -71,16 +71,6 @@ class CoreJrtFileSystem : DeprecatedVirtualFileSystem() {
return handlers[jdkHomePath]?.findFile(pathInImage)
}
private fun splitPath(path: String): Pair<String, String> {
val separator = path.indexOf(URLUtil.JAR_SEPARATOR)
if (separator < 0) {
throw IllegalArgumentException("Path in CoreJrtFileSystem must contain a separator: $path")
}
val localPath = path.substring(0, separator)
val pathInJar = path.substring(separator + 2)
return Pair(localPath, pathInJar)
}
override fun refresh(asynchronous: Boolean) {}
override fun refreshAndFindFileByPath(path: String): VirtualFile? = findFileByPath(path)
@@ -92,6 +82,16 @@ class CoreJrtFileSystem : DeprecatedVirtualFileSystem() {
fun isModularJdk(jdkHome: File): Boolean =
loadJrtFsJar(jdkHome) != null
fun splitPath(path: String): Pair<String, String> {
val separator = path.indexOf(URLUtil.JAR_SEPARATOR)
if (separator < 0) {
throw IllegalArgumentException("Path in CoreJrtFileSystem must contain a separator: $path")
}
val localPath = path.substring(0, separator)
val pathInJar = path.substring(separator + URLUtil.JAR_SEPARATOR.length)
return Pair(localPath, pathInJar)
}
private val jrtFsClassLoaderCache = ContainerUtil.createConcurrentWeakValueMap<File, URLClassLoader>()
}
}