From cc6e4e5cfb146a62f2813c59232e411477a1d9d7 Mon Sep 17 00:00:00 2001
From: Dmitriy Dolovov <Dmitriy.Dolovov@jetbrains.com>
Date: Fri, 27 Mar 2020 12:49:03 +0700
Subject: [PATCH] IDE, Native: Don't produce CompositePackageFragmentProvider
 when unnecessary

---
 .../konan/analyzer/NativeResolverForModuleFactory.kt   | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/analyzer/NativeResolverForModuleFactory.kt b/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/analyzer/NativeResolverForModuleFactory.kt
index cf94e392ba8..431acd8d470 100644
--- a/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/analyzer/NativeResolverForModuleFactory.kt
+++ b/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/analyzer/NativeResolverForModuleFactory.kt
@@ -53,8 +53,7 @@ class NativeResolverForModuleFactory(
             languageVersionSettings
         )
 
-        val packageFragmentProvider = container.get<ResolveSession>().packageFragmentProvider
-        val fragmentProviders = mutableListOf(packageFragmentProvider)
+        var packageFragmentProvider = container.get<ResolveSession>().packageFragmentProvider
 
         val klibPackageFragmentProvider = createNativeKlibPackageFragmentProvider(
             moduleContent.moduleInfo,
@@ -62,8 +61,11 @@ class NativeResolverForModuleFactory(
             languageVersionSettings,
             moduleDescriptor
         )
-        fragmentProviders.addIfNotNull(klibPackageFragmentProvider)
 
-        return ResolverForModule(CompositePackageFragmentProvider(fragmentProviders), container)
+        if (klibPackageFragmentProvider != null) {
+            packageFragmentProvider = CompositePackageFragmentProvider(listOf(packageFragmentProvider, klibPackageFragmentProvider))
+        }
+
+        return ResolverForModule(packageFragmentProvider, container)
     }
 }