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

Wizard: fix write action scope in IdeaJpsWizardService

Browse Source 
#KT-37925 fixed
This commit is contained in:
Ilya Kirillov
2020-04-01 19:52:10 +03:00
parent 24b8495e00
commit 00e5e96fe3
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/service/IdeaJpsWizardService.kt
+1 -3
View File
@@ -47,16 +47,14 @@ class IdeaJpsWizardService(
path: Path, path: Path,
modulesIrs: List<ModuleIR>, modulesIrs: List<ModuleIR>,
buildSystem: BuildSystemType buildSystem: BuildSystemType
): TaskResult<Unit> { ): TaskResult<Unit> = runWriteAction {
ideWizard.jpsData.jdk?.let { jdk -> NewProjectUtil.applyJdkToProject(project, jdk) } ideWizard.jpsData.jdk?.let { jdk -> NewProjectUtil.applyJdkToProject(project, jdk) }
KotlinSdkType.setUpIfNeeded() KotlinSdkType.setUpIfNeeded()
modulesBuilder.addModuleConfigurationUpdater(JpsModuleConfigurationUpdater(ideWizard.jpsData)) modulesBuilder.addModuleConfigurationUpdater(JpsModuleConfigurationUpdater(ideWizard.jpsData))
return runWriteAction {
ProjectImporter(project, modulesModel, path, modulesIrs).import() ProjectImporter(project, modulesModel, path, modulesIrs).import()
} }
} }
}
private class JpsModuleConfigurationUpdater(private val jpsData: IdeWizard.JpsData) : ModuleBuilder.ModuleConfigurationUpdater() { private class JpsModuleConfigurationUpdater(private val jpsData: IdeWizard.JpsData) : ModuleBuilder.ModuleConfigurationUpdater() {
override fun update(module: IdeaModule, rootModel: ModifiableRootModel) = with(jpsData) { override fun update(module: IdeaModule, rootModel: ModifiableRootModel) = with(jpsData) {