From db9e2523fcd888efcd29307b3a1afca6f2e84737 Mon Sep 17 00:00:00 2001 From: Sergey Simonchik Date: Tue, 29 May 2018 20:16:25 +0300 Subject: [PATCH] node: fallback to ConsoleViewImpl if PtyProcess failed to create --- .../intellij/terminal/TerminalExecutionConsole.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/terminal/TerminalExecutionConsole.java b/platform/platform-impl/src/com/intellij/terminal/TerminalExecutionConsole.java index e075e7b1aac7..587e85afb019 100644 --- a/platform/platform-impl/src/com/intellij/terminal/TerminalExecutionConsole.java +++ b/platform/platform-impl/src/com/intellij/terminal/TerminalExecutionConsole.java @@ -17,10 +17,7 @@ package com.intellij.terminal; import com.intellij.execution.filters.Filter; import com.intellij.execution.filters.HyperlinkInfo; -import com.intellij.execution.process.ProcessAdapter; -import com.intellij.execution.process.ProcessEvent; -import com.intellij.execution.process.ProcessHandler; -import com.intellij.execution.process.ProcessOutputTypes; +import com.intellij.execution.process.*; import com.intellij.execution.ui.ConsoleView; import com.intellij.execution.ui.ConsoleViewContentType; import com.intellij.execution.ui.ObservableConsoleView; @@ -46,6 +43,7 @@ import com.jediterm.terminal.model.TerminalTextBuffer; import com.jediterm.terminal.ui.TerminalSession; import com.jediterm.terminal.ui.settings.SettingsProvider; import com.jediterm.terminal.util.CharUtils; +import com.pty4j.PtyProcess; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -357,4 +355,8 @@ public class TerminalExecutionConsole implements ConsoleView, ObservableConsoleV public void dispose() { myTerminalWidget = null; } + + public static boolean isAcceptable(@NotNull ProcessHandler processHandler) { + return processHandler instanceof OSProcessHandler && ((OSProcessHandler)processHandler).getProcess() instanceof PtyProcess; + } }