From 2af28891cdc9a83605622e3395515b4e1828bd95 Mon Sep 17 00:00:00 2001 From: Dmitry Batrak Date: Wed, 7 Nov 2018 15:19:32 +0300 Subject: [PATCH] speed up opening of editor containing a lot of carets --- .../src/com/intellij/openapi/editor/impl/EditorImpl.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) 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 51ff3fb1142d..5c850a346096 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 @@ -909,9 +909,7 @@ public final class EditorImpl extends UserDataHolderBase implements EditorEx, Hi myCaretModel.updateVisualPosition(); // make sure carets won't appear at invalid positions (e.g. on Tab width change) - for (Caret caret : getCaretModel().getAllCarets()) { - caret.moveToOffset(caret.getOffset()); - } + getCaretModel().doWithCaretMerging(() -> myCaretModel.getAllCarets().forEach(caret -> caret.moveToOffset(caret.getOffset()))); if (myVirtualFile != null && myProject != null) { final EditorNotifications editorNotifications = EditorNotifications.getInstance(myProject);