byebug 10.0.1 → 11.1.1

data/lib/byebug/commands/skip.rb

@@ -0,0 +1,85 @@
+# frozen_string_literal: true
+
+require_relative "../command"
+require_relative "../helpers/parse"
+
+module Byebug
+  #
+  # Allows the user to continue execution until the next breakpoint, as
+  # long as it is different from the current one
+  #
+  class SkipCommand < Command
+    include Helpers::ParseHelper
+
+    class << self
+      attr_writer :file_line, :file_path
+      attr_reader :previous_autolist
+
+      def file_line
+        @file_line ||= 0
+      end
+
+      def file_path
+        @file_path ||= ""
+      end
+
+      def setup_autolist(value)
+        @previous_autolist = ListCommand.always_run
+        ListCommand.always_run = value
+      end
+
+      def restore_autolist
+        ListCommand.always_run = @previous_autolist
+        @previous_autolist = nil
+      end
+    end
+
+    def self.regexp
+      /^\s* sk(?:ip)? \s*$/x
+    end
+
+    def self.description
+      <<-DESCRIPTION
+        sk[ip]
+
+        #{short_description}
+      DESCRIPTION
+    end
+
+    def self.short_description
+      "Runs until the next breakpoint as long as it is different from the current one"
+    end
+
+    def initialize_attributes
+      self.class.always_run = 2
+      self.class.setup_autolist(0)
+      self.class.file_path = frame.file
+      self.class.file_line = frame.line
+    end
+
+    def keep_execution
+      [self.class.file_path, self.class.file_line] == [frame.file, frame.line]
+    end
+
+    def reset_attributes
+      self.class.always_run = 0
+      ListCommand.new(processor).execute if self.class.previous_autolist == 1
+      self.class.restore_autolist
+    end
+
+    def auto_run
+      return false unless self.class.always_run == 2
+
+      keep_execution ? processor.proceed! : reset_attributes
+      true
+    end
+
+    def execute
+      return if auto_run
+
+      initialize_attributes
+      processor.proceed!
+      Byebug.stop if Byebug.stoppable?
+    end
+  end
+end

data/lib/byebug/commands/source.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "byebug/command"
+require_relative "../command"
 
 module Byebug
   #
@@ -32,9 +32,7 @@ module Byebug
       return puts(help) unless @match[1]
 
       file = File.expand_path(@match[1]).strip
-      unless File.exist?(file)
-        return errmsg(pr("source.errors.not_found", file: file))
-      end
+      return errmsg(pr("source.errors.not_found", file: file)) unless File.exist?(file)
 
       processor.interface.read_file(file)
     end

data/lib/byebug/commands/step.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require "byebug/command"
-require "byebug/helpers/parse"
+require_relative "../command"
+require_relative "../helpers/parse"
 
 module Byebug
   #

data/lib/byebug/commands/thread.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require "byebug/subcommands"
+require_relative "../subcommands"
 
-require "byebug/commands/thread/current"
-require "byebug/commands/thread/list"
-require "byebug/commands/thread/resume"
-require "byebug/commands/thread/stop"
-require "byebug/commands/thread/switch"
+require_relative "../commands/thread/current"
+require_relative "../commands/thread/list"
+require_relative "../commands/thread/resume"
+require_relative "../commands/thread/stop"
+require_relative "../commands/thread/switch"
 
 module Byebug
   #

data/lib/byebug/commands/thread/current.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "byebug/helpers/thread"
+require_relative "../../helpers/thread"
 
 module Byebug
   #

data/lib/byebug/commands/thread/list.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "byebug/helpers/thread"
+require_relative "../../helpers/thread"
 
 module Byebug
   #

data/lib/byebug/commands/thread/resume.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "byebug/helpers/thread"
+require_relative "../../helpers/thread"
 
 module Byebug
   #
@@ -35,9 +35,7 @@ module Byebug
         context, err = context_from_thread(@match[1])
         return errmsg(err) if err
 
