From a8123c1ae705da8be6cd556622dfc58cbabec2bf Mon Sep 17 00:00:00 2001
From: Damien Robert <damien.olivier.robert+git@gmail.com>
Date: Fri, 27 Jul 2018 13:13:14 +0200
Subject: [PATCH] Allow to pass options to Pry.start

Adapted from JoshCheek code at
https://github.com/deivid-rodriguez/pry-byebug/issues/45

This fixes https://github.com/ConradIrwin/pry-rescue/issues/71
---
 lib/byebug/processors/pry_processor.rb | 38 +++++++++++++++++++++++---
 lib/pry-byebug/pry_ext.rb              |  2 +-
 2 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/lib/byebug/processors/pry_processor.rb b/lib/byebug/processors/pry_processor.rb
index 57a4ee1..59ae47e 100644
--- a/lib/byebug/processors/pry_processor.rb
+++ b/lib/byebug/processors/pry_processor.rb
@@ -11,13 +11,43 @@ class PryProcessor < CommandProcessor
     def_delegators :@pry, :output
     def_delegators Pry::Helpers::Text, :bold
 
-    def self.start
+    def self.start(target=nil, options={})
       Byebug.start
       Setting[:autolist] = false
-      Context.processor = self
+
+      # hack because byebug instantiates our class, so this lets us hang onto
+      # the binding until we have an instance to use it on
+      initializer = lambda do |*args, &b|
+        processor = new(*args, &b)
+        processor.enqueue_args([target, options])
+        processor
+      end
+      class << initializer
+        alias new call
+      end
+      Context.processor = initializer
+
       Byebug.current_context.step_out(4, true)
     end
 
+    def enqueue_args(args)
+      enqueued_args << args
+    end
+
+    private def enqueued_args
+      @enqueued_args ||= []
+    end
+
+    private def new_pry_args
+      if enqueued_args.any?
+        arg_binding, arg_options = enqueued_args.shift
+        arg_binding = frame._binding unless arg_binding.is_a? ::Binding
+        [arg_binding, arg_options]
+      else
+        [frame._binding, {}]
+      end
+    end
+
     #
     # Wrap a Pry REPL to catch navigational commands and act on them.
     #
@@ -106,13 +136,13 @@ def n_hits(breakpoint)
     # Resume an existing Pry REPL at the paused point.
     #
     def resume_pry
-      new_binding = frame._binding
 
       run do
         if defined?(@pry) && @pry
+          new_binding = frame._binding
           @pry.repl(new_binding)
         else
-          @pry = Pry.start_without_pry_byebug(new_binding)
+          @pry = Pry.start_without_pry_byebug(*new_pry_args)
         end
       end
     end
diff --git a/lib/pry-byebug/pry_ext.rb b/lib/pry-byebug/pry_ext.rb
index abfdd96..34c2b3b 100644
--- a/lib/pry-byebug/pry_ext.rb
+++ b/lib/pry-byebug/pry_ext.rb
@@ -5,7 +5,7 @@ class << Pry
 
   def start_with_pry_byebug(target = TOPLEVEL_BINDING, options = {})
     if target.is_a?(Binding) && PryByebug.file_context?(target)
-      Byebug::PryProcessor.start unless ENV["DISABLE_PRY"]
+      Byebug::PryProcessor.start(target, options) unless ENV["DISABLE_PRY"]
     else
       # No need for the tracer unless we have a file context to step through
       start_without_pry_byebug(target, options)