Fix irb:rdbg for ruby head (#876)

* Update binding.irb check for Ruby head With ruby/ruby#9605, backtrace in Ruby head now has a new format. This commit updates the check for binding.irb to work with Ruby head. * Do not include a backtick in error messages and backtraces [Feature #16495] --------- Co-authored-by: Yusuke Endoh <[email protected]>
ruby · Feb 16, 2024 · ebffd3d · ebffd3d
1 parent 9359d4b
commit ebffd3d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/lib/irb.rb b/lib/irb.rb
@@ -1235,7 +1235,7 @@ def handle_exception(exc)
         lines.map{ |l| l + "\n" }.join
       }
       # The "<top (required)>" in "(irb)" may be the top level of IRB so imitate the main object.
-      message = message.gsub(/\(irb\):(?<num>\d+):in `<(?<frame>top \(required\))>'/) { "(irb):#{$~[:num]}:in `<main>'" }
+      message = message.gsub(/\(irb\):(?<num>\d+):in (?<open_quote>[`'])<(?<frame>top \(required\))>'/) { "(irb):#{$~[:num]}:in #{$~[:open_quote]}<main>'" }
       puts message
       puts 'Maybe IRB bug!' if irb_bug
     rescue Exception => handler_exc

diff --git a/lib/irb/cmd/debug.rb b/lib/irb/cmd/debug.rb
@@ -12,7 +12,7 @@ class Debug < Nop
       BINDING_IRB_FRAME_REGEXPS = [
         '<internal:prelude>',
         binding.method(:irb).source_location.first,
-      ].map { |file| /\A#{Regexp.escape(file)}:\d+:in `irb'\z/ }
+      ].map { |file| /\A#{Regexp.escape(file)}:\d+:in (`|'Binding#)irb'\z/ }
 
       def execute(pre_cmds: nil, do_cmds: nil)
         if irb_context.with_debugger

diff --git a/test/irb/test_context.rb b/test/irb/test_context.rb
@@ -72,7 +72,7 @@ def test_eval_input
       expected_output =
         if RUBY_3_4
           [
-            :*, /\(irb\):1:in '<top \(required\)>': Foo \(RuntimeError\)\n/,
+            :*, /\(irb\):1:in '<main>': Foo \(RuntimeError\)\n/,
             :*, /#<RuntimeError: Foo>\n/,
             :*, /0$/,
             :*, /0$/,
@@ -107,8 +107,8 @@ def test_eval_input_raise2x
       expected_output =
         if RUBY_3_4
           [
-            :*, /\(irb\):1:in '<top \(required\)>': Foo \(RuntimeError\)\n/,
-            :*, /\(irb\):2:in '<top \(required\)>': Bar \(RuntimeError\)\n/,
+            :*, /\(irb\):1:in '<main>': Foo \(RuntimeError\)\n/,
+            :*, /\(irb\):2:in '<main>': Bar \(RuntimeError\)\n/,
             :*, /#<RuntimeError: Bar>\n/,
           ]
         else
@@ -531,7 +531,7 @@ def test_eval_input_with_exception
           [
             :*, /\(irb\):1:in 'fuga': unhandled exception\n/,
             :*, /\tfrom \(irb\):1:in 'hoge'\n/,
-            :*, /\tfrom \(irb\):1:in '<top \(required\)>'\n/,
+            :*, /\tfrom \(irb\):1:in '<main>'\n/,
             :*
           ]
         elsif RUBY_VERSION < '3.0.0' && STDOUT.tty?
@@ -569,7 +569,7 @@ def test_eval_input_with_invalid_byte_sequence_exception
           [
             :*, /\(irb\):1:in 'fuga': A\\xF3B \(RuntimeError\)\n/,
             :*, /\tfrom \(irb\):1:in 'hoge'\n/,
-            :*, /\tfrom \(irb\):1:in '<top \(required\)>'\n/,
+            :*, /\tfrom \(irb\):1:in '<main>'\n/,
             :*
           ]
         elsif RUBY_VERSION < '3.0.0' && STDOUT.tty?