byebug 1.5.0 → 1.6.0

data/lib/byebug/commands/frame.rb

@@ -16,12 +16,9 @@ module Byebug
       end
 
       if abs_frame_pos >= context.stack_size then
-        return \
-          errmsg "Adjusting would put us beyond the oldest (initial) frame.\n"
+        return errmsg "Adjusting would put us beyond the oldest frame.\n"
       elsif abs_frame_pos < 0 then
-        return \
-          errmsg "Adjusting would put us beyond the newest (innermost) frame.\n"
-        return
+        return errmsg "Adjusting would put us beyond the newest frame.\n"
       end
 
       if @state.frame_pos != abs_frame_pos then
@@ -35,48 +32,36 @@ module Byebug
       print_frame @state.frame_pos, false
     end
 
-    def get_frame_call(prefix, pos)
-      id = @state.context.frame_method(pos)
-      return "<main>" unless id
-
-      klass = @state.context.frame_class(pos)
+    def get_frame_class(style, pos)
+      frame_class = style == :short ? '' : "#{@state.context.frame_class pos}"
+      return frame_class == '' ? '' : "#{frame_class}."
+    end
 
-      if Command.settings[:callstyle] != :short && klass
-        call_str = "#{klass}.#{id.id2name}"
+    def get_frame_args(style, pos)
+      args = @state.context.frame_args pos
+      if args == [[:rest]]
+        frame_args = ''
+      elsif style == :short
+        frame_args = args.map { |_, name| name }.join(', ')
       else
-        call_str = "#{id.id2name}"
+        locals = @state.context.frame_locals pos
+        frame_args = args.map { |_, a| "#{a}##{locals[a].class}" }.join(', ')
       end
+      return frame_args == '' ? '' :  "(#{frame_args})"
+    end
 
-      args = @state.context.frame_args pos
-      locals = @state.context.frame_locals pos
-      if args.any?
-        call_str += "("
-        args.each_with_index do |name, i|
-          case Command.settings[:callstyle]
-          when :short
-            call_str += "#{name}, "
-          when :last
-            klass = locals[name].class
-            if klass.inspect.size > 20 + 3
-              klass = klass.inspect[0..20] + "..."
-            end
-            call_str += "#{name}##{klass}, "
-          when :tracked
-            arg_info = context.frame_args_info pos
-            if arg_info && arg_info.size > i
-              call_str += "#{name}: #{arg_info[i].inspect}, "
-            else
-              call_str += "#{name}, "
-            end
-          end
-          if call_str.size > Command.settings[:width] - prefix.size
-            # Strip off trailing ', ' if any but add stuff for later trunc
-            call_str[-2..-1] = ",...XX"
-            break
-          end
-        end
-        call_str[-2..-1] = ")" # Strip off trailing ', ' if any
+    def get_frame_call(prefix, pos)
+      frame_class = get_frame_class(Command.settings[:callstyle], pos)
+      frame_method = "#{@state.context.frame_method pos}"
+      frame_args = get_frame_args(Command.settings[:callstyle], pos)
+
+      call_str = frame_class + frame_method + frame_args
+
+      max_call_str_size = Command.settings[:width] - prefix.size
+      if call_str.size > max_call_str_size
+        call_str = call_str[0..max_call_str_size - 5] + "...)"
       end
+
       return call_str
     end
 
@@ -199,8 +184,7 @@ module Byebug
       if not @match[1]
         pos = 0
       else
-        pos = get_int(@match[1], "Frame")
-        return unless pos
+        return unless pos = get_int(@match[1], "Frame")
       end
       adjust_frame(pos, true)
     end

data/lib/byebug/commands/info.rb

@@ -84,8 +84,9 @@ module Byebug
 
       locals = @state.context.frame_locals
       args = @state.context.frame_args
+      return if args == [[:rest]]
 
-      args.each do |name|
+      args.map do |_, name|
         s = "#{name} = #{locals[name].inspect}"
         pad_with_dots(s)
         print "#{s}\n"

