From 88aa20e79166a2352fc164a1413a0e540aa861f6 Mon Sep 17 00:00:00 2001 From: Maxim Shafirov Date: Thu, 19 Apr 2012 20:31:03 +0400 Subject: [PATCH] OC-3717 Can move cursor inside the placeholder if it came in it from the upper/bottom line --- .../intellij/openapi/editor/actions/EditorActionUtil.java | 6 +++--- .../com/intellij/openapi/editor/impl/CaretModelImpl.java | 1 - 2 files changed, 3 insertions(+), 4 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 7371f18b4a69..3fdad4b2474e 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 @@ -619,12 +619,12 @@ public class EditorActionUtil { selectNonexpandableFold(editor); } - private final static Key PREV_POS = Key.create("PREV_POS"); + private final static Key PREV_POS = Key.create("PREV_POS"); public static void selectNonexpandableFold(Editor editor) { final CaretModel caretModel = editor.getCaretModel(); - final LogicalPosition pos = caretModel.getLogicalPosition(); + final VisualPosition pos = caretModel.getVisualPosition(); - LogicalPosition prevPos = editor.getUserData(PREV_POS); + VisualPosition prevPos = editor.getUserData(PREV_POS); if (prevPos != null) { int columnShift = pos.line == prevPos.line ? pos.column - prevPos.column : 0; diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/CaretModelImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/CaretModelImpl.java index 80a7541243cd..40af1ef37cab 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/CaretModelImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/CaretModelImpl.java @@ -196,7 +196,6 @@ public class CaretModelImpl implements CaretModel, PrioritizedDocumentListener, for (CaretListener listener : myCaretListeners) { listener.caretPositionChanged(event); } - EditorActionUtil.selectNonexpandableFold(myEditor); } }