redcar 0.9.2 → 0.10

data/plugins/edit_view_swt/lib/edit_view_swt.rb

@@ -85,7 +85,7 @@ module Redcar
       JavaMateView::ThemeManager.load_themes(dir)
     end
 
-    attr_reader :mate_text, :widget, :model
+    attr_reader :mate_text, :widget, :model, :key_listener, :verify_key_listener
 
     def initialize(model, parent, options={})
       @options = options
@@ -110,7 +110,7 @@ module Redcar
 
       create_model_listeners
     end
-    
+
     def create_mate_text
       @mate_text = JavaMateView::MateText.new(@parent, !!@options[:single_line])
       @mate_text.set_font(EditView.font, EditView.font_size)
@@ -288,7 +288,7 @@ module Redcar
         @mate_text.get_text_widget.right_margin = 0
       end
     end
-    
+
     def char_width
       return 0 if !!@options[:single_line]
       @char_width ||= begin
@@ -299,11 +299,11 @@ module Redcar
         width
       end
     end
-    
+
     def clear_char_width
       @char_width = nil
     end
-    
+
     def create_document
       @document = EditViewSWT::Document.new(@model.document, @mate_text.mate_document)
       @model.document.controller = @document
@@ -317,17 +317,17 @@ module Redcar
       h5 = @model.add_listener(:invisibles_changed) do |new_bool|
         @mate_text.showInvisibles(new_bool)
       end
-      
+
       h6 = @model.add_listener(:word_wrap_changed) do |should_word_wrap|
         @mate_text.set_word_wrap(should_word_wrap)
         reset_right_margin
       end
-      
+
       h11 = @model.add_listener(:margin_column_changed) do |new_column|
         @mate_text.set_margin_column(new_column)
         reset_right_margin
       end
-      
+
       h12 = @model.add_listener(:show_margin_changed) do |new_bool|
         if new_bool
           @mate_text.set_margin_column(@model.margin_column)
@@ -335,13 +335,13 @@ module Redcar
           @mate_text.set_margin_column(-1)
         end
       end
-      
+
       h7 = @model.add_listener(:font_changed) do
         @mate_text.set_font(EditView.font, EditView.font_size)
         clear_char_width
         reset_right_margin
       end
-      
+
       h8 = @model.add_listener(:theme_changed) do
         @mate_text.set_theme_by_name(EditView.theme)
       end
@@ -355,8 +355,10 @@ module Redcar
       @mate_text.getTextWidget.addFocusListener(FocusListener.new(self))
       @mate_text.getTextWidget.addVerifyListener(VerifyListener.new(@model.document, self))
       @mate_text.getTextWidget.addModifyListener(ModifyListener.new(@model.document, self))
-      @mate_text.get_control.add_verify_key_listener(VerifyKeyListener.new(self))
-      @mate_text.get_control.add_key_listener(KeyListener.new(self))
+      @verify_key_listener = VerifyKeyListener.new(self)
+      @key_listener = KeyListener.new(self)
+      @mate_text.get_control.add_verify_key_listener(@verify_key_listener)
+      @mate_text.get_control.add_key_listener(@key_listener)
       @handlers << [@model.document, h1] << [@model, h2] << [@model, h3] << [@model, h4] <<
         [@model, h5] << [@model, h6] << [@model, h7] << [@model, h8] <<
         [@model, h9] << [@model, h11] << [@model.document, h13]
@@ -467,15 +469,15 @@ module Redcar
       @mate_text.get_text_widget.add_word_movement_listener(WordMoveListener.new(self))
       @mate_text.get_text_widget.add_control_listener(ControlListener.new(self))
     end
-    
+
     class ControlListener
       def initialize(edit_view_swt)
         @edit_view_swt = edit_view_swt
       end
-      
+
       def controlMoved(*_)
       end
-      
+
       def controlResized(e)
         @edit_view_swt.reset_right_margin
       end
@@ -498,6 +500,22 @@ module Redcar
       @mate_text.viewer.set_top_index(line_index)
     end
 
