From 82e5fe2c9baf44be10e9598c8d66add563e309a4 Mon Sep 17 00:00:00 2001 From: Elizaveta Shashkova Date: Mon, 6 Aug 2018 15:59:55 +0300 Subject: [PATCH] PY-31063 "Run with Console" file is not executed on remote interpreter if there is big delay Remove timeout for code execution and set process cancellable --- .../jetbrains/python/console/PythonConsoleView.java | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/python/src/com/jetbrains/python/console/PythonConsoleView.java b/python/src/com/jetbrains/python/console/PythonConsoleView.java index 3eb9d1923fd6..4bd8c0a8e429 100644 --- a/python/src/com/jetbrains/python/console/PythonConsoleView.java +++ b/python/src/com/jetbrains/python/console/PythonConsoleView.java @@ -15,7 +15,6 @@ */ package com.jetbrains.python.console; -import com.intellij.codeInsight.hint.HintManager; import com.intellij.execution.console.LanguageConsoleImpl; import com.intellij.execution.filters.OpenFileHyperlinkInfo; import com.intellij.execution.impl.ConsoleViewUtil; @@ -59,7 +58,6 @@ import com.intellij.psi.codeStyle.CodeStyleManager; import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; import com.intellij.ui.JBSplitter; import com.intellij.util.TimeoutUtil; -import com.intellij.util.ui.UIUtil; import com.intellij.xdebugger.impl.frame.XStandaloneVariablesView; import com.jetbrains.python.PythonLanguage; import com.jetbrains.python.console.completion.PythonConsoleAutopopupBlockingHandler; @@ -212,22 +210,13 @@ public class PythonConsoleView extends LanguageConsoleImpl implements Observable myInitialized.doWhenDone( () -> { if (code != null) { - ProgressManager.getInstance().run(new Task.Backgroundable(null, "Executing Code in Console...", false) { + ProgressManager.getInstance().run(new Task.Backgroundable(null, "Executing Code in Console...", true) { @Override public void run(@NotNull final ProgressIndicator indicator) { - long time = System.currentTimeMillis(); while (!myExecuteActionHandler.isEnabled() || !myExecuteActionHandler.canExecuteNow()) { if (indicator.isCanceled()) { break; } - if (System.currentTimeMillis() - time > 1000) { - if (editor != null) { - UIUtil.invokeLaterIfNeeded( - () -> HintManager.getInstance() - .showErrorHint(editor, myExecuteActionHandler.getCantExecuteMessage())); - } - return; - } TimeoutUtil.sleep(300); } if (!indicator.isCanceled()) {