redcar 0.8.1 → 0.9.0

data/plugins/edit_view_swt/lib/edit_view_swt/document.rb

@@ -57,6 +57,7 @@ module Redcar
       end
 
       def offset_at_line(line_ix)
+        line_ix = [line_ix, line_count - 1].min
         jface_document.get_line_offset(line_ix)
       end
 
@@ -72,15 +73,27 @@ module Redcar
       def replace(offset, length, text)
         @model.verify_text(offset, offset+length, text)
         jface_document.replace(offset, length, text)
-        #if length > text.length
-        #  @swt_mate_document.mateText.redraw
-        #end
         @model.modify_text
       end
 
       def text=(text)
         @model.verify_text(0, length, text)
-        jface_document.set(text)
+        top_pixel   = styledText.getTopPixel
+        caret       = cursor_offset
+        line        = line_at_offset(caret)
+        caret       = caret - offset_at_line(line)
+
+        styledText.setRedraw(false)
+        styledText.setText(text)
+
+        unless line > line_count - 1
+          # The documents new text is still longer than our previous position, restore position
+          line_offset = offset_at_line(line)
+          styledText.setCaretOffset([line_offset + caret, offset_at_line(line + 1) - 1].min)
+          styledText.setTopPixel(top_pixel)
+        end
+
+        styledText.setRedraw(true)
         @model.modify_text
         notify_listeners(:set_text)
       end

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

@@ -7,10 +7,7 @@ module Redcar
       Redcar::Menu::Builder.build do
         sub_menu "Edit" do
           sub_menu "Search" do
-            sub_menu "Find In Project", :priority => 64 do
-              item "Find In Project!", Redcar::FindInProject::OpenSearch
-              item "Edit Preferences", Redcar::FindInProject::EditPreferences
-            end
+            item "Find In Project!", Redcar::FindInProject::OpenSearch
           end
         end
       end

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

@@ -26,19 +26,5 @@ module Redcar
         end
       end
     end
-
-    class EditPreferences < Redcar::Command
-      def execute
-        Redcar.app.make_sure_at_least_one_window_open # open a new window if needed
-
-        Redcar::FindInProject.storage # populate the file if it isn't already
-
-        tab  = Redcar.app.focussed_window.new_tab(Redcar::EditTab)
-        mirror = Project::FileMirror.new(File.join(Redcar.user_dir, "storage", "find_in_project.yaml"))
-        tab.edit_view.document.mirror = mirror
-        tab.edit_view.reset_undo
-        tab.focus
-      end
-    end
   end
 end

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

@@ -51,6 +51,18 @@ module Redcar
         doc.scroll_to_line(line.to_i)
         nil
       end
+      
+      def preferences
+        Redcar.app.make_sure_at_least_one_window_open # open a new window if needed
+
+        Redcar::FindInProject.storage # populate the file if it isn't already
+
+        tab  = Redcar.app.focussed_window.new_tab(Redcar::EditTab)
+        mirror = Project::FileMirror.new(File.join(Redcar.user_dir, "storage", "find_in_project.yaml"))
+        tab.edit_view.document.mirror = mirror
+        tab.edit_view.reset_undo
+        tab.focus
+      end
 
       def close
         Thread.kill(@thread) if @thread

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

@@ -40,6 +40,7 @@
           <label for="match_case">Match case</label>
           <input type="checkbox" id="with_context" <%="checked=checked" if @with_context %>>
           <label for="with_context">With context</label>
+          <a href="#" title="Edit Preferences" id="edit_preferences">Edit Preferences...</a>
         </td>
         <td></td>
       </tr>
@@ -94,6 +95,10 @@
         $('#recent_queries').show();
       }
     });
+    
+    $('#edit_preferences').click(function(ev) {
+      Controller.preferences();
+    });
 
     // in the case the user wants to search for things like <table>, we need to unescape the entities
     String.prototype.unescapeHTML = function() {

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

@@ -0,0 +1,27 @@
+When /^I add "([^"]*)" to the groovy classpath$/ do |dir|
+  File.open(File.expand_path("../../fixtures/.redcar/classpath.groovy", __FILE__), "a") do |f|
+    f.puts <<-CONFIG
+    def redcar_config = new File(getClass().protectionDomain.codeSource.location.path).parentFile
+    def project       = redcar_config.parentFile
+    def classpath     = []
+
+    //installed libraries
+    def lib = new File(project.path + File.separator + "lib")
+    lib.list().each {name -> classpath << lib.path+File.separator+name}
+
+    //compiled classes
+    def target_classes = new File(
+    	project.path + File.separator +
+    	"target"     + File.separator +
+    	"classes"
+    )
+
+    classpath << target_classes.path
+
+    //other classes
+    classpath << project.path + File.separator + "#{dir}"
+
+    return classpath.toArray()
+    CONFIG
+  end
+end

data/plugins/groovy/features/support/env.rb

