readapt 0.7.1 → 1.1.1

data/lib/readapt/message/disconnect.rb

@@ -1,14 +1,13 @@
-# frozen_string_literal: true
-
-module Readapt
-  module Message
-    class Disconnect < Base
-      def run
-        # HACK: Wait a moment to make sure the output is flushed
-        # @todo Find a better way
-        sleep 1
-        debugger.disconnect
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Readapt
+  module Message
+    class Disconnect < Base
+      def run
+        # The message only sets an empty body to acknowledge that the request
+        # was received. The adapter handles the actual disconnection process.
+        set_body({})
+      end
+    end
+  end
+end

data/lib/readapt/message/evaluate.rb

@@ -1,18 +1,18 @@
-# frozen_string_literal: true
-
-require 'json'
-
-module Readapt
-  module Message
-    class Evaluate < Base
-      def run
-        ref = arguments['frameId']
-        frame = debugger.frame(ref)
-        result = frame.evaluate(arguments['expression'])
-        set_body(
-          result: result
-        )
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+require 'json'
+
+module Readapt
+  module Message
+    class Evaluate < Base
+      def run
+        ref = arguments['frameId']
+        frame = debugger.frame(ref)
+        result = frame.evaluate(arguments['expression'])
+        set_body(
+          result: result
+        )
+      end
+    end
+  end
+end

data/lib/readapt/message/initialize.rb

@@ -1,13 +1,13 @@
-# frozen_string_literal: true
-
-module Readapt
-  module Message
-    class Initialize < Base
-      def run
-        set_body({
-          supportsConfigurationDoneRequest: true
-        })
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Readapt
+  module Message
+    class Initialize < Base
+      def run
+        set_body({
+          supportsConfigurationDoneRequest: true
+        })
+      end
+    end
+  end
+end

data/lib/readapt/message/launch.rb

@@ -1,11 +1,11 @@
-# frozen_string_literal: true
-
-module Readapt
-  module Message
-    class Launch < Base
-      def run
-        debugger.config arguments, :launch
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Readapt
+  module Message
+    class Launch < Base
+      def run
+        debugger.config arguments, :launch
+      end
+    end
+  end
+end

data/lib/readapt/message/next.rb

@@ -1,12 +1,12 @@
-# frozen_string_literal: true
-
-module Readapt
-  module Message
-    class Next < Base
-      def run
-        thread = debugger.thread(arguments['threadId'])
-        thread.control = :next
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Readapt
+  module Message
+    class Next < Base
+      def run
+        thread = debugger.thread(arguments['threadId'])
+        thread.control = :next
+      end
+    end
+  end
+end

data/lib/readapt/message/pause.rb

@@ -1,11 +1,11 @@
-# frozen_string_literal: true
-
-module Readapt
-  module Message
-    class Pause < Base
-      def run
-        Monitor.pause arguments['threadId']
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Readapt
+  module Message
+    class Pause < Base
+      def run
+        Monitor.pause arguments['threadId']
+      end
+    end
+  end
+end

data/lib/readapt/message/scopes.rb

@@ -1,25 +1,26 @@
-# frozen_string_literal: true
-
-module Readapt
-  module Message
-    class Scopes < Base
-      def run
-        frame = debugger.frame(arguments['frameId'])
-        set_body({
-          scopes: [
-            {
-              name: 'Local',
-              variablesReference: frame.local_id,
-              expensive: false
-            },
-            {
-              name: 'Global',
-              variablesReference: TOPLEVEL_BINDING.receiver.object_id,
-              expensive: true
-            }
-          ]
-        })
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Readapt
+  module Message
+    class Scopes < Base
+      def run
+        frame = debugger.frame(arguments['frameId'])
+        set_body({
+          scopes: [
+            {
+              name: 'Local',
+              variablesReference: frame.local_id,
+              expensive: false
+            },
+            {
+              name: 'Global',
+              # @todo 1 is a magic number representing the toplevel binding
+              variablesReference: 1,
+              expensive: true
+            }
+          ]
+        })
+      end
+    end
+  end
+end