-        unless context.suspended?
-          return errmsg(pr("thread.errors.already_running"))
-        end
+        return errmsg(pr("thread.errors.already_running")) unless context.suspended?
 
         context.resume
         display_context(context)

data/lib/byebug/commands/thread/stop.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "byebug/helpers/thread"
+require_relative "../../helpers/thread"
 
 module Byebug
   #

data/lib/byebug/commands/thread/switch.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "byebug/helpers/thread"
+require_relative "../../helpers/thread"
 
 module Byebug
   #

data/lib/byebug/commands/tracevar.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "byebug/command"
+require_relative "../command"
 
 module Byebug
   #
@@ -32,10 +32,7 @@ module Byebug
     def execute
       var = @match[1]
       return errmsg(pr("trace.errors.needs_global_variable")) unless var
-
-      unless global_variables.include?(:"#{var}")
-        return errmsg(pr("trace.errors.var_is_not_global", name: var))
-      end
+      return errmsg(pr("trace.errors.var_is_not_global", name: var)) unless global_variables.include?(:"#{var}")
 
       stop = @match[2] && @match[2] !~ /nostop/
 

data/lib/byebug/commands/undisplay.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require "byebug/command"
-require "byebug/helpers/parse"
+require_relative "../command"
+require_relative "../helpers/parse"
 
 module Byebug
   #
@@ -37,11 +37,10 @@ module Byebug
         pos, err = get_int(@match[1], "Undisplay", 1, Byebug.displays.size)
         return errmsg(err) unless err.nil?
 
-        unless Byebug.displays[pos - 1]
-          return errmsg(pr("display.errors.undefined", expr: pos))
-        end
+        last_display = Byebug.displays[pos - 1]
+        return errmsg(pr("display.errors.undefined", expr: pos)) unless last_display
 
-        Byebug.displays[pos - 1][0] = nil
+        last_display[0] = nil
       else
         return unless confirm(pr("display.confirmations.clear_all"))
 

data/lib/byebug/commands/untracevar.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "byebug/command"
+require_relative "../command"
 
 module Byebug
   #

data/lib/byebug/commands/up.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 require "pathname"
-require "byebug/command"
-require "byebug/helpers/frame"
-require "byebug/helpers/parse"
+require_relative "../command"
+require_relative "../helpers/frame"
+require_relative "../helpers/parse"
 
 module Byebug
   #

data/lib/byebug/commands/var.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require "byebug/subcommands"
-
-require "byebug/commands/var/all"
-require "byebug/commands/var/args"
-require "byebug/commands/var/const"
-require "byebug/commands/var/instance"
-require "byebug/commands/var/local"
-require "byebug/commands/var/global"
+require_relative "../subcommands"
+
+require_relative "var/all"
+require_relative "var/args"
+require_relative "var/const"
+require_relative "var/instance"
+require_relative "var/local"
+require_relative "var/global"
 
 module Byebug
   #

data/lib/byebug/commands/var/all.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "byebug/helpers/var"
+require_relative "../../helpers/var"
 
 module Byebug
   #

data/lib/byebug/commands/var/args.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "byebug/helpers/var"
+require_relative "../../helpers/var"
 
 module Byebug
   #

data/lib/byebug/commands/var/const.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "byebug/helpers/eval"
+require_relative "../../helpers/eval"
 
 module Byebug
   #
@@ -33,9 +33,7 @@ module Byebug
 
       def execute
         obj = warning_eval(str_obj)
-        unless obj.is_a?(Module)
-          return errmsg(pr("variable.errors.not_module", object: str_obj))
-        end
+        return errmsg(pr("variable.errors.not_module", object: str_obj)) unless obj.is_a?(Module)
 
         constants = warning_eval("#{str_obj}.constants")
         puts prv(constants.sort.map { |c| [c, obj.const_get(c)] }, "constant")

data/lib/byebug/commands/var/instance.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "byebug/helpers/var"
+require_relative "../../helpers/var"
 
 module Byebug
   #

data/lib/byebug/commands/var/local.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "byebug/helpers/var"
+require_relative "../../helpers/var"
 
 module Byebug
   #