@@ -0,0 +1,27 @@
+After do
+  # Truncate the test file
+  File.open(File.expand_path("../../fixtures/test.groovy", __FILE__), "w")
+  
+  #recreate the classpath file
+  File.open(File.expand_path("../../fixtures/.redcar/classpath.groovy", __FILE__), "w") do |f|
+    f.puts <<-CONFIG
+    def redcar_config = new File(getClass().protectionDomain.codeSource.location.path).parentFile
+    def project       = redcar_config.parentFile
+    def classpath     = []
+    
+    //installed libraries
+    def lib = new File(project.path + File.separator + "lib")
+    lib.list().each {name -> classpath << lib.path+File.separator+name}
+    
+    //compiled classes
+    def target_classes = new File(
+    	project.path + File.separator +
+    	"target"     + File.separator +
+    	"classes"
+    )
+    classpath << target_classes.path
+    
+    return classpath.toArray()
+    CONFIG
+  end
+end

data/plugins/groovy/features/syntax_check_groovy.feature

@@ -0,0 +1,72 @@
+Feature: Syntax Checking for Groovy
+  As a user
+  I want to get annotations on syntax errors in Groovy files
+
+  Background:
+    When I have opened "plugins/groovy/features/fixtures/test.groovy"
+
+  Scenario: A syntax-clean Groovy file has no syntax error annotations
+    When I replace the contents with "class Foo {\n\n}"
+    And I save the tab
+    Then the tab should not have annotations
+
+  Scenario: A syntax-error in a Groovy file should cause syntax error annotations
+    When I replace the contents with "class Foo {\n    sdef\n}"
+    And I save the tab
+    Then the tab should have annotations
+    And the tab should have an annotation on line 2
+
+  Scenario: Fixing a syntax-error in a Groovy file should cause syntax error annotations to vanish
+    When I replace the contents with "class Foo {\n    sdef\n}"
+    And I save the tab
+    Then the tab should have annotations
+    When I replace the contents with "class Foo {\n\n}"
+    And I save the tab
+    Then the tab should not have annotations
+
+  Scenario: A file which references unknown groovy classes should cause syntax error annotations
+    And I replace the contents with "class Foo {\n    def x = new Bar(10)\n    def y = new FooBar()\n}"
+    And I save the tab
+    Then the tab should have annotations
+    And the tab should have an annotation on line 2
+
+  Scenario: A project can add libraries and compiled class directories to the groovy classpath
+    When I will choose "plugins/groovy/features/fixtures" from the "open_directory" dialog
+    And I open a directory
+    And I replace the contents with "class Foo {\n    def x = new Bar(10)\n    def y = new FooBar()\n}"
+    And I save the tab
+    Then the tab should not have annotations
+
+  Scenario: If a project classpath.groovy file has syntax errors, there should be an error message and annotations
+    And I close the focussed tab
+    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 have opened "plugins/groovy/features/fixtures/.redcar/classpath.groovy"
+    And I replace the contents with "def x = 4\nsdef"
+    And I save the tab
+    Then I should see a message box containing "An error occurred while loading groovy classpath file"
+
+  Scenario: If an error occurs while parsing a groovy file, there should be an error message
+    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 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"
+    And the tab should have an annotation on line 2
+
+  Scenario: If syntax message dialogs are suppressed, I should see no message boxes
+    Given I have 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 have opened "plugins/groovy/features/fixtures/.redcar/classpath.groovy"
+    And I replace the contents with "sdef"
+    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 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

data/plugins/groovy/lib/syntax_check/groovy.rb

@@ -0,0 +1,76 @@
+require 'java'
+
+module Redcar
+  module SyntaxCheck
+    class Groovy < Checker
+      supported_grammars "Groovy", "Easyb"
+
+      def initialize(document)
+        super
+        unless @loaded
+          require File.join(Redcar.asset_dir,"groovy-all")
+          import 'groovy.lang.GroovyShell'
+          import 'org.codehaus.groovy.control.CompilationFailedException'
+          import 'org.codehaus.groovy.control.CompilerConfiguration'
+          @loaded = true
+        end
+      end
+
+      def check(*args)
+        path    = manifest_path(doc)
+        name    = File.basename(path)
+        shell   = create_shell
+        text    = doc.get_all_text
+        io      = java.io.File.new(path)
+        begin
+          shell.parse(io)
+        rescue CompilationFailedException => e
+          create_syntax_error(doc, e.message, name).annotate
+        rescue Object => e
+          SyntaxCheck.message(
+            "An error occurred while parsing #{name}: #{e.message}",:error)
+        end
+      end
+
+      def create_syntax_error(doc, message, name)
+        message  =~ /#{Regexp.escape(name)}: (\d+):(.*)/
+        line     = $1.to_i - 1
+        message  = $2
+        SyntaxCheck::Error.new(doc, line, message)
+      end
+
+      def classpath_files(project)
+        project.config_files("classpath.groovy")
+      end
+
+      def classpath(project)
+        parts  = []
+        shell  = GroovyShell.new
+        files  = classpath_files(project)
+        return unless files.any?
+        files.each do |path|
+          begin
+            file  = java.io.File.new(path)
+            part  = shell.run(file, [])
+            parts += part if part
+          rescue Object => e
+            SyntaxCheck.message(
+              "An error occurred while loading groovy classpath file #{path}: #{e.message}",:error)
+          end
+        end
+        parts
+      end
+
+      def create_shell
+        config = CompilerConfiguration.new
+        if project = Redcar::Project::Manager.focussed_project
+          classpath = classpath(project)
+          config.setClasspathList(classpath) if classpath and classpath.any?
+        end
+        shell = GroovyShell.new(config)
+        shell.setProperty("out",nil)
+        shell
+      end
+    end
+  end
+end

