Enable "step <n>" while replay

ruby · Oct 29, 2022 · 046159a · 046159a
1 parent 5a30073
commit 046159a
Show file tree

Hide file tree

Showing 2 changed files with 87 additions and 3 deletions.
diff --git a/lib/debug/thread_client.rb b/lib/debug/thread_client.rb
@@ -831,8 +831,9 @@ def wait_next_action_
 
           case step_type
           when :in
+            iter = iter || 1
             if @recorder&.replaying?
-              @recorder.step_forward
+              @recorder.step_forward iter
               raise SuspendReplay
             else
               step_tp iter do
@@ -1191,8 +1192,11 @@ def step_back
         @index += 1
       end
 
-      def step_forward
-        @index -= 1
+      def step_forward iter
+        @index -= iter
+        if @index < 0
+          @index = 0
+        end
       end
 
       def step_reset

diff --git a/test/console/record_test.rb b/test/console/record_test.rb
@@ -167,4 +167,84 @@ def test_1656237686
       end
     end
   end
+
+  class StepIntoWithNumWhileReplayTest < ConsoleTestCase
+    def program
+      <<~RUBY
+         1| def a
+         2|   return b()
+         3| end
+         4| 
+         5| def b
+         6|   return 1
+         7| end
+         8| 
+         9| a()
+        10| a()
+        11| a()
+        12| a()
+        13| a()
+        14| a()
+      RUBY
+    end
+
+    def test_1663647719
+      debug_code(program) do
+        type 'record on'
+        type 'b 11'
+        type 'c'
+        assert_line_num 11
+        type 'step back'
+        assert_line_num 11
+        type 'step back'
+        assert_line_num 6
+        type 'step back'
+        assert_line_num 2
+        type 'step back'
+        assert_line_num 10
+        type 'step 2'
+        assert_line_num 6
+        type 'step 2'
+        assert_line_num 11
+        type 'q!'
+      end
+    end
+  end
+
+  class StepIntoWhenNumberIsLargetThanLogIndex < ConsoleTestCase
+    def program
+      <<~RUBY
+         1| def a
+         2|   return b()
+         3| end
+         4| 
+         5| def b
+         6|   return 1
+         7| end
+         8| 
+         9| a()
+        10| a()
+        11| a()
+        12| a()
+        13| a()
+        14| a()
+      RUBY
+    end
+
+    def test_1663647719
+      debug_code(program) do
+        type 'record on'
+        type 'b 11'
+        type 'c'
+        assert_line_num 11
+        type 'step back'
+        assert_line_num 11
+        type 'step back'
+        assert_line_num 6
+        type 'step 100'
+        assert_line_num 11
+        type 'q!'
+      end
+    end
+  end
 end