+    def scroll_to_horizontal_offset(offset)
+      @mate_text.get_text_widget.set_horizontal_index(offset)
+    end
+
+    def smallest_visible_horizontal_index
+      @mate_text.get_text_widget.get_horizontal_index
+    end
+
+    def largest_visible_horizontal_index
+      wpix = @mate_text.get_text_widget.get_client_area.width
+      gc   = org.eclipse.swt.graphics.GC.new(@mate_text.get_text_widget)
+      inc  = gc.getFontMetrics().getAverageCharWidth()
+      gc.dispose
+      @mate_text.get_text_widget.get_horizontal_index + (wpix/inc)
+    end
+
     def model_grammar_changed(name)
       @mate_text.set_grammar_by_name(name)
     end

data/plugins/encryption/encryption.rb

@@ -29,6 +29,7 @@ module Encryption
     def execute
       Encryption.lazy_load
       result = Redcar::Application::Dialog.input("Password", "Enter password")
+      return if result[:button] == :cancel
       pw = result[:value]
       begin
         doc.text = Encryption.decrypt(doc.to_s, pw)
@@ -42,6 +43,7 @@ module Encryption
     def execute
       Encryption.lazy_load
       result = Redcar::Application::Dialog.input("Password", "Enter password")
+      return if result[:button] == :cancel
       pw = result[:value]
       doc.text = Encryption.encrypt(doc.to_s, pw)
     end

data/plugins/find-in-project/lib/find_in_project.rb

@@ -5,14 +5,12 @@ module Redcar
   class FindInProject
     def self.menus
       Redcar::Menu::Builder.build do
-        sub_menu "Edit" do
-          sub_menu "Search" do
-            item "Find In Project!", Redcar::FindInProject::OpenSearch
-          end
+        sub_menu "Project" do
+          item "Find in Project!", :command => Redcar::FindInProject::OpenSearch, :priority => 3
         end
       end
     end
-    
+
   def self.toolbars
     ToolBar::Builder.build do
       item "Find in Project", :command => OpenSearch, :icon => File.join(Redcar::ICONS_DIRECTORY, "application-search-result.png"), :barname => :project

data/plugins/find-in-project/lib/find_in_project/views/index.html.erb

@@ -1,5 +1,7 @@
 <% jquery_path = File.expand_path(File.join(Redcar.root, %w(plugins html_view assets jquery-1.4.min.js))) %>
 <script type="text/javascript" src="file://<%= jquery_path %>"></script>
+<% json_path = File.expand_path(File.join(Redcar.root, %w(plugins html_view assets json2.js))) %>
+<script type="text/javascript" src="file://<%= json_path %>"></script>
 
 <% plugin_css = File.expand_path(File.join(@plugin_root, %w(lib find_in_project stylesheets style.css))) %>
 <link rel="stylesheet" href="file://<%= plugin_css %>" type="text/css" media="screen">

data/plugins/groovy/features/step_definitions/groovy_steps.rb

