Merge branch 'master' into st0012-improve-protocol-test-case

Author: st0012

lib/debug/server_cdp.rb

@@ -98,7 +98,6 @@ def run_new_chrome
             candidates = ['C:\\Program Files (x86)\\Google\\Chrome\\Application\\chrome.exe', 'C:\\Program Files\\Google\\Chrome\\Application\\chrome.exe']
             path = get_chrome_path candidates
           end
-          uuid = SecureRandom.uuid
           # The path is based on https://github.com/sindresorhus/open/blob/v8.4.0/index.js#L128.
           stdin, stdout, stderr, wait_thr = *Open3.popen3("#{ENV['SystemRoot']}\\System32\\WindowsPowerShell\\v1.0\\powershell")
           tf = Tempfile.create(['debug-', '.txt'])

lib/debug/server_dap.rb

@@ -251,17 +251,17 @@ class RetryBecauseCantRead < Exception
     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
@@ -551,7 +551,7 @@ def process_protocol_request req
       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
@@ -560,7 +560,7 @@ def process_protocol_request req
         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
@@ -596,7 +596,7 @@ def process_protocol_request req
             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
@@ -605,7 +605,7 @@ def process_protocol_request req
           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
@@ -624,7 +624,7 @@ def process_protocol_request req
           tid, fid = @frame_map[frame_id]
           expr = req.dig('arguments', 'expression')
 
-          if tc = find_waiting_tc(tid)
+          if find_waiting_tc(tid)
             request_tc [:dap, :evaluate, req, fid, expr, context]
           else
             fail_response req
@@ -645,7 +645,7 @@ def process_protocol_request req
         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')

lib/debug/source_repository.rb

@@ -49,7 +49,7 @@ def orig_src iseq
         lines = iseq.script_lines&.map(&:chomp)
         line = iseq.first_line
         if line > 1
-          lines = [*([''] * (line - 1)), *lines]
+          [*([''] * (line - 1)), *lines]
         else
           lines
         end

test/support/protocol_test_case.rb

@@ -370,7 +370,7 @@ def execute_cdp_scenario_ scenario
       scenario.call
     ensure
       kill_remote_debuggee test_info
-      if name = test_info.failed_process
+      if test_info.failed_process
         flunk create_protocol_message "Expected the debuggee program to finish"
       end
       # Because the debuggee may be terminated by executing the following operations, we need to run them after `kill_remote_debuggee` method.
@@ -1070,4 +1070,3 @@ def parse_ k, v
     end
   end
 end
-

test/support/test_case.rb

@@ -223,11 +223,11 @@ def get_request host, port, path
           sock.print "GET #{path} HTTP/1.1\r\n"
           sock.close_write
           loop do
-            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 $1.to_i
               return JSON.parse l, symbolize_names: true
             end

test/tool/test_builder.rb

@@ -477,7 +477,7 @@ def activate_debugger
           when /\[\>\]\s(.*)/
             begin
               req = JSON.parse $1
-            rescue JSON::ParserError => e
+            rescue JSON::ParserError
               $stderr.print data
               next
             end
@@ -504,7 +504,7 @@ def activate_debugger
           when /\[\<\]\s(.*)/
             begin
               res = JSON.parse $1
-            rescue JSON::ParserError => e
+            rescue JSON::ParserError
               $stderr.print data
               next
             end