byebug 9.1.0 → 10.0.0

data/lib/byebug/commands/interrupt.rb

@@ -1,4 +1,6 @@
-require 'byebug/command'
+# frozen_string_literal: true
+
+require "byebug/command"
 
 module Byebug
   #
@@ -12,18 +14,20 @@ module Byebug
     end
 
     def self.description
-      <<-EOD
+      <<-DESCRIPTION
         int[errupt]
 
         #{short_description}
-      EOD
+      DESCRIPTION
     end
 
     def self.short_description
-      'Interrupts the program'
+      "Interrupts the program"
     end
 
     def execute
+      Byebug.start
+
       Byebug.thread_context(Thread.main).interrupt
     end
   end

data/lib/byebug/commands/irb.rb

@@ -1,6 +1,8 @@
-require 'byebug/command'
-require 'irb'
-require 'English'
+# frozen_string_literal: true
+
+require "byebug/command"
+require "irb"
+require "English"
 
 module Byebug
   #
@@ -14,20 +16,20 @@ module Byebug
     end
 
     def self.description
-      <<-EOD
+      <<-DESCRIPTION
         irb
 
         #{short_description}
-      EOD
+      DESCRIPTION
     end
 
     def self.short_description
-      'Starts an IRB session'
+      "Starts an IRB session"
     end
 
     def execute
       unless processor.interface.instance_of?(LocalInterface)
-        return errmsg(pr('base.errors.only_local'))
+        return errmsg(pr("base.errors.only_local"))
       end
 
       # @todo IRB tries to parse $ARGV so we must clear it (see #197). Add a

data/lib/byebug/commands/kill.rb

@@ -1,4 +1,6 @@
-require 'byebug/command'
+# frozen_string_literal: true
+
+require "byebug/command"
 
 module Byebug
   #
@@ -12,17 +14,17 @@ module Byebug
     end
 
     def self.description
-      <<-EOD
+      <<-DESCRIPTION
         kill[ signal]
 
         #{short_description}
 
         Equivalent of Process.kill(Process.pid)
-      EOD
+      DESCRIPTION
     end
 
     def self.short_description
-      'Sends a signal to the current process'
+      "Sends a signal to the current process"
     end
 
     def execute
@@ -33,12 +35,12 @@ module Byebug
           return errmsg("signal name #{signame} is not a signal I know about\n")
         end
       else
-        return unless confirm('Really kill? (y/n) ')
+        return unless confirm("Really kill? (y/n) ")
 
-        signame = 'KILL'
+        signame = "KILL"
       end
 
-      processor.interface.close if signame == 'KILL'
+      processor.interface.close if signame == "KILL"
       Process.kill(signame, Process.pid)
     end
   end

data/lib/byebug/commands/list.rb

@@ -1,6 +1,9 @@
-require 'byebug/command'
-require 'byebug/helpers/file'
-require 'byebug/helpers/parse'
+# frozen_string_literal: true
+
+require "byebug/command"
+require "byebug/source_file_formatter"
+require "byebug/helpers/file"
+require "byebug/helpers/parse"
 
 module Byebug
   #
@@ -17,7 +20,7 @@ module Byebug
     end
 
     def self.description
-      <<-EOD
+      <<-DESCRIPTION
         l[ist][[-=]][ nn-mm]
 
         #{short_description}
@@ -27,20 +30,18 @@ module Byebug
         "list=" is specified, lists from current line regardless of where code
         was last listed. A line range can also be specified to list specific
         sections of code.
-      EOD
+      DESCRIPTION
     end
 
     def self.short_description
-      'Lists lines of source code'
+      "Lists lines of source code"
     end
 
     def execute
       msg = "No sourcefile available for #{frame.file}"
       raise(msg) unless File.exist?(frame.file)
 
-      max_lines = n_lines(frame.file)
-      b, e = range(@match[2], max_lines)
-      raise('Invalid line range') unless valid_range?(b, e, max_lines)
+      b, e = range(@match[2])
 
       display_lines(b, e)
 
@@ -56,42 +57,44 @@ module Byebug
     #
     # Otherwise it's automatically chosen.
     #
-    def range(input, max_line)
-      size = [Setting[:listsize], max_line].min
+    def range(input)
+      return auto_range(@match[1] || "+") unless input
 
-      return set_range(size, max_line) unless input
+      b, e = parse_range(input)
+      raise("Invalid line range") unless valid_range?(b, e)
 
-      parse_range(input, size, max_line)
+      [b, e]
     end
 
