MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Revert to avoid conflicts.

Browse Source 
(cherry picked from commit 18058b47ea38b55969e85d23d267d35cc035786a)
This commit is contained in:
Dmitry Trofimov
2016-10-11 04:26:53 +02:00
parent ea6972d9a8
commit a5d99f602a
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/console/PydevConsoleRunner.java
+1 -3
View 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.application.ModalityState;
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.ui.GuiUtils;
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();
}
GuiUtils.invokeLaterIfNeeded(() -> PydevConsoleRunner.this.run(), ModalityState.defaultModalityState());
UIUtil.invokeLaterIfNeeded(() -> PydevConsoleRunner.this.run());
}
}.queue();
}
python/src/com/jetbrains/python/console/PythonConsoleToolWindowFactory.java
+1 -2
View File
@@ -16,7 +16,6 @@
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;
@@ -38,6 +37,6 @@ public class PythonConsoleToolWindowFactory implements ToolWindowFactory, DumbAw
PythonConsoleToolWindow.getInstance(project).initialized();
}
});
TransactionGuard.submitTransaction(project, () -> runner.run());
runner.run();
}
}