From f4985e3bcbdd5cdcdf51c0d2fd8a4249373eebc7 Mon Sep 17 00:00:00 2001 From: Dmitry Batrak Date: Thu, 13 Mar 2014 15:07:58 +0400 Subject: [PATCH] IDEA-121896 Delete key doesn't delete CRLF while using multiple carets --- .../com/intellij/openapi/editor/actions/DeleteAction.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/actions/DeleteAction.java b/platform/platform-impl/src/com/intellij/openapi/editor/actions/DeleteAction.java index 98d941bb3116..cdd239abacfb 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/actions/DeleteAction.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/actions/DeleteAction.java @@ -108,12 +108,9 @@ public class DeleteAction extends EditorAction { public static void deleteCharAtCaret(Editor editor) { int lineNumber = editor.getCaretModel().getLogicalPosition().line; - int offset = editor.getCaretModel().getOffset(); - if (editor.isColumnMode() && editor.getCaretModel().supportsMultipleCarets() && offset == editor.getDocument().getLineEndOffset(lineNumber)) { - return; - } int afterLineEnd = EditorModificationUtil.calcAfterLineEnd(editor); Document document = editor.getDocument(); + int offset = editor.getCaretModel().getOffset(); if (!EditorActionUtil.canEditAtOffset(editor, offset + 1)) return; if (afterLineEnd < 0 // There is a possible case that caret is located right before the soft wrap position at the last logical line