From a083c6fc4c794f40198e2064741c1cbb918256eb Mon Sep 17 00:00:00 2001
From: "Maxim.Mossienko" <Maxim.Mossienko@jetbrains.com>
Date: Thu, 21 Oct 2010 19:31:59 +0400
Subject: [PATCH] IDEA-60172 Ctrl + Y doesn't delete the line

---
 .../com/intellij/openapi/editor/actions/DeleteLineAction.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/actions/DeleteLineAction.java b/platform/platform-impl/src/com/intellij/openapi/editor/actions/DeleteLineAction.java
index 185198aa17ee..9c3b94b20c0b 100644
--- a/platform/platform-impl/src/com/intellij/openapi/editor/actions/DeleteLineAction.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/actions/DeleteLineAction.java
@@ -45,8 +45,8 @@ public class DeleteLineAction extends TextComponentEditorAction {
         int selectionEnd = selectionModel.getSelectionEnd();
         selectionModel.removeSelection();
         int lineStartOffset = document.getLineStartOffset(document.getLineNumber(selectionStart));
-        int lineEndOffset = document.getLineEndOffset(document.getLineNumber(selectionEnd));
-        document.deleteString(lineStartOffset, lineEndOffset);
+        int nextLineStartOffset = Math.min(document.getTextLength(), document.getLineStartOffset(document.getLineNumber(selectionEnd) + 1));
+        document.deleteString(lineStartOffset, nextLineStartOffset);
         return;
       }
       deleteLineAtCaret(editor);