From 32bb0e261b8081fbe8bda32b86ffb82e626414fe Mon Sep 17 00:00:00 2001
From: Daniil Ovchinnikov <daniil.ovchinnikov@jetbrains.com>
Date: Fri, 19 May 2023 16:15:19 +0200
Subject: [PATCH] `VcsInitialization.ShutDownProjectListener` is not needed
 anymore because the future is a child of the service scope

And the platform already cancels and joins the service scope.

GitOrigin-RevId: 97bc866be68403b7692df80c0ee33d3c9a30d53a
---
 .../vcs-impl/resources/META-INF/VcsExtensions.xml    |  2 --
 .../intellij/openapi/vcs/impl/VcsInitialization.kt   | 12 ------------
 2 files changed, 14 deletions(-)

diff --git a/platform/vcs-impl/resources/META-INF/VcsExtensions.xml b/platform/vcs-impl/resources/META-INF/VcsExtensions.xml
index cfba1c39e573..a4491d6aa378 100644
--- a/platform/vcs-impl/resources/META-INF/VcsExtensions.xml
+++ b/platform/vcs-impl/resources/META-INF/VcsExtensions.xml
@@ -358,8 +358,6 @@
   <applicationListeners>
     <listener class="com.intellij.openapi.vcs.changes.patch.PatchClipboardListener"
               topic="com.intellij.openapi.application.ApplicationActivationListener"/>
-    <listener class="com.intellij.openapi.vcs.impl.VcsInitialization$ShutDownProjectListener"
-              topic="com.intellij.openapi.project.ProjectCloseListener"/>
     <listener class="com.intellij.openapi.vcs.impl.ProjectLevelVcsManagerImpl$TrustListener"
               topic="com.intellij.ide.trustedProjects.TrustedProjectsListener"
               activeInHeadlessMode="false" activeInTestMode="false"/>
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/VcsInitialization.kt b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/VcsInitialization.kt
index 3d04ed2675cf..a7227cce8f80 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/VcsInitialization.kt
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/VcsInitialization.kt
@@ -5,7 +5,6 @@ import com.intellij.diagnostic.runActivity
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.components.Service
 import com.intellij.openapi.components.service
-import com.intellij.openapi.components.serviceIfCreated
 import com.intellij.openapi.diagnostic.debug
 import com.intellij.openapi.diagnostic.getOrLogException
 import com.intellij.openapi.diagnostic.logger
@@ -13,7 +12,6 @@ import com.intellij.openapi.extensions.ExtensionPointName
 import com.intellij.openapi.progress.blockingContext
 import com.intellij.openapi.progress.withBackgroundProgress
 import com.intellij.openapi.project.Project
-import com.intellij.openapi.project.ProjectCloseListener
 import com.intellij.openapi.project.ex.ProjectEx
 import com.intellij.openapi.startup.ProjectActivity
 import com.intellij.openapi.util.Disposer
@@ -224,16 +222,6 @@ class VcsInitialization(private val project: Project, private val coroutineScope
     }
   }
 
-  internal class ShutDownProjectListener : ProjectCloseListener {
-    override fun projectClosing(project: Project) {
-      if (project.isDefault) {
-        return
-      }
-
-      project.serviceIfCreated<VcsInitialization>()?.cancelBackgroundInitialization()
-    }
-  }
-
   private class ProxyVcsStartupActivity(vcsInitObject: VcsInitObject, private val runnable: Runnable) : VcsStartupActivity {
     private val order = vcsInitObject.order