data/lib/byebug/commands/where.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 require "pathname"
-require "byebug/command"
-require "byebug/helpers/frame"
+require_relative "../command"
+require_relative "../helpers/frame"
 
 module Byebug
   #

data/lib/byebug/context.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require "byebug/frame"
-require "byebug/helpers/path"
-require "byebug/helpers/file"
-require "byebug/processors/command_processor"
+require_relative "frame"
+require_relative "helpers/path"
+require_relative "helpers/file"
+require_relative "processors/command_processor"
 
 module Byebug
   #

data/lib/byebug/core.rb

@@ -1,15 +1,15 @@
 # frozen_string_literal: true
 
-require "byebug/helpers/reflection"
+require_relative "helpers/reflection"
 require "byebug/byebug"
-require "byebug/context"
-require "byebug/breakpoint"
-require "byebug/interface"
-require "byebug/processors/script_processor"
-require "byebug/processors/post_mortem_processor"
-require "byebug/commands"
-require "byebug/remote"
-require "byebug/printers/plain"
+require_relative "context"
+require_relative "breakpoint"
+require_relative "interface"
+require_relative "processors/script_processor"
+require_relative "processors/post_mortem_processor"
+require_relative "commands"
+require_relative "remote"
+require_relative "printers/plain"
 
 #
 # Main debugger's container module. Everything is defined under this module
@@ -36,6 +36,7 @@ module Byebug
   #
   # * :attached => Attached to a running program through the `byebug` method.
   # * :standalone => Started through `byebug` script.
+  # * :off => Ignoring any `byebug` method calls.
   #
   attr_accessor :mode
 

data/lib/byebug/frame.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "byebug/helpers/file"
+require_relative "helpers/file"
 
 module Byebug
   #
@@ -118,7 +118,7 @@ module Byebug
     # Properly formatted frame number of frame
     #
     def deco_pos
-      format("%-2d", pos)
+      format("%-2<pos>d", pos: pos)
     end
 
     #

data/lib/byebug/helpers/frame.rb

@@ -21,7 +21,7 @@ module Byebug
 
       def adjust_frame(new_frame)
         return frame_err("too_low") if new_frame >= context.stack_size
-        return frame_err("too_high") if new_frame < 0
+        return frame_err("too_high") if new_frame.negative?
 
         context.frame = new_frame
         processor.prev_line = nil

data/lib/byebug/helpers/parse.rb

@@ -15,9 +15,7 @@ module Byebug
       # purpose.
       #
       def get_int(str, cmd, min = nil, max = nil)
-        if str !~ /\A-?[0-9]+\z/
-          return nil, pr("parse.errors.int.not_number", cmd: cmd, str: str)
-        end
+        return nil, pr("parse.errors.int.not_number", cmd: cmd, str: str) unless /\A-?[0-9]+\z/.match?(str)
 
         int = str.to_i
         if min && int < min

data/lib/byebug/helpers/string.rb

@@ -25,9 +25,6 @@ module Byebug
       #
       # Removes a number of leading whitespace for each input line.
       #
-      # @note Might be unnecessary when Ruby 2.2 support is dropped and we can
-      # use squiggly heredoc's.
-      #
       def deindent(str, leading_spaces: 6)
         str.gsub(/^ {#{leading_spaces}}/, "")
       end

data/lib/byebug/helpers/toggle.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "byebug/helpers/parse"
+require_relative "parse"
 
 module Byebug
   module Helpers
@@ -15,9 +15,7 @@ module Byebug
 
         select_breakpoints(is_enable, args).each do |b|
           enabled = (is_enable == "enable")
-          if enabled && !syntax_valid?(b.expr)
-            raise pr("toggle.errors.expression", expr: b.expr)
-          end
+          raise pr("toggle.errors.expression", expr: b.expr) if enabled && !syntax_valid?(b.expr)
 
           puts pr("toggle.messages.toggled", bpnum: b.id,
                                              endis: enabled ? "en" : "dis")