From 0b3f5d315e3bed374701a3272fddf8d7aa8cb5bf Mon Sep 17 00:00:00 2001 From: peter Date: Sat, 31 Aug 2013 11:31:55 +0200 Subject: [PATCH] editors should only handle bulk changes of their own documents (otherwise main editor constantly scrolls during test run) --- .../src/com/intellij/openapi/editor/impl/EditorImpl.java | 4 ++++ .../com/intellij/openapi/editor/impl/SoftWrapModelImpl.java | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java index fcef9aa8dff7..b2681768a671 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java @@ -6223,11 +6223,15 @@ public final class EditorImpl extends UserDataHolderBase implements EditorEx, Hi class EditorDocumentBulkUpdateAdapter implements DocumentBulkUpdateListener { @Override public void updateStarted(@NotNull Document doc) { + if (doc != getDocument()) return; + bulkUpdateStarted(); } @Override public void updateFinished(@NotNull Document doc) { + if (doc != getDocument()) return; + bulkUpdateFinished(); } } diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/SoftWrapModelImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/SoftWrapModelImpl.java index 1f9e9ba684fa..9971e82b61bd 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/SoftWrapModelImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/SoftWrapModelImpl.java @@ -602,11 +602,15 @@ public class SoftWrapModelImpl implements SoftWrapModelEx, PrioritizedDocumentLi @Override public void updateStarted(@NotNull Document doc) { + if (doc != myEditor.getDocument()) return; + myBulkUpdateInProgress = true; } @Override public void updateFinished(@NotNull Document doc) { + if (doc != myEditor.getDocument()) return; + myBulkUpdateInProgress = false; if (!isSoftWrappingEnabled()) { return;