@@ -1,5 +1,5 @@
-When /^I add "([^"]*)" to the groovy classpath$/ do |dir|
-  File.open(File.expand_path("../../fixtures/.redcar/classpath.groovy", __FILE__), "a") do |f|
+When /^I add "([^"]*)" to the "([^"]*)" classpath$/ do |dir,plugin|
+  File.open(File.expand_path("plugins/#{plugin}/features/fixtures/.redcar/classpath.groovy"), "a") do |f|
     f.puts <<-CONFIG
     def redcar_config = new File(getClass().protectionDomain.codeSource.location.path).parentFile
     def project       = redcar_config.parentFile

data/plugins/groovy/features/syntax_check_groovy.feature

@@ -51,7 +51,7 @@ Feature: Syntax Checking for Groovy
     Given I have not suppressed syntax checking message dialogs
     When I will choose "plugins/groovy/features/fixtures" from the "open_directory" dialog
     And I open a directory
-    And I add "lib2" to the groovy classpath
+    And I add "lib2" to the "groovy" classpath
     And I replace the contents with "class Foo {\n    def x = new Bar(10)\n    def y = new FooBaz()\n}"
     And I save the tab
     Then I should see a message box containing "An error occurred while parsing"
@@ -66,7 +66,7 @@ Feature: Syntax Checking for Groovy
     And I save the tab
     Then the tab should not have annotations
     When I close the focussed tab
-    And I add "lib2" to the groovy classpath
+    And I add "lib2" to the "groovy" classpath
     And I replace the contents with "class Foo {\n    def x = new Bar(10)\n    def y = new FooBaz()\n}"
     And I save the tab
-    Then the tab should have an annotation on line 2
+    Then the tab should have an annotation on line 2

data/plugins/groovy/lib/groovy.rb

@@ -0,0 +1,38 @@
+
+require 'groovy/commands'
+require 'groovy/repl_mirror'
+require 'groovy/syntax_checker'
+
+module Redcar
+  class Groovy
+
+    def self.load_dependencies
+      unless @loaded
+        require File.join(Redcar.asset_dir,"groovy-all")
+        @loaded = true
+      end
+    end
+
+    def self.menus
+      Redcar::Menu::Builder.build do
+        sub_menu "Plugins" do
+          sub_menu "REPL" do
+            item "Open Groovy REPL", GroovyOpenREPL
+          end
+        end
+      end
+    end
+
+    def self.keymaps
+      osx = Keymap.build("main", :osx) do
+        link "Cmd+Alt+G", GroovyOpenREPL
+      end
+
+      linwin = Keymap.build("main", [:linux, :windows]) do
+        link "Ctrl+Alt+G", GroovyOpenREPL
+      end
+
+      [linwin, osx]
+    end
+  end
+end

data/plugins/groovy/lib/groovy/commands.rb

@@ -0,0 +1,10 @@
+
+module Redcar
+  class Groovy
+    class GroovyOpenREPL < Redcar::REPL::OpenREPL
+      def execute
+        open_repl(ReplMirror.new)
+      end
+    end
+  end
+end

data/plugins/{repl/lib/repl/groovy_mirror.rb → groovy/lib/groovy/repl_mirror.rb}

@@ -2,8 +2,8 @@
 require 'java'
 
 module Redcar
-  class REPL
-    class GroovyMirror < ReplMirror
+  class Groovy
+    class ReplMirror < Redcar::REPL::ReplMirror
       def title
         "Groovy REPL"
       end
@@ -11,13 +11,13 @@ module Redcar
       def grammar_name
         "Groovy REPL"
       end
-      
+
       def prompt
         "groovy>"
-      end      
+      end
 
       def evaluator
-        @instance ||= GroovyMirror::Evaluator.new
+        @instance ||= ReplMirror::Evaluator.new
       end
 
       def format_error(e)
@@ -25,19 +25,39 @@ module Redcar
         "ERROR #{e.class}:\n #{e.message}\n        #{backtrace.join("\n        ")}"
       end
 
+      def help
+        h = super
+        h << """
+Note on Groovy Script Scoping:
+Classes, undefined variables, and undefined closures are saved in the script
+binding between statements.
+Defined methods, closures, and variables are not added to the binding,
+because they are considered local variables and thus are not available after
+the defining statement.
+
+Example:
+
+def foo = 'hello! I am a local variable'
+foo = 'hi! I am a binding variable'
+
+See 'http://groovy.codehaus.org/Scoping+and+the+Semantics+of+%22def%22'
+for more information.
+"""
+      end
+
       class Evaluator
-        def self.load_groovy_dependencies
+        def self.load_dependencies
           unless @loaded
-            require File.join(Redcar.asset_dir,"groovy-all")
+            Groovy.load_dependencies
             import 'groovy.lang.GroovyShell'
             import 'java.io.PrintWriter'
             import 'java.io.StringWriter'
             @loaded = true
           end
         end
-        
+
         def initialize
-          GroovyMirror::Evaluator.load_groovy_dependencies
+          Evaluator.load_dependencies
           @out = StringWriter.new
           @shell = GroovyShell.new
           @shell.setProperty('out',@out)
@@ -48,9 +68,9 @@ module Redcar
         end
 
         def execute(cmd)
-          output = @shell.evaluate(cmd).to_s
-          output = "null" unless output and not output.strip.empty?
-          if @out and not @out.toString().strip.empty?
+          output = @shell.evaluate(cmd,"GroovyREPL").to_s
+          output = "null" unless output and not output.empty?
+          if @out and not @out.toString().empty?
             console = @out.toString() + "\n"
           else
             console = ""
@@ -62,4 +82,4 @@ module Redcar
       end
     end
   end
-end
+end

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

@@ -1,14 +1,14 @@
+
 require 'java'
 
 module Redcar
-  module SyntaxCheck
-    class Groovy < Checker
+  class Groovy
+    class SyntaxChecker < Redcar::SyntaxCheck::Checker
       supported_grammars "Groovy", "Easyb"
 
-      def initialize(document)
-        super
+      def self.load_dependencies
         unless @loaded
-          require File.join(Redcar.asset_dir,"groovy-all")
+          Groovy.load_dependencies
           import 'groovy.lang.GroovyShell'
           import 'org.codehaus.groovy.control.CompilationFailedException'
           import 'org.codehaus.groovy.control.CompilerConfiguration'
@@ -16,6 +16,11 @@ module Redcar
         end
       end
 
+      def initialize(document)
+        super
+        SyntaxChecker.load_dependencies
+      end
+
       def check(*args)
         path    = manifest_path(doc)
         name    = File.basename(path)
@@ -27,7 +32,7 @@ module Redcar
         rescue CompilationFailedException => e
           create_syntax_error(doc, e.message, name).annotate
         rescue Object => e
-          SyntaxCheck.message(
+          Redcar::SyntaxCheck.message(
             "An error occurred while parsing #{name}: #{e.message}",:error)
         end
       end
@@ -36,7 +41,7 @@ module Redcar
         message  =~ /#{Regexp.escape(name)}: (\d+):(.*)/
         line     = $1.to_i - 1
         message  = $2
-        SyntaxCheck::Error.new(doc, line, message)
+        Redcar::SyntaxCheck::Error.new(doc, line, message)
       end
 
       def classpath_files(project)
@@ -54,7 +59,7 @@ module Redcar
             part  = shell.run(file, [])
             parts += part if part
           rescue Object => e
-            SyntaxCheck.message(
+            Redcar::SyntaxCheck.message(
               "An error occurred while loading groovy classpath file #{path}: #{e.message}",:error)
           end
         end

data/plugins/groovy/plugin.rb

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

data/plugins/{repl/spec/repl/groovy_mirror_spec.rb → groovy/spec/groovy/repl_mirror_spec.rb}

@@ -1,9 +1,9 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require File.join(File.dirname(__FILE__),'..', 'spec_helper')
 
-class Redcar::REPL
-  describe GroovyMirror do
+class Redcar::Groovy
+  describe ReplMirror do
     before(:all) do
-      @mirror = GroovyMirror.new
+      @mirror = ReplMirror.new
       @changed_event = false
       @mirror.add_listener(:change) { @changed_event = true }
     end
@@ -12,44 +12,45 @@ class Redcar::REPL
       while @mirror.read.nil? || @mirror.read[-8,8] != "groovy> "
       end
     end
-    
+
     describe "before executing" do
       it "should exist" do
         @mirror.should be_exist
       end
-      
+
       it "should have a title" do
         @mirror.title.should == "Groovy REPL"
       end
-      
+
       it "should not be changed" do
         @mirror.should_not be_changed
       end
     end
-    
+
     describe "after executing" do
       it "should exist" do
         @mirror.should be_exist
       end
-      
+
       it "should have a title" do
         @mirror.title.should == "Groovy REPL"
       end
-      
+
       it "should not be changed" do
         @mirror.should_not be_changed
       end
-      
+
       it "should have a prompt" do
         wait_for_prompt
         @mirror.read.should == (<<-Groovy).chomp
 # Groovy REPL
+# type 'help' for help
 
 groovy> 
 Groovy
       end
-      
+
     end
-          
+
   end
 end