data/lib/readapt/message/set_breakpoints.rb

@@ -1,25 +1,25 @@
-# frozen_string_literal: true
-
-module Readapt
-  module Message
-    class SetBreakpoints < Base
-      def run
-        path = Readapt.normalize_path(arguments['source']['path'])
-        debugger.clear_breakpoints path
-        lines = []
-        set_body(
-          breakpoints: arguments['breakpoints'].map do |val|
-            debugger.set_breakpoint path, val['line'], val['condition']
-            lines.push val['line']
-            {
-              verified: true, # @todo Verify
-              source: arguments['source'],
-              line: val['line']
-            }
-          end
-        )
-        Breakpoints.set(path, lines)
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Readapt
+  module Message
+    class SetBreakpoints < Base
+      def run
+        path = Readapt.normalize_path(arguments['source']['path'])
+        debugger.clear_breakpoints path
+        lines = []
+        set_body(
+          breakpoints: arguments['breakpoints'].map do |val|
+            debugger.set_breakpoint path, val['line'], val['condition'], val['hitCondition']
+            lines.push val['line']
+            {
+              verified: true, # @todo Verify
+              source: arguments['source'],
+              line: val['line']
+            }
+          end
+        )
+        Breakpoints.set(path, lines)
+      end
+    end
+  end
+end

data/lib/readapt/message/set_exception_breakpoints.rb

@@ -1,8 +1,8 @@
-# frozen_string_literal: true
-
-module Readapt
-  module Message
-    class SetExceptionBreakpoints < Base
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Readapt
+  module Message
+    class SetExceptionBreakpoints < Base
+    end
+  end
+end

data/lib/readapt/message/stack_trace.rb

@@ -1,26 +1,38 @@
-# frozen_string_literal: true
-
-module Readapt
-  module Message
-    class StackTrace < Base
-      def run
-        frames = debugger.thread(arguments['threadId']).frames
-        set_body({
-          stackFrames: frames.map do |frm|
-            {
-              name: "#{File.basename(frm.location.file)}:#{frm.location.line}",
-              source: {
-                name: File.basename(frm.location.file),
-                path: frm.location.file
-              },
-              id: frm.local_id,
-              line: frm.location.line,
-              column: 0
-            }
-          end,
-          totalFrames: frames.length
-        })
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Readapt
+  module Message
+    class StackTrace < Base
+      @@file_hash = {}
+
+      def run
+        frames = debugger.thread(arguments['threadId']).frames
+        set_body({
+          stackFrames: frames.map do |frm|
+            {
+              name: frame_code(frm.file, frm.line),
+              source: {
+                name: frm.file ? File.basename(frm.file) : nil,
+                path: frm.file
+              },
+              id: frm.local_id,
+              line: frm.line,
+              column: 0
+            }
+          end,
+          totalFrames: frames.length
+        })
+      end
+
+      private
+
+      def read_file file
+        @@file_hash[file] ||= File.read(file)
+      end
+
+      def frame_code file, line
+        read_file(file).lines[line - 1].strip
+      end
+    end
+  end
+end

data/lib/readapt/message/step_in.rb

@@ -1,11 +1,11 @@
-# frozen_string_literal: true
-
-module Readapt
-  module Message
-    class StepIn < Base
-      def run
-        debugger.thread(arguments['threadId']).control = :step_in
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Readapt
+  module Message
+    class StepIn < Base
+      def run
+        debugger.thread(arguments['threadId']).control = :step_in
+      end
+    end
+  end
+end

data/lib/readapt/message/step_out.rb

@@ -1,11 +1,11 @@
-# frozen_string_literal: true
-
-module Readapt
-  module Message
-    class StepOut < Base
-      def run
-        debugger.thread(arguments['threadId']).control = :step_out
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Readapt
+  module Message
+    class StepOut < Base
+      def run
+        debugger.thread(arguments['threadId']).control = :step_out
+      end
+    end
+  end
+end

