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

FIR JS: fix klib matching in fir dependencies

Browse Source 
use file paths for more reliable matching, since klib-based libs
do strange things with libraryName
This commit is contained in:
Ilya Chernikov
2022-08-11 17:01:36 +02:00
parent 1f11a2865f
commit 4e8fed09b4
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/session/KlibBasedSymbolProvider.kt
+2 -2
View File
@@ -64,7 +64,7 @@ class KlibBasedSymbolProvider(
return resolvedLibrary.library.packageMetadataParts(packageStringName).mapNotNull {
val fragment = getPackageFragment(packageStringName, it)
val libraryPath = Paths.get(resolvedLibrary.library.libraryName)
val libraryPath = Paths.get(resolvedLibrary.library.libraryFile.path)
val moduleData = moduleDataProvider.getModuleData(libraryPath) ?: return@mapNotNull null
val packageProto = fragment.`package`
@@ -94,7 +94,7 @@ class KlibBasedSymbolProvider(
}
resolvedLibrary.library.packageMetadataParts(packageStringName).forEach {
val libraryPath = Paths.get(resolvedLibrary.library.libraryName)
val libraryPath = Paths.get(resolvedLibrary.library.libraryFile.path)
val fragment = getPackageFragment(packageStringName, it)
val nameResolver = NameResolverImpl(