IJPL-162718 introduce createNewProjectAsync

GitOrigin-RevId: 44b7e6b6e098107a05be321b31558765b32e5730
2026-03-22 15:19:59 +07:00 · 2024-09-23 14:26:31 +02:00
parent 00760b25cf
commit 3d74edadb2
3 changed files with 55 additions and 32 deletions
--- a/java/idea-ui/resources/messages/JavaUiBundle.properties
+++ b/java/idea-ui/resources/messages/JavaUiBundle.properties
@@ -174,6 +174,7 @@ sdk.configure.javadoc.tab=Documentation Paths
 add.external.annotations.path.title=Add Path to External Annotations
 library.source.show.diff=Show diff
 prompt.relative.path.to.sources.empty=Relative path to sources is empty.\nWould you like to mark the module content root\n''{0}''\nas a source directory?
+# not used by platform, only by MPS plugin
 project.new.wizard.progress.title=Initialization \u2026
 sdk.paths.specify.url.button=Specify URL\u2026
 dialog.text.enter.common.prefix.comment=<html>Modules are grouped in the IDE accordingly to their names; <br>if names of several modules have a common \
--- a/java/idea-ui/src/com/intellij/ide/actions/NewProjectAction.kt
+++ b/java/idea-ui/src/com/intellij/ide/actions/NewProjectAction.kt
@@ -3,7 +3,7 @@ package com.intellij.ide.actions

 import com.intellij.icons.AllIcons
 import com.intellij.ide.JavaUiBundle
-import com.intellij.ide.impl.NewProjectUtil.createNewProject
+import com.intellij.ide.impl.createNewProjectAsync
 import com.intellij.ide.projectWizard.NewProjectWizard
 import com.intellij.lang.IdeLanguageCustomization
 import com.intellij.lang.java.JavaLanguage
