debug 1.10.0 → 1.11.0

data/lib/debug/console.rb

@@ -153,21 +153,28 @@ module DEBUGGER__
     end
 
     def history_file
-      history_file = CONFIG[:history_file]
-
-      if !history_file.empty?
-        File.expand_path(history_file)
+      case
+      when (path = CONFIG[:history_file]) && !path.empty?
+        path = File.expand_path(path)
+      when (path = File.expand_path("~/.rdbg_history")) && File.exist?(path) # for compatibility
+        # path
       else
-        history_file
+        state_dir = ENV['XDG_STATE_HOME'] || File.join(Dir.home, '.local', 'state')
+        path = File.join(File.expand_path(state_dir), 'rdbg', 'history')
       end
+
+      FileUtils.mkdir_p(File.dirname(path)) unless File.exist?(path)
+      path
     end
 
     FH = "# Today's OMIKUJI: "
 
     def read_history_file
-      if history && File.exist?(path = history_file)
+      if history && File.exist?(path = history_file())
         f = (['', 'DAI-', 'CHU-', 'SHO-'].map{|e| e+'KICHI'}+['KYO']).sample
-        ["#{FH}#{f}".dup] + File.readlines(path)
+        # Read history file and scrub invalid characters to prevent encoding errors
+        lines = File.readlines(path).map(&:scrub)
+        ["#{FH}#{f}".dup] + lines
       else
         []
       end
@@ -186,15 +193,17 @@ module DEBUGGER__
     def deactivate
       if history && @init_history_lines
         added_records = history.to_a[@init_history_lines .. -1]
-        path = history_file
+        path = history_file()
         max = CONFIG[:save_history]
 
         if !added_records.empty? && !path.empty?
           orig_records = read_history_file
-          open(history_file, 'w'){|f|
+          open(history_file(), 'w'){|f|
             (orig_records + added_records).last(max).each{|line|
-              if !line.start_with?(FH) && !line.strip.empty?
-                f.puts line.strip
+              # Use scrub to handle encoding issues gracefully
+              scrubbed_line = line.scrub.strip
+              if !line.start_with?(FH) && !scrubbed_line.empty?
+                f.puts scrubbed_line
               end
             }
           }
@@ -204,6 +213,8 @@ module DEBUGGER__
 
     def load_history
       read_history_file.each{|line|
+        # Use scrub to handle encoding issues gracefully, then strip
+        line.scrub!
         line.strip!
         history << line unless line.empty?
       } if history.empty?

data/lib/debug/frame_info.rb

@@ -86,7 +86,9 @@ module DEBUGGER__
 
     def block_identifier
       return unless frame_type == :block
-      _, level, block_loc = location.label.match(BLOCK_LABL_REGEXP).to_a
+      re_match = location.label.match(BLOCK_LABL_REGEXP)
+      _, level, block_loc = re_match ? re_match.to_a : [nil, nil, location.label]
+
       [level || "", block_loc]
     end
 

data/lib/debug/session.rb

@@ -931,7 +931,6 @@ module DEBUGGER__
       register_command 'eval', 'call' do |arg|
         if arg == nil || arg.empty?
           show_help 'eval'
-          @ui.puts "\nTo evaluate the variable `#{cmd}`, use `pp #{cmd}` instead."
           :retry
         else
           request_eval :call, arg
@@ -1144,7 +1143,7 @@ module DEBUGGER__
 
     def process_command line
       if line.empty?
-        if @repl_prev_line
+        if @repl_prev_line && !CONFIG[:no_repeat]
           line = @repl_prev_line
         else
           return :retry
@@ -2301,11 +2300,20 @@ module DEBUGGER__
   end
 
   def self.load_rc
-    [[File.expand_path('~/.rdbgrc'), true],
-     [File.expand_path('~/.rdbgrc.rb'), true],
-     # ['./.rdbgrc', true], # disable because of security concern
-     [CONFIG[:init_script], false],
-     ].each{|(path, rc)|
+    rc_file_paths = [
+      [File.expand_path('~/.rdbgrc'), true],
+      [File.expand_path('~/.rdbgrc.rb'), true],
+      # ['./.rdbgrc', true], # disable because of security concern
+    ]
+
+    if (xdg_home = ENV["XDG_CONFIG_HOME"])
+      rc_file_paths << [File.expand_path(File.join(xdg_home, "rdbg", "config")), true]
+      rc_file_paths << [File.expand_path(File.join(xdg_home, "rdbg", "config.rb")), true]
+    end
+
+    rc_file_paths << [CONFIG[:init_script], false]
+
+    rc_file_paths.each{|(path, rc)|
       next unless path
       next if rc && CONFIG[:no_rc] # ignore rc
 

data/lib/debug/thread_client.rb

@@ -350,6 +350,7 @@ module DEBUGGER__
           next if tp.path.start_with?(__dir__)
           next if tp.path.start_with?('<internal:trace_point>')
           next unless File.exist?(tp.path) if CONFIG[:skip_nosrc]
+          next if skip_internal_path?(tp.path)
           loc = caller_locations(1, 1).first
           next if skip_location?(loc)
           next if iter && (iter -= 1) > 0
@@ -369,6 +370,7 @@ module DEBUGGER__
           next if tp.path.start_with?(__dir__)
           next if tp.path.start_with?('<internal:trace_point>')
           next unless File.exist?(tp.path) if CONFIG[:skip_nosrc]
+          next if skip_internal_path?(tp.path)
           loc = caller_locations(1, 1).first
           next if skip_location?(loc)
           next if iter && (iter -= 1) > 0
@@ -1079,13 +1081,13 @@ module DEBUGGER__
           when :up
             if @current_frame_index + 1 < @target_frames.size
               @current_frame_index += 1
-              show_src max_lines: 1
+              show_src max_lines: CONFIG[:show_src_lines_frame]
               show_frame(@current_frame_index)
             end
           when :down
             if @current_frame_index > 0
               @current_frame_index -= 1
-              show_src max_lines: 1
+              show_src max_lines: CONFIG[:show_src_lines_frame]
               show_frame(@current_frame_index)
             end
           when :set
@@ -1097,7 +1099,7 @@ module DEBUGGER__
                 puts "out of frame index: #{index}"
               end
             end
-            show_src max_lines: 1
+            show_src max_lines: CONFIG[:show_src_lines_frame]
             show_frame(@current_frame_index)
           else
             raise "unsupported frame operation: #{arg.inspect}"

data/lib/debug/version.rb

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