redcar 0.9.2 → 0.10

data/plugins/mirah/features/fixtures/test.mirah

@@ -0,0 +1,2 @@
+def foo
+end

data/plugins/mirah/features/syntax_check_mirah.feature

@@ -0,0 +1,46 @@
+Feature: Syntax Checking for Mirah
+  As a user
+  I want to get annotations on syntax errors and warnings in Mirah files
+
+  Background:
+    When I have opened "plugins/mirah/features/fixtures/test.mirah"
+
+  Scenario: A syntax-clean Mirah file has no syntax error annotations
+    When I replace the contents with "def foo\n  bar\nend"
+    And I save the tab
+    And I wait 2 seconds
+    Then the tab should not have annotations
+
+  Scenario: A syntax-error in a Mirah file should cause syntax error annotations
+    When I replace the contents with "def foo\n  => bar\nend"
+    And I save the tab
+    And I wait 2 seconds
+    Then the tab should have annotations
+    And the tab should have an annotation on line 2
+
+  Scenario: A syntax-warning in a Mirah file should cause syntax warning annotations
+    When I replace the contents with "def foo\n end"
+    And I save the tab
+    And I wait 2 seconds
+    Then the tab should have annotations
+    And the tab should have an annotation on line 2
+
+  Scenario: Fixing a syntax-error in a Mirah file should cause syntax error annotations to vanish
+    When I replace the contents with "def foo\n  => bar\nend"
+    And I save the tab
+    And I wait 2 seconds
+    Then the tab should have annotations
+    When I replace the contents with "def foo\n  bar\nend"
+    And I save the tab
+    And I wait 2 seconds
+    Then the tab should not have annotations
+
+  Scenario: Fixing a syntax-warning in a Mirah file should cause syntax error annotations to vanish
+    When I replace the contents with "def foo\n end"
+    And I save the tab
+    And I wait 2 seconds
+    Then the tab should have annotations
+    When I replace the contents with "def foo\nend"
+    And I save the tab
+    And I wait 2 seconds
+    Then the tab should not have annotations

data/plugins/mirah/lib/mirah.rb

@@ -0,0 +1,43 @@
+
+require 'java'
+require 'mirah/syntax_checker'
+require 'mirah/repl_mirror'
+
+module Redcar
+  class Mirah
+
+    def self.menus
+      Menu::Builder.build do
+        sub_menu "Plugins" do
+          sub_menu "REPL" do
+            item "Open Mirah REPL", MirahOpenREPL
+          end
+        end
+      end
+    end
+
+    def self.load_dependencies
+      unless @loaded
+        require File.join(File.dirname(__FILE__),'..','vendor','mirah-parser')
+        import  'mirah.impl.MirahParser'
+        import  'jmeta.ErrorHandler'
+        require 'mirah/my_error_handler'
+        @loaded = true
+      end
+    end
+
+    def self.storage
+      @storage ||= begin
+        storage = Plugin::Storage.new('mirah')
+        storage.set_default('check_for_warnings', true)
+        storage
+      end
+    end
+
+    class MirahOpenREPL < Redcar::REPL::OpenREPL
+      def execute
+        open_repl(ReplMirror.new)
+      end
+    end
+  end
+end

data/plugins/mirah/lib/mirah/my_error_handler.rb

@@ -0,0 +1,22 @@
+
+module Redcar
+  class Mirah
+    class MyErrorHandler
+      include ErrorHandler
+
+      def problem(m)
+        (@problems||=[]) << m
+      end
+
+      def problems
+        @problems || []
+      end
+
+      def warning(messages, positions)
+        messages.length.times { |i|
+          problem "Warning: #{messages[i]} #{positions[i]}"
+        }
+      end
+    end
+  end
+end

data/plugins/mirah/lib/mirah/repl_mirror.rb

@@ -0,0 +1,50 @@
+
+module Redcar
+  class Mirah
+    class ReplMirror < Redcar::REPL::ReplMirror
+
+      def title
+        "Mirah REPL"
+      end
+
+      def grammar_name
+        "Ruby REPL"
+      end
+
+      def prompt
+        ">>"
+      end
+
+      def format_error(e)
+        backtrace = e.backtrace.reject{|l| 
+          l =~ /(repl_mirror|redcar)/
+        }
+        backtrace.unshift("(repl):1")
+        "#{e.class}: #{e.message}\n        #{backtrace.join("\n        ")}"
+      end
+
+      def evaluator
+        @evaluator ||= ReplMirror::Evaluator.new
+      end
+
+      class Evaluator
+        attr_reader :output
+
+        def initialize
+          Mirah.load_dependencies
+          @binding = binding
+          @impl   = Java::MirahImpl::Mirah.new
+          @output = nil
+        end
+
+        def inspect
+          "main"
+        end
+
+        def execute(command)
+          @impl.instance_eval(command).inspect
+        end
+      end
+    end
+  end
+end

