From f27254df535fad68603b820d3916dba4cdc58144 Mon Sep 17 00:00:00 2001 From: Dmitry Batrak Date: Wed, 13 Jul 2016 16:52:46 +0300 Subject: [PATCH] IDEA-140614 Find action search field doesn't respect editor's keymap for cut/copy/paste actions --- .../src/com/intellij/openapi/editor/actions/CopyAction.java | 3 +-- .../src/com/intellij/openapi/editor/actions/CutAction.java | 3 +-- .../src/com/intellij/openapi/editor/actions/PasteAction.java | 3 +-- .../openapi/editor/textarea/TextComponentEditorImpl.java | 2 +- .../openapi/editor/textarea/TextComponentSelectionModel.java | 3 ++- 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/actions/CopyAction.java b/platform/platform-impl/src/com/intellij/openapi/editor/actions/CopyAction.java index 68185278e201..94f6895a167f 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/actions/CopyAction.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/actions/CopyAction.java @@ -28,11 +28,10 @@ import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.editor.Caret; import com.intellij.openapi.editor.CaretAction; import com.intellij.openapi.editor.Editor; -import com.intellij.openapi.editor.actionSystem.EditorAction; import com.intellij.openapi.editor.actionSystem.EditorActionHandler; import com.intellij.openapi.util.registry.Registry; -public class CopyAction extends EditorAction { +public class CopyAction extends TextComponentEditorAction { public static final String SKIP_COPY_AND_CUT_FOR_EMPTY_SELECTION_KEY = "editor.skip.copy.and.cut.for.empty.selection"; diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/actions/CutAction.java b/platform/platform-impl/src/com/intellij/openapi/editor/actions/CutAction.java index dd54b1de2087..0eb82688b17d 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/actions/CutAction.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/actions/CutAction.java @@ -29,11 +29,10 @@ import com.intellij.openapi.editor.Caret; import com.intellij.openapi.editor.CaretAction; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.editor.EditorModificationUtil; -import com.intellij.openapi.editor.actionSystem.EditorAction; import com.intellij.openapi.editor.actionSystem.EditorWriteActionHandler; import com.intellij.openapi.util.registry.Registry; -public class CutAction extends EditorAction { +public class CutAction extends TextComponentEditorAction { public CutAction() { super(new Handler()); } diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/actions/PasteAction.java b/platform/platform-impl/src/com/intellij/openapi/editor/actions/PasteAction.java index 1ba31dac63e2..7de5d0b5e3c9 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/actions/PasteAction.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/actions/PasteAction.java @@ -20,7 +20,6 @@ import com.intellij.openapi.actionSystem.DataKey; import com.intellij.openapi.editor.Caret; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.editor.EditorCopyPasteHelper; -import com.intellij.openapi.editor.actionSystem.EditorAction; import com.intellij.openapi.editor.ex.EditorEx; import com.intellij.openapi.util.TextRange; import com.intellij.util.Producer; @@ -31,7 +30,7 @@ import java.awt.datatransfer.Transferable; * @author max * @since May 13, 2002 */ -public class PasteAction extends EditorAction { +public class PasteAction extends TextComponentEditorAction { public static final DataKey> TRANSFERABLE_PROVIDER = DataKey.create("PasteTransferableProvider"); public PasteAction() { diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/textarea/TextComponentEditorImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/textarea/TextComponentEditorImpl.java index 8fdeec5aefd8..3d6cced77c12 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/textarea/TextComponentEditorImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/textarea/TextComponentEditorImpl.java @@ -251,7 +251,7 @@ public class TextComponentEditorImpl extends UserDataHolderBase implements TextC @Override public boolean isInsertMode() { - throw new UnsupportedOperationException("Not implemented"); + return true; } @Override diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/textarea/TextComponentSelectionModel.java b/platform/platform-impl/src/com/intellij/openapi/editor/textarea/TextComponentSelectionModel.java index 51fe696c5be2..d10f5b44e5ec 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/textarea/TextComponentSelectionModel.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/textarea/TextComponentSelectionModel.java @@ -17,6 +17,7 @@ package com.intellij.openapi.editor.textarea; import com.intellij.ide.DataManager; import com.intellij.openapi.actionSystem.IdeActions; +import com.intellij.openapi.editor.EditorCopyPasteHelper; import com.intellij.openapi.editor.LogicalPosition; import com.intellij.openapi.editor.SelectionModel; import com.intellij.openapi.editor.VisualPosition; @@ -159,7 +160,7 @@ public class TextComponentSelectionModel implements SelectionModel { @Override public void copySelectionToClipboard() { - throw new UnsupportedOperationException("Not implemented"); + EditorCopyPasteHelper.getInstance().copySelectionToClipboard(myEditor); } @Override