From b2be1ed69d7e09f4d71bb75a99c42c5d45baec6e Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Thu, 4 May 2023 21:39:44 +0200
Subject: [PATCH] cleanup

GitOrigin-RevId: 8cb8a0d297678f8a923daf0fae161c3d5f7e6dfa
---
 .../module/ModuleBridgeLoaderService.kt       | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/module/ModuleBridgeLoaderService.kt b/platform/lang-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/module/ModuleBridgeLoaderService.kt
index 1986c2daeabc..24b422a3ab68 100644
--- a/platform/lang-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/module/ModuleBridgeLoaderService.kt
+++ b/platform/lang-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/module/ModuleBridgeLoaderService.kt
@@ -6,6 +6,7 @@ import com.intellij.diagnostic.StartUpMeasurer
 import com.intellij.diagnostic.runActivity
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.application.EDT
+import com.intellij.openapi.application.writeAction
 import com.intellij.openapi.components.serviceAsync
 import com.intellij.openapi.diagnostic.logger
 import com.intellij.openapi.module.ModuleManager
@@ -38,7 +39,7 @@ private val LOG = logger<ModuleBridgeLoaderService>()
 
 private val modulesLoadingTimeMs: AtomicLong = AtomicLong()
 
-private fun setupOpenTelemetryReporting(meter: Meter): Unit {
+private fun setupOpenTelemetryReporting(meter: Meter) {
   val modulesLoadingTimeGauge = meter.gaugeBuilder("workspaceModel.moduleBridgeLoader.loading.modules.ms")
     .ofLongs().setDescription("Total time spent in method").buildObserver()
 
@@ -51,6 +52,12 @@ private fun setupOpenTelemetryReporting(meter: Meter): Unit {
 }
 
 private class ModuleBridgeLoaderService : ProjectServiceContainerInitializedListener {
+  companion object {
+    init {
+      setupOpenTelemetryReporting(jpsMetrics.meter)
+    }
+  }
+
   override suspend fun execute(project: Project) {
     val projectModelSynchronizer = JpsProjectModelSynchronizer.getInstance(project)
     val workspaceModel = project.serviceAsync<WorkspaceModel>().await() as WorkspaceModelImpl
@@ -100,10 +107,8 @@ private class ModuleBridgeLoaderService : ProjectServiceContainerInitializedList
       val jdkTableDeferred = ApplicationManager.getApplication().serviceAsync<ProjectJdkTable>()
       val projectRootManager = project.serviceAsync<ProjectRootManager>().await() as ProjectRootManagerBridge
       jdkTableDeferred.join()
-      withContext(Dispatchers.EDT) {
-        ApplicationManager.getApplication().runWriteAction {
-          projectRootManager.setupTrackedLibrariesAndJdks()
-        }
+      writeAction {
+        projectRootManager.setupTrackedLibrariesAndJdks()
       }
     }
     runActivity("workspace file index initialization") {
@@ -113,12 +118,6 @@ private class ModuleBridgeLoaderService : ProjectServiceContainerInitializedList
     modulesLoadingTimeMs.addAndGet(System.currentTimeMillis() - start)
     WorkspaceModelTopics.getInstance(project).notifyModulesAreLoaded()
   }
-
-  companion object {
-    init {
-      setupOpenTelemetryReporting(jpsMetrics.meter)
-    }
-  }
 }
 
 private suspend fun loadModules(project: Project,