debug 1.6.1 → 1.9.1

data/lib/debug/server_dap.rb

@@ -18,7 +18,7 @@ module DEBUGGER__
       end
 
       at_exit do
-        CONFIG.skip_all
+        DEBUGGER__.skip_all
         FileUtils.rm_rf dir if tempdir
       end
 
@@ -125,10 +125,12 @@ module DEBUGGER__
     def dap_setup bytes
       CONFIG.set_config no_color: true
       @seq = 0
+      @send_lock = Mutex.new
 
       case self
       when UI_UnixDomainServer
-        UI_DAP.local_fs_map_set true
+        # If the user specified a mapping, respect it, otherwise, make sure that no mapping is used
+        UI_DAP.local_fs_map_set CONFIG[:local_fs_map] || true
       when UI_TcpServer
         # TODO: loopback address can be used to connect other FS env, like Docker containers
         # UI_DAP.local_fs_set if @local_addr.ipv4_loopback? || @local_addr.ipv6_loopback?
@@ -198,15 +200,26 @@ module DEBUGGER__
              # supportsInstructionBreakpoints:
       )
       send_event 'initialized'
+      puts <<~WELCOME
+        Ruby REPL: You can run any Ruby expression here.
+        Note that output to the STDOUT/ERR printed on the TERMINAL.
+        [experimental]
+          `,COMMAND` runs `COMMAND` debug command (ex: `,info`).
+          `,help` to list all debug commands.
+      WELCOME
     end
 
     def send **kw
       if sock = @sock
         kw[:seq] = @seq += 1
         str = JSON.dump(kw)
-        sock.write "Content-Length: #{str.bytesize}\r\n\r\n#{str}"
+        @send_lock.synchronize do
+          sock.write "Content-Length: #{str.bytesize}\r\n\r\n#{str}"
+        end
         show_protocol '<', str
       end
+    rescue Errno::EPIPE => e
+      $stderr.puts "#{e.inspect} rescued during sending message"
     end
 
     def send_response req, success: true, message: nil, **kw
@@ -238,17 +251,17 @@ module DEBUGGER__
     end
 
     def recv_request
-      r = IO.select([@sock])
+      IO.select([@sock])
 
       @session.process_group.sync do
         raise RetryBecauseCantRead unless IO.select([@sock], nil, nil, 0)
 
-        case header = @sock.gets
+        case @sock.gets
         when /Content-Length: (\d+)/
           b = @sock.read(2)
           raise b.inspect unless b == "\r\n"
 
-          l = @sock.read(s = $1.to_i)
+          l = @sock.read($1.to_i)
           show_protocol :>, l
           JSON.load(l)
         when nil
@@ -261,178 +274,225 @@ module DEBUGGER__
       retry
     end
 
+    def load_extensions req
+      if exts = req.dig('arguments', 'rdbgExtensions')
+        exts.each{|ext|
+          require_relative "dap_custom/#{File.basename(ext)}"
+        }
+      end
+
+      if scripts = req.dig('arguments', 'rdbgInitialScripts')
+        scripts.each do |script|
+          begin
+            eval(script)
+          rescue Exception => e
+            puts e.message
+            puts e.backtrace.inspect
+          end
+        end
+      end
+    end
+
     def process
       while req = recv_request
-        raise "not a request: #{req.inpsect}" unless req['type'] == 'request'
-        args = req.dig('arguments')
+        process_request(req)
+      end
+    ensure
+      send_event :terminated unless @sock.closed?
+    end
 
-        case req['command']
+    def process_request req
+      raise "not a request: #{req.inspect}" unless req['type'] == 'request'
+      args = req.dig('arguments')
 
-        ## boot/configuration
-        when 'launch'
-          send_response req
-          UI_DAP.local_fs_map_set req.dig('arguments', 'localfs') || req.dig('arguments', 'localfsMap')
-          @is_launch = true
+      case req['command']
 
-        when 'attach'
-          send_response req
-          UI_DAP.local_fs_map_set req.dig('arguments', 'localfs') || req.dig('arguments', 'localfsMap')
-          @is_launch = false
+      ## boot/configuration
+      when 'launch'
+        send_response req
+        # `launch` runs on debuggee on the same file system
+        UI_DAP.local_fs_map_set req.dig('arguments', 'localfs') || req.dig('arguments', 'localfsMap') || true
+        @nonstop = true
 
-        when 'configurationDone'
-          send_response req
+        load_extensions req
 
