debug 1.3.1 → 1.4.0

data/lib/debug/console.rb

@@ -34,6 +34,12 @@ module DEBUGGER__
         load_history_if_not_loaded
         commands = DEBUGGER__.commands
 
+        prev_completion_proc = Reline.completion_proc
+        prev_output_modifier_proc = Reline.output_modifier_proc
+        prev_prompt_proc = Reline.prompt_proc
+
+        Reline.prompt_proc = nil
+
         Reline.completion_proc = -> given do
           buff = Reline.line_buffer
           Reline.completion_append_character= ' '
@@ -72,6 +78,13 @@ module DEBUGGER__
             colorize_code(buff.chomp) + colorize("    # ruby", [:DIM])
           end
         end
+
+        yield
+
+      ensure
+        Reline.completion_proc = prev_completion_proc
+        Reline.output_modifier_proc = prev_output_modifier_proc
+        Reline.prompt_proc = prev_prompt_proc
       end
 
       private def get_command line
@@ -84,8 +97,9 @@ module DEBUGGER__
       end
 
       def readline prompt
-        readline_setup prompt
-        Reline.readmultiline(prompt, true){ true }
+        readline_setup prompt do
+          Reline.readmultiline(prompt, true){ true }
+        end
       end
 
       def history
@@ -145,7 +159,7 @@ module DEBUGGER__
     FH = "# Today's OMIKUJI: "
 
     def read_history_file
-      if history && File.exists?(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)
       else

data/lib/debug/frame_info.rb

@@ -2,10 +2,11 @@
 
 module DEBUGGER__
   FrameInfo = Struct.new(:location, :self, :binding, :iseq, :class, :frame_depth,
-                          :has_return_value, :return_value,
+                          :has_return_value,     :return_value,
                           :has_raised_exception, :raised_exception,
                           :show_line,
-                          :_local_variables, :_callee # for recorder
+                          :_local_variables, :_callee, # for recorder
+                          :dupped_binding,
                         )
 
   # extend FrameInfo with debug.so
@@ -31,7 +32,7 @@ module DEBUGGER__
       use_short_path = CONFIG[:use_short_path]
 
       case
-      when use_short_path && path.start_with?(dir = CONFIG["rubylibdir"] + '/')
+      when use_short_path && path.start_with?(dir = RbConfig::CONFIG["rubylibdir"] + '/')
         path.sub(dir, '$(rubylibdir)/')
       when use_short_path && Gem.path.any? do |gp|
           path.start_with?(dir = gp + '/gems/')
@@ -110,7 +111,7 @@ module DEBUGGER__
 
     def return_str
       if self.binding && iseq && has_return_value
-        DEBUGGER__.short_inspect(return_value)
+        DEBUGGER__.safe_inspect(return_value, short: true)
       end
     end
 
@@ -118,19 +119,13 @@ module DEBUGGER__
       "#{pretty_path}:#{location.lineno}"
     end
 
-    private def make_binding
-      __newb__ = self.self.instance_eval('binding')
-      self.local_variables.each{|var, val|
-        __newb__.local_variable_set(var, val)
-      }
-      __newb__
-    end
-
     def eval_binding
-      if b = self.binding
+      if b = self.dupped_binding
         b
-      elsif self.local_variables
-        make_binding
+      else
+        b = TOPLEVEL_BINDING unless b = self.binding
+        b = self.binding || TOPLEVEL_BINDING
+        self.dupped_binding = b.dup
       end
     end
 
