redcar 0.9.2 → 0.10

data/plugins/repl/lib/repl/repl_tab.rb

@@ -1,25 +1,150 @@
+
 module Redcar
   class REPL
-    class ReplTab < Redcar::EditTab
-      
+    class Tab < Redcar::EditTab
+
       DEFAULT_ICON = :application_terminal
-      
+
       def initialize(*args, &block)
         super(*args,&block)
       end
-      
+
       def icon
         DEFAULT_ICON
       end
-      
+
+      def close
+        history = REPL.storage['command_history']
+        history[repl_mirror.title] = repl_mirror.command_history
+        REPL.storage['command_history'] = history
+        notify_listeners(:close)
+      end
+
+      def repl_mirror
+        edit_view.document.mirror
+      end
+
       def repl_mirror=(mirror)
         edit_view.document.mirror = mirror
         edit_view.cursor_offset = edit_view.document.length
         edit_view.grammar = mirror.grammar_name
-        mirror.add_listener(:change) do
+        indenters = edit_view.document.controllers(Redcar::AutoIndenter::DocumentController)
+        indenters.first.increase_ignore
+        update_cursor_size
+        attach_listeners
+      end
+
+      def attach_listeners
+        control = edit_view.controller.mate_text.get_control
+        control.add_verify_key_listener(Redcar::ReplSWT::KeyListener.new(self))
+        control.remove_key_listener(edit_view.controller.key_listener)
+        control.remove_verify_key_listener(edit_view.controller.verify_key_listener)
+        repl_mirror.add_listener(:change) do
           edit_view.cursor_offset = edit_view.document.length
           edit_view.scroll_to_line(edit_view.document.line_count)
         end
