From 3cbb9b8378cc603090eb806af3e193e47c6163a1 Mon Sep 17 00:00:00 2001
From: Elizaveta Shashkova <Elizaveta.Shashkova@jetbrains.com>
Date: Thu, 1 Jun 2017 14:33:11 +0300
Subject: [PATCH] Do not evaluate commands on UI thread (PY-23834)

---
 .../python/debugger/pydev/RemoteDebugger.java | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/python/pydevSrc/com/jetbrains/python/debugger/pydev/RemoteDebugger.java b/python/pydevSrc/com/jetbrains/python/debugger/pydev/RemoteDebugger.java
index d6caae627bc1..777faf05a777 100644
--- a/python/pydevSrc/com/jetbrains/python/debugger/pydev/RemoteDebugger.java
+++ b/python/pydevSrc/com/jetbrains/python/debugger/pydev/RemoteDebugger.java
@@ -7,6 +7,7 @@ package com.jetbrains.python.debugger.pydev;
 
 import com.google.common.collect.Maps;
 import com.intellij.execution.ui.ConsoleViewContentType;
+import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.util.SystemInfo;
@@ -320,17 +321,19 @@ public class RemoteDebugger implements ProcessDebugger {
 
   @Override
   public void execute(@NotNull final AbstractCommand command) {
-    if (command instanceof ResumeOrStepCommand) {
-      final String threadId = ((ResumeOrStepCommand)command).getThreadId();
-      clearTempVariables(threadId);
-    }
+    ApplicationManager.getApplication().executeOnPooledThread(() -> {
+      if (command instanceof ResumeOrStepCommand) {
+        final String threadId = ((ResumeOrStepCommand)command).getThreadId();
+        clearTempVariables(threadId);
+      }
 
-    try {
-      command.execute();
-    }
-    catch (PyDebuggerException e) {
-      LOG.error(e);
-    }
+      try {
+        command.execute();
+      }
+      catch (PyDebuggerException e) {
+        LOG.error(e);
+      }
+    });
   }
 
   boolean sendFrame(final ProtocolFrame frame) {