@@ -11,10 +11,14 @@ import com.intellij.openapi.actionSystem.ActionPlaces
 import com.intellij.openapi.actionSystem.ActionUpdateThread
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
+import com.intellij.openapi.application.EDT
+import com.intellij.openapi.progress.currentThreadCoroutineScope
 import com.intellij.openapi.project.DumbAware
 import com.intellij.openapi.roots.ui.configuration.ModulesProvider
 import com.intellij.openapi.wm.impl.welcomeScreen.NewWelcomeScreen
 import com.intellij.ui.ExperimentalUI
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch

 open class NewProjectAction : AnAction(), DumbAware, NewProjectOrModuleAction {
  init {
@@ -38,8 +42,10 @@ open class NewProjectAction : AnAction(), DumbAware, NewProjectOrModuleAction {
  }

  override fun actionPerformed(e: AnActionEvent) {
-    val wizard = NewProjectWizard(null, ModulesProvider.EMPTY_MODULES_PROVIDER, null)
-    createNewProject(wizard)
+    currentThreadCoroutineScope().launch(Dispatchers.EDT) {
+      val wizard = NewProjectWizard(null, ModulesProvider.EMPTY_MODULES_PROVIDER, null)
+      createNewProjectAsync(wizard)
+    }
  }

  override fun update(e: AnActionEvent) {
--- a/java/idea-ui/src/com/intellij/ide/impl/NewProjectUtil.kt
+++ b/java/idea-ui/src/com/intellij/ide/impl/NewProjectUtil.kt
@@ -1,8 +1,9 @@
-// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.ide.impl

 import com.intellij.ide.JavaUiBundle
 import com.intellij.ide.SaveAndSyncHandler
+import com.intellij.ide.impl.NewProjectUtil.createFromWizard
 import com.intellij.ide.impl.OpenProjectTask.Companion.build
 import com.intellij.ide.impl.ProjectUtil.focusProjectWindow
 import com.intellij.ide.impl.ProjectUtil.getOpenProjects
@@ -14,9 +15,9 @@ import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.application.ModalityState
 import com.intellij.openapi.command.CommandProcessor
 import com.intellij.openapi.components.StorageScheme
-import com.intellij.openapi.diagnostic.Logger
-import com.intellij.openapi.progress.ProgressManager
-import com.intellij.openapi.progress.runBlockingModalWithRawProgressReporter
+import com.intellij.openapi.components.serviceAsync
+import com.intellij.openapi.diagnostic.debug
+import com.intellij.openapi.diagnostic.logger
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.project.ProjectManager
 import com.intellij.openapi.project.ex.ProjectManagerEx
@@ -32,6 +33,7 @@ import com.intellij.openapi.vfs.VfsUtilCore
 import com.intellij.openapi.wm.ToolWindowId
 import com.intellij.openapi.wm.ToolWindowManager
 import com.intellij.platform.ide.progress.ModalTaskOwner
+import com.intellij.platform.ide.progress.runWithModalProgressBlocking
 import com.intellij.projectImport.ProjectOpenedCallback
 import com.intellij.ui.AppUIUtil
 import com.intellij.ui.IdeUICustomization
@@ -42,49 +44,62 @@ import java.nio.file.Path
 import java.nio.file.Paths
 import java.util.concurrent.CancellationException

-object NewProjectUtil {
-  private val LOG = Logger.getInstance(NewProjectUtil::class.java)
+private val LOG = logger<NewProjectUtil>()

+internal suspend fun createNewProjectAsync(wizard: AbstractProjectWizard) {
+  // warm-up components
+  serviceAsync<ProjectManager>().defaultProject
+
+  val context = wizard.wizardContext
+  val time = System.nanoTime()
+  NewProjectWizardCollector.logOpen(context)
+  if (wizard.showAndGet()) {
+    createFromWizard(wizard)
+    NewProjectWizardCollector.logFinish(context, true, TimeoutUtil.getDurationMillis(time))
+  }
+  else {
+    NewProjectWizardCollector.logFinish(context, false, TimeoutUtil.getDurationMillis(time))
+  }
+}
+
+object NewProjectUtil {
  @JvmStatic
  @Deprecated("Use {@link #createNewProject(AbstractProjectWizard)}, projectToClose param is not used.",
              ReplaceWith("createNewProject(wizard)", "com.intellij.ide.impl.NewProjectUtil.createNewProject"))
-  fun createNewProject(projectToClose: Project?, wizard: AbstractProjectWizard) {
+  fun createNewProject(@Suppress("unused") projectToClose: Project?, wizard: AbstractProjectWizard) {
    createNewProject(wizard)
  }

  @JvmStatic
  fun createNewProject(wizard: AbstractProjectWizard) {
-    val title = JavaUiBundle.message("project.new.wizard.progress.title")
    // warm-up components
-    val warmUp = Runnable { ProjectManager.getInstance().defaultProject }
-    val proceed = ProgressManager.getInstance().runProcessWithProgressSynchronously(warmUp, title, true, null)
-    var time = 0L
+    ProjectManager.getInstance().defaultProject
    val context = wizard.wizardContext
-    time = System.nanoTime()
+    val time = System.nanoTime()
    NewProjectWizardCollector.logOpen(context)
-    if (proceed && wizard.showAndGet()) {
+    if (wizard.showAndGet()) {
      createFromWizard(wizard)
      NewProjectWizardCollector.logFinish(context, true, TimeoutUtil.getDurationMillis(time))
-      return
    }
-    NewProjectWizardCollector.logFinish(context, false, TimeoutUtil.getDurationMillis(time))
+    else {
+      NewProjectWizardCollector.logFinish(context, false, TimeoutUtil.getDurationMillis(time))
+    }
  }

  @JvmOverloads
  @JvmStatic
  fun createFromWizard(wizard: AbstractProjectWizard, projectToClose: Project? = null): Project? {
-    return try {
+    try {
      val newProject = doCreate(wizard, projectToClose)
      NewProjectWizardCollector.logProjectCreated(newProject, wizard.wizardContext)
-      newProject
+      return newProject
    }
    catch (e: IOException) {
      AppUIUtil.invokeOnEdt { Messages.showErrorDialog(e.message, JavaUiBundle.message("dialog.title.project.initialization.failed")) }
-      null
+      return null
    }
  }

-  @Throws(IOException::class)
  private fun doCreate(wizard: AbstractProjectWizard, projectToClose: Project?): Project? {
    val projectFilePath = wizard.newProjectFilePath
    for (p in getOpenProjects()) {
@@ -93,10 +108,11 @@ object NewProjectUtil {
        return null
      }
    }
+
    val projectBuilder = wizard.projectBuilder
-    LOG.debug("builder $projectBuilder")
+    LOG.debug { "builder $projectBuilder" }
    val projectManager = ProjectManagerEx.getInstanceEx()
-    return try {
+    try {
      val projectFile = Path.of(projectFilePath)
      val projectDir = if (wizard.storageScheme == StorageScheme.DEFAULT) {
        projectFile.parent ?: throw IOException("Cannot create project in '$projectFilePath': no parent file exists")
@@ -184,19 +200,19 @@ object NewProjectUtil {
            }
          }
        }
-        TrustedPaths.getInstance().setProjectPathTrusted(projectDir, true)
-        runBlockingModalWithRawProgressReporter(
+        runWithModalProgressBlocking(
          owner = ModalTaskOwner.guess(),
          title = IdeUICustomization.getInstance().projectMessage("progress.title.project.loading.name", options.projectName),
        ) {
-          ProjectManagerEx.getInstanceEx().openProjectAsync(projectStoreBaseDir = projectDir, options = options)
+          serviceAsync<TrustedPaths>().setProjectPathTrusted(projectDir, true)
+          (serviceAsync<ProjectManager>() as ProjectManagerEx).openProjectAsync(projectStoreBaseDir = projectDir, options = options)
        }
      }
      if (!ApplicationManager.getApplication().isUnitTestMode) {
        SaveAndSyncHandler.getInstance().scheduleProjectSave(newProject)
      }

-      newProject
+      return newProject
    }
    finally {
      projectBuilder?.cleanup()
@@ -208,11 +224,11 @@ object NewProjectUtil {
      ApplicationManager.getApplication().runWriteAction {
        val extension = CompilerProjectExtension.getInstance(project)
        if (extension != null) {
-          var canonicalPath = path
-          try {
-            canonicalPath = FileUtil.resolveShortWindowsName(path)
+          val canonicalPath = try {
+            FileUtil.resolveShortWindowsName(path)
          }
-          catch (ignored: IOException) {
+          catch (_: IOException) {
+            path
          }
          extension.compilerOutputUrl = VfsUtilCore.pathToUrl(canonicalPath)
        }