@@ -160,7 +155,7 @@ module DEBUGGER__
       vars = iseq.locals[0...argc]
       vars.map{|var|
         begin
-          { name: var, value: DEBUGGER__.short_inspect(local_variable_get(var)) }
+          { name: var, value: DEBUGGER__.safe_inspect(local_variable_get(var), short: true) }
         rescue NameError, TypeError
           nil
         end

data/lib/debug/prelude.rb

@@ -2,9 +2,9 @@
 
 return if defined?(::DEBUGGER__)
 
+# Put the following line in your login script (e.g. ~/.bash_profile) with modified path:
 #
-# put the following line in .bash_profile
-#   export RUBYOPT="-r .../debug/prelude $(RUBYOPT)"
+#   export RUBYOPT="-r /path/to/debug/prelude $(RUBYOPT)"
 #
 module Kernel
   def debugger(*a, up_level: 0, **kw)

data/lib/debug/server.rb

@@ -75,12 +75,7 @@ module DEBUGGER__
           DEBUGGER__.warn "ReaderThreadError: #{e}"
           pp e.backtrace
         ensure
-          DEBUGGER__.warn "Disconnected."
-          @sock = nil
-          @q_msg.close
-          @q_msg = nil
-          @q_ans.close
-          @q_ans = nil
+          cleanup_reader
         end # accept
 
       rescue Terminate
@@ -88,6 +83,15 @@ module DEBUGGER__
       end
     end
 
+    def cleanup_reader
+      DEBUGGER__.warn "Disconnected."
+      @sock = nil
+      @q_msg.close
+      @q_msg = nil
+      @q_ans.close
+      @q_ans = nil
+    end
+
     def greeting
       case g = @sock.gets
       when /^version:\s+(.+)\s+width: (\d+) cookie:\s+(.*)$/
@@ -116,8 +120,10 @@ module DEBUGGER__
 
         self.extend(UI_CDP)
         @repl = false
-        @web_sock = UI_CDP::WebSocket.new(@sock)
-        @web_sock.handshake
+        CONFIG.set_config no_color: true
+
+        @ws_server = UI_CDP::WebSocketServer.new(@sock)
+        @ws_server.handshake
       else
         raise "Greeting message error: #{g}"
       end
@@ -178,7 +184,7 @@ module DEBUGGER__
 
     def sigurg_overridden? prev_handler
       case prev_handler
-      when "SYSTEM_DEFAULT"
+      when "SYSTEM_DEFAULT", "DEFAULT"
         false
       when Proc
         if prev_handler.source_location[0] == __FILE__
@@ -191,10 +197,19 @@ module DEBUGGER__
       end
     end
 
+    begin
+      prev = trap(:SIGURG, nil)
+      trap(:SIGURG, prev)
+      TRAP_SIGNAL = :SIGURG
+    rescue ArgumentError
+      # maybe Windows?
+      TRAP_SIGNAL = :SIGINT
+    end
+
     def setup_interrupt
-      prev_handler = trap(:SIGURG) do
+      prev_handler = trap(TRAP_SIGNAL) do
         # $stderr.puts "trapped SIGINT"
-        ThreadClient.current.on_trap :SIGURG
+        ThreadClient.current.on_trap TRAP_SIGNAL
 
         case prev_handler
         when Proc
@@ -209,7 +224,7 @@ module DEBUGGER__
       end
       yield
     ensure
-      trap(:SIGURG, prev_handler)
+      trap(TRAP_SIGNAL, prev_handler)
     end
 
     attr_reader :reader_thread
@@ -297,7 +312,7 @@ module DEBUGGER__
 
     def pause
       # $stderr.puts "DEBUG: pause request"
-      Process.kill(:SIGURG, Process.pid)
+      Process.kill(TRAP_SIGNAL, Process.pid)
     end
 
     def quit n
@@ -328,29 +343,37 @@ module DEBUGGER__
       super()
     end
 
+    def chrome_setup
+      require_relative 'server_cdp'
+
+      unless @chrome_pid = UI_CDP.setup_chrome(@addr)
+        DEBUGGER__.warn <<~EOS if CONFIG[:open_frontend] == 'chrome'
+          With Chrome browser, type the following URL in the address-bar:
+          
+             devtools://devtools/bundled/inspector.html?ws=#{@addr}
+          
+          EOS
+      end
+    end
+
     def accept
       retry_cnt = 0
       super # for fork
 
       begin
         Socket.tcp_server_sockets @host, @port do |socks|
-          addr = socks[0].local_address.inspect_sockaddr # Change this part if `socks` are multiple.
+          @addr = socks[0].local_address.inspect_sockaddr # Change this part if `socks` are multiple.
           rdbg = File.expand_path('../../exe/rdbg', __dir__)
 
-          DEBUGGER__.warn "Debugger can attach via TCP/IP (#{addr})"
+          DEBUGGER__.warn "Debugger can attach via TCP/IP (#{@addr})"
           DEBUGGER__.info <<~EOS
           With rdbg, use the following command line:
           #
-          #   #{rdbg} --attach #{addr.split(':').join(' ')}
+          #   #{rdbg} --attach #{@addr.split(':').join(' ')}
           #
           EOS
 
-          DEBUGGER__.warn <<~EOS if CONFIG[:open_frontend] == 'chrome'
-          With Chrome browser, type the following URL in the address-bar:
-          
-             devtools://devtools/bundled/inspector.html?ws=#{addr}
-          
-          EOS
+          chrome_setup if CONFIG[:open_frontend] == 'chrome'
 
           Socket.accept_loop(socks) do |sock, client|
             @client_addr = client
@@ -387,61 +410,8 @@ module DEBUGGER__
     end
 
     def vscode_setup
-      require 'tmpdir'
-      require 'json'
-      require 'fileutils'
-
-      dir = Dir.mktmpdir("ruby-debug-vscode-")
-      at_exit{
-        FileUtils.rm_rf dir
-      }
-      Dir.chdir(dir) do
-        Dir.mkdir('.vscode')
-        open('README.rb', 'w'){|f|
-          f.puts <<~MSG
-          # Wait for starting the attaching to the Ruby process
-          # This file will be removed at the end of the debuggee process.
-          #
-          # Note that vscode-rdbg extension is needed. Please install if you don't have.
-          MSG
-        }
-        open('.vscode/launch.json', 'w'){|f|
-          f.puts JSON.pretty_generate({
-            version: '0.2.0',
-            configurations: [
-            {
-              type: "rdbg",
-              name: "Attach with rdbg",
-              request: "attach",
-              rdbgPath: File.expand_path('../../exe/rdbg', __dir__),
-              debugPort: @sock_path,
-              autoAttach: true,
-            }
-            ]
-          })
-        }
-      end
-
-      cmds = ['code', "#{dir}/", "#{dir}/README.rb"]
-      cmdline = cmds.join(' ')
-      ssh_cmdline = "code --remote ssh-remote+[SSH hostname] #{dir}/ #{dir}/README.rb"
-
-      STDERR.puts "Launching: #{cmdline}"
-      env = ENV.delete_if{|k, h| /RUBY/ =~ k}.to_h
-
-      unless system(env, *cmds)
-        DEBUGGER__.warn <<~MESSAGE
-        Can not invoke the command.
-        Use the command-line on your terminal (with modification if you need).
-
-          #{cmdline}
-
-        If your application is running on a SSH remote host, please try:
-
-          #{ssh_cmdline}
-
-        MESSAGE
-      end
+      require_relative 'server_dap'
+      UI_DAP.setup @sock_path
     end
 
     def accept