data/plugins/groovy/plugin.rb

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

data/plugins/help/lib/help.rb

@@ -1,4 +1,7 @@
 
+require 'help/view_controller'
+require 'help/help_tab'
+
 module Redcar
   class Help
     def self.menus
@@ -7,6 +10,7 @@ module Redcar
           group(:priority => :first) do
             item "Online Help", :command => OnlineHelpCommand
             item "Submit a Bug", :command => SubmitABugCommand
+            item "Keyboard Shortcuts", :command => ViewShortcutsCommand
           end
         end
       end
@@ -19,20 +23,40 @@ module Redcar
       [map]
     end
 
+    def self.toolbars
+      ToolBar::Builder.build do
+        item "Keyboard Shortcuts", :command => ViewShortcutsCommand, :icon => File.join(Redcar::ICONS_DIRECTORY, "/keyboard.png"), :barname => :help
+        item "Help", :command => OnlineHelpCommand, :icon => File.join(Redcar::ICONS_DIRECTORY, "/question.png"), :barname => :help
+      end
+    end
+
+    class ViewShortcutsCommand < Redcar::Command
+      def execute
+        controller = Help::ViewController.new
+        tab = win.new_tab(Help::HelpTab)
+        tab.html_view.controller = controller
+        tab.focus
+      end
+    end
+
     class SubmitABugCommand < Redcar::Command
       def execute
-        Redcar::WebBookmarks::DisplayWebContent.new(
+        Redcar::HtmlView::DisplayWebContent.new(
           "Submit a Bug",
-          "https://redcar.lighthouseapp.com/projects/25090-redcar/tickets/new"
+          "https://redcar.lighthouseapp.com/projects/25090-redcar/tickets/new",
+          true,
+          Help::HelpTab
         ).run
       end
     end
 
     class OnlineHelpCommand < Redcar::Command
       def execute
-        Redcar::WebBookmarks::DisplayWebContent.new(
+        Redcar::HtmlView::DisplayWebContent.new(
           "Online Help",
-          "http://github.com/redcar/redcar/wiki/Users-Guide"
+          "http://github.com/redcar/redcar/wiki/Users-Guide",
+          true,
+          Help::HelpTab
         ).run
       end
     end

data/plugins/help/lib/help/help_tab.rb

@@ -0,0 +1,11 @@
+module Redcar
+  class Help
+    class HelpTab < HtmlTab
+      DEFAULT_ICON = HELP_ICON
+
+      def icon
+        DEFAULT_ICON
+      end
+    end
+  end
+end

data/plugins/help/lib/help/view_controller.rb

@@ -0,0 +1,25 @@
+module Redcar
+  class Help
+    class ViewController
+      include HtmlController
+
+      def title
+        "Shortcuts"
+      end
+
+      def clean_name(command)
+        name = command.to_s.sub("Command","")
+        idx = name.rindex("::")
+        unless idx.nil?
+          name = name[idx+2,name.length]
+        end
+        name = name.split(/(?=[A-Z])/).map{|w| w}.join(" ").sub("R E P L","REPL")
+      end
+
+      def index
+        rhtml = ERB.new(File.read(File.join(File.dirname(__FILE__), "..", "..", "views", "index.html.erb")))
+        rhtml.result(binding)
+      end
+    end
+  end
+end

data/plugins/help/plugin.rb

@@ -4,5 +4,6 @@ Plugin.define do
   version "1.0"
   file    "lib", "help"
   object  "Redcar::Help"
-  dependencies "web_bookmarks", ">0"
+  dependencies "web_bookmarks", ">0",
+               "open_default_app", ">0.1"
 end

data/plugins/{view_shortcuts → help}/views/index.html.erb

@@ -1,7 +1,7 @@
 <html>
   <head>
     <title>Keyboard Shortcuts</title>
-    <% redcar_css = File.expand_path(File.join(Redcar.root, %w(plugins view_shortcuts views default.css))) %>
+    <% redcar_css = File.expand_path(File.join(Redcar.root, %w(plugins help views default.css))) %>
     <link rel="stylesheet" href="file://<%= redcar_css %>" type="text/css" media="screen">
   </head>
   <body>