IJPL-212811 added a method isNewlyCreatedProject and fixed creation of two instances of the project for DataGrip

GitOrigin-RevId: 7ec9472d862180ac02d9b03914db13f40c2f9a48

Author: villanellex2

platform/platform-impl/src/com/intellij/ide/impl/ProjectUtil.kt

@@ -27,7 +27,6 @@ import com.intellij.openapi.project.ex.ProjectManagerEx
 import com.intellij.openapi.startup.StartupManager
 import com.intellij.openapi.ui.MessageDialogBuilder
 import com.intellij.openapi.ui.Messages
-import com.intellij.openapi.util.Disposer
 import com.intellij.openapi.util.SystemInfoRt
 import com.intellij.openapi.util.io.FileUtil
 import com.intellij.openapi.util.io.FileUtilRt
@@ -654,31 +653,25 @@ object ProjectUtil {
       false
     }
 
-    var projectFile: Path? = null
-    if (created) {
-      val options = OpenProjectTask {
-        isNewProject = true
-        runConfigurators = true
-        projectName = name
-      }
-
-      val project = projectManager.newProjectAsync(file = file, options = options)
-      runInAutoSaveDisabledMode {
-        saveSettings(componentManager = project, forceSavingAllSettings = true)
-      }
-      edtWriteAction {
-        Disposer.dispose(project)
-      }
-      projectFile = file
+    if (!created) {
+      return null
     }
 
-    if (projectFile == null) {
-      return null
+    val newProject = projectManager.newProjectAsync(file = file, options = OpenProjectTask {
+      isNewProject = true
+      isProjectCreatedWithWizard = true
+      runConfigurators = true
+      projectName = name
+    })
+
+    runInAutoSaveDisabledMode {
+      saveSettings(componentManager = newProject, forceSavingAllSettings = true)
     }
 
-    return projectManager.openProjectAsync(projectIdentityFile = projectFile, options = OpenProjectTask {
+    return projectManager.openProjectAsync(projectIdentityFile = file, options = OpenProjectTask {
       runConfigurators = true
       isProjectCreatedWithWizard = true
+      project = newProject
     })
   }
 

platform/platform-impl/src/com/intellij/openapi/project/impl/ProjectManagerImpl.kt

@@ -73,6 +73,7 @@ import com.intellij.openapi.wm.WindowManager
 import com.intellij.openapi.wm.ex.WelcomeScreenProjectProvider
 import com.intellij.openapi.wm.ex.WindowManagerEx
 import com.intellij.openapi.wm.impl.welcomeScreen.WelcomeFrame
+import com.intellij.platform.PROJECT_NEWLY_CREATED
 import com.intellij.platform.PROJECT_NEWLY_OPENED
 import com.intellij.platform.PlatformProjectOpenProcessor
 import com.intellij.platform.attachToProjectAsync
@@ -657,7 +658,8 @@ open class ProjectManagerImpl : ProjectManagerEx(), Disposable {
                 projectName = options.projectName,
                 beforeInit = options.beforeInit,
                 useDefaultProjectAsTemplate = options.useDefaultProjectAsTemplate,
-                preloadServices = options.preloadServices
+                preloadServices = options.preloadServices,
+                markAsNewlyCreated = options.isProjectCreatedWithWizard,
               )
               else -> prepareProject(
                 projectIdentityFile = projectIdentityFile,
@@ -838,6 +840,7 @@ open class ProjectManagerImpl : ProjectManagerEx(), Disposable {
       options.beforeInit,
       options.useDefaultProjectAsTemplate,
       options.preloadServices,
+      options.isProjectCreatedWithWizard,
       markAsNew = false
     ).also { project ->
       TrustedProjects.setProjectTrusted(project, true)
@@ -885,6 +888,7 @@ open class ProjectManagerImpl : ProjectManagerEx(), Disposable {
     beforeInit: ((Project) -> Unit)?,
     useDefaultProjectAsTemplate: Boolean,
     preloadServices: Boolean,
+    markAsNewlyCreated: Boolean,
     markAsNew: Boolean = true,
   ): Project {
     return coroutineScope {
@@ -915,6 +919,7 @@ open class ProjectManagerImpl : ProjectManagerEx(), Disposable {
 
       val project = instantiateProject(identityFle = identityFle, projectName = projectName, beforeInit = beforeInit)
       project.putUserData(PROJECT_NEWLY_OPENED, markAsNew)
+      project.putUserData(PROJECT_NEWLY_CREATED, markAsNewlyCreated)
       val template = templateAsync?.await()
       initProject(file = identityFle, project = project, preloadServices = preloadServices, template = template)
       project

platform/platform-impl/src/com/intellij/platform/PlatformProjectOpenProcessor.kt

@@ -54,6 +54,7 @@ private val PROJECT_CONFIGURED_BY_PLATFORM_PROCESSOR: Key<Boolean> = Key.create(
 val PROJECT_LOADED_FROM_CACHE_BUT_HAS_NO_MODULES: Key<Boolean> = Key.create("PROJECT_LOADED_FROM_CACHE_BUT_HAS_NO_MODULES")
 
 internal val PROJECT_NEWLY_OPENED: Key<Boolean> = Key.create("PROJECT_NEWLY_OPENED")
+internal val PROJECT_NEWLY_CREATED: Key<Boolean> = Key.create("PROJECT_NEWLY_CREATED")
 
 @Internal
 fun isConfiguredByPlatformProcessor(project: Project): Boolean = project.getUserData(PROJECT_CONFIGURED_BY_PLATFORM_PROCESSOR) == true
@@ -89,6 +90,9 @@ class PlatformProjectOpenProcessor : ProjectOpenProcessor(), CommandLineProjectO
 
     fun isNewProject(project: Project): Boolean = project.getUserData(PROJECT_NEWLY_OPENED) == true
 
+    @Internal
+    fun isNewlyCreatedProject(project: Project): Boolean = project.getUserData(PROJECT_NEWLY_CREATED) == true
+
     fun isTempProject(project: Project): Boolean = project.service<OpenProjectSettingsService>().state.isLocatedInTempDirectory
 
     @JvmStatic