From a7b7f09965d5dfb5087f146673adc86ebe1a2532 Mon Sep 17 00:00:00 2001 From: peter Date: Thu, 8 Jan 2015 16:07:41 +0100 Subject: [PATCH 1/3] minor formatting fix --- .../src/com/intellij/codeInsight/editorActions/CopyHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/CopyHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/CopyHandler.java index 1b8acbccc56e..e780e3922b29 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/CopyHandler.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/CopyHandler.java @@ -90,7 +90,7 @@ public class CopyHandler extends EditorActionHandler { List transferableDatas = new ArrayList(); CopyPastePostProcessor[] postProcessors = Extensions.getExtensions(CopyPastePostProcessor.EP_NAME); - for (CopyPastePostProcessor processor : DumbService.getInstance(project).filterByDumbAwareness( Arrays.asList(postProcessors))) { + for (CopyPastePostProcessor processor : DumbService.getInstance(project).filterByDumbAwareness(Arrays.asList(postProcessors))) { transferableDatas.addAll(processor.collectTransferableData(file, editor, startOffsets, endOffsets)); } From 62d0443a0ee2cddad0a7932319fceabec8c08194 Mon Sep 17 00:00:00 2001 From: peter Date: Thu, 8 Jan 2015 16:08:00 +0100 Subject: [PATCH 2/3] document that CopyPastePostProcessor can be dumb-aware --- .../codeInsight/editorActions/CopyPastePostProcessor.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/CopyPastePostProcessor.java b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/CopyPastePostProcessor.java index e95410218a1e..f34488917b27 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/CopyPastePostProcessor.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/CopyPastePostProcessor.java @@ -19,6 +19,7 @@ package com.intellij.codeInsight.editorActions; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.editor.RangeMarker; import com.intellij.openapi.extensions.ExtensionPointName; +import com.intellij.openapi.project.DumbAware; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Ref; import com.intellij.psi.PsiFile; @@ -29,6 +30,10 @@ import java.util.Collections; import java.util.List; /** + * An extension to collect and apply additional transferable data when performing copy-paste in editors.

+ * + * Can be {@link DumbAware} + * * @author yole */ public abstract class CopyPastePostProcessor { From 09953982e2c5c7c1808186e6c5b53f2399357705 Mon Sep 17 00:00:00 2001 From: "Maxim.Mossienko" Date: Fri, 9 Jan 2015 12:12:05 +0100 Subject: [PATCH 3/3] IDEA-129635 Undo doesn't work in the Find in Path dialog --- .../lang-impl/src/com/intellij/ui/StringComboboxEditor.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/ui/StringComboboxEditor.java b/platform/lang-impl/src/com/intellij/ui/StringComboboxEditor.java index 1d43ebb362a5..68afc2b26b6b 100644 --- a/platform/lang-impl/src/com/intellij/ui/StringComboboxEditor.java +++ b/platform/lang-impl/src/com/intellij/ui/StringComboboxEditor.java @@ -18,7 +18,6 @@ package com.intellij.ui; import com.intellij.openapi.application.Result; import com.intellij.openapi.command.WriteCommandAction; -import com.intellij.openapi.command.undo.UndoConstants; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.editor.Document; import com.intellij.openapi.editor.Editor; @@ -58,7 +57,7 @@ public class StringComboboxEditor extends EditorComboBoxEditor { if (usePlainMatcher) { document.putUserData(USE_PLAIN_PREFIX_MATCHER, true); } - document.putUserData(UndoConstants.DONT_RECORD_UNDO, true); + super.setItem(document); }