data/plugins/mirah/lib/mirah/syntax_checker.rb

@@ -0,0 +1,38 @@
+
+module Redcar
+  class Mirah
+    class SyntaxChecker < Redcar::SyntaxCheck::Checker
+      supported_grammars "Mirah"
+
+      def check(*args)
+        Mirah.load_dependencies
+        check_warnings = Mirah.storage['check_for_warnings']
+        path = manifest_path(doc)
+
+        parser = MirahParser.new
+        parser.filename = path
+
+        handler = MyErrorHandler.new
+        parser.errorHandler = handler
+
+        begin
+          parser.parse(IO.read(path))
+        rescue
+          m = $!.message
+          error = m.split(" (").first
+          if info = m.match(/line: ([0-9]+), char: ([0-9]+)\)/)
+            SyntaxCheck::Error.new(doc, info[1].to_i-1, error).annotate
+          end
+        end
+
+        if check_warnings
+          handler.problems.each do |problem|
+            if info = problem.match(/line: ([0-9]+), char: ([0-9]+)\)/)
+              SyntaxCheck::Warning.new(doc, info[1].to_i-1, problem.split(" (").first).annotate
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/plugins/mirah/plugin.rb

@@ -0,0 +1,8 @@
+Plugin.define do
+  name    "mirah"
+  version "1.0"
+  file    "lib", "mirah"
+  object  "Redcar::Mirah"
+  dependencies "syntax_check", ">0",
+               "repl", ">0"
+end

data/plugins/mirah/spec/mirah/repl_mirror_spec.rb

