diff --git a/plugins/terminal/lib/jediterm-pty-2.2.jar b/plugins/terminal/lib/jediterm-pty-2.2.jar index 5bbc389b2302..ca2aa5eb4288 100644 Binary files a/plugins/terminal/lib/jediterm-pty-2.2.jar and b/plugins/terminal/lib/jediterm-pty-2.2.jar differ diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/JBTerminalSystemSettingsProvider.java b/plugins/terminal/src/org/jetbrains/plugins/terminal/JBTerminalSystemSettingsProvider.java index b49d52f5ca2e..c1cb26720339 100644 --- a/plugins/terminal/src/org/jetbrains/plugins/terminal/JBTerminalSystemSettingsProvider.java +++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/JBTerminalSystemSettingsProvider.java @@ -31,7 +31,7 @@ import com.intellij.openapi.options.FontSize; import com.intellij.openapi.util.registry.Registry; import com.intellij.util.containers.HashMap; import com.intellij.util.messages.MessageBusConnection; -import com.jediterm.terminal.ProcessTtyConnector; +import com.jediterm.pty.PtyProcessTtyConnector; import com.jediterm.terminal.TerminalColor; import com.jediterm.terminal.TextStyle; import com.jediterm.terminal.TtyConnector; @@ -139,7 +139,7 @@ public class JBTerminalSystemSettingsProvider extends DefaultTabbedSettingsProvi @Override public String tabName(TtyConnector ttyConnector, String sessionName) { //for local terminal use name from settings - if (ttyConnector instanceof ProcessTtyConnector) { + if (ttyConnector instanceof PtyProcessTtyConnector) { return TerminalOptionsProvider.getInstance().getTabName(); } else { diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/LocalTerminalDirectRunner.java b/plugins/terminal/src/org/jetbrains/plugins/terminal/LocalTerminalDirectRunner.java index 53766b003395..a4c6f5846b1e 100644 --- a/plugins/terminal/src/org/jetbrains/plugins/terminal/LocalTerminalDirectRunner.java +++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/LocalTerminalDirectRunner.java @@ -31,10 +31,9 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.ArrayUtil; import com.intellij.util.concurrency.AppExecutorUtil; import com.intellij.util.containers.HashMap; -import com.jediterm.terminal.ProcessTtyConnector; +import com.jediterm.pty.PtyProcessTtyConnector; import com.jediterm.terminal.TtyConnector; import com.pty4j.PtyProcess; -import com.pty4j.WinSize; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -142,29 +141,6 @@ public class LocalTerminalDirectRunner extends AbstractTerminalRunner