Merge pull request #645 from JunoLab/sp/terminalfixes

update node-pty

Author: pfitzseb

lib/connection/process/basic.js

@@ -1,7 +1,7 @@
 'use babel'
 
 import tcp from './tcp'
-import * as pty from '@pfitzseb/node-pty-prebuilt'
+import * as pty from 'node-pty-prebuilt-multiarch'
 import net from 'net'
 import { paths, mutex } from '../../misc'
 
@@ -59,7 +59,8 @@ function getUnix (path, args, env) {
             cols: 100,
             rows: 30,
             env: env,
-            cwd: cwd
+            cwd: cwd,
+            useConpty: true
           })
 
           let sock = socket(ty)
@@ -110,7 +111,8 @@ function getWindows (path, args, env) {
                `-jlargs ${jlargs}`], {
               cols: 100,
               rows: 30,
-              env: env
+              env: env,
+              useConpty: true
             })
 
             let sock = socket(ty)

lib/connection/process/remote.js

@@ -1,7 +1,6 @@
 'use babel'
 
 import tcp from './tcp'
-import * as pty from '@pfitzseb/node-pty-prebuilt'
 import net from 'net'
 import { paths, mutex } from '../../misc'
 import * as ssh from 'ssh2'

lib/runtime/console.js

@@ -5,7 +5,7 @@ import { customEnv } from '../connection/process/basic'
 import { CompositeDisposable } from 'atom'
 import { paths } from '../misc'
 import modules from './modules'
-import * as pty from '@pfitzseb/node-pty-prebuilt'
+import * as pty from 'node-pty-prebuilt-multiarch'
 import { debounce } from 'underscore-plus'
 import { selector } from '../ui'
 import { withRemoteConfig } from '../connection/process/remote'
@@ -252,14 +252,14 @@ function addLinkHandler (terminal) {
 }
 
 function handleKeybinding (e, term, binds = whitelistedKeybindingsTerminal) {
-  if (e.keyCode === 13 && (e.altKey || e.metaKey)) {
+  if (process.platform !== 'win32' && e.keyCode === 13 && (e.altKey || e.metaKey) && e.type === 'keydown') {
     // Meta-Enter doesn't work properly with xterm.js atm, so we send the right escape sequence ourselves:
     if (term.ty) {
       term.ty.write('\x1b\x0d')
     }
     return false
   } else if (binds.indexOf(atom.keymaps.keystrokeForKeyboardEvent(e)) > -1) {
-    // allow users to let key events to fall through to Atom's handler
+    // let certain user defined key events fall through to Atom's handler
     return false
   }
   return e
@@ -315,7 +315,8 @@ function shellPty (cwd) {
             cols: 100,
             rows: 30,
             cwd: cwd,
-            env: env
+            env: env,
+            useConpty: true
           }),
           cwd: cwd})
       } else {

package-lock.json

@@ -16,7 +16,7 @@
     "workspace",
     "outline",
     "documentation",
-    "plot",    
+    "plot",
     "debugger"
   ],
   "repository": "https://github.com/JunoLab/atom-julia-client",
@@ -25,7 +25,7 @@
     "atom": ">=1.39.0 <2.0.0"
   },
   "dependencies": {
-    "@pfitzseb/node-pty-prebuilt": "0.8.1-prebuilt3",
+    "node-pty-prebuilt-multiarch": "0.9.0",
     "atom-package-deps": "*",
     "atom-space-pen-views": "^2.0.0",
     "etch": "^0.14",