redcar 0.9.2 → 0.10

data/plugins/html_view/lib/html_view.rb

@@ -19,6 +19,7 @@ module Redcar
     def self.keymaps
       map = Redcar::Keymap.build("main", [:osx, :linux, :windows]) do
         link "Alt+Shift+B", ToggleBrowserBar
+        link "Alt+Shift+P", FileWebPreview
       end
       [map]
     end

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

@@ -0,0 +1,27 @@
+After do
+  # Truncate the test file
+  File.open(File.expand_path("../../fixtures/test.java", __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/java/features/syntax_check_java.feature

@@ -0,0 +1,86 @@
+Feature: Syntax Checking for Java
+  As a user
+  I want to get annotations on syntax errors in Java files
+
+  Background:
+    When I have opened "plugins/java/features/fixtures/test.java"
+
+  Scenario: A syntax-clean Java 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 Java file should cause syntax error annotations
+    When I replace the contents with "class Foo {\n    int\n}"
+    And I save the tab
+    And I wait "2.5" seconds
+    Then the tab should have annotations
+    And the tab should have an annotation on line 2
+
+  Scenario: Fixing a syntax-error in a Java file should cause syntax error annotations to vanish
+    When I replace the contents with "class Foo {\n    int\n}"
+    And I save the tab
+    And I wait "2.5" seconds
+    Then the tab should have annotations
+    When I replace the contents with "class Foo {\n\n}"
+    And I wait "2.5" seconds
+    And I save the tab
+    Then the tab should not have annotations
+
+  Scenario: If java is excluded from being checked, I should see no syntax errors
+    Given I excluded "java" files from being checked for syntax errors
+    When I replace the contents with "class Foo {\n    int\n}"
+    And I save the tab
+    And I wait "2.5" seconds
+    Then the tab should not have annotations
+
+  Scenario: A file which references unknown java classes should cause syntax error annotations
+    And I replace the contents with "class Foo {\n    Bar x = new Bar(10);\n    FooBar y = new FooBar();\n}"
+    And I save the tab
+    And I wait "2.5" seconds
+    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 java classpath
+    When I will choose "plugins/java/features/fixtures" from the "open_directory" dialog
+    And I open a directory
+    And I replace the contents with "class Foo {\n    Bar x = new Bar(10);\n    FooBar y = new FooBar();\n}"
+    And I save the tab
+    And I wait "2.5" seconds
+    Then the tab should not have annotations
+
+  Scenario: If a project classpath.java 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/java/features/fixtures" from the "open_directory" dialog
+    And I open a directory
+    And I have opened "plugins/java/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 classpath file"
+
+  Scenario: If an error occurs while parsing a java file, there should be an error message
+    Given I have not suppressed syntax checking message dialogs
+    When I will choose "plugins/java/features/fixtures" from the "open_directory" dialog
+    And I open a directory
+    And I add "lib2" to the "java" classpath
+    And I replace the contents with "class Foo {\n    Bar x = new Bar(10);\n    FooBaz 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 not have annotations
+
+  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/java/features/fixtures" from the "open_directory" dialog
+    And I open a directory
+    And I have opened "plugins/java/features/fixtures/.redcar/classpath.groovy"
+    And I replace the contents with "sdef"
+    And I save the tab
+    And I wait "2.5" seconds
+    Then the tab should not have annotations
+    When I close the focussed tab
+    And I add "lib2" to the "java" classpath
+    And I replace the contents with "class Foo {\n    Bar x = new Bar(10);\n    FooBaz y = new FooBaz();\n}"
+    And I save the tab
+    And I wait "2.5" seconds
+    And the tab should have annotations

data/plugins/java/lib/syntax_check/java.rb

@@ -0,0 +1,86 @@
+require 'java'
+require 'open3'
+module Redcar
+  module SyntaxCheck
+    class Java < Checker
+      supported_grammars "Java"
+
+      def check(*args)
+        path = manifest_path(doc)
+        name = File.basename(path)
+        temp = java.lang.System.getProperty('java.io.tmpdir')
+        if t = Java.thread and t.alive? and t[:java]
+          t.exit
+          SyntaxCheck.remove_syntax_error_annotations(doc.edit_view)
+        end
+        Java.thread=Thread.new do
+          Thread.current[:java] = true
+          begin
+            cmd = "javac -d #{temp}"
+            if project = Project::Manager.focussed_project and
+              cpath = classpath(project)
+              cmd << " -cp \"#{cpath}\""
+            end
+            stdin,stdout,err = Open3.popen3("#{cmd} #{path}")
+            err.each_line do |msg|
+              if msg =~ /#{Regexp.escape(name)}:(\d+):(.*)/
+                SyntaxCheck::Error.new(doc, $1.to_i - 1, $2).annotate
+                sleep 1
+              end
+            end
+          rescue Object => e
+            SyntaxCheck.message(
+            "An error occurred while parsing #{name}: #{e.message}", :error)
+          end
+        end
+      end
+
+      def classpath_files(project)
+        project.config_files("classpath.groovy")
+      end
+
+      def classpath(project)
+        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
+        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 classpath file #{path}: #{e.message}",:error)
+            end
+          end
+          build_classpath(parts)
+      end
+
+      def build_classpath(parts)
+        composite = ""
+        separator = java.lang.System.getProperty('path.separator')
+        parts.each {|p| composite << p+separator}
+        composite[0,composite.length-1] if composite.length > 0
+        composite
+      end
+
+      private
+
+      def self.thread
+        @thread
+      end
+
+      def self.thread=(thread)
+        @thread = thread
+      end
+    end
+  end
+end

data/plugins/java/plugin.rb

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

data/plugins/javascript/features/fixtures/test2.js

@@ -0,0 +1,5 @@
+boo foo
+baz
+bee
+baux
+beau

data/plugins/javascript/features/step_definitions/javascript_steps.rb

@@ -0,0 +1,16 @@
+When /^I save the tab (\d+) times and wait (\d+) seconds each time$/ do |count,time|
+  count = count.to_i
+  time  = time.to_i
+  (1..count).each do |i|
+    begin
+      When "I save the tab"
+      When "I wait #{time} seconds"
+    rescue => e
+      add_exception(e)
+    end
+  end
+end
+
+Then /^the tab should not have thrown SWT concurrency exceptions$/ do
+  exception_count.should == 0
+end

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

@@ -1,4 +1,18 @@
 After do
   # Truncate the test file
   File.open(File.expand_path("../../fixtures/test.js", __FILE__), "w")
+  @exceptions = 0
+end
+
+Before do
+  @exceptions = 0
+end
+
+def add_exception(e)
+  @exceptions = @exceptions + 1
+  p e.message
+end
+
+def exception_count
+  @exceptions
 end

data/plugins/javascript/features/syntax_check_javascript.feature

@@ -13,15 +13,58 @@ Feature: Syntax Checking for JavaScript
   Scenario: A syntax-error in a JavaScript file should cause syntax error annotations
     When I replace the contents with "var foo = 1;\nbar"
     And I save the tab
-    And I wait "1.5" seconds
+    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 JavaScript file should cause syntax error annotations to vanish
     When I replace the contents with "var foo = 1;\nbar"
     And I save the tab
-    And I wait "1.5" seconds
+    And I wait 2 seconds
     Then the tab should have annotations
     When I replace the contents with "var foo = 1;\nvar bar;"
     And I save the tab
-    Then the tab should not have annotations
+    Then the tab should not have annotations
+
+  Scenario: Checking for syntax errors on a file with syntax errors should not cause concurrency errors
+    When I replace the contents with "foo\nbar\nfunction\nbax\nboo\nbonne"
+    And I save the tab 10 times and wait 2 seconds each time
+    Then the tab should not have thrown SWT concurrency exceptions
+
+  Scenario: Checking for syntax errors between two different error-throwing files should not cause concurrency errors
+    When I replace the contents with "foo\nbar\nfunction\nbax\nboo\nbonne"
+    And I have opened "plugins/javascript/features/fixtures/test2.js"
+    And I replace the contents with "boo foo\nbaz\nbee\nbaux\nbeau"
+    And I save the tab
+    And I wait 1 seconds
+    And I switch up a tab
+    And I save the tab
+    And I wait 1 seconds
+    And I switch down a tab
+    And I save the tab
+    And I wait 1 seconds
+    And I switch up a tab
+    And I save the tab
+    And I wait 1 seconds
+    Then the tab should not have thrown SWT concurrency exceptions
+    And the tab should have annotations
+    When I switch down a tab
+    Then the tab should have annotations
+
+  Scenario: Checking rapidly for syntax errors between two files should not cause concurrency errors
+    When I replace the contents with "foo\nbar\nfunction\nbax\nboo\nbonne"
+    And I have opened "plugins/javascript/features/fixtures/test2.js"
+    And I replace the contents with "boo foo\nbaz\nbee\nbaux\nbeau"
+    And I save the tab
+    And I switch up a tab
+    And I save the tab
+    And I switch down a tab
+    And I save the tab
+    And I switch up a tab
+    And I save the tab
+    And I wait 5 seconds
+    Then the tab should not have thrown SWT concurrency exceptions
+    And the tab should have annotations
+    When I switch down a tab
+    Then the tab should have annotations
+

data/plugins/javascript/lib/syntax_check/javascript.rb

@@ -1,4 +1,3 @@
-require 'java'
 
 module Redcar
   module SyntaxCheck
@@ -14,21 +13,28 @@ module Redcar
         File.join(Redcar.asset_dir,'js.jar')
       end
 
+      def main_method
+        "org.mozilla.javascript.tools.shell.Main"
+      end
+
       def check(*args)
-        path    = manifest_path(doc)
-        name    = File.basename(path)
-        text    = doc.get_all_text
-        if t = JavaScript.thread and t.alive? and t[:js]
-          t.exit
-          SyntaxCheck.remove_syntax_error_annotations(doc.edit_view)
+        path = manifest_path(doc)
+        name = File.basename(path)
+        if t = JavaScript.thread and t.alive?
+          if t[:doc] and t[:doc] == doc
+            t.exit
+            SyntaxCheck.remove_syntax_error_annotations(doc.edit_view)
+          end
         end
         JavaScript.thread=Thread.new do
-          Thread.current[:js] = true
+          SyntaxCheck.remove_syntax_error_annotations(doc.edit_view)
+          Thread.current[:doc] = doc
           begin
-            output = `java -cp #{rhino_path} org.mozilla.javascript.tools.shell.Main #{jslint_path} #{path}`
+            output = `java -cp #{rhino_path} #{main_method} #{jslint_path} #{path}`
             output.each_line do |line|
               if line =~ /Lint at line (\d+) character (\d+): (.*)/
                 SyntaxCheck::Error.new(doc, $1.to_i-1, $3).annotate
+                sleep 1
               end
             end
           rescue Object => e

data/plugins/line_tools/features/trim_line.feature

@@ -22,3 +22,52 @@ Scenario: Trimming a line with unicode
   And I move the cursor to 5
   And I trim the line
   Then the contents should be "foo\nb\nbaz"
+
+Scenario: Trimming a line with Windows line endings
+  When I open a new edit tab
+  And I replace the contents with "foo\r\nbść\r\nbaz"
+  And I move the cursor to 6
+  And I trim the line
+  Then the contents should be "foo\r\nb\r\nbaz"
+
+Scenario: Trimming empty line removes newline character
+  When I open a new edit tab
+  And I replace the contents with "foo\n\nbaz"
+  And I move the cursor to 4
+  And I trim the line
+  Then the contents should be "foo\nbaz"
+
+Scenario: Trimming empty line removes newline character (Windows)
+  When I open a new edit tab
+  And I replace the contents with "foo\r\n\r\nbaz"
+  And I move the cursor to 5
+  And I trim the line
+  Then the contents should be "foo\r\nbaz"
+
+Scenario: Trimming when at end of line removes newline character
+  When I open a new edit tab
+  And I replace the contents with "foo\nbść\nbaz"
+  And I move the cursor to 7
+  And I trim the line
+  Then the contents should be "foo\nbśćbaz"
+
+Scenario: Trimming when at end of file and newline absent it does nothing
+  When I open a new edit tab
+  And I replace the contents with "foo\nbść\nbaz"
+  And I move the cursor to 11
+  And I trim the line
+  Then the contents should be "foo\nbść\nbaz"
+
+Scenario: Trimming when just before last newline character it removes it
+  When I open a new edit tab
+  And I replace the contents with "foo\nbść\nbaz\n"
+  And I move the cursor to 11
+  And I trim the line
+  Then the contents should be "foo\nbść\nbaz"
+
+Scenario: Trimming when at end of file and newline present it does nothing
+  When I open a new edit tab
+  And I replace the contents with "foo\nbść\nbaz\n"
+  And I move the cursor to 12
+  And I trim the line
+  Then the contents should be "foo\nbść\nbaz\n"

data/plugins/line_tools/lib/line_tools.rb

@@ -92,7 +92,11 @@ module Redcar
           text = doc.get_slice(offset, doc.offset_at_line_end(line_ix))
         end
         doc.controllers(Redcar::AutoIndenter::DocumentController).first.disable do
-          doc.replace(offset, text.split(//).length, "\n")
+          if text == doc.line_delimiter or text == ""
+            doc.replace(offset, text.split(//).length, "")
+          else
+            doc.replace(offset, text.split(//).length, doc.line_delimiter)
+          end
         end
         #doc.cursor_offset = doc.cursor_offset - 1
       end

data/plugins/mirah/README

@@ -0,0 +1,7 @@
+== Syntax checking for Mirah in Redcar
+
+Complains and suggestions
+  Michal Hantl michal.hantl@gmail.com
+
+Thank you
+  Delisa Mason, Rib Rdb, Nick Howard