MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-130503 Emacs cut to end of line broken

Browse Source 
make all 'delete' actions work consistently (other actions were changed as per IDEA-121896)
This commit is contained in:
Dmitry Batrak
2014-09-30 13:44:01 +04:00
parent 9d0ddbd8eb
commit 3bf8569819
2 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/editor/actions/CutLineActionHandler.java
-5
View File
@@ -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) {
platform/platform-impl/src/com/intellij/openapi/editor/actions/DeleteToWordEndAction.java
+2 -7
View File
@@ -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;