-          if @is_launch
-            @q_msg << 'continue'
-          else
-            if SESSION.in_subsession?
-              send_event 'stopped', reason: 'pause',
-                                    threadId: 1, # maybe ...
-                                    allThreadsStopped: true
-            end
-          end
+      when 'attach'
+        send_response req
+        UI_DAP.local_fs_map_set req.dig('arguments', 'localfs') || req.dig('arguments', 'localfsMap')
 
-        when 'setBreakpoints'
-          req_path = args.dig('source', 'path')
-          path = UI_DAP.local_to_remote_path(req_path)
+        if req.dig('arguments', 'nonstop') == true
+          @nonstop = true
+        else
+          @nonstop = false
+        end
 
-          if path
-            SESSION.clear_line_breakpoints path
+        load_extensions req
 
-            bps = []
-            args['breakpoints'].each{|bp|
-              line = bp['line']
-              if cond = bp['condition']
-                bps << SESSION.add_line_breakpoint(path, line, cond: cond)
-              else
-                bps << SESSION.add_line_breakpoint(path, line)
-              end
-            }
-            send_response req, breakpoints: (bps.map do |bp| {verified: true,} end)
-          else
-            send_response req, success: false, message: "#{req_path} is not available"
+      when 'configurationDone'
+        send_response req
+
+        if @nonstop
+          @q_msg << 'continue'
+        else
+          if SESSION.in_subsession?
+            send_event 'stopped', reason: 'pause',
+                                  threadId: 1, # maybe ...
+                                  allThreadsStopped: true
           end
+        end
 
-        when 'setFunctionBreakpoints'
-          send_response req
+      when 'setBreakpoints'
+        req_path = args.dig('source', 'path')
+        path = UI_DAP.local_to_remote_path(req_path)
+        if path
+          SESSION.clear_line_breakpoints path
+
+          bps = []
+          args['breakpoints'].each{|bp|
+            line = bp['line']
+            if cond = bp['condition']
+              bps << SESSION.add_line_breakpoint(path, line, cond: cond)
+            else
+              bps << SESSION.add_line_breakpoint(path, line)
+            end
+          }
+          send_response req, breakpoints: (bps.map do |bp| {verified: true,} end)
+        else
+          send_response req, success: false, message: "#{req_path} is not available"
+        end
 