data/lib/byebug/commands/list.rb

@@ -21,7 +21,7 @@ module Byebug
       Byebug.source_reload if Command.settings[:autoreload]
       lines = LineCache::getlines @state.file, Command.settings[:autoreload]
       if !lines
-        errmsg "No sourcefile available for #{@state.file}\n" if @state.file != '(irb)'
+        errmsg "No sourcefile available for #{@state.file}\n"
         return @state.previous_line
       end
 

data/lib/byebug/commands/repl.rb

@@ -60,9 +60,7 @@ module Byebug
     end
 
     def regexp
-      /^\s* irb
-        (?:\s+(-d))?
-        \s*$/x
+      /^\s* irb \s*$/x
     end
 
     def execute
@@ -71,9 +69,6 @@ module Byebug
         throw :debug_error
       end
 
-      add_debugging = @match.is_a?(MatchData) && '-d' == @match[1]
-      $byebug_state = @state if add_debugging
-
       cont = IRB.start_session(get_binding)
       case cont
       when :cont
@@ -92,7 +87,6 @@ module Byebug
         CommandProcessor.print_location_and_text(file, line)
         @state.previous_line = nil
       end
-      $byebug_state = nil if add_debugging
     end
 
 
@@ -102,12 +96,11 @@ module Byebug
       end
 
       def description
