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

MPP wizard fix: remove non-existing modules from settings.gradle

Browse Source
This commit is contained in:
Mikhail Glukhikh
2018-03-06 13:05:50 +03:00
committed by Mikhail Glukhikh
parent 1d0c5413de
commit ea4b04780c
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleMultiplatformModuleBuilder.kt
+4 -2
View File
@@ -79,8 +79,10 @@ class KotlinGradleMultiplatformModuleBuilder : GradleModuleBuilder() {
settingsGradle?.let { settingsGradle?.let {
module.project.executeCommand("Update settings.gradle") { module.project.executeCommand("Update settings.gradle") {
val doc = FileDocumentManager.getInstance().getDocument(it) ?: return@executeCommand val doc = FileDocumentManager.getInstance().getDocument(it) ?: return@executeCommand
val commonPrefix = commonModuleName?.let { "'$it', " } ?: "" val includedModules = listOfNotNull(commonModuleName, jvmModuleName, jsModuleName).filter { it.isNotEmpty() }
doc.insertString(doc.textLength, "include $commonPrefix'$jvmModuleName', '$jsModuleName'") if (includedModules.isNotEmpty()) {
doc.insertString(doc.textLength, includedModules.joinToString(prefix = "include ") { "'$it'" })
}
FileDocumentManager.getInstance().saveDocument(doc) FileDocumentManager.getInstance().saveDocument(doc)
} }
} }