From the TTY and Readline drivers, rewrite the last line if it was ch…

…anged.

git-svn-id: http://svn.macosforge.org/repository/ruby/DietRB/trunk@4857 23306eb0-4c56-4727-a40e-e92c0eb68959

lib/irb/driver/tty.rb

@@ -3,6 +3,11 @@
 module IRB
   module Driver
     class TTY
+      move_one_line_up      = "\e[1A"
+      move_to_begin_of_line = "\r"
+      clear_to_end_of_line  = "\e[0K"
+      CLEAR_LAST_LINE       = move_one_line_up + move_to_begin_of_line + clear_to_end_of_line
+
       attr_reader :input, :output, :context_stack
 
       def initialize(input = $stdin, output = $stdout)
@@ -28,17 +33,13 @@ def consume
         ""
       end
 
-      def last_line_decreased_indentation_level(reformatted_line)
-        move_one_line_up      = "\e[1A"
-        move_to_begin_of_line = "\r"
-        clear_to_end_of_line  = "\e[0K"
-        clear_last_line       = move_one_line_up + move_to_begin_of_line + clear_to_end_of_line
-        @output.print clear_last_line
-        @output.puts(context.prompt + reformatted_line)
+      def update_last_line(reformatted_line)
+        @output.print CLEAR_LAST_LINE
+        @output.puts(context.prompt(true) + reformatted_line)
       end
 
       def process_input(line)
-        context.process_line(line) { |new_line| last_line_decreased_indentation_level(new_line) }
+        context.process_line(line) { |reformatted_line| update_last_line(reformatted_line) }
       end
 
       # Feeds input into a given context.

spec/driver/tty_spec.rb

@@ -1,10 +1,12 @@
 require File.expand_path('../../spec_helper', __FILE__)
 require 'irb/driver/tty'
 
+main = self
+
 describe "IRB::Driver::TTY" do
   before do
     @driver = IRB::Driver::TTY.new(InputStub.new, OutputStub.new)
-    @context = IRB::Context.new(Object.new)
+    @context = IRB::Context.new(main)
     @driver.context_stack << @context
   end
 
@@ -38,6 +40,22 @@ def @driver.readline; raise Interrupt; end
     @driver.consume.should == ""
     @context.source.to_s.should == ""
   end
+
+  it "feeds the input into the context" do
+    @driver.process_input("def foo")
+    @context.source.to_s.should == "def foo"
+  end
+
+  it "updates the previously printed line on the console, if a change to the input occurs (such as re-indenting)" do
+    @context.formatter.auto_indent = true
+    @driver.process_input("def foo")
+    @driver.process_input("p :ok")
+    @driver.process_input("  end")
+    @driver.output.printed.strip.should == [
+      IRB::Driver::TTY::CLEAR_LAST_LINE + "irb(main):002:1>   p :ok",
+      IRB::Driver::TTY::CLEAR_LAST_LINE + "irb(main):003:1> end"
+    ].join("\n")
+  end
 end
 
 describe "IRB::Driver::TTY, when starting the runloop" do