-        %{irb[ -d]\tstarts an Interactive Ruby (IRB) session.
+        %{irb\tstarts an Interactive Ruby (IRB) session.
 
-          If -d is added you can get access to byebug's state via the global
-          variable $byebug_state. IRB is extended with methods "cont", "n" and
-          "step" which run the corresponding byebug commands. In contrast to the
-          real byebug commands these commands don't allow arguments.}
+          IRB is extended with methods "cont", "n" and "step" which run the
+          corresponding byebug commands. In contrast to the real byebug commands
+          these commands don't allow arguments.}
       end
     end
   end
@@ -122,9 +115,7 @@ module Byebug
   # Implements byebug's "pry" command
   class PryCommand < Command
     def regexp
-      /^\s* pry
-        (?:\s+(-d))?
-        \s*$/x
+      /^\s* pry \s*$/x
     end
 
     def execute
@@ -133,12 +124,7 @@ module Byebug
         throw :debug_error
       end
 
-      add_debugging = @match.is_a?(MatchData) && '-d' == @match[1]
-      $byebug_state = @state if add_debugging
-
       get_binding.pry
-
-      $byebug_state = nil if add_debugging
     end
 
     class << self
@@ -147,7 +133,7 @@ module Byebug
       end
 
       def description
-        %{pry[ -d]\tstarts a Pry session.}
+        %{pry\tstarts a Pry session.}
       end
     end
   end if has_pry

data/lib/byebug/commands/set.rb

@@ -94,15 +94,10 @@ module Byebug
       when /^basename$/
         Command.settings[:basename] = set_on
       when /^callstyle$/
-        if args[0]
-          arg = args[0].downcase.to_sym
-          case arg
-          when :short, :last, :tracked
-            Command.settings[:callstyle] = arg
-          else
-            print "Invalid call style #{arg}. Should be one of: " \
-                  "\"short\", \"last\" or \"tracked\".\n"
-          end
+        if args[0] and (args[0] == 'short' or arg[0] == 'long')
+          Command.settings[:callstyle] = arg[0].to_sym
+        else
+          print "Invalid callstyle. Should be one of: \"short\" or \"long\"\n"
         end
       when /^trace$/
         Command.settings[:stack_trace_on_error] = set_on

data/lib/byebug/commands/trace.rb

@@ -14,12 +14,12 @@ module Byebug
         Byebug.tracing = onoff
         print "#{show_setting('linetrace')}\n"
       elsif @match[1] =~ /var(?:iable)?/
-        varname=@match[2]
+        varname = @match[2]
         if debug_eval("defined?(#{varname})")
           if @match[3] && @match[3] !~ /(:?no)?stop/
             errmsg "expecting \"stop\" or \"nostop\"; got \"#{@match[3]}\"\n"
           else
-            dbg_cmd = (@match[3] && (@match[3] !~ /nostop/)) ? 'byebug' : ''
+            dbg_cmd = (@match[3] && @match[3] !~ /nostop/) ? 'byebug(1,0)' : ''
           end
           eval("trace_var(:#{varname}) do |val|
                   print \"traced variable \#{varname} has value \#{val}\n\"

data/lib/byebug/context.rb

@@ -8,24 +8,12 @@ module Byebug
   end
 
   class Context
-    def frame_args frame_no = 0
-      bind = frame_binding frame_no
-      return [] unless eval "__method__", bind
-      begin
-        eval "self.method(__method__).parameters.map{|(attr, mid)| mid}", bind
-      rescue NameError => e
-        print "(WARNING: retreving args from frame #{frame_no} => " \
-              "#{e.class} Exception: #{e.message})\n     "
-        return []
-      end
-    end
-
     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
     end
 
-    def frame_args_info
+    def frame_args frame_no = 0
       bind = frame_binding frame_no
       return [] unless eval "__method__", bind
       eval "self.method(__method__).parameters", bind
@@ -35,9 +23,8 @@ module Byebug
       Byebug.handler or raise 'No interface loaded'
     end
 
-    def at_breakpoint(breakpoint)
-      handler.at_breakpoint(self, breakpoint) unless
-        IGNORED_FILES.include?(breakpoint.source)
+    def at_breakpoint(brkpnt)
+      handler.at_breakpoint(self, brkpnt)
     end
 
     def at_catchpoint(excpt)
@@ -51,5 +38,9 @@ module Byebug
     def at_line(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) unless IGNORED_FILES.include?(file)
+    end
   end
 end

data/lib/byebug/processor.rb

@@ -82,7 +82,7 @@ module Byebug
     end
 
     def self.print_location_and_text(file, line)
-      if file == '(irb)'
+      if file == '(irb)' || file == '-e'
         file_line = "#{canonic_file(file)} @ #{line}\n"
       else
         file_line = "#{canonic_file(file)} @ #{line}\n" \
@@ -159,6 +159,11 @@ module Byebug
     end
     protect :at_line
 
+    def at_return(context, file, line)
+      process_commands(context, file, line)
+    end
+    protect :at_return
+
     private
       ##
       # Prompt shown before reading a command.
@@ -185,15 +190,10 @@ module Byebug
           cmd.allow_in_post_mortem
         end if context.dead?
 
-        state = State.new do |s|
-          s.context   = context
-          s.file      = file
-          s.line      = line
-          s.display   = display
-          s.interface = interface
-          s.commands  = event_cmds
-        end
-        @interface.state = state if @interface.respond_to?('state=')
+        state = State.new(event_cmds, context, display, file, interface, line)
+
+        # Change default when in irb or code included in command line
+        Command.settings[:autolist] = 0 if file == '(irb)' or file == '-e'
 
         # Bind commands to the current state.
         commands = event_cmds.map{|cmd| cmd.new(state)}
@@ -209,7 +209,7 @@ module Byebug
       #
       def process_commands(context, file, line)
         state, commands = always_run(context, file, line, 1)
-        $byebug_state = Command.settings[:testing] ? state : nil
+        $state = Command.settings[:testing] ? state : nil
 
         splitter = lambda do |str|
           str.split(/;/).inject([]) do |m, v|
@@ -229,7 +229,7 @@ module Byebug
 
         preloop(commands, context)
 
-        if Command.settings[:autolist] == 0 || file == '(irb)'
+        if Command.settings[:autolist] == 0
           CommandProcessor.print_location_and_text(file, line)
         end
 
@@ -338,12 +338,10 @@ module Byebug
         attr_accessor :commands, :context, :display, :file
         attr_accessor :frame_pos, :interface, :line, :previous_line
 
-        def initialize
-          super()
-          @frame_pos = 0
-          @previous_line = nil
-          @proceed = false
-          yield self
+        def initialize(commands, context, display, file, interface, line)
+          @commands, @context, @display = commands, context, display
+          @file, @interface, @line = file, interface, line
+          @frame_pos, @previous_line, @proceed = 0, nil, false
         end
 
         extend Forwardable

data/lib/byebug/version.rb

@@ -1,3 +1,3 @@
 module Byebug
-  VERSION = '1.5.0'
+  VERSION = '1.6.0'
 end

data/old_doc/byebug.texi

@@ -2519,24 +2519,19 @@ Shows the whether filename display shows just the file basename or not.
 
 @table @code
 @ifset FINISHED
-@kindex set callstyle @r{[} short | last | tracked @r{]}
-@item set forcestep @r{[} short | last | tracked @r{]}
+@kindex set callstyle @r{[} short | long @r{]}
+@item set callstyle @r{[} short | long @r{]}
 @else
-@kindex set callstyle @r{[} short | last
-@item set forcestep @r{[} short | last
+@kindex set callstyle @r{[} short | long
+@item set callstyle @r{[} short | long
 @end ifset
 
-Sets how you want call parameters displayed; @code{short} shows just
-the parameter names;
-@ifset FINISHED
-@code{last} shows the parameter names and the
-class of these variables as they currently exist. Note the type could
-have changed between when the call and its current
-values.
-@end ifset
-@code{tracked} is the most accurate but this adds
-overhead. On every call, scalar values of the parameters get
-saved. For non-scalar values the class is saved.
+Sets how you want call parameters displayed
+
+@code{short} shows current method and parameter names.
+@code{long} shows current class, current method, parameter names and the class
+of each parameter as it currently exist. Note the type could have changed
+since the call was made.
 @end table
 
 @node Forcestep
@@ -2965,7 +2960,7 @@ Fixnum: 1 if on or 0 if off.
 @item :basename
 Boolean. True if basename on. @xref{Basename}.
 @item :callstyle
-Symbol: @code{:short} or @code{:last}. @xref{Callstyle}.
+Symbol: @code{:short} or @code{:long}. @xref{Callstyle}.
 @item :testing
 Boolean. True if currently testing byebug.
 @item :force_stepping
@@ -3226,7 +3221,7 @@ y = 1
 
 $ ruby scope-test.rb
 ../lib/byebug.rb:386
-Byebug.context.stop_frame = 0
+Byebug.context.after_frame = 0
 (byebug:1) where
 --> #0 Kernel.byebug(steps#Fixnum) at ../lib/byebug-base.rb:386
     #1 at scope-test.rb:4

data/test/breakpoints_test.rb

@@ -7,28 +7,28 @@ class TestBreakpoints < TestDsl::TestCase
     subject { Byebug.breakpoints.first }
 
     def check_subject(field, value)
-      debug_file('breakpoint1') { subject.send(field).must_equal value }
+      debug_file('breakpoint') { subject.send(field).must_equal value }
     end
 
     it('must have correct pos') { check_subject(:pos, 10) }
     it('must have correct source') {
-      check_subject(:source, fullpath('breakpoint1')) }
+      check_subject(:source, fullpath('breakpoint')) }
     it('must have correct expression') { check_subject(:expr, nil) }
     it('must have correct hit count') { check_subject(:hit_count, 0) }
     it('must have correct hit value') { check_subject(:hit_value, 0) }
     it('must be enabled') { check_subject(:enabled?, true) }
     it('must return right response') do
       id = nil
-      debug_file('breakpoint1') { id = subject.id }
+      debug_file('breakpoint') { id = subject.id }
       check_output_includes \
-        "Created breakpoint #{id} at #{fullpath('breakpoint1')}:10"
+        "Created breakpoint #{id} at #{fullpath('breakpoint')}:10"
     end
   end
 
   describe 'using shortcut for the command' do
     before { enter 'b 10' }
     it 'must set a breakpoint' do
-      debug_file('breakpoint1') { Byebug.breakpoints.size.must_equal 1 }
+      debug_file('breakpoint') { Byebug.breakpoints.size.must_equal 1 }
     end
   end
 
@@ -36,14 +36,14 @@ class TestBreakpoints < TestDsl::TestCase
     before { enter 'break 100' }
 
     it 'must not create a breakpoint' do
-      debug_file('breakpoint1') { Byebug.breakpoints.must_be_empty }
+      debug_file('breakpoint') { Byebug.breakpoints.must_be_empty }
     end
 
     it 'must show an error' do
-      debug_file('breakpoint1')
+      debug_file('breakpoint')
       check_output_includes \
-        "There are only #{LineCache.size(fullpath('breakpoint1'))} lines in" \
-        " file #{fullpath('breakpoint1')}", interface.error_queue
+        "There are only #{LineCache.size(fullpath('breakpoint'))} lines in" \
+        " file #{fullpath('breakpoint')}", interface.error_queue
     end
   end
 
@@ -52,13 +52,13 @@ class TestBreakpoints < TestDsl::TestCase
     before { enter 'break 11' }
 
     it 'must not create a breakpoint' do
-      debug_file('breakpoint1') { Byebug.breakpoints.must_be_empty }
+      debug_file('breakpoint') { Byebug.breakpoints.must_be_empty }
     end
 
     it 'must show an error' do
-      debug_file('breakpoint1')
+      debug_file('breakpoint')
       check_output_includes \
-        "Line 11 is not a stopping point in file #{fullpath('breakpoint1')}",
+        "Line 11 is not a stopping point in file #{fullpath('breakpoint')}",
         interface.error_queue
     end
   end
@@ -66,13 +66,13 @@ class TestBreakpoints < TestDsl::TestCase
   describe 'stopping at breakpoint' do
     it 'must stop at the correct line' do
       enter 'break 14', 'cont'
-      debug_file('breakpoint1') { state.line.must_equal 14 }
+      debug_file('breakpoint') { $state.line.must_equal 14 }
     end
 
     it 'must stop at the correct file' do
       enter 'break 14', 'cont'
-      debug_file('breakpoint1') {
-        state.file.must_equal fullpath('breakpoint1') }
+      debug_file('breakpoint') {
+        $state.file.must_equal fullpath('breakpoint') }
     end
 
     describe 'show a message' do
@@ -80,9 +80,9 @@ class TestBreakpoints < TestDsl::TestCase
       describe 'with full filename' do
         it 'must show a message with full filename' do
           enter 'break 14', 'cont'
-          debug_file('breakpoint1') { @id = Byebug.breakpoints.first.id }
+          debug_file('breakpoint') { @id = Byebug.breakpoints.first.id }
           check_output_includes \
-            "Created breakpoint #{@id} at #{fullpath('breakpoint1')}:14"
+            "Created breakpoint #{@id} at #{fullpath('breakpoint')}:14"
         end
       end
 
@@ -91,8 +91,8 @@ class TestBreakpoints < TestDsl::TestCase
 
         it 'must show a message with basename' do
           enter 'break 14', 'cont'
-          debug_file('breakpoint1') { @id = Byebug.breakpoints.first.id }
-          check_output_includes "Created breakpoint #{@id} at breakpoint1.rb:14"
+          debug_file('breakpoint') { @id = Byebug.breakpoints.first.id }
+          check_output_includes "Created breakpoint #{@id} at breakpoint.rb:14"
         end
       end
     end
@@ -105,25 +105,25 @@ class TestBreakpoints < TestDsl::TestCase
       it 'must not reload source' do
         id = nil
         enter \
-          ->{change_line_in_file(fullpath('breakpoint1'), 14, ''); 'break 14'},
-          ->{change_line_in_file(fullpath('breakpoint1'), 14, 'c = a + b');
+          ->{change_line_in_file(fullpath('breakpoint'), 14, ''); 'break 14'},
+          ->{change_line_in_file(fullpath('breakpoint'), 14, 'c = a + b');
           'cont'}
-        debug_file('breakpoint1') { id = Byebug.breakpoints.first.id }
+        debug_file('breakpoint') { id = Byebug.breakpoints.first.id }
         check_output_includes \
-          "Created breakpoint #{id} at #{fullpath('breakpoint1')}:14"
+          "Created breakpoint #{id} at #{fullpath('breakpoint')}:14"
       end
     end
 
     describe 'autoreload set' do
       it 'must reload source' do
         enter \
-          ->{change_line_in_file(fullpath('breakpoint1'), 14, ''); 'break 14'},
+          ->{change_line_in_file(fullpath('breakpoint'), 14, ''); 'break 14'},
           # 2nd breakpoint just to reload source code after rolling changes back
-          ->{change_line_in_file(fullpath('breakpoint1'), 14, 'c = a + b');
+          ->{change_line_in_file(fullpath('breakpoint'), 14, 'c = a + b');
             'break 15'}, 'cont'
-        debug_file 'breakpoint1'
+        debug_file 'breakpoint'
         check_output_includes \
-          "Line 14 is not a stopping point in file #{fullpath('breakpoint1')}",
+          "Line 14 is not a stopping point in file #{fullpath('breakpoint')}",
           interface.error_queue
       end
     end
@@ -134,19 +134,19 @@ class TestBreakpoints < TestDsl::TestCase
       before { enter "break #{fullpath('breakpoint2')}:3", 'cont' }
 
       it 'must stop at the correct line' do
-        debug_file('breakpoint1') { state.line.must_equal 3 }
+        debug_file('breakpoint') { $state.line.must_equal 3 }
       end
 
       it 'must stop at the correct file' do
-        debug_file('breakpoint1') {
-          state.file.must_equal fullpath('breakpoint2') }
+        debug_file('breakpoint') {
+          $state.file.must_equal fullpath('breakpoint2') }
       end
     end
 
     describe 'when setting breakpoint to unexisted file' do
       before do
         enter 'break asf:324'
-        debug_file('breakpoint1')
+        debug_file('breakpoint')
       end
       it 'must show an error' do
         check_output_includes 'No source file named asf', interface.error_queue
@@ -164,12 +164,12 @@ class TestBreakpoints < TestDsl::TestCase
       before { enter 'break A#b', 'cont' }
 
       it 'must stop at the correct line' do
-        debug_file('breakpoint1') { state.line.must_equal 5 }
+        debug_file('breakpoint') { $state.line.must_equal 5 }
       end
 
       it 'must stop at the correct file' do
-        debug_file('breakpoint1') {
-          state.file.must_equal fullpath('breakpoint1') }
+        debug_file('breakpoint') {
+          $state.file.must_equal fullpath('breakpoint') }
       end
     end
 
@@ -177,19 +177,19 @@ class TestBreakpoints < TestDsl::TestCase
       before { enter 'break A.a', 'cont' }
 
       it 'must stop at the correct line' do
-        debug_file('breakpoint1') { state.line.must_equal 2 }
+        debug_file('breakpoint') { $state.line.must_equal 2 }
       end
 
       it 'must stop at the correct file' do
-        debug_file('breakpoint1') {
-          state.file.must_equal fullpath('breakpoint1') }
+        debug_file('breakpoint') {
+          $state.file.must_equal fullpath('breakpoint') }
       end
     end
 
     describe 'set breakpoint to unexisted class' do
       it 'must show an error' do
         enter 'break B.a'
-        debug_file('breakpoint1')
+        debug_file('breakpoint')
         check_output_includes 'Unknown class B.', interface.error_queue
       end
     end
@@ -199,11 +199,11 @@ class TestBreakpoints < TestDsl::TestCase
     before { enter 'break foo' }
 
     it 'must not create a breakpoint' do
-      debug_file('breakpoint1') { Byebug.breakpoints.must_be_empty }
+      debug_file('breakpoint') { Byebug.breakpoints.must_be_empty }
     end
 
     it 'must show an error' do
-      debug_file('breakpoint1')
+      debug_file('breakpoint')
       check_output_includes \
         'Invalid breakpoint location: foo.', interface.error_queue
     end
@@ -218,13 +218,13 @@ class TestBreakpoints < TestDsl::TestCase
                        'break 15' }
 
         it 'must have a breakpoint with #enabled? returning false' do
-          debug_file('breakpoint1') {
+          debug_file('breakpoint') {
             Byebug.breakpoints.first.enabled?.must_equal false }
         end
 
         it 'must not stop on the disabled breakpoint' do
           enter 'cont'
-          debug_file('breakpoint1') { state.line.must_equal 15 }
+          debug_file('breakpoint') { $state.line.must_equal 15 }
         end
       end
 
@@ -233,7 +233,7 @@ class TestBreakpoints < TestDsl::TestCase
                        'break 15' }
 
         it 'must have a breakpoint with #enabled? returning false' do
-          debug_file('breakpoint1') {
+          debug_file('breakpoint') {
             Byebug.breakpoints.first.enabled?.must_equal false }
         end
       end
@@ -242,7 +242,7 @@ class TestBreakpoints < TestDsl::TestCase
     describe 'errors' do
       it 'must show an error if syntax is incorrect' do
         enter 'disable'
-        debug_file('breakpoint1')
+        debug_file('breakpoint')
         check_output_includes \
           '"disable" must be followed by "display", "breakpoints" or ' \
           'breakpoint numbers.', interface.error_queue
@@ -250,7 +250,7 @@ class TestBreakpoints < TestDsl::TestCase
 
       it 'must show an error if no breakpoints is set' do
         enter 'disable 1'
-        debug_file('breakpoint1')
+        debug_file('breakpoint')
         check_output_includes \
           'No breakpoints have been set.', interface.error_queue
       end
@@ -258,7 +258,7 @@ class TestBreakpoints < TestDsl::TestCase
       it 'must show an error if not a number is provided as an argument to ' \
          ' "disable" command' do
         enter 'break 14', 'disable foo'
-        debug_file('breakpoint1')
+        debug_file('breakpoint')
         check_output_includes \
           'Disable breakpoints argument "foo" needs to be a number.'
       end
@@ -274,13 +274,13 @@ class TestBreakpoints < TestDsl::TestCase
         before { enter ->{"enable #{Byebug.breakpoints.first.id}"}, 'break 15' }
 
         it 'must have a breakpoint with #enabled? returning true' do
-          debug_file('breakpoint1') {
+          debug_file('breakpoint') {
             Byebug.breakpoints.first.enabled?.must_equal true }
         end
 
         it 'must stop on the enabled breakpoint' do
           enter 'cont'
-          debug_file('breakpoint1') { state.line.must_equal 14 }
+          debug_file('breakpoint') { $state.line.must_equal 14 }
         end
       end
 
@@ -289,7 +289,7 @@ class TestBreakpoints < TestDsl::TestCase
                        'break 15' }
 
         it 'must have a breakpoint with #enabled? returning true' do
-          debug_file('breakpoint1') {
+          debug_file('breakpoint') {
             Byebug.breakpoints.first.enabled?.must_equal true }
         end
       end
@@ -298,7 +298,7 @@ class TestBreakpoints < TestDsl::TestCase
     describe 'errors' do
       it 'must show an error if syntax is incorrect' do
         enter 'enable'
-        debug_file('breakpoint1')
+        debug_file('breakpoint')
         check_output_includes \
           '"enable" must be followed by "display", "breakpoints" or ' \
           'breakpoint numbers.', interface.error_queue
@@ -311,29 +311,29 @@ class TestBreakpoints < TestDsl::TestCase
                    'break 15' }
 
     it 'must have only one breakpoint' do
-      debug_file('breakpoint1') { Byebug.breakpoints.size.must_equal 1 }
+      debug_file('breakpoint') { Byebug.breakpoints.size.must_equal 1 }
     end
 
     it 'must not stop on the disabled breakpoint' do
       enter 'cont'
-      debug_file('breakpoint1') { state.line.must_equal 15 }
+      debug_file('breakpoint') { $state.line.must_equal 15 }
     end
   end
 
   describe 'Conditional breakpoints' do
     it 'must stop if the condition is true' do
       enter 'break 14 if b == 5', 'break 15', 'cont'
-      debug_file('breakpoint1') { state.line.must_equal 14 }
+      debug_file('breakpoint') { $state.line.must_equal 14 }
     end
 
     it 'must skip if the condition is false' do
       enter 'break 14 if b == 3', 'break 15', 'cont'
-      debug_file('breakpoint1') { state.line.must_equal 15 }
+      debug_file('breakpoint') { $state.line.must_equal 15 }
     end
 
     it 'must show an error when conditional syntax is wrong' do
       enter 'break 14 ifa b == 3', 'break 15', 'cont'
-      debug_file('breakpoint1') { state.line.must_equal 15 }
+      debug_file('breakpoint') { $state.line.must_equal 15 }
       check_output_includes \
         'Expecting "if" in breakpoint condition; got: ifa b == 3.',
         interface.error_queue
@@ -346,12 +346,12 @@ class TestBreakpoints < TestDsl::TestCase
                      ->{"enable #{Byebug.breakpoints.first.id}"} }
 
       it 'must not enable a breakpoint' do
-        debug_file('breakpoint1') {
+        debug_file('breakpoint') {
           Byebug.breakpoints.first.enabled?.must_equal false }
       end
 
       it 'must show an error' do
-        debug_file('breakpoint1')
+        debug_file('breakpoint')
         check_output_includes \
           'Expression "b -=( 3" syntactically incorrect; breakpoint remains ' \
           'disabled.', interface.error_queue
@@ -360,24 +360,38 @@ class TestBreakpoints < TestDsl::TestCase
 
     it 'must show an error if no file or line is specified' do
       enter 'break ifa b == 3', 'break 15', 'cont'
-      debug_file('breakpoint1') { state.line.must_equal 15 }
+      debug_file('breakpoint') { $state.line.must_equal 15 }
       check_output_includes \
         'Invalid breakpoint location: ifa b == 3.', interface.error_queue
     end
 
     it 'must show an error if expression syntax is invalid' do
       enter 'break if b -=) 3', 'break 15', 'cont'
-      debug_file('breakpoint1') { state.line.must_equal 15 }
+      debug_file('breakpoint') { $state.line.must_equal 15 }
       check_output_includes \
         'Expression "b -=) 3" syntactically incorrect; breakpoint disabled.',
         interface.error_queue
     end
   end
 
+  describe 'Stopping through `byebug` keyword' do
+    describe 'when not the last instruction of a method' do
+      it 'must stop in the next line' do
+        debug_file('breakpoint') { $state.line.must_equal 13 }
+      end
+    end
+
+    describe 'when last instruction of a method' do
+      it 'must stop right before returning from the frame' do
+        debug_file('breakpoint_deep') { $state.line.must_equal 16 }
+      end
+    end
+  end
+
   describe 'Help' do
     it 'must show info about setting breakpoints when using just "break"' do
       enter 'break', 'cont'
-      debug_file 'breakpoint1'
+      debug_file 'breakpoint'
       check_output_includes /b\[reak\] file:line \[if expr\]/
     end
   end
@@ -385,7 +399,7 @@ class TestBreakpoints < TestDsl::TestCase
   describe 'Post Mortem' do
     it 'must be able to set breakpoints in post-mortem mode' do
       enter 'cont', 'break 12', 'cont'
-      debug_file('post_mortem') { state.line.must_equal 12 }
+      debug_file('post_mortem') { $state.line.must_equal 12 }
     end
   end