Merge pull request #695 from JunoLab/sp/betterinterrupts

improve interrupt handling

Author: pfitzseb

lib/connection/client.coffee

@@ -141,10 +141,7 @@ module.exports =
 
   interrupt: ->
     if @isActive()
-      if @isWorking()
-        @clientCall 'interrupts', 'interrupt'
-      else
-        @clientCall 'interrupts', 'interruptREPL'
+      @clientCall 'interrupts', 'interrupt'
 
   disconnect: ->
     if @isActive()

lib/connection/process/basic.js

@@ -20,11 +20,7 @@ export function get (path, args) {
 
 export function get_ (path, args) {
   const env = customEnv()
-  if (process.platform == 'win32') {
-    return getWindows(path, args, env)
-  } else {
-    return getUnix(path, args, env)
-  }
+  return getUnix(path, args, env)
 }
 
 export function customEnv (env = process.env) {
@@ -47,8 +43,6 @@ export function customEnv (env = process.env) {
   return env
 }
 
-// TODO: reduce code duplication in getUnix and getWindows
-
 function getUnix (path, args, env) {
   return new Promise((resolve, reject) => {
     tcp.listen().then((port) => {
@@ -70,10 +64,7 @@ function getUnix (path, args, env) {
           let proc = {
             ty: ty,
             kill: () => ty.kill(),
-            interrupt: () => ty.kill('SIGINT'),
-            // more robust REPL-only interrupt, in theory only needed on windows
-            // without powershell wrapper:
-            interruptREPL: () => ty.write('\x03'),
+            interrupt: () => ty.write('\x03'),
             socket: sock,
             onExit: (f) => ty.on('exit', f),
             onStderr: (f) => {},
@@ -93,71 +84,6 @@ function getUnix (path, args, env) {
   })
 }
 
-function getWindows (path, args, env) {
-  if (!atom.config.get('julia-client.juliaOptions.enablePowershellWrapper')) {
-    return getUnix(path, args, env)
-  }
-  return new Promise((resolve, reject) => {
-    tcp.listen().then((port) => {
-      freePort().then((wrapPort) => {
-        paths.fullPath("powershell").then((psPath) => {
-          paths.projectDir().then((cwd) => {
-            let jlargs = [...args, '"`"' + paths.script('boot_repl.jl') + '`""', ` ${port}`]
-            let ty = pty.spawn(psPath,
-              ["-NoProfile", "-ExecutionPolicy", "bypass",
-               `& \"${paths.script('spawnInterruptible.ps1')}\"`,
-               `-wrapPort ${wrapPort}`,
-               `-jlpath \"${path}\"`,
-               `-jlargs ${jlargs}`], {
-              cols: 100,
-              rows: 30,
-              env: env,
-              useConpty: true
-            })
-
-            let sock = socket(ty)
-            sock.catch((err) => reject(err))
-
-            let proc = {
-              ty: ty,
-              kill: () => {
-                sendSignalToWrapper('KILL', wrapPort)
-                ty.kill()
-              },
-              interrupt: () => sendSignalToWrapper('SIGINT', wrapPort),
-              // more robust REPL-only interrupt, in theory only needed on windows
-              // without powershell wrapper:
-              interruptREPL: () => ty.write('\x03'),
-              socket: sock,
-              onExit: (f) => ty.on('exit', f),
-              onStderr: (f) => {},
-              onStdout: (f) => ty.on('data', f)
-            }
-
-            resolve(proc)
-          }).catch((err) => {
-            reject(err)
-          })
-        }).catch((err) => {
-          atom.notifications.addError('Julia could not be started.', {
-            description: "We tried to start Julia with the `powershell` wrapper but "+
-                         "could not find `powershell` or `where` on your `PATH`. Please make sure "+
-                         "`%SYSTEMROOT%\\System32\\WindowsPowerShell\\v1.0` and "+
-                         "`%SYSTEMROOT%\\System32` are on your `PATH` and restart Juno.",
-            detail: err,
-            dismissable: true
-          })
-          reject(err)
-        })
-      }).catch((err) => {
-        reject(err)
-      })
-    }).catch((err) => {
-      reject(err)
-    })
-  })
-}
-
 function freePort() {
   return new Promise((resolve) => {
     let server = net.createServer()
@@ -169,13 +95,6 @@ function freePort() {
   })
 }
 
-function sendSignalToWrapper(signal, port) {
-  let wrapper = net.connect({port})
-  wrapper.setNoDelay()
-  wrapper.write(signal)
-  wrapper.end()
-}
-
 function socket (ty) {
   conn = tcp.next()
   failure = new Promise((resolve, reject) => {

lib/connection/process/remote.js

@@ -238,7 +238,6 @@ export function get_ (path, args) {
               kill: () => stream.signal('KILL'),
               disconnect: () => stream.close(),
               interrupt: () => stream.write('\x03'), // signal handling doesn't seem to work :/
-              interruptREPL: () => stream.write('\x03'),
               socket: sock,
               onExit: (f) => stream.on('close', f),
               onStderr: (f) => stream.stderr.on('data', data => f(data.toString())),

lib/package/config.coffee

@@ -637,12 +637,4 @@ if process.platform == 'darwin'
     default: false
     order: 5.5
 
-if process.platform == 'win32'
-  config.juliaOptions.properties.enablePowershellWrapper =
-    title: 'Enable Powershell Wrapper'
-    type: 'boolean'
-    default: true
-    description: 'If enabled, use a Powershell wrapper to spawn Julia. Necessary to enable interrupts.'
-    order: 99
-
 module.exports = config