From 756bc03d0b5da59fd2f41aa9ce6cb18acee2eec3 Mon Sep 17 00:00:00 2001 From: Dmitry Batrak Date: Wed, 9 Jul 2014 14:28:04 +0400 Subject: [PATCH] performance optimization (following IDEA-CR-337) --- .../intellij/openapi/editor/actions/EditorActionUtil.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/actions/EditorActionUtil.java b/platform/platform-impl/src/com/intellij/openapi/editor/actions/EditorActionUtil.java index 8b7791086014..a0355cf71222 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/actions/EditorActionUtil.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/actions/EditorActionUtil.java @@ -601,7 +601,9 @@ public class EditorActionUtil { } } caretModel.moveToOffset(newOffset); - editor.getScrollingModel().scrollToCaret(ScrollType.RELATIVE); + if (editor.getCaretModel().getCurrentCaret() == editor.getCaretModel().getPrimaryCaret()) { + editor.getScrollingModel().scrollToCaret(ScrollType.RELATIVE); + } setupSelection(editor, isWithSelection, selectionStart, blockSelectionStart); } @@ -673,7 +675,9 @@ public class EditorActionUtil { if (isWordStart(text, newOffset, camel)) break; } editor.getCaretModel().moveToOffset(newOffset); - editor.getScrollingModel().scrollToCaret(ScrollType.RELATIVE); + if (editor.getCaretModel().getCurrentCaret() == editor.getCaretModel().getPrimaryCaret()) { + editor.getScrollingModel().scrollToCaret(ScrollType.RELATIVE); + } setupSelection(editor, isWithSelection, selectionStart, blockSelectionStart); }