From 5bfab8db021d53d8e931248d12c7f95f75b8e2eb Mon Sep 17 00:00:00 2001 From: "Denis.Zhdanov" Date: Mon, 25 Jun 2012 11:02:34 +0400 Subject: [PATCH] IDEA-86397 Delete line (Ctrl+Y) moves caret to the 1st column position Typos are corrected --- .../com/intellij/openapi/editor/actions/DuplicateAction.java | 2 +- .../src/com/intellij/openapi/editor/ex/util/EditorUtil.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/actions/DuplicateAction.java b/platform/platform-impl/src/com/intellij/openapi/editor/actions/DuplicateAction.java index 9bd2213b8559..5e73400b79ac 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/actions/DuplicateAction.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/actions/DuplicateAction.java @@ -86,7 +86,7 @@ public class DuplicateAction extends EditorAction { int newOffset = end + offset - start; if(lineToCheck == document.getLineCount () /* empty document */ - || nextLineStart.line == document.getLineCount() - 1 /* last line*/ + || lineStart.line == document.getLineCount() - 1 /* last line*/ || document.getLineSeparatorLength(lineToCheck) == 0) { s = "\n"+s; diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/ex/util/EditorUtil.java b/platform/platform-impl/src/com/intellij/openapi/editor/ex/util/EditorUtil.java index 434a6bfcc8ba..2db3acf4527a 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/ex/util/EditorUtil.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/ex/util/EditorUtil.java @@ -720,9 +720,9 @@ public class EditorUtil { second = new LogicalPosition(line + 1, 0); break; } - final int foldEndLine = document.getLineNumber(foldRegion.getStartOffset()); + final int foldEndLine = document.getLineNumber(foldRegion.getEndOffset()); if (foldEndLine <= line) { - first = new LogicalPosition(line + 1, 0); + second = new LogicalPosition(line + 1, 0); break; } line = foldEndLine;