From 3bf85698191e4b7c95957c783aead20b87640c7f Mon Sep 17 00:00:00 2001 From: Dmitry Batrak Date: Tue, 30 Sep 2014 13:10:42 +0400 Subject: [PATCH] IDEA-130503 Emacs cut to end of line broken make all 'delete' actions work consistently (other actions were changed as per IDEA-121896) --- .../openapi/editor/actions/CutLineActionHandler.java | 5 ----- .../openapi/editor/actions/DeleteToWordEndAction.java | 9 ++------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/actions/CutLineActionHandler.java b/platform/platform-impl/src/com/intellij/openapi/editor/actions/CutLineActionHandler.java index f09a53c8ae99..b64040de3ef6 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/actions/CutLineActionHandler.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/actions/CutLineActionHandler.java @@ -56,11 +56,6 @@ class CutLineActionHandler extends EditorWriteActionHandler { int lineEndOffset = doc.getLineEndOffset(lineNumber); int lineStartOffset = doc.getLineStartOffset(lineNumber); - if (editor.isColumnMode() && editor.getCaretModel().supportsMultipleCarets() - && caretOffset == (myToLineStart ? lineStartOffset : lineEndOffset)) { - return; - } - int start; int end; if (myToLineStart) { diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/actions/DeleteToWordEndAction.java b/platform/platform-impl/src/com/intellij/openapi/editor/actions/DeleteToWordEndAction.java index 5785f01feb33..b97e0cdaa2d9 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/actions/DeleteToWordEndAction.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/actions/DeleteToWordEndAction.java @@ -18,6 +18,7 @@ package com.intellij.openapi.editor.actions; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.command.CommandProcessor; +import com.intellij.openapi.editor.Caret; import com.intellij.openapi.editor.Document; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.editor.EditorModificationUtil; @@ -45,16 +46,10 @@ public class DeleteToWordEndAction extends TextComponentEditorAction { } @Override - public void executeWriteAction(Editor editor, DataContext dataContext) { + public void executeWriteAction(Editor editor, Caret caret, DataContext dataContext) { CommandProcessor.getInstance().setCurrentCommandGroupId(EditorActionUtil.DELETE_COMMAND_GROUP); CopyPasteManager.getInstance().stopKillRings(); - int lineNumber = editor.getCaretModel().getLogicalPosition().line; - if (editor.isColumnMode() && editor.getCaretModel().supportsMultipleCarets() - && editor.getCaretModel().getOffset() == editor.getDocument().getLineEndOffset(lineNumber)) { - return; - } - boolean camelMode = editor.getSettings().isCamelWords(); if (myNegateCamelMode) { camelMode = !camelMode;