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

Fix Android Extension imports resolution after project reopening (KT-27793)

Browse Source
This commit is contained in:
Yan Zhulanow
2018-10-25 21:23:49 +03:00
parent beba8f215e
commit cd88209cf4
5 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidGradleMPPModuleDataService.kt
+2 -1
View File
@@ -68,7 +68,8 @@ class KotlinAndroidGradleMPPModuleDataService : AbstractProjectDataService<Modul
val module = modelsProvider.findIdeModule(moduleData) ?: continue
val shouldCreateEmptySourceRoots = shouldCreateEmptySourceRoots(nodeToImport, module)
val rootModel = modelsProvider.getModifiableRootModel(module)
for (sourceSetInfo in nodeToImport.kotlinAndroidSourceSets ?: emptyList()) {
val kotlinAndroidSourceSets = nodeToImport.kotlinAndroidSourceSets ?: continue
for (sourceSetInfo in kotlinAndroidSourceSets) {
val compilation = sourceSetInfo.kotlinModule as? KotlinCompilation ?: continue
for (sourceSet in compilation.sourceSets) {
if (sourceSet.platform == KotlinPlatform.ANDROID) {
idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidGradleMPPModuleDataService.kt.173
+2 -1
View File
@@ -64,7 +64,8 @@ class KotlinAndroidGradleMPPModuleDataService : AbstractProjectDataService<Modul
val module = modelsProvider.findIdeModule(moduleData) ?: continue
val shouldCreateEmptySourceRoots = shouldCreateEmptySourceRoots(nodeToImport, module)
val rootModel = modelsProvider.getModifiableRootModel(module)
for (sourceSetInfo in nodeToImport.kotlinAndroidSourceSets ?: emptyList()) {
val kotlinAndroidSourceSets = nodeToImport.kotlinAndroidSourceSets ?: continue
for (sourceSetInfo in kotlinAndroidSourceSets) {
val compilation = sourceSetInfo.kotlinModule as? KotlinCompilation ?: continue
for (sourceSet in compilation.sourceSets) {
if (sourceSet.platform == KotlinPlatform.ANDROID) {
idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidGradleMPPModuleDataService.kt.181
+2 -1
View File
@@ -68,7 +68,8 @@ class KotlinAndroidGradleMPPModuleDataService : AbstractProjectDataService<Modul
val module = modelsProvider.findIdeModule(moduleData) ?: continue
val shouldCreateEmptySourceRoots = shouldCreateEmptySourceRoots(nodeToImport, module)
val rootModel = modelsProvider.getModifiableRootModel(module)
for (sourceSetInfo in nodeToImport.kotlinAndroidSourceSets ?: emptyList()) {
val kotlinAndroidSourceSets = nodeToImport.kotlinAndroidSourceSets ?: continue
for (sourceSetInfo in kotlinAndroidSourceSets) {
val compilation = sourceSetInfo.kotlinModule as? KotlinCompilation ?: continue
for (sourceSet in compilation.sourceSets) {
if (sourceSet.platform == KotlinPlatform.ANDROID) {
idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidGradleMPPModuleDataService.kt.as31
+2 -1
View File
@@ -79,7 +79,8 @@ class KotlinAndroidGradleMPPModuleDataService : AbstractProjectDataService<Modul
val module = modelsProvider.findIdeModule(moduleData) ?: continue
val shouldCreateEmptySourceRoots = shouldCreateEmptySourceRoots(nodeToImport, module)
val rootModel = modelsProvider.getModifiableRootModel(module)
for (sourceSetInfo in nodeToImport.kotlinAndroidSourceSets ?: emptyList()) {
val kotlinAndroidSourceSets = nodeToImport.kotlinAndroidSourceSets ?: continue
for (sourceSetInfo in kotlinAndroidSourceSets) {
val compilation = sourceSetInfo.kotlinModule as? KotlinCompilation ?: continue
for (sourceSet in compilation.sourceSets) {
if (sourceSet.platform == KotlinPlatform.ANDROID) {
idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidGradleMPPModuleDataService.kt.as32
+2 -1
View File
@@ -68,7 +68,8 @@ class KotlinAndroidGradleMPPModuleDataService : AbstractProjectDataService<Modul
val module = modelsProvider.findIdeModule(moduleData) ?: continue
val shouldCreateEmptySourceRoots = shouldCreateEmptySourceRoots(nodeToImport, module)
val rootModel = modelsProvider.getModifiableRootModel(module)
for (sourceSetInfo in nodeToImport.kotlinAndroidSourceSets ?: emptyList()) {
val kotlinAndroidSourceSets = nodeToImport.kotlinAndroidSourceSets ?: continue
for (sourceSetInfo in kotlinAndroidSourceSets) {
val compilation = sourceSetInfo.kotlinModule as? KotlinCompilation ?: continue
for (sourceSet in compilation.sourceSets) {
if (sourceSet.platform == KotlinPlatform.ANDROID) {