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

IDE, Native: Don't produce CompositePackageFragmentProvider when unnecessary

Browse Source
This commit is contained in:
Dmitriy Dolovov
2020-03-27 12:49:03 +07:00
parent 87da4be9bb
commit cc6e4e5cfb
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-native/src/org/jetbrains/kotlin/ide/konan/analyzer/NativeResolverForModuleFactory.kt
+6 -4
View File
@@ -53,8 +53,7 @@ class NativeResolverForModuleFactory(
languageVersionSettings languageVersionSettings
) )
val packageFragmentProvider = container.get<ResolveSession>().packageFragmentProvider var packageFragmentProvider = container.get<ResolveSession>().packageFragmentProvider
val fragmentProviders = mutableListOf(packageFragmentProvider)
val klibPackageFragmentProvider = createNativeKlibPackageFragmentProvider( val klibPackageFragmentProvider = createNativeKlibPackageFragmentProvider(
moduleContent.moduleInfo, moduleContent.moduleInfo,
@@ -62,8 +61,11 @@ class NativeResolverForModuleFactory(
languageVersionSettings, languageVersionSettings,
moduleDescriptor moduleDescriptor
) )
fragmentProviders.addIfNotNull(klibPackageFragmentProvider)
return ResolverForModule(CompositePackageFragmentProvider(fragmentProviders), container) if (klibPackageFragmentProvider != null) {
packageFragmentProvider = CompositePackageFragmentProvider(listOf(packageFragmentProvider, klibPackageFragmentProvider))
}
return ResolverForModule(packageFragmentProvider, container)
} }
} }