From 8a9b2638b85089be9cd6d2a3dd5b9afe25ded9d9 Mon Sep 17 00:00:00 2001 From: Dmitry Batrak Date: Fri, 7 Oct 2016 12:57:35 +0300 Subject: [PATCH] allow requesting (potentially stale) values for logical/visual caret position from non-EDT threads (for IDEA-135620) --- .../src/com/intellij/openapi/editor/impl/CaretImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/CaretImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/CaretImpl.java index 3279ed5788df..82dd1d5d1372 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/CaretImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/CaretImpl.java @@ -1440,7 +1440,7 @@ public class CaretImpl extends UserDataHolderBase implements Caret, Dumpable { } void updateCachedStateIfNeeded() { - assertIsDispatchThread(); + if (!ApplicationManager.getApplication().isDispatchThread()) return; int modelCounter = myEditor.getCaretModel().myDocumentUpdateCounter; if (myDocumentUpdateCounter != modelCounter) { LogicalPosition lp = myEditor.offsetToLogicalPosition(getOffset());