Revert to avoid conflicts.
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 11 Oct 2016 02:20:22 +0000 (04:20 +0200)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 11 Oct 2016 02:26:53 +0000 (04:26 +0200)
(cherry picked from commit 18058b47ea38b55969e85d23d267d35cc035786a)

python/src/com/jetbrains/python/console/PydevConsoleRunner.java
python/src/com/jetbrains/python/console/PythonConsoleToolWindowFactory.java

index 2476bdc11f30df6df05f8f3155334fe7fc80ddbb..938dff0b3344869ce6fae8e363f1720cb00a1a40 100644 (file)
@@ -43,7 +43,6 @@ import com.intellij.lang.ASTNode;
 import com.intellij.openapi.actionSystem.*;
 import com.intellij.openapi.actionSystem.ex.ActionUtil;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.actionSystem.*;
 import com.intellij.openapi.actionSystem.ex.ActionUtil;
 import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.openapi.application.ModalityState;
 import com.intellij.openapi.application.Result;
 import com.intellij.openapi.command.WriteCommandAction;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.application.Result;
 import com.intellij.openapi.command.WriteCommandAction;
 import com.intellij.openapi.diagnostic.Logger;
@@ -76,7 +75,6 @@ import com.intellij.psi.PsiFile;
 import com.intellij.remote.RemoteProcess;
 import com.intellij.remote.Tunnelable;
 import com.intellij.testFramework.LightVirtualFile;
 import com.intellij.remote.RemoteProcess;
 import com.intellij.remote.Tunnelable;
 import com.intellij.testFramework.LightVirtualFile;
-import com.intellij.ui.GuiUtils;
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.IJSwingUtilities;
 import com.intellij.util.PathMappingSettings;
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.IJSwingUtilities;
 import com.intellij.util.PathMappingSettings;
@@ -1050,7 +1048,7 @@ public class PydevConsoleRunner extends AbstractConsoleRunnerWithHistory<PythonC
           myProcessHandler.waitFor();
         }
 
           myProcessHandler.waitFor();
         }
 
-        GuiUtils.invokeLaterIfNeeded(() -> PydevConsoleRunner.this.run(), ModalityState.defaultModalityState());
+        UIUtil.invokeLaterIfNeeded(() -> PydevConsoleRunner.this.run());
       }
     }.queue();
   }
       }
     }.queue();
   }
index 8ae23b99acb28ed06c42d3d6c7292ddd9f768654..2a49d5efedd3d4832dd6eca5471e9548287b0cde 100644 (file)
@@ -16,7 +16,6 @@
 package com.jetbrains.python.console;
 
 import com.intellij.execution.console.LanguageConsoleView;
 package com.jetbrains.python.console;
 
 import com.intellij.execution.console.LanguageConsoleView;
-import com.intellij.openapi.application.TransactionGuard;
 import com.intellij.openapi.project.DumbAware;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.wm.ToolWindow;
 import com.intellij.openapi.project.DumbAware;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.wm.ToolWindow;
@@ -38,6 +37,6 @@ public class PythonConsoleToolWindowFactory implements ToolWindowFactory, DumbAw
         PythonConsoleToolWindow.getInstance(project).initialized();
       }
     });
         PythonConsoleToolWindow.getInstance(project).initialized();
       }
     });
-    TransactionGuard.submitTransaction(project, () -> runner.run());
+    runner.run();
   }
 }
   }
 }