From 4e8fed09b40e31e43ba56d8d53d91112440a870a Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Thu, 11 Aug 2022 17:01:36 +0200 Subject: [PATCH] FIR JS: fix klib matching in fir dependencies use file paths for more reliable matching, since klib-based libs do strange things with libraryName --- .../jetbrains/kotlin/fir/session/KlibBasedSymbolProvider.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/session/KlibBasedSymbolProvider.kt b/compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/session/KlibBasedSymbolProvider.kt index ab7bc985ccb..d7f9dff2294 100644 --- a/compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/session/KlibBasedSymbolProvider.kt +++ b/compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/session/KlibBasedSymbolProvider.kt @@ -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(