From 20bba07340eec2a4096c5c4f2948a035d836eb12 Mon Sep 17 00:00:00 2001
From: Sebastian Pfitzner <pfitzseb@physik.hu-berlin.de>
Date: Fri, 26 Jan 2018 12:42:00 +0100
Subject: [PATCH] fix interrupts

---
 src/repl.jl | 56 +++++++++++++++++++++++++++++++----------------------
 1 file changed, 33 insertions(+), 23 deletions(-)

diff --git a/src/repl.jl b/src/repl.jl
index 02a8fc9a..a3bfdf85 100644
--- a/src/repl.jl
+++ b/src/repl.jl
@@ -80,12 +80,14 @@ function didWriteToREPL(f)
   rout, wout = redirect_stdout()
   rerr, werr = redirect_stderr()
 
+  ct = current_task()
+
   didWrite = false
 
   outreader = @async begin
     didWriteLinebreak = false
-    while isopen(rout)
-      if isopen(rout)
+    try
+      while isopen(rout)
         r = readavailable(rout)
         didRead = length(r) > 0
         if !didWrite && didRead
@@ -93,43 +95,51 @@ function didWriteToREPL(f)
         end
         didWrite |= didRead
         write(origout, r)
-      end
 
-      if didRead
-        didWriteLinebreak = r[end] == 0x0a
+        if didRead
+          didWriteLinebreak = r[end] == 0x0a
+        end
       end
+    catch e
+      Base.throwto(ct, e)
+      rethrow(e)
     end
     didWriteLinebreak
   end
 
   errreader = @async begin
     didWriteLinebreak = false
-    while isopen(rerr)
-      r = readavailable(rerr)
-      didRead = length(r) > 0
-      if !didWrite && didRead
-        print(origout, "\r         \r")
-      end
-      didWrite |= didRead
-      write(origerr, r)
+    try
+      while isopen(rerr)
+        r = readavailable(rerr)
+        didRead = length(r) > 0
+        if !didWrite && didRead
+          print(origout, "\r         \r")
+        end
+        didWrite |= didRead
+        write(origerr, r)
 
-      if didRead
-        didWriteLinebreak = r[end] == 0x0a
+        if didRead
+          didWriteLinebreak = r[end] == 0x0a
+        end
       end
+    catch e
+      Base.throwto(ct, e)
+      rethrow(e)
     end
     didWriteLinebreak
   end
 
-  local res
   didWriteLinebreakOut, didWriteLinebreakErr = false, false
 
-  try
-    res = f()
-  finally
-    redirect_stdout(origout)
-    redirect_stderr(origerr)
-    close(wout)
-    close(werr)
+  res = f()
+  redirect_stdout(origout)
+  redirect_stderr(origerr)
+  close(wout)
+  close(werr)
+  
+  # FIXME: This probably leaks unterminated Tasks everywhere...
+  if !(res isa EvalError)
     didWriteLinebreakOut = wait(outreader)
     didWriteLinebreakErr = wait(errreader)
   end