+        edit_view.add_listener(:font_changed) do
+          update_cursor_size
+        end
+      end
+
+      def current_command
+        offset     = repl_mirror.current_offset.to_i
+        end_offset = edit_view.document.length
+        length     = end_offset.to_i - offset.to_i
+        edit_view.document.get_range(offset,length) if length > 0
+      end
+
+      def cached_command
+        @cached_command
+      end
+
+      def set_command(text)
+        offset = repl_mirror.current_offset.to_i
+        length = 0
+        length = current_command.split(//).length if current_command
+        if length > 0
+          edit_view.document.replace(offset,length,text.to_s)
+        else
+          edit_view.document.cursor_offset = offset
+          edit_view.document.insert_at_cursor(text.to_s)
+          edit_view.document.cursor_offset = edit_view.document.length
+        end
+      end
+
+      def go_to_previous_command
+        if repl_mirror.command_index == repl_mirror.command_history.size
+          @cached_command = current_command
+        end
+        command = repl_mirror.previous_command
+        set_command(command) if command
+      end
+
+      def go_to_next_command
+        command = repl_mirror.next_command || cached_command
+        command = "" if current_command and !command
+        set_command(command) if command
+      end
+
+      def go_to_home?
+        cursor_line = edit_view.document.cursor_line
+        prompt_line = edit_view.document.line_at_offset(repl_mirror.current_offset.to_i)
+        if cursor_line == prompt_line
+          edit_view.document.cursor_offset = repl_mirror.current_offset.to_i
+          false
+        else
+          true
+        end
+      end
+
+      def commit_changes
+        @cached_command = nil
+        edit_view.document.save!
+      end
+
+      # Check (and move, if necessary) the cursor position before inserting text
+      def check_cursor_location
+        offset         = repl_mirror.current_offset
+        current_offset = edit_view.document.cursor_offset
+        end_offset     = edit_view.document.selection_offset
+        if end_offset and end_offset < current_offset
+          current_offset = end_offset
+          end_offset     = edit_view.document.cursor_offset
+        end
+        unless current_offset.to_i >= offset
+          if edit_view.document.selection? and end_offset > offset
+            edit_view.document.set_selection_range(offset,end_offset)
+          else
+            edit_view.document.cursor_offset = edit_view.document.length
+          end
+        end
+      end
+
+      def backspace_possible?
+        check_cursor_location
+        length = 0
+        length = current_command.split(//).length if current_command
+        length > 0
+      end
+
+      def delete_possible?
+        check_cursor_location
+        offset = edit_view.document.cursor_offset
+        edit_view.document.length - offset > 0
+      end
+
+      private
+
+      def update_cursor_size
+        if widget = edit_view.controller.mate_text.get_text_widget
+          caret = Swt::Widgets::Caret.new(widget, Swt::SWT::NONE)
+          caret.set_image(nil)
+          widget.set_caret(caret)
+          height = widget.get_line_height
+          width  = edit_view.controller.char_width
+          caret.set_size(width,height)
+          caret.set_visible(true)
+        end
       end
     end
   end

data/plugins/repl/plugin.rb

@@ -1,7 +1,7 @@
 
 Plugin.define do
   name    "repl"
-  version "1.0"
+  version "1.1"
   file    "lib", "repl"
   object  "Redcar::REPL"
   dependencies "redcar", ">0"

data/plugins/repl/spec/repl/repl_mirror_spec.rb

@@ -0,0 +1,72 @@
+require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+
+class Redcar::REPL
+  describe ReplMirror do
+    before do
+      @mirror = ReplMirror.new
+      @changed_event = false
+      @mirror.add_listener(:change) { @changed_event = true }
+    end
+
+    describe "has special commands" do
+      it "gives usage assistance" do
+        @mirror.evaluate('help')
+        @mirror.history.include?(@mirror.help).should == true
+      end
+
+      it "clears command output" do
+        ['1','2','3'].each {|cmd| @mirror.add_command(cmd)}
+        @mirror.evaluate('clear')
+        @mirror.history.should == @mirror.prompt + " "
+      end
+
+      it "resets command history" do
+        ['1','2','3'].each {|cmd| @mirror.add_command(cmd)}
+        @mirror.evaluate('reset')
+        @mirror.command_history.should == []
+        @mirror.history.should == @mirror.initial_preamble
+        Redcar::REPL.storage['command_history'][@mirror.title].should == []
+      end
+    end
+
+    describe "has command history" do
+      it "should be empty initially" do
+        @mirror.command_history.should == []
+      end
+
+      describe "adding and navigating command history" do
+        before(:each) do
+          Redcar::REPL.storage['command_history'][@mirror.title] = []
+          ['1','2','3'].each {|cmd| @mirror.add_command(cmd)}
+        end
+
+        it "should add new commands" do
+          @mirror.command_history.size.should == 3
+        end
+
+        it "should retrieve previous commands in order" do
+          @mirror.previous_command.should == "3"
+          @mirror.previous_command.should == "2"
+          @mirror.previous_command.should == "1"
+          @mirror.previous_command.should == nil
+        end
+
+        it "should retrieve next commands in order" do
+          @mirror.previous_command.should == "3"
+          @mirror.previous_command.should == "2"
+          @mirror.previous_command.should == "1"
+          @mirror.next_command.should == "2"
+          @mirror.next_command.should == "3"
+          @mirror.next_command.should == nil
+        end
+
+        it "should have a maximum size" do
+          @mirror.set_buffer_size 3
+          ['4','5'].each {|cmd| @mirror.add_command(cmd)}
+          @mirror.command_history.size.should == 3
+          @mirror.command_history.should == ['3','4','5']
+        end
+      end
+    end
+  end
+end

data/plugins/repl/spec/spec_helper.rb

@@ -2,4 +2,4 @@ $:.push File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
 
 require 'redcar'
 Redcar.environment = :test
-Redcar.load_unthreaded
+Redcar.load_unthreaded

data/plugins/repl_swt/lib/repl_swt.rb

@@ -0,0 +1,7 @@
+require 'repl_swt/key_listener'
+
+module Redcar
+  class ReplSWT
+
+  end
+end

data/plugins/repl_swt/lib/repl_swt/key_listener.rb

@@ -0,0 +1,43 @@
+
+module Redcar
+  class ReplSWT
+    class KeyListener
+      def initialize(controller)
+        @controller = controller
+      end
+
+      def key_pressed(e)
+      end
+
+      def key_released(e)
+      end
+
+      def verify_key(e)
+        e.doit = false
+        case e.keyCode
+        when Swt::SWT::ARROW_UP
+          @controller.go_to_previous_command
+        when Swt::SWT::ARROW_DOWN
+          @controller.go_to_next_command
+        when Swt::SWT::ARROW_LEFT
+          e.doit = @controller.backspace_possible?
+        when Swt::SWT::CR
+          if e.stateMask == Swt::SWT::SHIFT
+            e.doit = true
+          else
+            @controller.commit_changes
+          end
+        when Swt::SWT::HOME
+          e.doit = @controller.go_to_home?
+        when Swt::SWT::DEL
+          e.doit = @controller.delete_possible?
+        when Swt::SWT::BS
+          e.doit = @controller.backspace_possible?
+        else
+          @controller.check_cursor_location
+          e.doit = true
+        end
+      end
+    end
+  end
+end

data/plugins/repl_swt/plugin.rb

@@ -0,0 +1,8 @@
+
+Plugin.define do
+  name    "REPL SWT bindings"
+  version "1.0"
+  file    "lib", "repl_swt"
+  object  "Redcar::ReplSWT"
+  dependencies "redcar", ">0"
+end

data/plugins/ruby/lib/ruby.rb

@@ -0,0 +1,35 @@
+require 'ruby/syntax_checker'
+require 'ruby/repl_mirror'
+
+module Redcar
+  class Ruby
+
+    def self.menus
+      Menu::Builder.build do
+        sub_menu "Plugins" do
+          sub_menu "REPL" do
+            item "Open Ruby REPL", RubyOpenREPL
+          end
+        end
+      end
+    end
+
+    def self.keymaps
+      osx = Keymap.build("main", :osx) do
+        link "Cmd+Shift+R", RubyOpenREPL
+      end
+
+      linwin = Keymap.build("main", [:linux, :windows]) do
+        link "Ctrl+Shift+R", RubyOpenREPL
+      end
+
+      [linwin, osx]
+    end
+
+    class RubyOpenREPL < Redcar::REPL::OpenREPL
+      def execute
+        open_repl(ReplMirror.new)
+      end
+    end
+  end
+end

data/plugins/{repl/lib/repl/ruby_mirror.rb → ruby/lib/ruby/repl_mirror.rb}

@@ -1,33 +1,33 @@
 
 module Redcar
-  class REPL
-    class RubyMirror < ReplMirror
-      
+  class Ruby
+    class ReplMirror < Redcar::REPL::ReplMirror
+
       def title
         "Ruby REPL"
       end
-      
+
       def grammar_name
         "Ruby REPL"
       end
-      
+
       def prompt
         ">>"
       end
-      
+
       def format_error(e)
-        backtrace = e.backtrace.reject{|l| l =~ /ruby_mirror/}
+        backtrace = e.backtrace.reject{|l| l =~ /repl_mirror/}
         backtrace.unshift("(repl):1")
         "#{e.class}: #{e.message}\n        #{backtrace.join("\n        ")}"
       end
-      
+
       def evaluator
-        @evaluator ||= RubyMirror::Evaluator.new
+        @evaluator ||= ReplMirror::Evaluator.new
       end
-      
+
       class Evaluator
         attr_reader :output
-        
+
         def initialize
           @binding = binding
           @output = nil
@@ -36,7 +36,7 @@ module Redcar
         def inspect
           "main"
         end
-        
+
         def execute(command)
           eval(command, @binding).inspect
         end

data/plugins/ruby/lib/{syntax_check/ruby.rb → ruby/syntax_checker.rb}

@@ -1,8 +1,8 @@
 require 'java'
 
 module Redcar
-  module SyntaxCheck
-    class Ruby < Checker
+  class Ruby
+    class SyntaxChecker < Redcar::SyntaxCheck::Checker
       supported_grammars "Ruby", "Ruby on Rails"
 
       def check(*args)
@@ -21,7 +21,7 @@ module Redcar
         message  =~ /#{Regexp.escape(file)}:(\d+):(.*)/
         line     = $1.to_i - 1
         message  = $2
-        SyntaxCheck::Error.new(doc, line, message)
+        Redcar::SyntaxCheck::Error.new(doc, line, message)
       end
     end
   end

data/plugins/ruby/plugin.rb

@@ -1,7 +1,8 @@
 Plugin.define do
   name    "ruby"
-  version "0.1"
-  file    "lib", "syntax_check", "ruby"
-  object  "Redcar::SyntaxCheck::Ruby"
-  dependencies "syntax_check", ">0"
+  version "0.2"
+  file    "lib", "ruby"
+  object  "Redcar::Ruby"
+  dependencies "syntax_check", ">0",
+               "repl", ">0"
 end

data/plugins/{repl/spec/repl/ruby_mirror_spec.rb → ruby/spec/ruby/repl_mirror_spec.rb}

@@ -1,25 +1,27 @@
 require File.join(File.dirname(__FILE__), '..', 'spec_helper')
 
-class Redcar::REPL
-  describe RubyMirror do
+class Redcar::Ruby
+  describe ReplMirror do
     before do
-      @mirror = RubyMirror.new
+      @mirror = ReplMirror.new
       @changed_event = false
       @mirror.add_listener(:change) { @changed_event = true }
     end
-    
+
     def commit_test_text1
       text = <<-RUBY
 # Ruby REPL
+# type 'help' for help
 
 >> $internal_repl_test = 707
 RUBY
       @mirror.commit(text.chomp)
     end
-    
+
     def result_test_text1
       (<<-RUBY).chomp
 # Ruby REPL
+# type 'help' for help
 
 >> $internal_repl_test = 707
 => 707
@@ -30,6 +32,7 @@ RUBY
     def commit_test_text2
       text = <<-RUBY
 # Ruby REPL
+# type 'help' for help
 
 >> $internal_repl_test = 707
 => 707
@@ -38,10 +41,11 @@ RUBY
       @mirror.commit(text.chomp)
       text.chomp
     end
-    
+
     def result_test_text2
       (<<-RUBY).chomp
 # Ruby REPL
+# type 'help' for help
 
 >> $internal_repl_test = 707
 => 707
@@ -50,59 +54,61 @@ RUBY
 >> 
 RUBY
     end
-    
-    
+
+
     def commit_no_input
       text = <<-RUBY
 # Ruby REPL
+# type 'help' for help
 
 >> 
 RUBY
       @mirror.commit(text)
     end
-    
-    def prompt     
+
+    def prompt
       "# Ruby REPL\n\n"
     end
-    
+
     describe "with no history" do
       it "should exist" do
         @mirror.should be_exist
       end
-      
+
       it "should have a message and a prompt" do
         @mirror.read.should == (<<-RUBY).chomp
 # Ruby REPL
+# type 'help' for help
 
 >> 
 RUBY
       end
-      
+
       it "should have a title" do
         @mirror.title.should == "Ruby REPL"
       end
-      
+
       it "should not be changed" do
         @mirror.should_not be_changed
       end
-      
+
       describe "when executing" do
         it "should execute committed text" do
           commit_test_text1
           $internal_repl_test.should == 707
         end
-        
+
         it "should allow committing nothing as the first command" do
           commit_no_input
-          @mirror.read.should == "# Ruby REPL\n\n>> \n=> nil\n>> "
+          @mirror.read.should == "# Ruby REPL\n# type 'help' for help\n\n>> \n=> nil\n>> "
         end
-        
+
         it "should allow committing nothing as an xth command" do
           committed = commit_test_text2
           @mirror.commit committed + "\n>> "
-          @mirror.read.should == "# Ruby REPL\n\n>> $internal_repl_test = 909\n=> 909\n>> \n=> nil\n>> "      
+          @mirror.read.should == "# Ruby REPL\n# type 'help' for help\n\n>> $internal_repl_test = 909\n=> 909\n>> \n=> nil\n>> "
         end
-        
+
         it "should emit changed event when text is executed" do
           commit_test_text1
           @changed_event.should be_true
@@ -112,11 +118,12 @@ RUBY
           commit_test_text1
           @mirror.read.should == result_test_text1
         end
-        
+
         it "should display errors" do
           @mirror.commit(prompt + ">> nil.foo")
           @mirror.read.should == (<<-RUBY).chomp
 # Ruby REPL
+# type 'help' for help
 
 >> nil.foo
 x> NoMethodError: undefined method `foo' for nil:NilClass
@@ -127,44 +134,45 @@ RUBY
         end
       end
     end
-    
+
     describe "with a history" do
       before do
         commit_test_text1
       end
-      
+
       it "should not have changed" do
         @mirror.changed?.should be_false
       end
-      
+
       it "should display the history and prompt correctly" do
         @mirror.read.should == result_test_text1
       end
-      
+
       describe "when executing" do
         it "should execute committed text" do
           commit_test_text2
           $internal_repl_test.should == 909
         end
-        
+
         it "should show the correct history" do
           commit_test_text2
           @mirror.read.should == result_test_text2
         end
-        
+
         it "should allow the history to be cleared" do
           @mirror.clear_history
           @mirror.read.should == ">> "
         end
-        
+
       end
     end
-    
+
     describe "when executing" do
       it "should execute inside a main object" do
         @mirror.commit(prompt + ">> self")
         @mirror.read.should == (<<-RUBY).chomp
 # Ruby REPL
+# type 'help' for help
 
 >> self
 => main
@@ -178,6 +186,7 @@ RUBY
         @mirror.commit(sent + "\n>> a")
         @mirror.read.should == (<<-RUBY).chomp
 # Ruby REPL
+# type 'help' for help
 
 >> a = 13
 => 13