Update jediterm with fixes for IDEA-162497
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Wed, 26 Oct 2016 12:55:14 +0000 (14:55 +0200)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Wed, 26 Oct 2016 12:55:14 +0000 (14:55 +0200)
plugins/terminal/lib/jediterm-pty-2.2.jar
plugins/terminal/src/org/jetbrains/plugins/terminal/JBTerminalStarter.java
plugins/terminal/src/org/jetbrains/plugins/terminal/JBTerminalWidget.java

index ca2aa5eb4288d2dbfe934d7188e336f7c37a2b2c..b8c321c79bf58e74efeaa03eb0ccf5285df5fd16 100644 (file)
Binary files a/plugins/terminal/lib/jediterm-pty-2.2.jar and b/plugins/terminal/lib/jediterm-pty-2.2.jar differ
index f220b1b11ac032922b992f7fd0f156c2dbd1f177..ef97d1643663dc0bf77b4f016f2e1b04a2de15f3 100644 (file)
@@ -2,22 +2,24 @@ package org.jetbrains.plugins.terminal;
 
 import com.intellij.ide.GeneralSettings;
 import com.intellij.openapi.vfs.LocalFileSystem;
-import com.jediterm.terminal.*;
+import com.jediterm.terminal.Terminal;
+import com.jediterm.terminal.TerminalDataStream;
+import com.jediterm.terminal.TerminalStarter;
+import com.jediterm.terminal.TtyConnector;
 import com.jediterm.terminal.emulator.JediEmulator;
 
-import javax.swing.*;
-
 /**
  * @author traff
  */
 public class JBTerminalStarter extends TerminalStarter {
-  public JBTerminalStarter(Terminal terminal, TtyConnector ttyConnector) {
-    super(terminal, ttyConnector);
+
+  public JBTerminalStarter(Terminal terminal, TtyConnector ttyConnector, TerminalDataStream dataStream) {
+    super(terminal, ttyConnector, dataStream);
   }
 
   @Override
-  protected JediEmulator createEmulator(TtyChannel channel, TerminalOutputStream stream, Terminal terminal) {
-    return new JediEmulator(channel, stream, terminal) {
+  protected JediEmulator createEmulator(TerminalDataStream dataStream, Terminal terminal) {
+    return new JediEmulator(dataStream, terminal) {
       @Override
       protected void unsupported(char... sequenceChars) {
         if (sequenceChars[0] == 7) { //ESC BEL
index c6ab620cfac28a94eb7216482453d46ccc19f401..9485714944c359600710f6477512256910ff88fd 100644 (file)
@@ -9,6 +9,7 @@ import com.intellij.util.ui.JBSwingUtilities;
 import com.intellij.util.ui.RegionPainter;
 import com.jediterm.terminal.SubstringFinder;
 import com.jediterm.terminal.TerminalStarter;
+import com.jediterm.terminal.TtyBasedArrayDataStream;
 import com.jediterm.terminal.TtyConnector;
 import com.jediterm.terminal.model.JediTerminal;
 import com.jediterm.terminal.model.StyleState;
@@ -48,7 +49,7 @@ public class JBTerminalWidget extends JediTermWidget implements Disposable{
 
   @Override
   protected TerminalStarter createTerminalStarter(JediTerminal terminal, TtyConnector connector) {
-    return new JBTerminalStarter(terminal, connector);
+    return new JBTerminalStarter(terminal, connector, new TtyBasedArrayDataStream(connector));
   }
 
   @Override