diff --git a/platform/platform-impl/src/com/intellij/ide/ClipboardSynchronizer.java b/platform/platform-impl/src/com/intellij/ide/ClipboardSynchronizer.java index d69137a51604..2797c874b3ff 100644 --- a/platform/platform-impl/src/com/intellij/ide/ClipboardSynchronizer.java +++ b/platform/platform-impl/src/com/intellij/ide/ClipboardSynchronizer.java @@ -286,7 +286,6 @@ public class ClipboardSynchronizer implements ApplicationComponent { @Nullable public static Transferable getContentsSafe() { final Ref result = new Ref(); - if (Registry.is("ide.mac.useNativeClipboard.async")) { final JRootPane pane = getRootPane(); if (pane != null) { try { @@ -312,7 +311,6 @@ public class ClipboardSynchronizer implements ApplicationComponent { } }; - if (SwingUtilities.isEventDispatchThread()) { run.run(); } else { @@ -331,19 +329,6 @@ public class ClipboardSynchronizer implements ApplicationComponent { } return null; - } - - Foundation.executeOnMainThread(new Runnable() { - @Override - public void run() { - Transferable transferable = getClipboardContentNatively(); - if (transferable != null) { - result.set(transferable); - } - } - }, true, true); - - return result.get(); } } diff --git a/platform/platform-resources-en/src/misc/registry.properties b/platform/platform-resources-en/src/misc/registry.properties index 8eb94ba4ebdd..fd6bb8351f10 100644 --- a/platform/platform-resources-en/src/misc/registry.properties +++ b/platform/platform-resources-en/src/misc/registry.properties @@ -154,7 +154,6 @@ show.live.templates.in.completion=false documentation.component.editor.font=false ide.mac.useNativeClipboard=true -ide.mac.useNativeClipboard.async=false show.all.classes.on.first.completion=false limited.relevance.sorting.in.completion=false