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

Tests: fix python console npe

Browse Source
This commit is contained in:
Elizaveta Shashkova
2016-10-17 17:52:20 +03:00
parent 1468b5f0ef
commit e3f9dc0f96
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/console/PydevConsoleRunnerImpl.java
+11 -6
View File
@@ -63,11 +63,15 @@ import com.intellij.openapi.project.DumbAwareAction;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.projectRoots.Sdk;
import com.intellij.openapi.ui.Messages;
import com.intellij.openapi.util.*;
import com.intellij.openapi.util.Couple;
import com.intellij.openapi.util.Key;
import com.intellij.openapi.util.SystemInfo;
import com.intellij.openapi.util.TextRange;
import com.intellij.openapi.util.io.StreamUtil;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vfs.CharsetToolkit;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.openapi.wm.ToolWindow;
import com.intellij.psi.PsiFile;
import com.intellij.remote.RemoteProcess;
import com.intellij.remote.Tunnelable;
@@ -107,8 +111,10 @@ import java.awt.event.KeyEvent;
import java.io.File;
import java.io.IOException;
import java.net.ServerSocket;
import java.util.*;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Scanner;
import java.util.stream.Collectors;
import static com.intellij.execution.runners.AbstractConsoleRunnerWithHistory.registerActionShortcuts;
@@ -317,10 +323,9 @@ public class PydevConsoleRunnerImpl implements PydevConsoleRunner {
private void showContentDescriptor(RunContentDescriptor contentDescriptor) {
PythonConsoleToolWindow toolWindow = PythonConsoleToolWindow.getInstance(myProject);
if (toolWindow != null) {
toolWindow
.init(PythonConsoleToolWindow.getToolWindow(myProject), contentDescriptor);
ToolWindow toolwindow = PythonConsoleToolWindow.getToolWindow(myProject);
if (toolwindow != null) {
PythonConsoleToolWindow.getInstance(myProject).init(toolwindow, contentDescriptor);
}
else {
ExecutionManager