redcar-dev 0.12.12dev-java → 0.12.13dev-java

data/plugins/project_search/lib/project_search/word_search.rb

@@ -1,8 +1,12 @@
 
 class ProjectSearch
   class WordSearch
+    java_import org.apache.lucene.util.Version
+    java_import org.apache.lucene.analysis.standard.StandardAnalyzer
+    java_import org.apache.lucene.queryParser.QueryParser
+
     attr_reader :query_string, :context_size, :project
-    
+
     def initialize(project, query_string, match_case, context_size)
       @project      = project
       @query_string = query_string
@@ -25,6 +29,13 @@ class ProjectSearch
     def regex
       @regex ||= begin
         regexp_text = Regexp.escape(@query_string)
+        # Replace Lucene wildcards with non-greedy Ruby regex equivalents
+        # TODO: determine best (expected?) way of handling phrases
+        p [regexp_text]
+        regexp_text = regexp_text.gsub(/\\\s+or\\\s+/i,"|").gsub('\\*','.*?').gsub('\\?','.').gsub(/\\\s+/,".*?")
+        p regexp_text
+        # Match to the next word boundary if the last char is '*'
+        regexp_text += "\\b" if regexp_text =~ /\.\*\?$/
         match_case? ? /#{regexp_text}/ : /#{regexp_text}/i
       end
     end
@@ -79,24 +90,22 @@ class ProjectSearch
     def results
       @results ||= generate_results
     end
-    
-    def bits
-      query_string.
-        gsub(/[^\w]/, " ").
-        gsub("_", " ").
-        split(/\s/).
-        map {|b| b.strip}.
-        reject {|b| b == "" or org.apache.lucene.analysis.standard.StandardAnalyzer::STOP_WORDS_SET.to_a.include?(b)}
+
+    def formatted_query
+      parser = QueryParser.new(
+        Version::LUCENE_29,
+        "contents",
+        StandardAnalyzer.new(Version::LUCENE_29)
+      )
+      parser.parse(query_string).to_s
     end
-    
+
     def doc_ids
       @doc_ids ||= begin
         index = ProjectSearch.indexes[project.path].lucene_index
         doc_ids = nil
-        bits.each do |bit|
-          new_doc_ids = index.find(:contents => bit.downcase).map {|doc| doc.id }
-          doc_ids = doc_ids ? (doc_ids & new_doc_ids) : new_doc_ids
-        end
+        p [:formatted_query, formatted_query]
+        doc_ids = index.find(formatted_query).map {|doc| doc.id}
         doc_ids.reject {|doc_id| Redcar::Project::FileList.hide_file_path?(doc_id) }
       end
     end

data/plugins/project_search/lib/project_search/word_search_controller.rb

@@ -8,11 +8,11 @@ class ProjectSearch
     def title
       TITLE
     end
-    
+
     def search_copy
       "Search for complete words only"
     end
-    
+
     def show_literal_match_option?
       false
     end
@@ -20,31 +20,31 @@ class ProjectSearch
     def num_context_lines
       settings['context_lines']
     end
-    
+
     def plugin_root
       File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
     end
-    
+
     def settings
       ProjectSearch.storage
     end
-    
+
     def match_case?
       ProjectSearch.storage['match_case']
     end
-    
+
     def context?
       ProjectSearch.storage['with_context']
     end
-    
+
     def context_size
       context? ? num_context_lines : 0
     end
-    
+
     def default_query
       doc.selected_text if doc && doc.selection?
     end
-    
+
     def index
       render('index')
     end
@@ -79,20 +79,20 @@ class ProjectSearch
       @thread = nil
       super
     end
-    
+
     def render(view, bg=nil)
       erb(view).result(bg || binding)
     end
-    
+
     def render_file(bg)
       @erb ||= erb("_file")
       @erb.result(bg)
     end
-    
+
     def erb(view)
       ERB.new(File.read(File.join(File.dirname(__FILE__), "views", "#{view.to_s}.html.erb")))
     end
-    
+
     def doc
       Redcar.app.focussed_window.focussed_notebook_tab.edit_view.document rescue false
     end
