From 046da177b5c9b6d5d554dda258be188daa1e208c Mon Sep 17 00:00:00 2001 From: Alexander Bubenchikov Date: Thu, 14 Mar 2024 14:30:07 +0100 Subject: [PATCH] [maven ][IDEA-348826] [refactor] project importer user notificaton extract method GitOrigin-RevId: 22f3304d020b27363a71f84f3f239fdbacc50f18 --- .../WorkspaceProjectImporter.kt | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/workspaceModel/WorkspaceProjectImporter.kt b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/workspaceModel/WorkspaceProjectImporter.kt index 8616d2239c97..e10aad661e6d 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/workspaceModel/WorkspaceProjectImporter.kt +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/workspaceModel/WorkspaceProjectImporter.kt @@ -31,10 +31,7 @@ import com.intellij.platform.backend.workspace.impl.internal import com.intellij.platform.workspace.jps.JpsImportedEntitySource import com.intellij.platform.workspace.jps.entities.* import com.intellij.platform.workspace.jps.serialization.impl.FileInDirectorySourceNames -import com.intellij.platform.workspace.storage.EntitySource -import com.intellij.platform.workspace.storage.EntityStorage -import com.intellij.platform.workspace.storage.MutableEntityStorage -import com.intellij.platform.workspace.storage.WorkspaceEntity +import com.intellij.platform.workspace.storage.* import com.intellij.util.ExceptionUtil import com.intellij.workspaceModel.ide.impl.legacyBridge.module.findModule import org.jetbrains.annotations.ApiStatus.Internal @@ -123,6 +120,16 @@ internal class WorkspaceProjectImporter( stats.finish(numberOfModules = projectsWithModuleEntities.sumOf { it.modules.size }) + notifyUserAboutWorkspaceImport(storageBeforeImport, postTasks) + + postTasks.add(AfterImportConfiguratorsTask(contextData, appliedProjectsWithModules)) + + return postTasks + + } + + private fun notifyUserAboutWorkspaceImport(storageBeforeImport: ImmutableEntityStorage, + postTasks: ArrayList) { var notifyUserAboutWorkspaceImport = false if (NOTIFY_USER_ABOUT_WORKSPACE_IMPORT_KEY[myProject] == true) { notifyUserAboutWorkspaceImport = true @@ -131,14 +138,9 @@ internal class WorkspaceProjectImporter( if (notifyUserAboutWorkspaceImport || (!ExternalSystemUtil.isNewProject(myProject) && hasLegacyImportedModules(storageBeforeImport)) - ) { + ) { postTasks.add(NotifyUserAboutWorkspaceImportTask()) } - - postTasks.add(AfterImportConfiguratorsTask(contextData, appliedProjectsWithModules)) - - return postTasks - } private fun migrateToExternalStorageIfNeeded(): Boolean {