From d752b30121f20d80ef5ad63172e782d1976603ca Mon Sep 17 00:00:00 2001 From: Sergey Ignatov Date: Thu, 21 Nov 2019 15:11:17 +0300 Subject: [PATCH] mark paste provider as dynamic GitOrigin-RevId: 5c37318676c82128b9d7108427ce9bae456b313f --- .../src/com/intellij/openapi/editor/impl/EditorImpl.java | 6 ++++-- .../platform-resources/src/META-INF/LangExtensionPoints.xml | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java index 2279ed0787fe..e65d056fdf05 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java @@ -80,7 +80,10 @@ import com.intellij.util.ui.update.Activatable; import com.intellij.util.ui.update.UiNotifyConnector; import org.intellij.lang.annotations.JdkConstants; import org.intellij.lang.annotations.MagicConstant; -import org.jetbrains.annotations.*; +import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.TestOnly; import javax.swing.Timer; import javax.swing.*; @@ -3148,7 +3151,6 @@ public final class EditorImpl extends UserDataHolderBase implements EditorEx, Hi @Override public PasteProvider getPasteProvider() { - return getViewer(); } diff --git a/platform/platform-resources/src/META-INF/LangExtensionPoints.xml b/platform/platform-resources/src/META-INF/LangExtensionPoints.xml index 7a268a0baefa..3814d4b3daaf 100644 --- a/platform/platform-resources/src/META-INF/LangExtensionPoints.xml +++ b/platform/platform-resources/src/META-INF/LangExtensionPoints.xml @@ -481,7 +481,7 @@ - +