From 00e5e96fe3831016a2189e4210fb38290b9aee63 Mon Sep 17 00:00:00 2001
From: Ilya Kirillov <ilya.kirillov@jetbrains.com>
Date: Wed, 1 Apr 2020 19:52:10 +0300
Subject: [PATCH] Wizard: fix write action scope in IdeaJpsWizardService

#KT-37925 fixed
---
 .../wizard/service/IdeaJpsWizardService.kt    | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/service/IdeaJpsWizardService.kt b/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/service/IdeaJpsWizardService.kt
index abd07712f5d..e997386a65d 100644
--- a/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/service/IdeaJpsWizardService.kt
+++ b/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/service/IdeaJpsWizardService.kt
@@ -47,14 +47,12 @@ class IdeaJpsWizardService(
         path: Path,
         modulesIrs: List<ModuleIR>,
         buildSystem: BuildSystemType
-    ): TaskResult<Unit> {
+    ): TaskResult<Unit> = runWriteAction {
         ideWizard.jpsData.jdk?.let { jdk -> NewProjectUtil.applyJdkToProject(project, jdk) }
         KotlinSdkType.setUpIfNeeded()
         modulesBuilder.addModuleConfigurationUpdater(JpsModuleConfigurationUpdater(ideWizard.jpsData))
 
-        return runWriteAction {
-            ProjectImporter(project, modulesModel, path, modulesIrs).import()
-        }
+        ProjectImporter(project, modulesModel, path, modulesIrs).import()
     }
 }
 
@@ -170,13 +168,13 @@ private class ProjectImporter(
 
     private fun downloadLibraryAndGetItsClasses(libraryProperties: RepositoryLibraryProperties) =
         JarRepositoryManager.loadDependenciesModal(
-                project,
-                libraryProperties,
-                false,
-                false,
-                librariesPath.toString(),
-                null
-            ).asSequence()
+            project,
+            libraryProperties,
+            false,
+            false,
+            librariesPath.toString(),
+            null
+        ).asSequence()
             .filter { it.type == OrderRootType.CLASSES }
             .map { PathUtil.getLocalPath(it.file) }
             .toList()