lib/byebug/context.rb in byebug-3.2.0 vs lib/byebug/context.rb in byebug-3.3.0

@@ -1,66 +1,69 @@
 module Byebug
-
+  #
+  # Mantains context information for the debugger and it's the main
+  # communication point between the library and the C-extension through the
+  # at_breakpoint, at_catchpoint, at_tracing, at_line and at_return callbacks
+  #
   class Context
-
     class << self
       def stack_size(byebug_frames = false)
-        if backtrace = Thread.current.backtrace_locations(0)
-          unless byebug_frames
-            backtrace = backtrace.drop_while { |l| !ignored(l.path) }
-                                 .drop_while { |l|  ignored(l.path) }
-                                 .take_while { |l| !ignored(l.path) }
-          end
-          backtrace.size
-        else
-          0
+        backtrace = Thread.current.backtrace_locations(0)
+        return 0 unless backtrace
+
+        unless byebug_frames
+          backtrace = backtrace.drop_while { |l| !ignored(l.path) }
+                               .drop_while { |l|  ignored(l.path) }
+                               .take_while { |l| !ignored(l.path) }
         end
+
+        backtrace.size
       end
 
       def ignored(path)
         IGNORED_FILES.include?(path)
       end
       private :ignored
     end
 
     def interrupt
-      self.step_into 1
+      step_into 1
     end
 
-    def frame_locals frame_no = 0
+    def frame_locals(frame_no = 0)
       bind = frame_binding frame_no
-      eval "local_variables.inject({}){|h, v| h[v] = eval(v.to_s); h}", bind
+      eval 'local_variables.inject({}){|h, v| h[v] = eval(v.to_s); h}', bind
     end
 
-    def c_frame_args frame_no
+    def c_frame_args(frame_no)
       myself = frame_self frame_no
       return [] unless myself.to_s != 'main'
       myself.send(:method, frame_method(frame_no)).parameters
     end
 
-    def ruby_frame_args bind
+    def ruby_frame_args(bind)
       return [] unless eval '__method__', bind
       begin
-        eval "self.method(__method__).parameters", bind
+        eval 'self.method(__method__).parameters', bind
       rescue NameError => e
-        print "WARNING: Got exception #{e.class}: \"#{e.message}\" " \
-              "while retreving parameters from frame\n"
+        puts "WARNING: Got exception #{e.class}: \"#{e.message}\" " \
+             'while retreving parameters from frame'
         return []
       end
     end
 
-    def frame_args frame_no = 0
+    def frame_args(frame_no = 0)
       bind = frame_binding frame_no
       if bind.nil?
         c_frame_args frame_no
       else
         ruby_frame_args bind
       end
     end
 
     def handler
-      Byebug.handler or raise 'No interface loaded'
+      Byebug.handler || fail('No interface loaded')
     end
 
     def at_breakpoint(brkpnt)
       handler.at_breakpoint(self, brkpnt)
     end
@@ -72,10 +75,10 @@
     def at_tracing(file, line)
       handler.at_tracing(self, file, line)
     end
 
     def at_line(file, line)
-      handler.at_line(self, file, line)
+      handler.at_line(self, file, line) unless IGNORED_FILES.include?(file)
     end
 
     def at_return(file, line)
       handler.at_return(self, file, line)
     end