-        when 'setExceptionBreakpoints'
-          process_filter = ->(filter_id, cond = nil) {
-            bp =
-              case filter_id
-              when 'any'
-                SESSION.add_catch_breakpoint 'Exception', cond: cond
-              when 'RuntimeError'
-                SESSION.add_catch_breakpoint 'RuntimeError', cond: cond
-              else
-                nil
-              end
-              {
-                verified: !bp.nil?,
-                message: bp.inspect,
-              }
+      when 'setFunctionBreakpoints'
+        send_response req
+
+      when 'setExceptionBreakpoints'
+        process_filter = ->(filter_id, cond = nil) {
+          bp =
+            case filter_id
+            when 'any'
+              SESSION.add_catch_breakpoint 'Exception', cond: cond
+            when 'RuntimeError'
+              SESSION.add_catch_breakpoint 'RuntimeError', cond: cond
+            else
+              nil
+            end
+            {
+              verified: !bp.nil?,
+              message: bp.inspect,
             }
+          }
 
-            SESSION.clear_catch_breakpoints 'Exception', 'RuntimeError'
-
-            filters = args.fetch('filters').map {|filter_id|
-              process_filter.call(filter_id)
-            }
+          SESSION.clear_catch_breakpoints 'Exception', 'RuntimeError'
 
-            filters += args.fetch('filterOptions', {}).map{|bp_info|
-            process_filter.call(bp_info['filterId'], bp_info['condition'])
+          filters = args.fetch('filters').map {|filter_id|
+            process_filter.call(filter_id)
           }
 
-          send_response req, breakpoints: filters
+          filters += args.fetch('filterOptions', {}).map{|bp_info|
+          process_filter.call(bp_info['filterId'], bp_info['condition'])
+        }
 
-        when 'disconnect'
-          terminate = args.fetch("terminateDebuggee", false)
+        send_response req, breakpoints: filters
 
-          if SESSION.in_subsession?
-            if terminate
-              @q_msg << 'kill!'
-            else
-              @q_msg << 'continue'
-            end
-          else
-            if terminate
-              @q_msg << 'kill!'
-              pause
-            end
-          end
+      when 'disconnect'
+        terminate = args.fetch("terminateDebuggee", false)
 
-          SESSION.clear_all_breakpoints
-          send_response req
+        SESSION.clear_all_breakpoints
+        send_response req
 
-        ## control
-        when 'continue'
-          @q_msg << 'c'
-          send_response req, allThreadsContinued: true
-        when 'next'
-          begin
-            @session.check_postmortem
-            @q_msg << 'n'
-            send_response req
-          rescue PostmortemError
-            send_response req,
-                          success: false, message: 'postmortem mode',
-                          result: "'Next' is not supported while postmortem mode"
-          end
-        when 'stepIn'
-          begin
-            @session.check_postmortem
-            @q_msg << 's'
-            send_response req
-          rescue PostmortemError
-            send_response req,
-                          success: false, message: 'postmortem mode',
-                          result: "'stepIn' is not supported while postmortem mode"
+        if SESSION.in_subsession?
+          if terminate
+            @q_msg << 'kill!'
+          else
+            @q_msg << 'continue'
           end
-        when 'stepOut'
-          begin
-            @session.check_postmortem
-            @q_msg << 'fin'
-            send_response req
-          rescue PostmortemError
-            send_response req,
-                          success: false, message: 'postmortem mode',
-                          result: "'stepOut' is not supported while postmortem mode"
+        else
+          if terminate
+            @q_msg << 'kill!'
+            pause
           end
-        when 'terminate'
+        end
+
+      ## control
+      when 'continue'
+        @q_msg << 'c'
+        send_response req, allThreadsContinued: true
+      when 'next'
+        begin
+          @session.check_postmortem
+          @q_msg << 'n'
           send_response req
-          exit
-        when 'pause'
+        rescue PostmortemError
+          send_response req,
+                        success: false, message: 'postmortem mode',
+                        result: "'Next' is not supported while postmortem mode"
+        end
+      when 'stepIn'
+        begin
+          @session.check_postmortem
+          @q_msg << 's'
           send_response req
-          Process.kill(UI_ServerBase::TRAP_SIGNAL, Process.pid)
-        when 'reverseContinue'
+        rescue PostmortemError
           send_response req,
-                        success: false, message: 'cancelled',
-                        result: "Reverse Continue is not supported. Only \"Step back\" is supported."
-        when 'stepBack'
-          @q_msg << req
+                        success: false, message: 'postmortem mode',
+                        result: "'stepIn' is not supported while postmortem mode"
+        end
+      when 'stepOut'
+        begin
+          @session.check_postmortem
+          @q_msg << 'fin'
+          send_response req
+        rescue PostmortemError
+          send_response req,
+                        success: false, message: 'postmortem mode',
+                        result: "'stepOut' is not supported while postmortem mode"
+        end
+      when 'terminate'
+        send_response req
+        exit
+      when 'pause'
+        send_response req
+        Process.kill(UI_ServerBase::TRAP_SIGNAL, Process.pid)
+      when 'reverseContinue'
+        send_response req,
+                      success: false, message: 'cancelled',
+                      result: "Reverse Continue is not supported. Only \"Step back\" is supported."
+      when 'stepBack'
+        @q_msg << req
 
-        ## query
-        when 'threads'
-          send_response req, threads: SESSION.managed_thread_clients.map{|tc|
-            { id: tc.id,
-              name: tc.name,
-            }
+      ## query
+      when 'threads'
+        send_response req, threads: SESSION.managed_thread_clients.map{|tc|
+          { id: tc.id,
+            name: tc.name,
           }
+        }
+
+      when 'evaluate'
+        expr = req.dig('arguments', 'expression')
+        if /\A\s*,(.+)\z/ =~ expr
+          dbg_expr = $1.strip
+          dbg_expr.split(';;') { |cmd| @q_msg << cmd }
 
-        when 'stackTrace',
-             'scopes',
-             'variables',
-             'evaluate',
-             'source',
-             'completions'
+          send_response req,
+                        result: "(rdbg:command) #{dbg_expr}",
+                        variablesReference: 0
+        else
           @q_msg << req
+        end
+      when 'stackTrace',
+           'scopes',
+           'variables',
+           'source',
+           'completions'
+        @q_msg << req
 
+      else
+        if respond_to? mid = "custom_dap_request_#{req['command']}"
+          __send__ mid, req
         else
           raise "Unknown request: #{req.inspect}"
         end
       end
-    ensure
-      send_event :terminated unless @sock.closed?
     end
 
     ## called by the SESSION thread
@@ -443,7 +503,11 @@ module DEBUGGER__
 
     def puts result
       # STDERR.puts "puts: #{result}"
-      # send_event 'output', category: 'stderr', output: "PUTS!!: " + result.to_s
+      send_event 'output', category: 'console', output: "#{result&.chomp}\n"
+    end
+
+    def ignore_output_on_suspend?
+      true
     end
 
     def event type, *args
@@ -488,6 +552,8 @@ module DEBUGGER__
   end
 
   class Session
+    include GlobalVariablesHelper
+
     def find_waiting_tc id
       @th_clients.each{|th, tc|
         return tc if tc.id == id && tc.waiting?
@@ -512,7 +578,7 @@ module DEBUGGER__
       when 'stackTrace'
         tid = req.dig('arguments', 'threadId')
 
-        if tc = find_waiting_tc(tid)
+        if find_waiting_tc(tid)
           request_tc [:dap, :backtrace, req]
         else
           fail_response req
@@ -521,7 +587,7 @@ module DEBUGGER__
         frame_id = req.dig('arguments', 'frameId')
         if @frame_map[frame_id]
           tid, fid = @frame_map[frame_id]
-          if tc = find_waiting_tc(tid)
+          if find_waiting_tc(tid)
             request_tc [:dap, :scopes, req, fid]
           else
             fail_response req
@@ -534,8 +600,12 @@ module DEBUGGER__
         if ref = @var_map[varid]
           case ref[0]
           when :globals
-            vars = global_variables.map do |name|
-              gv = 'Not implemented yet...'
+            vars = safe_global_variables.sort.map do |name|
+              begin
+                gv = eval(name.to_s)
+              rescue Exception => e
+                gv = e.inspect
+              end
               {
                 name: name,
                 value: gv.inspect,
@@ -553,7 +623,7 @@ module DEBUGGER__
             frame_id = ref[1]
             tid, fid = @frame_map[frame_id]
 
-            if tc = find_waiting_tc(tid)
+            if find_waiting_tc(tid)
               request_tc [:dap, :scope, req, fid]
             else
               fail_response req
@@ -562,7 +632,7 @@ module DEBUGGER__
           when :variable
             tid, vid = ref[1], ref[2]
 
-            if tc = find_waiting_tc(tid)
+            if find_waiting_tc(tid)
               request_tc [:dap, :variable, req, vid]
             else
               fail_response req
@@ -580,7 +650,9 @@ module DEBUGGER__
         if @frame_map[frame_id]
           tid, fid = @frame_map[frame_id]
           expr = req.dig('arguments', 'expression')
-          if tc = find_waiting_tc(tid)
+
+          if find_waiting_tc(tid)
+            restart_all_threads
             request_tc [:dap, :evaluate, req, fid, expr, context]
           else
             fail_response req
@@ -601,7 +673,7 @@ module DEBUGGER__
         frame_id = req.dig('arguments', 'frameId')
         tid, fid = @frame_map[frame_id]
 
-        if tc = find_waiting_tc(tid)
+        if find_waiting_tc(tid)
           text = req.dig('arguments', 'text')
           line = req.dig('arguments', 'line')
           if col  = req.dig('arguments', 'column')
@@ -612,11 +684,15 @@ module DEBUGGER__
           fail_response req
         end
       else
-        raise "Unknown DAP request: #{req.inspect}"
+        if respond_to? mid = "custom_dap_request_#{req['command']}"
+          __send__ mid, req
+        else
+          raise "Unknown request: #{req.inspect}"
+        end
       end
     end
 
-    def dap_event args
+    def process_protocol_result args
       # puts({dap_event: args}.inspect)
       type, req, result = args
 
@@ -653,6 +729,7 @@ module DEBUGGER__
         register_vars result[:variables], tid
         @ui.respond req, result
       when :evaluate
+        stop_all_threads
         message = result.delete :message
         if message
           @ui.respond req, success: false, message: message
@@ -664,7 +741,11 @@ module DEBUGGER__
       when :completions
         @ui.respond req, result
       else
-        raise "unsupported: #{args.inspect}"
+        if respond_to? mid = "custom_dap_request_event_#{type}"
+          __send__ mid, req, result
+        else
+          raise "unsupported: #{args.inspect}"
+        end
       end
     end
 
@@ -684,10 +765,35 @@ module DEBUGGER__
     end
   end
 
+  class NaiveString
+    attr_reader :str
+    def initialize str
+      @str = str
+    end
+  end
+
   class ThreadClient
-    def value_inspect obj
+    MAX_LENGTH = 180
+
+    def value_inspect obj, short: true
       # TODO: max length should be configuarable?
-      DEBUGGER__.safe_inspect obj, short: true, max_length: 4 * 1024
+      str = DEBUGGER__.safe_inspect obj, short: short, max_length: MAX_LENGTH
+
+      if str.encoding == Encoding::UTF_8
+        str.scrub
+      else
+        str.encode(Encoding::UTF_8, invalid: :replace, undef: :replace)
+      end
+    end
+
+    def dap_eval b, expr, _context, prompt: '(repl_eval)'
+      begin
+        tp_allow_reentry do
+          b.eval(expr.to_s, prompt)
+        end
+      rescue Exception => e
+        e
+      end
     end
 
     def process_dap args
@@ -702,9 +808,10 @@ module DEBUGGER__
         frames = []
         @target_frames.each_with_index do |frame, i|
           next if i < start_frame
-          break if (levels -= 1) < 0
 
           path = frame.realpath || frame.path
+          next if skip_path?(path) && !SESSION.stop_stepping?(path, frame.location.lineno)
+          break if (levels -= 1) < 0
           source_name = path ? File.basename(path) : frame.location.to_s
 
           if (path && File.exist?(path)) && (local_path = UI_DAP.remote_to_local_path(path))
@@ -726,7 +833,7 @@ module DEBUGGER__
           }
         end
 
-        event! :dap_result, :backtrace, req, {
+        event! :protocol_result, :backtrace, req, {
           stackFrames: frames,
           totalFrames: @target_frames.size,
         }
@@ -743,7 +850,7 @@ module DEBUGGER__
             0
           end
 
-        event! :dap_result, :scopes, req, scopes: [{
+        event! :protocol_result, :scopes, req, scopes: [{
           name: 'Local variables',
           presentationHint: 'locals',
           # variablesReference: N, # filled by SESSION
@@ -754,7 +861,7 @@ module DEBUGGER__
           name: 'Global variables',
           presentationHint: 'globals',
           variablesReference: 1, # GLOBAL
-          namedVariables: global_variables.size,
+          namedVariables: safe_global_variables.size,
           indexedVariables: 0,
           expensive: false,
         }]
@@ -765,7 +872,7 @@ module DEBUGGER__
           variable(var, val)
         end
 
-        event! :dap_result, :scope, req, variables: vars, tid: self.id
+        event! :protocol_result, :scope, req, variables: vars, tid: self.id
       when :variable
         vid = args.shift
         obj = @var_map[vid]
@@ -792,13 +899,12 @@ module DEBUGGER__
             when String
               vars = [
                 variable('#length', obj.length),
-                variable('#encoding', obj.encoding)
+                variable('#encoding', obj.encoding),
               ]
+              printed_str = value_inspect(obj)
+              vars << variable('#dump', NaiveString.new(obj)) if printed_str.end_with?('...')
             when Class, Module
-              vars = obj.instance_variables.map{|iv|
-                variable(iv, obj.instance_variable_get(iv))
-              }
-              vars.unshift variable('%ancestors', obj.ancestors[1..])
+              vars << variable('%ancestors', obj.ancestors[1..])
             when Range
               vars = [
                 variable('#begin', obj.begin),
@@ -806,13 +912,15 @@ module DEBUGGER__
               ]
             end
 
-            vars += M_INSTANCE_VARIABLES.bind_call(obj).map{|iv|
-              variable(iv, M_INSTANCE_VARIABLE_GET.bind_call(obj, iv))
-            }
-            vars.unshift variable('#class', M_CLASS.bind_call(obj))
+            unless NaiveString === obj
+              vars += M_INSTANCE_VARIABLES.bind_call(obj).sort.map{|iv|
+                variable(iv, M_INSTANCE_VARIABLE_GET.bind_call(obj, iv))
+              }
+              vars.unshift variable('#class', M_CLASS.bind_call(obj))
+            end
           end
         end
-        event! :dap_result, :variable, req, variables: (vars || []), tid: self.id
+        event! :protocol_result, :variable, req, variables: (vars || []), tid: self.id
 
       when :evaluate
         fid, expr, context = args
@@ -826,12 +934,7 @@ module DEBUGGER__
 
           case context
           when 'repl', 'watch'
-            begin
-              result = b.eval(expr.to_s, '(DEBUG CONSOLE)')
-            rescue Exception => e
-              result = e
-            end
-
+            result = dap_eval b, expr, context, prompt: '(DEBUG CONSOLE)'
           when 'hover'
             case expr
             when /\A\@\S/
@@ -841,7 +944,7 @@ module DEBUGGER__
                 message = "Error: Not defined instance variable: #{expr.inspect}"
               end
             when /\A\$\S/
-              global_variables.each{|gvar|
+              safe_global_variables.each{|gvar|
                 if gvar.to_s == expr
                   result = eval(gvar.to_s)
                   break false
@@ -872,7 +975,7 @@ module DEBUGGER__
           result = 'Error: Can not evaluate on this frame'
         end
 
-        event! :dap_result, :evaluate, req, message: message, tid: self.id, **evaluate_result(result)
+        event! :protocol_result, :evaluate, req, message: message, tid: self.id, **evaluate_result(result)
 
       when :completions
         fid, text = args
@@ -882,7 +985,7 @@ module DEBUGGER__
           words = IRB::InputCompletor::retrieve_completion_data(word, bind: b).compact
         end
 
-        event! :dap_result, :completions, req, targets: (words || []).map{|phrase|
+        event! :protocol_result, :completions, req, targets: (words || []).map{|phrase|
           detail = nil
 
           if /\b([_a-zA-Z]\w*[!\?]?)\z/ =~ phrase
@@ -905,16 +1008,24 @@ module DEBUGGER__
         }
 
       else
-        raise "Unknown req: #{args.inspect}"
+        if respond_to? mid = "custom_dap_request_#{type}"
+          __send__ mid, req
+        else
+          raise "Unknown request: #{args.inspect}"
+        end
       end
     end
 
     def search_const b, expr
       cs = expr.delete_prefix('::').split('::')
-      [Object, *b.eval('Module.nesting')].reverse_each{|mod|
+      [Object, *b.eval('::Module.nesting')].reverse_each{|mod|
         if cs.all?{|c|
              if mod.const_defined?(c)
-               mod = mod.const_get(c)
+               begin
+                 mod = mod.const_get(c)
+               rescue Exception
+                 false
+               end
              else
                false
              end
@@ -927,11 +1038,17 @@ module DEBUGGER__
     end
 
     def evaluate_result r
-      v = variable nil, r
-      v.delete :name
-      v.delete :value
-      v[:result] = value_inspect(r)
-      v
+      variable nil, r
+    end
+
+    def type_name obj
+      klass = M_CLASS.bind_call(obj)
+
+      begin
+        M_NAME.bind_call(klass) || klass.to_s
+      rescue Exception => e
+        "<Error: #{e.message} (#{e.backtrace.first}>"
+      end
     end
 
     def variable_ name, obj, indexedVariables: 0, namedVariables: 0
@@ -942,15 +1059,31 @@ module DEBUGGER__
         vid = 0
       end
 
-      ivnum = M_INSTANCE_VARIABLES.bind_call(obj).size
+      namedVariables += M_INSTANCE_VARIABLES.bind_call(obj).size
 
-      { name: name,
-        value: value_inspect(obj),
-        type: (klass = M_CLASS.bind_call(obj)).name || klass.to_s,
-        variablesReference: vid,
-        indexedVariables: indexedVariables,
-        namedVariables: namedVariables + ivnum,
-      }
+      if NaiveString === obj
+        str = obj.str.dump
+        vid = indexedVariables = namedVariables = 0
+      else
+        str = value_inspect(obj)
+      end
+
+      if name
+        { name: name,
+          value: str,
+          type: type_name(obj),
+          variablesReference: vid,
+          indexedVariables: indexedVariables,
+          namedVariables: namedVariables,
+        }
+      else
+        { result: str,
+          type: type_name(obj),
+          variablesReference: vid,
+          indexedVariables: indexedVariables,
+          namedVariables: namedVariables,
+        }
+      end
     end
 
     def variable name, obj
@@ -960,7 +1093,7 @@ module DEBUGGER__
       when Hash
         variable_ name, obj, namedVariables: obj.size
       when String
-        variable_ name, obj, namedVariables: 3 # #to_str, #length, #encoding
+        variable_ name, obj, namedVariables: 3 # #length, #encoding, #to_str
       when Struct
         variable_ name, obj, namedVariables: obj.size
       when Class, Module