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

Refactoring: Clean-up usage of KlibMetadataFactories

Browse Source
This commit is contained in:
Dmitriy Dolovov
2020-03-26 21:52:50 +07:00
parent 36988cf15c
commit c23a11a6fc
5 changed files with 16 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-native/src/org/jetbrains/kotlin/ide/konan/NativePlatformKindResolution.kt
+4 -4
View File
@@ -87,7 +87,7 @@ class NativePlatformKindResolution : IdePlatformKindResolution {
object NativeBuiltInsCacheKey : BuiltInsCacheKey
companion object {
private val NativeFactories = KlibMetadataFactories(::KonanBuiltIns, NullFlexibleTypeDeserializer)
private val metadataFactories = KlibMetadataFactories(::KonanBuiltIns, NullFlexibleTypeDeserializer)
fun createNativeKlibPackageFragmentProvider(
moduleInfo: ModuleInfo,
@@ -99,7 +99,7 @@ class NativePlatformKindResolution : IdePlatformKindResolution {
?.resolvedKotlinLibrary
?.createKlibPackageFragmentProvider(
storageManager = storageManager,
metadataModuleDescriptorFactory = NativeFactories.DefaultDeserializedDescriptorFactory,
metadataModuleDescriptorFactory = metadataFactories.DefaultDeserializedDescriptorFactory,
languageVersionSettings = languageVersionSettings,
moduleDescriptor = moduleDescriptor
)
@@ -111,7 +111,7 @@ class NativePlatformKindResolution : IdePlatformKindResolution {
val project = projectContext.project
val storageManager = projectContext.storageManager
val builtInsModule = NativeFactories.DefaultDescriptorFactory.createDescriptorAndNewBuiltIns(
val builtInsModule = metadataFactories.DefaultDescriptorFactory.createDescriptorAndNewBuiltIns(
KotlinBuiltIns.BUILTINS_MODULE_NAME,
storageManager,
DeserializedKlibModuleOrigin(stdlibInfo.resolvedKotlinLibrary),
@@ -136,7 +136,7 @@ class NativePlatformKindResolution : IdePlatformKindResolution {
listOf(
stdlibPackageFragmentProvider,
functionInterfacePackageFragmentProvider(storageManager, builtInsModule),
(NativeFactories.DefaultDeserializedDescriptorFactory as KlibMetadataModuleDescriptorFactoryImpl)
(metadataFactories.DefaultDeserializedDescriptorFactory as KlibMetadataModuleDescriptorFactoryImpl)
.createForwardDeclarationHackPackagePartProvider(storageManager, builtInsModule)
)
)