From a5b530d5050a1beefd8ebcd1abad79df417cacd0 Mon Sep 17 00:00:00 2001 From: Ivan Kochurkin Date: Mon, 7 Aug 2023 21:30:36 +0200 Subject: [PATCH] [K2] Use real path in `LibraryList` Fix `testDirectoryWithRelativePath` in the LV20 branch ^KT-60886 Fixed --- .../AbstractFirDeserializedSymbolProvider.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/AbstractFirDeserializedSymbolProvider.kt b/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/AbstractFirDeserializedSymbolProvider.kt index 284c382925d..091c9fbd1d6 100644 --- a/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/AbstractFirDeserializedSymbolProvider.kt +++ b/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/AbstractFirDeserializedSymbolProvider.kt @@ -60,11 +60,11 @@ abstract class LibraryPathFilter { override fun accepts(path: Path?): Boolean { if (path == null) return false val isPathAbsolute = path.isAbsolute - val absolutePath by lazy(LazyThreadSafetyMode.NONE) { path.toAbsolutePath() } + val realPath by lazy(LazyThreadSafetyMode.NONE) { path.toRealPath() } return libs.any { when { - it.isAbsolute && !isPathAbsolute -> absolutePath.startsWith(it) - !it.isAbsolute && isPathAbsolute -> path.startsWith(it.toAbsolutePath()) + it.isAbsolute && !isPathAbsolute -> realPath.startsWith(it) + !it.isAbsolute && isPathAbsolute -> path.startsWith(it.toRealPath()) else -> path.startsWith(it) } }