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

Use File.toPath instead of Paths.get+File.toURI in moduleVisibilityUtils

Browse Source 
#KT-27930 Fixed
This commit is contained in:
Alexander Udalov
2018-11-14 18:37:32 +01:00
parent d5acc8ff5b
commit 4c64db66dc
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/moduleVisibilityUtils.kt
+1 -2
View File
@@ -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.DeserializedMemberDescriptor
import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedTypeAliasDescriptor import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedTypeAliasDescriptor
import java.io.File import java.io.File
import java.nio.file.Paths
interface ModuleVisibilityManager { interface ModuleVisibilityManager {
val chunk: Collection<Module> val chunk: Collection<Module>
@@ -72,7 +71,7 @@ fun isContainedByCompiledPartOfOurModule(descriptor: DeclarationDescriptor, outD
StandardFileSystems.JAR_PROTOCOL -> VfsUtilCore.getVirtualFileForJar(file)?.let(VfsUtilCore::virtualToIoFile) StandardFileSystems.JAR_PROTOCOL -> VfsUtilCore.getVirtualFileForJar(file)?.let(VfsUtilCore::virtualToIoFile)
else -> null else -> null
} }
return ioFile != null && Paths.get(ioFile.toURI()).startsWith(Paths.get(outDirectory.toURI())) return ioFile != null && ioFile.toPath().startsWith(outDirectory.toPath())
} }
return false return false