From 98252655a7ce8a3814d9e5ceca3f64d06aea373b Mon Sep 17 00:00:00 2001
From: Konstantin Nisht <konstantin.nisht@jetbrains.com>
Date: Mon, 15 Dec 2025 12:22:09 +0100
Subject: [PATCH] [threading] IJPL-223870: Add write-intent into `MergeWindow`

GitOrigin-RevId: be14ab3dfba1e8c4da33435b91919a325ba6fd3c
---
 .../diff-impl/src/com/intellij/diff/merge/MergeWindow.java   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/platform/diff-impl/src/com/intellij/diff/merge/MergeWindow.java b/platform/diff-impl/src/com/intellij/diff/merge/MergeWindow.java
index 16914f89ef70..de37181c9847 100644
--- a/platform/diff-impl/src/com/intellij/diff/merge/MergeWindow.java
+++ b/platform/diff-impl/src/com/intellij/diff/merge/MergeWindow.java
@@ -1,10 +1,11 @@
-// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.diff.merge;
 
 import com.intellij.diff.DiffDialogHints;
 import com.intellij.diff.util.DiffUserDataKeys;
 import com.intellij.diff.util.DiffUtil;
 import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.application.WriteIntentReadAction;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.WindowWrapper;
@@ -50,7 +51,7 @@ public abstract class MergeWindow {
       .setDimensionServiceKey(dialogGroupKey)
       .setInitialSize(JBUI.DialogSizes.extraLarge())
       .setPreferredFocusedComponent(() -> myProcessor.getPreferredFocusedComponent())
-      .setOnShowCallback(() -> initProcessor(myProcessor))
+      .setOnShowCallback(() -> WriteIntentReadAction.run(() -> initProcessor(myProcessor)))
       .setOnCloseHandler(() -> myProcessor.checkCloseAction())
       .build();
     myWrapper.setImages(DiffUtil.DIFF_FRAME_ICONS.getValue());