Merge pull request #404 from aycabta/finalize-when-exception-occurred

Finalize when exception occurred
ruby · Dec 20, 2021 · 50ed575 · 50ed575
2 parents 7e6f33e + 1f8a3ae
commit 50ed575
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/lib/reline.rb b/lib/reline.rb
@@ -290,7 +290,6 @@ def readline(prompt = '', add_hist = false)
 
       may_req_ambiguous_char_width
       line_editor.reset(prompt, encoding: Reline::IOGate.encoding)
-      line_editor.set_signal_handlers
       if multiline
         line_editor.multiline_on
         if block_given?
@@ -320,6 +319,7 @@ def readline(prompt = '', add_hist = false)
       line_editor.rerender
 
       begin
+        line_editor.set_signal_handlers
         prev_pasting_state = false
         loop do
           prev_pasting_state = Reline::IOGate.in_pasting?
@@ -348,6 +348,11 @@ def readline(prompt = '', add_hist = false)
         line_editor.finalize
         Reline::IOGate.deprep(otio)
         raise e
+      rescue Exception
+        # Including Interrupt
+        line_editor.finalize
+        Reline::IOGate.deprep(otio)
+        raise
       end
 
       line_editor.finalize

diff --git a/lib/reline/line_editor.rb b/lib/reline/line_editor.rb
@@ -235,7 +235,7 @@ def set_signal_handlers
       when 'EXIT'
         exit
       else
-        @old_trap.call
+        @old_trap.call if @old_trap.respond_to?(:call)
       end
     }
     begin