-    def valid_range?(first, last, max)
-      first <= last && (1..max).cover?(first) && (1..max).cover?(last)
+    def valid_range?(first, last)
+      first <= last && (1..max_line).cover?(first) && (1..max_line).cover?(last)
     end
 
     #
     # Set line range to be printed by list
     #
-    # @param size - number of lines to be printed
-    # @param max_line - max line number that can be printed
-    #
     # @return first line number to list
     # @return last line number to list
     #
-    def set_range(size, max_line)
-      first = amend(lower(size, @match[1] || '+'), max_line - size + 1)
+    def auto_range(direction)
+      prev_line = processor.prev_line
 
-      [first, move(first, size - 1)]
+      if direction == "=" || prev_line.nil?
+        source_file_formatter.range_around(frame.line)
+      else
+        source_file_formatter.range_from(move(prev_line, size, direction))
+      end
     end
 
-    def parse_range(input, size, max_line)
-      first, err = get_int(lower_bound(input), 'List', 1, max_line)
+    def parse_range(input)
+      first, err = get_int(lower_bound(input), "List", 1, max_line)
       raise(err) unless first
 
       if upper_bound(input)
-        last, err = get_int(upper_bound(input), 'List', 1, max_line)
+        last, err = get_int(upper_bound(input), "List", 1, max_line)
         raise(err) unless last
 
-        last = amend(last, max_line)
+        last = amend_final(last)
       else
         first -= (size / 2)
       end
@@ -99,20 +102,7 @@ module Byebug
       [first, last || move(first, size - 1)]
     end
 
-    def amend(line, max_line)
-      return 1 if line < 1
-
-      [max_line, line].min
-    end
-
-    def lower(size, direction = '+')
-      prev_line = processor.prev_line
-      return frame.line - size / 2 if direction == '=' || prev_line.nil?
-
-      move(prev_line, size, direction)
-    end
-
-    def move(line, size, direction = '+')
+    def move(line, size, direction = "+")
       line.send(direction, size)
     end
 
@@ -125,13 +115,7 @@ module Byebug
     def display_lines(min, max)
       puts "\n[#{min}, #{max}] in #{frame.file}"
 
-      File.foreach(frame.file).with_index do |line, lineno|
-        break if lineno + 1 > max
-        next unless (min..max).cover?(lineno + 1)
-
-        mark = lineno + 1 == frame.line ? '=> ' : '   '
-        puts format("#{mark}%#{max.to_s.size}d: %s", lineno + 1, line)
-      end
+      puts source_file_formatter.lines(min, max).join
     end
 
     #
@@ -160,5 +144,16 @@ module Byebug
     def split_range(str)
       str.split(/[-,]/)
     end
+
+    extend Forwardable
+
+    def_delegators :source_file_formatter, :amend_final, :size, :max_line
+
+    def source_file_formatter
+      @source_file_formatter ||= SourceFileFormatter.new(
+        frame.file,
+        ->(n) { n == frame.line ? "=>" : "  " }
+      )
+    end
   end
 end

data/lib/byebug/commands/method.rb

@@ -1,5 +1,7 @@
-require 'byebug/command'
-require 'byebug/helpers/eval'
+# frozen_string_literal: true
+
+require "byebug/command"
+require "byebug/helpers/eval"
 
 module Byebug
   #
@@ -15,7 +17,7 @@ module Byebug
     end
 
     def self.description
-      <<-EOD
+      <<-DESCRIPTION
         m[ethod] (i[nstance][ <obj>]|<class|module>)
 
         #{short_description}
@@ -25,11 +27,11 @@ module Byebug
 
         When invoked only with a class or module, shows class methods of the
         class or module specified as argument.
-      EOD
+      DESCRIPTION
     end
 
     def self.short_description
-      'Shows methods of an object, class or module'
+      "Shows methods of an object, class or module"
     end
 
     def execute
@@ -37,11 +39,11 @@ module Byebug
 
       result =
         if @match[1]
-          prc('method.methods', obj.methods.sort) { |item, _| { name: item } }
+          prc("method.methods", obj.methods.sort) { |item, _| { name: item } }
         elsif !obj.is_a?(Module)
-          pr('variable.errors.not_module', object: @match.post_match)
+          pr("variable.errors.not_module", object: @match.post_match)
         else
-          prc('method.methods', obj.instance_methods(false).sort) do |item, _|
+          prc("method.methods", obj.instance_methods(false).sort) do |item, _|
             { name: item }
           end
         end