@@ -107,11 +107,11 @@ class ProjectSearch
       ProjectSearch.storage['recent_queries'] = add_or_move_to_top(query, ProjectSearch.storage['recent_queries'])
       ProjectSearch.storage['match_case']     = (match_case == 'true')
       ProjectSearch.storage['with_context']   = (with_context == 'true')
-      
+
       project = Redcar::Project::Manager.focussed_project
-      
+
       @word_search = WordSearch.new(project, query, match_case?, context_size)
-      
+
       # kill any existing running search to prevent memory bloat
       Thread.kill(@thread) if @thread
       @thread = nil
@@ -122,7 +122,7 @@ class ProjectSearch
           line_num = 0
           have_prepared_table = false
           have_results = false
-          
+
           @word_search.on_file_results do |hits|
             next unless hits.any?
             have_results = true
@@ -130,26 +130,29 @@ class ProjectSearch
             line_num += hits.length
             set_file_count(file_num)
             set_line_count(line_num)
-            file = hits.first.file
-            
+
             unless have_prepared_table
               prepare_results_table
               have_prepared_table = true
             end
 
+            file = hits.first.file
+            add_nav_link(file,hits.length)
+
+
             file_html = render_file(binding)
             escaped_file_html = escape_javascript(file_html)
             execute("$('#results table tr:last').after(\"#{escaped_file_html}\");")
           end
-          
+
           @word_search.generate_results
-          
+
           if have_results
             remove_initial_blank_tr
           else
             render_no_results
           end
-          
+
           hide_spinner
           Thread.kill(@thread) if @thread
           @thread = nil
@@ -160,29 +163,37 @@ class ProjectSearch
       end
       nil
     end
-    
+
     def initialize_search_output
+      image_path = File.expand_path(File.join(plugin_root, %w(lib project_search images)))
       execute("$('#cached_query').val(\"#{escape_javascript(@word_search.query_string)}\");")
-      execute("$('#results').html(\"<div id='no_results'>Searching...</div>\");")
+      execute("$('#results').html(\"<div id='no_results'>Searching...<br/><img id='spinner' src='#{image_path}/spinner.gif' style='display:none;'/></div>\");")
       execute("$('#spinner').show();")
       execute("$('#results_summary').hide();")
       execute("$('#file_results_count').html(0);")
       execute("$('#line_results_count').html(0);")
     end
-    
+
     def prepare_results_table
       execute("if ($('#results table').size() == 0) { $('#results').html(\"<table><tr></tr></table>\"); }")
       execute("if ($('#results_summary').first().is(':hidden')) { $('#results_summary').show(); }")
+      execute("$('#files_nav').html('<li></li>');")
     end
-    
+
     def set_file_count(value)
       execute("$('#file_results_count').html(\"#{value}\");")
     end
-    
+
     def set_line_count(value)
       execute("$('#line_results_count').html(\"#{value}\");")
     end
