Merge branch 'master' into alias-whereami-command

Author: william-lawrence

lib/debug/breakpoint.rb

@@ -23,7 +23,7 @@ def safe_eval b, expr
       b.eval(expr)
     rescue Exception => e
       puts "[EVAL ERROR]"
-      puts "  expr: #{expr}"
+      puts "  expr: #{expr.inspect}"
       puts "  err: #{e} (#{e.class})"
       puts "Error caused by #{self}."
       nil
@@ -352,7 +352,7 @@ def setup
         next if ThreadClient.current.management?
         next if skip_path?(tp.path)
 
-        if need_suspend? safe_eval(tp.binding, @cond)
+        if @cond.nil? || need_suspend?(safe_eval(tp.binding, @cond))
           suspend
         end
       }

lib/debug/console.rb

@@ -163,6 +163,7 @@ def history_file
         path = File.join(File.expand_path(state_dir), 'rdbg', 'history')
       end
 
+      require 'fileutils'
       FileUtils.mkdir_p(File.dirname(path)) unless File.exist?(path)
       path
     end

lib/debug/frame_info.rb

@@ -171,7 +171,7 @@ def parameters_info
 
     private def get_singleton_class obj
       obj.singleton_class # TODO: don't use it
-    rescue TypeError
+    rescue Exception
       nil
     end
 

lib/debug/server.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'socket'
+require 'fileutils'
 require_relative 'config'
 require_relative 'version'
 

lib/debug/server_dap.rb

@@ -358,7 +358,7 @@ def process_request req
           }
           send_response req, breakpoints: (bps.map do |bp| {verified: true,} end)
         else
-          send_response req, success: false, message: "#{req_path} is not available"
+          send_response req, breakpoints: (args['breakpoints'].map do |bp| {verified: false, message: "#{req_path} could not be located; specify source location in launch.json with \"localfsMap\" or \"localfs\""} end)
         end
 
       when 'setFunctionBreakpoints'

lib/debug/thread_client.rb

@@ -1310,7 +1310,7 @@ def initialize
               frame._local_variables = b.local_variables.map{|name|
                 [name, b.local_variable_get(name)]
               }.to_h
-              frame._callee = b.eval('__callee__')
+              frame._callee = b.eval('::Kernel.__callee__')
             end
           }
           append(frames)

lib/debug/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DEBUGGER__
-  VERSION = "1.11.0"
+  VERSION = "1.11.1"
 end

test/console/backtrace_test.rb

@@ -229,4 +229,31 @@ def test_backtrace_prints_without_hanging
       end
     end
   end
+
+  class BrokenSingletonMethodBacktraceTest < ConsoleTestCase
+    def program
+      <<~RUBY
+      1| class C
+      2|   def self.foo
+      3|     debugger
+      4|   end
+      5|   def singleton_class
+      6|     raise
+      7|   end
+      8|   def self.singleton_class
+      9|     eval(")") # SyntaxError
+     10|   end
+     11| end
+     12| C.foo
+      RUBY
+    end
+
+    def test_raise_exception
+      debug_code program do
+        type 'c'
+        assert_line_text(/foo/)
+        type 'c'
+      end
+    end
+  end
 end

test/console/break_test.rb

@@ -255,6 +255,17 @@ def test_break_only_stops_when_path_matches
         end
       end
 
+      def test_break_only_path
+        with_extra_tempfile "foohtml" do |extra_file|
+          debug_code(program(extra_file.path)) do
+            type "break path: #{extra_file.path}"
+            type 'c'
+            assert_line_text(/#{extra_file.path}/)
+            type 'c'
+          end
+        end
+      end
+
       def test_the_path_option_supersede_skip_path_config
         # skips the extra_file's breakpoint
         with_extra_tempfile do |extra_file|

test/console/record_test.rb

@@ -315,4 +315,24 @@ def test_1663647719
       end
     end
   end
+
+  class RecordOnBasicClassTest < ConsoleTestCase
+    def program
+      <<~RUBY
+      1| class Test < BasicObject
+      2|   def test
+      3|     42
+      4|   end
+      5| end
+      6| Test.new.test
+      RUBY
+    end
+
+    def test_issue1152
+      debug_code program do
+        type 'record on'
+        type 'c'
+      end
+    end
+  end
 end