From 36882b19f00251f9aa2e99ea6817b40961c375ac Mon Sep 17 00:00:00 2001
From: Konstantin Nisht <konstantin.nisht@jetbrains.com>
Date: Wed, 19 Feb 2025 11:00:06 +0100
Subject: [PATCH] [threading] IJPL-178581: Set `Main` version of EDT dispatcher
 as `Dispatchers.Main`

GitOrigin-RevId: 7f5dcd2ec43df973b6bc9c455b51b0b6d1c80df1
---
 .../application/impl/EdtCoroutineDispatcherFactory.kt      | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/platform/core-impl/src/com/intellij/openapi/application/impl/EdtCoroutineDispatcherFactory.kt b/platform/core-impl/src/com/intellij/openapi/application/impl/EdtCoroutineDispatcherFactory.kt
index 4ef56968d270..2dfbd24233af 100644
--- a/platform/core-impl/src/com/intellij/openapi/application/impl/EdtCoroutineDispatcherFactory.kt
+++ b/platform/core-impl/src/com/intellij/openapi/application/impl/EdtCoroutineDispatcherFactory.kt
@@ -11,6 +11,11 @@ internal class EdtCoroutineDispatcherFactory : MainDispatcherFactory {
   override val loadPriority: Int get() = 0
 
   override fun createDispatcher(allFactories: List<MainDispatcherFactory>): MainCoroutineDispatcher {
-    return EdtCoroutineDispatcher.Locking
+    return if (System.getProperty("ide.install.ui.dispatcher.as.main.coroutine.dispatcher")?.toBooleanStrictOrNull() ?: true) {
+      EdtCoroutineDispatcher.Main
+    }
+    else {
+      EdtCoroutineDispatcher.Locking
+    }
   }
 }