data/lib/readapt/message/threads.rb

@@ -1,18 +1,18 @@
-# frozen_string_literal: true
-
-module Readapt
-  module Message
-    class Threads < Base
-      def run
-        set_body({
-          threads: debugger.threads.map do |thr|
-            {
-              id: thr.id,
-              name: thr.name
-            }
-          end
-        })
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Readapt
+  module Message
+    class Threads < Base
+      def run
+        set_body({
+          threads: debugger.threads.map do |thr|
+            {
+              id: thr.id,
+              name: thr.name
+            }
+          end
+        })
+      end
+    end
+  end
+end

data/lib/readapt/message/variables.rb

@@ -1,57 +1,61 @@
-# frozen_string_literal: true
-
-module Readapt
-  module Message
-    class Variables < Base
-      def run
-        ref = arguments['variablesReference']
-        frame = debugger.frame(ref)
-        vars = if frame != Frame::NULL_FRAME && !frame.nil?
-          frame.locals
-        elsif ref == TOPLEVEL_BINDING.receiver.object_id
-          global_variables.map do |gv|
-            Variable.new(gv, eval(gv.to_s))
-          end
-        else
-          obj = object_reference
-          result = []
-          if obj.is_a?(Array)
-            obj.each_with_index do |itm, idx|
-              result.push Variable.new("[#{idx}]", itm)
-            end
-          elsif obj.is_a?(Hash)
-            obj.each_pair do |idx, itm|
-              result.push Variable.new("[#{idx}]", itm)
-            end
-          else
-            obj.instance_variables.each do |iv|
-              result.push Variable.new(iv, obj.instance_variable_get(iv))
-            end
-            obj.class.class_variables.each do |cv|
-              result.push Variable.new(cv, obj.class.class_variable_get(cv))
-            end
-          end
-          result
-        end
-        set_body({
-          variables: vars.map do |var|
-            {
-              name: var.name,
-              value: var.value,
-              type: var.type,
-              variablesReference: var.reference
-            }
-          end
-        })
-      end
-
-      private
-
-      def object_reference
-        ObjectSpace._id2ref(arguments['variablesReference'])
-      rescue RangeError
-        nil
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Readapt
+  module Message
+    class Variables < Base
+      def run
+        ref = arguments['variablesReference']
+        frame = debugger.frame(ref)
+        # @todo 1 is a magic number representing the toplevel binding (see
+        #   Message::Scopes)
+        vars = if ref == 1
+          global_variables.map do |gv|
+            Variable.new(gv, eval(gv.to_s))
+          end
+        else
+          if frame != Frame::NULL_FRAME && !frame.nil?
+            frame.locals
+          else
+            obj = object_reference
+            result = []
+            if obj.is_a?(Array)
+              obj.each_with_index do |itm, idx|
+                result.push Variable.new("[#{idx}]", itm)
+              end
+            elsif obj.is_a?(Hash)
+              obj.each_pair do |idx, itm|
+                result.push Variable.new("[#{idx}]", itm)
+              end
+            else
+              obj.instance_variables.sort.each do |iv|
+                result.push Variable.new(iv, obj.instance_variable_get(iv))
+              end
+              obj.class.class_variables.sort.each do |cv|
+                result.push Variable.new(cv, obj.class.class_variable_get(cv))
+              end
+            end
+            result
+          end
+        end
+        set_body({
+          variables: vars.map do |var|
+            {
+              name: var.name,
+              value: var.value,
+              type: var.type,
+              variablesReference: var.reference
+            }
+          end
+        })
+      end
+
+      private
+
+      def object_reference
+        ObjectSpace._id2ref(arguments['variablesReference'])
+      rescue RangeError
+        nil
+      end
+    end
+  end
+end