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

[K2] Use real path in LibraryList

Browse Source 
Fix `testDirectoryWithRelativePath` in the LV20 branch

^KT-60886 Fixed
This commit is contained in:
Ivan Kochurkin
2023-08-07 21:30:36 +02:00
committed by Space Team
parent a73442f90f
commit a5b530d505
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/AbstractFirDeserializedSymbolProvider.kt
+3 -3
View File
@@ -60,11 +60,11 @@ abstract class LibraryPathFilter {
override fun accepts(path: Path?): Boolean { override fun accepts(path: Path?): Boolean {
if (path == null) return false if (path == null) return false
val isPathAbsolute = path.isAbsolute val isPathAbsolute = path.isAbsolute
val absolutePath by lazy(LazyThreadSafetyMode.NONE) { path.toAbsolutePath() } val realPath by lazy(LazyThreadSafetyMode.NONE) { path.toRealPath() }
return libs.any { return libs.any {
when { when {
it.isAbsolute && !isPathAbsolute -> absolutePath.startsWith(it) it.isAbsolute && !isPathAbsolute -> realPath.startsWith(it)
!it.isAbsolute && isPathAbsolute -> path.startsWith(it.toAbsolutePath()) !it.isAbsolute && isPathAbsolute -> path.startsWith(it.toRealPath())
else -> path.startsWith(it) else -> path.startsWith(it)
} }
} }