Wizard: fix write action scope in IdeaJpsWizardService
#KT-37925 fixed
This commit is contained in:
+9
-11
@@ -47,14 +47,12 @@ 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()
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -170,13 +168,13 @@ private class ProjectImporter(
|
|||||||
|
|
||||||
private fun downloadLibraryAndGetItsClasses(libraryProperties: RepositoryLibraryProperties) =
|
private fun downloadLibraryAndGetItsClasses(libraryProperties: RepositoryLibraryProperties) =
|
||||||
JarRepositoryManager.loadDependenciesModal(
|
JarRepositoryManager.loadDependenciesModal(
|
||||||
project,
|
project,
|
||||||
libraryProperties,
|
libraryProperties,
|
||||||
false,
|
false,
|
||||||
false,
|
false,
|
||||||
librariesPath.toString(),
|
librariesPath.toString(),
|
||||||
null
|
null
|
||||||
).asSequence()
|
).asSequence()
|
||||||
.filter { it.type == OrderRootType.CLASSES }
|
.filter { it.type == OrderRootType.CLASSES }
|
||||||
.map { PathUtil.getLocalPath(it.file) }
|
.map { PathUtil.getLocalPath(it.file) }
|
||||||
.toList()
|
.toList()
|
||||||
|
|||||||
Reference in New Issue
Block a user