@@ -0,0 +1,188 @@
+require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+
+class Redcar::Mirah
+  describe ReplMirror do
+    before do
+      @mirror = ReplMirror.new
+      @changed_event = false
+      @mirror.add_listener(:change) { @changed_event = true }
+    end
+
+    def commit_test_text1
+      text = <<-MIRAH
+# Mirah REPL
+# type 'help' for help
+
+>> $internal_repl_test = 707
+MIRAH
+      @mirror.commit(text.chomp)
+    end
+
+    def result_test_text1
+      (<<-MIRAH).chomp
+# Mirah REPL
+# type 'help' for help
+
+>> $internal_repl_test = 707
+=> 707
+>> 
+MIRAH
+    end
+
+    def commit_test_text2
+      text = <<-MIRAH
+# Mirah REPL
+# type 'help' for help
+
+>> $internal_repl_test = 707
+=> 707
+>> $internal_repl_test = 909
+MIRAH
+      @mirror.commit(text.chomp)
+      text.chomp
+    end
+
+    def result_test_text2
+      (<<-MIRAH).chomp
+# Mirah REPL
+# type 'help' for help
+
+>> $internal_repl_test = 707
+=> 707
+>> $internal_repl_test = 909
+=> 909
+>> 
+MIRAH
+    end
+
+
+    def commit_no_input
+      text = <<-MIRAH
+# Mirah REPL
+# type 'help' for help
+
+>> 
+MIRAH
+      @mirror.commit(text)
+    end
+
+    def prompt
+      "# Mirah 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 == (<<-MIRAH).chomp
+# Mirah REPL
+# type 'help' for help
+
+>> 
+MIRAH
+      end
+
+      it "should have a title" do
+        @mirror.title.should == "Mirah 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 == "# Mirah 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 == "# Mirah 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
+        end
+
+        it "should now have the command and the result at the end" do
+          commit_test_text1
+          @mirror.read.should == result_test_text1
+        end
+
+        it "should display errors" do
+          @mirror.commit(prompt + ">> nil.foo")
+          text = <<-MIRAH
+# Mirah REPL
+# type 'help' for help
+
+>> nil.foo
+x> NoMethodError: undefined method `foo' for nil:NilClass
+        (repl):1
+MIRAH
+          @mirror.read.include?(text).should be_true
+        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
+
+# somehow ...
+#     describe "when executing" do
+#       it "should persist local variables" do
+#         sent = prompt + ">> a = 13"
+#         @mirror.commit(sent)
+#         @mirror.commit(sent + "\n>> a")
+#         @mirror.read.should == (<<-MIRAH).chomp
+# # Mirah REPL
+# # type 'help' for help
+# 
+# >> a = 13
+# => 13
+# >> a
+# => 13
+# >> 
+# MIRAH
+#       end
+#    end
+  end
+end

data/plugins/mirah/spec/spec_helper.rb

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

data/plugins/pair_highlighter/lib/pair_highlighter/document_controller.rb

@@ -5,7 +5,7 @@ module Redcar
 
       attr_accessor :gc, :styledText, :document, :mate_text, :theme_name
       attr_accessor :height, :width, :highlighted
- 
+
       include Redcar::Document::Controller
       include Redcar::Document::Controller::ModificationCallbacks
       include Redcar::Document::Controller::CursorCallbacks
@@ -14,14 +14,14 @@ module Redcar
         if @theme_name == EditView.theme
           return @colour if @colour
         end
-            
+
         @theme_name = EditView.theme
         @theme = @mate_text.colourer.getTheme()
         @colour = @theme.globalSettings.get("pairHighlight")
       	if @colour
       	  @colour = JavaMateView::SwtColourer.getColour(@colour)
       	else
-          @colour = ApplicationSWT.display.system_color Swt::SWT::COLOR_GRAY	      	  
+          @colour = ApplicationSWT.display.system_color Swt::SWT::COLOR_GRAY
       	end
       	@colour
       end
@@ -57,15 +57,15 @@ module Redcar
           clear
           #puts "Highligh on offset " + current.to_s() + " and its pair at " + pair.to_s()
           gc = Swt::Graphics::GC.new(@styledText)
-          gc.setBackground(set_highlight_colour) 
+          gc.setBackground(set_highlight_colour)
           gc.setAlpha(98)
           gc.fill_rectangle(styledText.getTextBounds(current, current))
-          gc.fill_rectangle(styledText.getTextBounds(pair, pair))          
+          gc.fill_rectangle(styledText.getTextBounds(pair, pair))
           @highlight.set_on(current, pair)
           gc.dispose() if gc
         end
       end
-      
+
       def clear
         if @highlight.on?
 	        styledText.redrawRange(@highlight.current, 1, false) if @highlight.current < document.length
@@ -73,14 +73,14 @@ module Redcar
           @highlight.clear
         end
       end
-      
+
       def find_pair(step, offset, search_char, current_char)
         state = 1;
         quotes = false
         doublequotes = false
-        
+
+        offset = offset + step;
         while offset >= 0 and offset < document.length
-          offset = offset + step;
           @newchar = styledText.getTextRange(offset, 1)
           if @newchar == search_char and !quotes and !doublequotes
             state = state - 1
@@ -94,8 +94,9 @@ module Redcar
           if state == 0
             return offset
           end
+          offset = offset + step;
         end
-        
+
         if state != 0
           return nil
         end
@@ -121,47 +122,47 @@ module Redcar
         if @wait > 0
           return
         end
-        
+
         pair = nil
-        
+
         if offset >= document.length
             @char_next = nil
         else
-            @char_next = document.get_range(offset, 1)    
+            @char_next = document.get_range(offset, 1)
         end
-        
+
         if offset > 0
-            @char_prev = document.get_range(offset-1, 1) 
+            @char_prev = document.get_range(offset-1, 1)
         else
             @char_prev = nil
         end
-        
+
         if @char_next and @pair_chars.include?(@char_next)
-            pair = pair_of_offset(offset)            
+            pair = pair_of_offset(offset)
         elsif @char_prev and @pair_chars.include?(@char_prev)
             offset = offset - 1
             pair = pair_of_offset(offset)
         else
             clear
         end
-        
+
         highlight_pair(offset, pair)
       end
     end
-    
+
     class Highlighted
       attr_accessor :on, :current, :pair
-      
+
       def initialize
         clear
       end
-      
+
       def clear
         @on = false
         @current = nil
         @pair = nil
       end
-      
+
       def on?
         if @on
           true
@@ -169,7 +170,7 @@ module Redcar
           false
         end
       end
-      
+
       def set_on(current, pair)
         if current and pair
           @on = true