From 597cae54eada06ea347fcdde16d4eb31f99af9cc Mon Sep 17 00:00:00 2001 From: Mikhail Zarechenskiy Date: Mon, 7 Jun 2021 10:18:06 +0300 Subject: [PATCH] [kotlin] fix transitive library dependency Fixes IdeaModuleInfoTest.testTransitiveLibraryDependency GitOrigin-RevId: 2c4c95374b7a6fb063762bd14c45e528d33a557d --- .../kotlin/idea/caches/project/LibraryDependenciesCache.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/caches/project/LibraryDependenciesCache.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/caches/project/LibraryDependenciesCache.kt index 2ee0ca318d13..28f1c4e8c43d 100644 --- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/caches/project/LibraryDependenciesCache.kt +++ b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/caches/project/LibraryDependenciesCache.kt @@ -58,7 +58,7 @@ class LibraryDependenciesCacheImpl(private val project: Project) : LibraryDepend val libraries = LinkedHashSet() val sdks = LinkedHashSet() - for (module in getLibraryUsageIndex().modulesLibraryIsUsedIn[libraryInfo.library]) { + for (module in getLibraryUsageIndex().modulesLibraryIsUsedIn[libraryInfo.library.wrap()]) { val (moduleLibraries, moduleSdks) = moduleDependenciesCache.getOrPut(module) { computeLibrariesAndSdksUsedIn(module) } @@ -114,7 +114,7 @@ class LibraryDependenciesCacheImpl(private val project: Project) : LibraryDepend } private inner class LibraryUsageIndex { - val modulesLibraryIsUsedIn: MultiMap = MultiMap.createSet() + val modulesLibraryIsUsedIn: MultiMap = MultiMap.createSet() init { for (module in ModuleManager.getInstance(project).modules) { @@ -122,7 +122,7 @@ class LibraryDependenciesCacheImpl(private val project: Project) : LibraryDepend if (entry is LibraryOrderEntry) { val library = entry.library if (library != null) { - modulesLibraryIsUsedIn.putValue(library, module) + modulesLibraryIsUsedIn.putValue(library.wrap(), module) } } }