diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/modules/CoreJrtFileSystem.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/modules/CoreJrtFileSystem.kt index 805dd96ffa1..9fc2039ef54 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/modules/CoreJrtFileSystem.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/modules/CoreJrtFileSystem.kt @@ -33,7 +33,7 @@ class CoreJrtFileSystem(private val fileSystem: FileSystem) : DeprecatedVirtualF override fun getProtocol(): String = StandardFileSystems.JRT_PROTOCOL private fun findFileByPath(path: Path): VirtualFile? = - if (Files.exists(path)) CoreLocalPathVirtualFile(this, path) else null + if (Files.exists(path)) CoreJrtVirtualFile(this, path) else null override fun findFileByPath(path: String): VirtualFile? = findFileByPath(fileSystem.getPath(path)) diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/modules/CoreLocalPathVirtualFile.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/modules/CoreJrtVirtualFile.kt similarity index 87% rename from compiler/cli/src/org/jetbrains/kotlin/cli/jvm/modules/CoreLocalPathVirtualFile.kt rename to compiler/cli/src/org/jetbrains/kotlin/cli/jvm/modules/CoreJrtVirtualFile.kt index 1aa4d5bf18c..4cdf15bec68 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/modules/CoreLocalPathVirtualFile.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/modules/CoreJrtVirtualFile.kt @@ -27,7 +27,7 @@ import java.nio.file.Files import java.nio.file.Path import java.nio.file.attribute.BasicFileAttributes -class CoreLocalPathVirtualFile(private val fileSystem: VirtualFileSystem, private val path: Path) : VirtualFile() { +internal class CoreJrtVirtualFile(private val fileSystem: VirtualFileSystem, private val path: Path) : VirtualFile() { // TODO: catch IOException? private val attributes: BasicFileAttributes get() = Files.readAttributes(path, BasicFileAttributes::class.java) @@ -47,7 +47,7 @@ class CoreLocalPathVirtualFile(private val fileSystem: VirtualFileSystem, privat override fun getParent(): VirtualFile? { val parentPath = path.parent - return if (parentPath != null) CoreLocalPathVirtualFile(fileSystem, parentPath) else null + return if (parentPath != null) CoreJrtVirtualFile(fileSystem, parentPath) else null } override fun getChildren(): Array { @@ -59,7 +59,7 @@ class CoreLocalPathVirtualFile(private val fileSystem: VirtualFileSystem, privat } return when { paths.isEmpty() -> VirtualFile.EMPTY_ARRAY - else -> paths.map { path -> CoreLocalPathVirtualFile(fileSystem, path) }.toTypedArray() + else -> paths.map { path -> CoreJrtVirtualFile(fileSystem, path) }.toTypedArray() } } @@ -82,7 +82,7 @@ class CoreLocalPathVirtualFile(private val fileSystem: VirtualFileSystem, privat override fun getModificationStamp(): Long = 0 override fun equals(other: Any?): Boolean = - other is CoreLocalPathVirtualFile && path == other.path && fileSystem == other.fileSystem + other is CoreJrtVirtualFile && path == other.path && fileSystem == other.fileSystem override fun hashCode(): Int = path.hashCode()