debug 1.0.0.rc2 → 1.2.1

data/lib/debug/server_dap.rb

@@ -153,8 +153,8 @@ module DEBUGGER__
         when 'setFunctionBreakpoints'
           send_response req
         when 'setExceptionBreakpoints'
-          filters = args.dig('filterOptions').map{|bp_info|
-            case bp_info.dig('filterId')
+          process_filter = ->(filter_id) {
+            case filter_id
             when 'any'
               bp = SESSION.add_catch_breakpoint 'Exception'
             when 'RuntimeError'
@@ -163,17 +163,26 @@ module DEBUGGER__
               bp = nil
             end
             {
-              verifiled: bp ? true : false,
+              verified: bp ? true : false,
               message: bp.inspect,
             }
           }
+
+          filters = args.fetch('filters').map {|filter_id|
+            process_filter.call(filter_id)
+          }
+
+          filters += args.fetch('filterOptions', {}).map{|bp_info|
+            process_filter.call(bp_info.dig('filterId'))
+          }
+
           send_response req, breakpoints: filters
         when 'configurationDone'
           send_response req
           @q_msg << 'continue'
         when 'attach'
           send_response req
-          Process.kill(:SIGINT, Process.pid)
+          Process.kill(:SIGURG, Process.pid)
         when 'disconnect'
           send_response req
           @q_msg << 'continue'
@@ -196,7 +205,7 @@ module DEBUGGER__
           exit
         when 'pause'
           send_response req
-          Process.kill(:SIGINT, Process.pid)
+          Process.kill(:SIGURG, Process.pid)
         when 'reverseContinue'
           send_response req,
                         success: false, message: 'cancelled',
@@ -247,7 +256,7 @@ module DEBUGGER__
     def event type, *args
       case type
       when :suspend_bp
-        _i, bp = *args
+        _i, bp, tid = *args
         if bp.kind_of?(CatchBreakpoint)
           reason = 'exception'
           text = bp.description
@@ -259,24 +268,26 @@ module DEBUGGER__
         send_event 'stopped', reason: reason,
                               description: text,
                               text: text,
-                              threadId: 1,
+                              threadId: tid,
                               allThreadsStopped: true
       when :suspend_trap
+        _sig, tid = *args
         send_event 'stopped', reason: 'pause',
-                              threadId: 1,
+                              threadId: tid,
                               allThreadsStopped: true
       when :suspended
+        tid, = *args
         send_event 'stopped', reason: 'step',
-                              threadId: 1,
+                              threadId: tid,
                               allThreadsStopped: true
       end
     end
   end
 
   class Session
-    def find_tc id
+    def find_waiting_tc id
       @th_clients.each{|th, tc|
-        return tc if tc.id == id
+        return tc if tc.id == id && tc.waiting?
       }
       return nil
     end
@@ -297,7 +308,7 @@ module DEBUGGER__
 
       when 'stackTrace'
         tid = req.dig('arguments', 'threadId')
-        if tc = find_tc(tid)
+        if tc = find_waiting_tc(tid)
           tc << [:dap, :backtrace, req]
         else
           fail_response req
@@ -306,7 +317,7 @@ module DEBUGGER__
         frame_id = req.dig('arguments', 'frameId')
         if @frame_map[frame_id]
           tid, fid = @frame_map[frame_id]
-          if tc = find_tc(tid)
+          if tc = find_waiting_tc(tid)
             tc << [:dap, :scopes, req, fid]
           else
             fail_response req
@@ -339,7 +350,7 @@ module DEBUGGER__
             frame_id = ref[1]
             tid, fid = @frame_map[frame_id]
 
-            if tc = find_tc(tid)
+            if tc = find_waiting_tc(tid)
               tc << [:dap, :scope, req, fid]
             else
               fail_response req
@@ -348,13 +359,13 @@ module DEBUGGER__
           when :variable
             tid, vid = ref[1], ref[2]
 
-            if tc = find_tc(tid)
+            if tc = find_waiting_tc(tid)
               tc << [:dap, :variable, req, vid]
             else
               fail_response req
             end
           else
-            raise "Uknown type: #{ref.inspect}"
+            raise "Unknown type: #{ref.inspect}"
           end
         else
           fail_response req
@@ -364,7 +375,7 @@ module DEBUGGER__
         if @frame_map[frame_id]
           tid, fid = @frame_map[frame_id]
           expr = req.dig('arguments', 'expression')
-          if tc = find_tc(tid)
+          if tc = find_waiting_tc(tid)
             tc << [:dap, :evaluate, req, fid, expr]
           else
             fail_response req
@@ -471,7 +482,7 @@ module DEBUGGER__
         fid = args.shift
         frame = @target_frames[fid]
 
-        lnum = 
+        lnum =
           if frame.binding
             frame.binding.local_variables.size
           elsif vars = frame.local_variables
@@ -580,7 +591,7 @@ module DEBUGGER__
         end
         event! :dap_result, :evaluate, req, tid: self.id, **evaluate_result(result)
       else
-        raise "Unkown req: #{args.inspect}"
+        raise "Unknown req: #{args.inspect}"
       end
     end