-    
+
+    def add_nav_link(file,hit_count)
+      file = File.basename(file)
+      link= file.gsub(/\.|:|\\|\//,"")
+      execute("$('#files_nav').append('<li><a id=\"link_#{link}\" class=\"file_link\">#{file} (#{hit_count})</a></li>');")
+    end
+
     def remove_initial_blank_tr
       execute("$('#results table tr:first').remove();")
     end
@@ -191,7 +202,7 @@ class ProjectSearch
       result = "<div id='no_results'>No results were found using the search terms you provided.</div>"
       execute("$('#results').html(\"#{escape_javascript(result)}\");")
     end
-    
+
     def hide_spinner
       execute("$('#spinner').hide();")
     end

metadata

@@ -2,7 +2,7 @@
 name: redcar-dev
 version: !ruby/object:Gem::Version 
   prerelease: 7
-  version: 0.12.12dev
+  version: 0.12.13dev
 platform: java
 authors: 
   - Daniel Lucraft
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-14 00:00:00 +01:00
+date: 2011-08-19 00:00:00 +01:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -250,6 +250,7 @@ files:
   - lib/redcar/ruby_extensions.rb
   - lib/redcar/runner.rb
   - lib/redcar/usage.rb
+  - lib/tasks/app-bundle.rake
   - plugins/application/plugin.rb
   - plugins/application/features/main_menu.feature
   - plugins/application/features/navigation_history.feature
@@ -570,14 +571,6 @@ files:
   - plugins/java/features/fixtures/lib/classes.jar
   - plugins/java/features/support/env.rb
   - plugins/java/lib/syntax_check/java.rb
-  - plugins/javascript/plugin.rb
-  - plugins/javascript/features/syntax_check_javascript.feature
-  - plugins/javascript/features/fixtures/test.js
-  - plugins/javascript/features/fixtures/test2.js
-  - plugins/javascript/features/step_definitions/javascript_steps.rb
-  - plugins/javascript/features/support/env.rb
-  - plugins/javascript/lib/syntax_check/javascript.rb
-  - plugins/javascript/vendor/jslint.js
   - plugins/key_bindings/plugin.rb
   - plugins/key_bindings/lib/key_bindings.rb
   - plugins/key_bindings/spec/spec_helper.rb
@@ -608,17 +601,6 @@ files:
   - plugins/macros/spec/spec_helper.rb
   - plugins/macros/spec/macros/predictive/sequence_finder_spec.rb
   - plugins/macros/views/macro_manager.html.erb
-  - plugins/mirah/plugin.rb
-  - plugins/mirah/README
-  - plugins/mirah/features/syntax_check_mirah.feature
-  - plugins/mirah/features/fixtures/test.mirah
-  - plugins/mirah/lib/mirah.rb
-  - plugins/mirah/lib/mirah/my_error_handler.rb
-  - plugins/mirah/lib/mirah/repl_mirror.rb
-  - plugins/mirah/lib/mirah/syntax_checker.rb
-  - plugins/mirah/spec/spec_helper.rb
-  - plugins/mirah/spec/mirah/repl_mirror_spec.rb
-  - plugins/mirah/vendor/mirah-parser.jar
   - plugins/my_plugin/plugin.rb
   - plugins/my_plugin/lib/my_plugin.rb
   - plugins/open_default_app/plugin.rb
@@ -689,7 +671,6 @@ files:
   - plugins/project/spec/project/adapters/remote_protocols/sftp_spec.rb
   - plugins/project/views/bulk_rename.html.erb
   - plugins/project_search/plugin.rb
-  - plugins/project_search/TODO.md
   - plugins/project_search/features/word_search.feature
   - plugins/project_search/features/support/env.rb
   - plugins/project_search/lib/project_search.rb

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

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

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

@@ -1,16 +0,0 @@
-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,18 +0,0 @@
-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

@@ -1,70 +0,0 @@
-Feature: Syntax Checking for JavaScript
-  As a user
-  I want to get annotations on syntax errors in JavaScript files
-  # 
-  # Background:
-  #   When I have opened "plugins/javascript/features/fixtures/test.js"
-  # 
-  # Scenario: A syntax-clean JavaScript file has no syntax error annotations
-  #   When I replace the contents with "var foo = 1;"
-  #   And I save the tab
-  #   Then the tab should not have annotations
-  # 
-  # 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 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 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
-  # 
-  # 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,58 +0,0 @@
-
-module Redcar
-  module SyntaxCheck
-    class JavaScript < Checker
-      supported_grammars  "JavaScript", "JavaScript (Rails)",
-                          "jQuery (JavaScript)", "HTML"
-
-      def jslint_path
-        File.join(File.dirname(__FILE__),'..','..','vendor','jslint.js')
-      end
-
-      def rhino_path
-        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)
-        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
-          SyntaxCheck.remove_syntax_error_annotations(doc.edit_view)
-          Thread.current[:doc] = doc
-          begin
-            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
-            SyntaxCheck.message(
-            "An error occurred while parsing #{name}: #{e.message}",:error)
-          end
-        end
-      end
-
-      private
-
-      def self.thread=(thread)
-        @thread=thread
-      end
-
-      def self.thread
-        @thread
-      end
-    end
-  end
-end