From 69f124786791eba49520e8eef83bba8137b2c2f1 Mon Sep 17 00:00:00 2001 From: "Denis.Zhdanov" Date: Tue, 5 Jun 2012 18:03:55 +0400 Subject: [PATCH] IDEA-86397 Delete line (Ctrl+Y) moves caret to the 1st column position Correct 'duplicate lines' processing in case of the last line --- .../intellij/openapi/editor/actions/DuplicateAction.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 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 551d8efcc8d9..9bd2213b8559 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 @@ -85,8 +85,10 @@ public class DuplicateAction extends EditorAction { final int lineToCheck = nextLineStart.line - 1; int newOffset = end + offset - start; - if(lineToCheck == document.getLineCount () /*empty document*/ || - document.getLineSeparatorLength(lineToCheck) == 0) { + if(lineToCheck == document.getLineCount () /* empty document */ + || nextLineStart.line == document.getLineCount() - 1 /* last line*/ + || document.getLineSeparatorLength(lineToCheck) == 0) + { s = "\n"+s; newOffset++; }