From 4c64db66dc8622561e5be1e5dc73ea4fb4acdb52 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Wed, 14 Nov 2018 18:37:32 +0100 Subject: [PATCH] Use File.toPath instead of Paths.get+File.toURI in moduleVisibilityUtils #KT-27930 Fixed --- .../org/jetbrains/kotlin/load/kotlin/moduleVisibilityUtils.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/moduleVisibilityUtils.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/moduleVisibilityUtils.kt index 99fdfe578a4..ffe82acf6f8 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/moduleVisibilityUtils.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/moduleVisibilityUtils.kt @@ -27,7 +27,6 @@ import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedMemberDescriptor import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedTypeAliasDescriptor import java.io.File -import java.nio.file.Paths interface ModuleVisibilityManager { val chunk: Collection @@ -72,7 +71,7 @@ fun isContainedByCompiledPartOfOurModule(descriptor: DeclarationDescriptor, outD StandardFileSystems.JAR_PROTOCOL -> VfsUtilCore.getVirtualFileForJar(file)?.let(VfsUtilCore::virtualToIoFile) else -> null } - return ioFile != null && Paths.get(ioFile.toURI()).startsWith(Paths.get(outDirectory.toURI())) + return ioFile != null && ioFile.toPath().startsWith(outDirectory.toPath()) } return false