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

MPP: Rewrite ImportedModule name instead of wrapping it

Browse Source 
Otherwise this instance is not deserialized properly
breaking import on opening project in AS

 #KT-27485 Fixed
 #KT-27473 Fixed
This commit is contained in:
Alexey Sedunov
2018-10-15 14:29:11 +03:00
parent bda1ef8d57
commit ca2367f2b5
3 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidMPPGradleProjectResolver.kt
+8 -3
View File
@@ -55,9 +55,8 @@ class KotlinAndroidMPPGradleProjectResolver : AbstractProjectResolverExtension()
for (childNode in ExternalSystemApiUtil.getChildren(ideModule, GradleSourceSetData.KEY)) { for (childNode in ExternalSystemApiUtil.getChildren(ideModule, GradleSourceSetData.KEY)) {
if (childNode.kotlinSourceSet == null) continue if (childNode.kotlinSourceSet == null) continue
val moduleName = childNode.data.internalName val moduleName = childNode.data.internalName
val importedModule = object : ImportedModule(gradleModule) { val importedModule = ImportedModule(gradleModule)
override fun getName() = moduleName importedModuleNameField.set(importedModule, moduleName)
}
ideModule.createChild(IMPORTED_MODULE, importedModule) ideModule.createChild(IMPORTED_MODULE, importedModule)
} }
} }
@@ -90,4 +89,10 @@ class KotlinAndroidMPPGradleProjectResolver : AbstractProjectResolverExtension()
.toList() .toList()
mainModuleData.createChild(KotlinAndroidSourceSetData.KEY, KotlinAndroidSourceSetData(androidSourceSets)) mainModuleData.createChild(KotlinAndroidSourceSetData.KEY, KotlinAndroidSourceSetData(androidSourceSets))
} }
companion object {
val importedModuleNameField by lazy {
ImportedModule::class.java.getDeclaredField("myName").apply { isAccessible = true }
}
}
} }
idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidMPPGradleProjectResolver.kt.173
+8 -3
View File
@@ -55,9 +55,8 @@ class KotlinAndroidMPPGradleProjectResolver : AbstractProjectResolverExtension()
for (childNode in ExternalSystemApiUtil.getChildren(ideModule, GradleSourceSetData.KEY)) { for (childNode in ExternalSystemApiUtil.getChildren(ideModule, GradleSourceSetData.KEY)) {
if (childNode.kotlinSourceSet == null) continue if (childNode.kotlinSourceSet == null) continue
val moduleName = childNode.data.internalName val moduleName = childNode.data.internalName
val importedModule = object : ImportedModule(gradleModule) { val importedModule = ImportedModule(gradleModule)
override fun getName() = moduleName importedModuleNameField.set(importedModule, moduleName)
}
ideModule.createChild(IMPORTED_MODULE, importedModule) ideModule.createChild(IMPORTED_MODULE, importedModule)
} }
} }
@@ -90,4 +89,10 @@ class KotlinAndroidMPPGradleProjectResolver : AbstractProjectResolverExtension()
.toList() .toList()
mainModuleData.createChild(KotlinAndroidSourceSetData.KEY, KotlinAndroidSourceSetData(androidSourceSets)) mainModuleData.createChild(KotlinAndroidSourceSetData.KEY, KotlinAndroidSourceSetData(androidSourceSets))
} }
companion object {
val importedModuleNameField by lazy {
ImportedModule::class.java.getDeclaredField("myName").apply { isAccessible = true }
}
}
} }
idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidMPPGradleProjectResolver.kt.as31
+8 -3
View File
@@ -55,9 +55,8 @@ class KotlinAndroidMPPGradleProjectResolver : AbstractProjectResolverExtension()
for (childNode in ExternalSystemApiUtil.getChildren(ideModule, GradleSourceSetData.KEY)) { for (childNode in ExternalSystemApiUtil.getChildren(ideModule, GradleSourceSetData.KEY)) {
if (childNode.kotlinSourceSet == null) continue if (childNode.kotlinSourceSet == null) continue
val moduleName = childNode.data.internalName val moduleName = childNode.data.internalName
val importedModule = object : ImportedModule(gradleModule) { val importedModule = ImportedModule(gradleModule)
override fun getName() = moduleName importedModuleNameField.set(importedModule, moduleName)
}
ideModule.createChild(IMPORTED_MODULE, importedModule) ideModule.createChild(IMPORTED_MODULE, importedModule)
} }
} }
@@ -90,4 +89,10 @@ class KotlinAndroidMPPGradleProjectResolver : AbstractProjectResolverExtension()
.toList() .toList()
mainModuleData.createChild(KotlinAndroidSourceSetData.KEY, KotlinAndroidSourceSetData(androidSourceSets)) mainModuleData.createChild(KotlinAndroidSourceSetData.KEY, KotlinAndroidSourceSetData(androidSourceSets))
} }
companion object {
val importedModuleNameField by lazy {
ImportedModule::class.java.getDeclaredField("myName").apply { isAccessible = true }
}
}
} }