From 754644f8a8143d0c78785f36e63e0983d6b13138 Mon Sep 17 00:00:00 2001 From: Aleksey Pivovarov Date: Tue, 29 Mar 2016 15:24:12 +0300 Subject: [PATCH] diff: add assertions --- .../src/com/intellij/diff/impl/CacheDiffRequestProcessor.java | 2 ++ .../src/com/intellij/diff/impl/DiffRequestProcessor.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/platform/diff-impl/src/com/intellij/diff/impl/CacheDiffRequestProcessor.java b/platform/diff-impl/src/com/intellij/diff/impl/CacheDiffRequestProcessor.java index 3ff90bc61e9e..790e85a7f551 100644 --- a/platform/diff-impl/src/com/intellij/diff/impl/CacheDiffRequestProcessor.java +++ b/platform/diff-impl/src/com/intellij/diff/impl/CacheDiffRequestProcessor.java @@ -24,6 +24,7 @@ import com.intellij.diff.util.DiffUserDataKeysEx.ScrollToPolicy; 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.diagnostic.Logger; import com.intellij.openapi.progress.ProcessCanceledException; import com.intellij.openapi.progress.ProgressIndicator; @@ -91,6 +92,7 @@ public abstract class CacheDiffRequestProcessor extends DiffRequestProcessor @CalledInAwt public void updateRequest(final boolean force, boolean useCache, @Nullable final ScrollToPolicy scrollToChangePolicy) { + ApplicationManager.getApplication().assertIsDispatchThread(); if (isDisposed()) return; final T requestProvider = getCurrentRequestProvider(); diff --git a/platform/diff-impl/src/com/intellij/diff/impl/DiffRequestProcessor.java b/platform/diff-impl/src/com/intellij/diff/impl/DiffRequestProcessor.java index d2294c03b55c..407cf54641ba 100644 --- a/platform/diff-impl/src/com/intellij/diff/impl/DiffRequestProcessor.java +++ b/platform/diff-impl/src/com/intellij/diff/impl/DiffRequestProcessor.java @@ -39,6 +39,7 @@ import com.intellij.internal.statistic.beans.ConvertUsagesUtil; import com.intellij.openapi.Disposable; import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.actionSystem.ex.ComboBoxAction; +import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.editor.LogicalPosition; @@ -246,6 +247,7 @@ public abstract class DiffRequestProcessor implements Disposable { @CalledInAwt protected void applyRequest(@NotNull DiffRequest request, boolean force, @Nullable ScrollToPolicy scrollToChangePolicy) { + ApplicationManager.getApplication().assertIsDispatchThread(); myIterationState = IterationState.NONE; force = force || (myQueuedApplyRequest != null && myQueuedApplyRequest.force);