From f737dd9f3a3d4214d5439d02e774d08e4787026a Mon Sep 17 00:00:00 2001 From: Aleksey Pivovarov Date: Mon, 22 Mar 2021 13:52:27 +0300 Subject: [PATCH] REWA: ApplicationImpl.throwThreadAccessException GitOrigin-RevId: 97804e6f7d1cc0a4ea33a7f54eff4fbaef4457b0 --- .../actions/diff/lst/SimpleLocalChangeListDiffViewer.java | 3 ++- .../actions/diff/lst/UnifiedLocalChangeListDiffViewer.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/diff/lst/SimpleLocalChangeListDiffViewer.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/diff/lst/SimpleLocalChangeListDiffViewer.java index e1cf1d70981d..1e1a1ed25463 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/diff/lst/SimpleLocalChangeListDiffViewer.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/diff/lst/SimpleLocalChangeListDiffViewer.java @@ -15,6 +15,7 @@ import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.CommonDataKeys; +import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.diff.DiffBundle; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.progress.ProcessCanceledException; @@ -136,7 +137,7 @@ public class SimpleLocalChangeListDiffViewer extends SimpleDiffViewer { @NotNull @Override public Runnable retryLater() { - scheduleRediff(); + ApplicationManager.getApplication().invokeLater(() -> scheduleRediff()); throw new ProcessCanceledException(); } diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/diff/lst/UnifiedLocalChangeListDiffViewer.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/diff/lst/UnifiedLocalChangeListDiffViewer.java index 1b98384b4b41..decf37f0764f 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/diff/lst/UnifiedLocalChangeListDiffViewer.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/diff/lst/UnifiedLocalChangeListDiffViewer.java @@ -14,6 +14,7 @@ import com.intellij.diff.util.Side; import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; +import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ReadAction; import com.intellij.openapi.diff.DiffBundle; import com.intellij.openapi.editor.Document; @@ -128,7 +129,7 @@ public class UnifiedLocalChangeListDiffViewer extends UnifiedDiffViewer { @NotNull @Override public Runnable retryLater() { - scheduleRediff(); + ApplicationManager.getApplication().invokeLater(() -> scheduleRediff()); throw new ProcessCanceledException(); }