data/lib/byebug/commands/next.rb

@@ -1,5 +1,7 @@
-require 'byebug/command'
-require 'byebug/helpers/parse'
+# frozen_string_literal: true
+
+require "byebug/command"
+require "byebug/helpers/parse"
 
 module Byebug
   #
@@ -16,19 +18,19 @@ module Byebug
     end
 
     def self.description
-      <<-EOD
+      <<-DESCRIPTION
         n[ext][ nnn]
 
         #{short_description}
-      EOD
+      DESCRIPTION
     end
 
     def self.short_description
-      'Runs one or more lines of code'
+      "Runs one or more lines of code"
     end
 
     def execute
-      steps, err = parse_steps(@match[1], 'Next')
+      steps, err = parse_steps(@match[1], "Next")
       return errmsg(err) unless steps
 
       context.step_over(steps, context.frame.pos)

data/lib/byebug/commands/pry.rb

@@ -1,5 +1,7 @@
-require 'byebug/command'
-require 'byebug/helpers/eval'
+# frozen_string_literal: true
+
+require "byebug/command"
+require "byebug/helpers/eval"
 
 module Byebug
   #
@@ -13,26 +15,26 @@ module Byebug
     end
 
     def self.description
-      <<-EOD
+      <<-DESCRIPTION
         pry
 
         #{short_description}
-      EOD
+      DESCRIPTION
     end
 
     def self.short_description
-      'Starts a Pry session'
+      "Starts a Pry session"
     end
 
     def execute
       unless processor.interface.instance_of?(LocalInterface)
-        return errmsg(pr('base.errors.only_local'))
+        return errmsg(pr("base.errors.only_local"))
       end
 
       begin
-        require 'pry'
+        require "pry"
       rescue LoadError
-        return errmsg(pr('pry.errors.not_installed'))
+        return errmsg(pr("pry.errors.not_installed"))
       end
 
       Pry.start(context.frame._binding)

data/lib/byebug/commands/quit.rb

@@ -1,4 +1,6 @@
-require 'byebug/command'
+# frozen_string_literal: true
+
+require "byebug/command"
 
 module Byebug
   #
@@ -13,7 +15,7 @@ module Byebug
     end
 
     def self.description
-      <<-EOD
+      <<-DESCRIPTION
         q[uit] [!|unconditionally]
 
         #{short_description}
@@ -21,15 +23,15 @@ module Byebug
         Normally we prompt before exiting. However if the parameter
         "unconditionally" is given or command is suffixed with !, we exit
         without asking further questions.
-      EOD
+      DESCRIPTION
     end
 
     def self.short_description
-      'Exits byebug'
+      "Exits byebug"
     end
 
     def execute
-      return unless @match[1] || confirm(pr('quit.confirmations.really'))
+      return unless @match[1] || confirm(pr("quit.confirmations.really"))
 
       processor.interface.autosave
       processor.interface.close

data/lib/byebug/commands/restart.rb

@@ -1,9 +1,11 @@
-require 'byebug/command'
-require 'byebug/helpers/bin'
-require 'byebug/helpers/path'
-require 'shellwords'
-require 'English'
-require 'rbconfig'
+# frozen_string_literal: true
+
+require "byebug/command"
+require "byebug/helpers/bin"
+require "byebug/helpers/path"
+require "shellwords"
+require "English"
+require "rbconfig"
 
 module Byebug
   #
@@ -21,18 +23,18 @@ module Byebug
     end
 
     def self.description
-      <<-EOD
+      <<-DESCRIPTION
         restart [args]
 
         #{short_description}
 
         This is a re-exec - all byebug state is lost. If command arguments are
         passed those are used.
-      EOD
+      DESCRIPTION
     end
 
     def self.short_description
-      'Restarts the debugged program'
+      "Restarts the debugged program"
     end
 
     def execute
@@ -43,7 +45,7 @@ module Byebug
 
       cmd += (@match[:args] ? @match[:args].shellsplit : $ARGV)
 
-      puts pr('restart.success', cmd: cmd.shelljoin)
+      puts pr("restart.success", cmd: cmd.shelljoin)
       Kernel.exec(*cmd)
     end
 
@@ -55,7 +57,7 @@ module Byebug
     end
 
     def prepend_ruby_bin(cmd)
-      cmd.unshift(RbConfig.ruby) if which('ruby') != which(cmd.first)
+      cmd.unshift(RbConfig.ruby) if which("ruby") != which(cmd.first)
       cmd
     end
   end