redcar-dev 0.12.15dev-java → 0.12.16dev-java

data/CHANGES

@@ -19,6 +19,9 @@ Version 0.12 (TBA)
  * Added option to add editable ComboItem widgets to Speedbars (Delisa Mason)
  * Updated UI Styling (Delisa Mason)
  * Added option to color tree background color via ApplicationSWT preferences (Delisa Mason)
+ * Project tree has colourful icons (Delisa Mason)
+ * Uses gems to install everything (Dan Lucraft)
+ * Wildcards permitted in project search (Delisa Mason)
 
 Version 0.11 (23 March 2011)
 ============================

data/lib/redcar.rb

@@ -57,7 +57,7 @@ end
 #
 # and so on.
 module Redcar
-  VERSION         = '0.12.15dev' # also change in the gemspec!
+  VERSION         = '0.12.16dev' # also change in the gemspec!
   VERSION_MAJOR   = 0
   VERSION_MINOR   = 12
   VERSION_RELEASE = 0

data/plugins/application/lib/application/dialogs/filter_list_dialog.rb

@@ -58,27 +58,37 @@ module Redcar
     # @block A -> String    optionally turns an element from the list into a string to match on
     def filter_and_rank_by(list, query, max_length=20)
       re = make_regex(query)
-      score_match_pairs = []
+      ranked_list = []
       cutoff = 100000000
       results = list.each do |element|
-        bit = block_given? ? yield(element) : element
         begin
-          if m = bit.match(re)
-            cs = []
-            m.captures.each_with_index do |_, i|
-              prev = cs.last
-              if prev and m.begin(i + 1) == prev[0] - prev[1]
-                cs.last[1] -= 1
+          match_data = (block_given? ? yield(element) : element).match(re)
+          if match_data
+            captures = []
+            match_data.captures.each_with_index do |_, i|
+              i += 1 # Match group 0 is actually the complete regex, we are interested in the subgroups
+              previous_capture = captures.last
+              if previous_capture and match_data.begin(i) - previous_capture[:end] <= 1
+                # If the the current match starts where the previous match ended, or they even overlap, merge the matches
+                captures.last[:end] = match_data.end(i)
               else
-                cs << [m.begin(i + 1), m.begin(i + 1) - m.end(i + 1)]
+                # Record the match
+                captures << {:begin => match_data.begin(i), :end => match_data.end(i)}
               end
             end
-            if cs.first.first < cutoff
-              score_match_pairs << [cs, element]
-              score_match_pairs = score_match_pairs.sort_by {|a| a.first }
-              if score_match_pairs.length == max_length
-                cutoff = score_match_pairs.last.first.first.first
-                score_match_pairs.pop
+            if captures.first[:begin] < cutoff
+              # The penalty is calculated as such: The values of the beginnings of matches are penalty, the lengths are bonuses
+              # This way, matching early and continiously is rewarded. Matching late in a word or only at intervals is punished.
+              penalty = captures.inject(0) {|p,c| p + c[:begin] - (c[:end] - c[:begin]) }
+              ranked_list << {:penalty => penalty, :first_match => captures.first[:begin], :element => element}
+              ranked_list = ranked_list.sort_by {|a| a[:penalty] }
+
+              # Performance optimization: Once we reach the maximum length, remove elements (saves later sorting)
+              # Set the new cutoff to the beginning of the previously last element, to avoid later elements getting
+              # into the list which would have an even worse rank.
+              if ranked_list.length > max_length
+                cutoff = ranked_list.last[:first_match]
+                ranked_list.pop
               end
             end
           end
@@ -88,7 +98,7 @@ module Redcar
           # unicode in them.
         end
       end
-      score_match_pairs.map {|a| a.last }
+      ranked_list.map {|a| a[:element] }
     end
     
     # The time interval in seconds in which moved_to events are ignored

data/plugins/project_search/lib/project_search/lucene_index.rb

@@ -2,27 +2,27 @@
 class ProjectSearch
   class LuceneIndex
     attr_accessor :last_updated, :lucene_index
-    
+
     def initialize(project)
       @project     = project
       @has_content = false
       load
     end
-    
+
     def timestamp_file_path
       File.join(@project.config_dir, 'lucene_last_updated')
     end
-    
+
     def lucene_index_dir
       File.join(@project.config_dir, "lucene")
     end
-    
+
     def delete
       FileUtils.rm(timestamp_file_path)
       FileUtils.rm_r(lucene_index_dir)
       load
     end
-    
+
     def load
       @last_updated = Time.at(0)
       if File.exist?(timestamp_file_path)
@@ -30,19 +30,19 @@ class ProjectSearch
         @has_content = true
       end
     end
-    
+
     def dump
       File.open(timestamp_file_path, "w") do |fout|
         fout.puts(last_updated.to_i.to_s)
       end
     end
-    
+
     def has_content?
       @has_content
     end
-    
+
     MAX_FILE_SIZE = 500 * 1024
-    
+
     def update
       changed_files = @project.file_list.changed_since(last_updated)
       @last_updated = Time.now
@@ -60,7 +60,7 @@ class ProjectSearch
               pre_contents = File.new(fn).read(200)
               unless !pre_contents or BinaryDataDetector.binary?(pre_contents)
                 contents = File.read(fn)
-                adjusted_contents = contents
+                adjusted_contents = contents.gsub(/\.([^\s])/, '. \1')
                 @lucene_index << { :id => fn, :contents => adjusted_contents }
               end
             rescue => e
@@ -76,6 +76,6 @@ class ProjectSearch
       end
       dump
     end
-    
+
   end
 end

data/plugins/project_search/lib/project_search/stylesheets/style.css

@@ -2,7 +2,8 @@
   margin: 0;
   padding: 0;
   font-weight: normal;
-  font-family: Helvetica Neue, Sawasdee, sans-serif;
+  font-size: 14px;
+  font-family: Myriad, Helvetica Neue, Sawasdee, Lucida Grande, sans-serif;
 }
 
 body {
@@ -167,7 +168,7 @@ body {
 /*  background-color: #ccc;*/
   padding: 4px 4px 4px 12px;
   font-weight: bold;
-  font-family:Helvetica Neue, Sawasdee, sans-serif;
+  font-family: Myriad, Helvetica Neue, Sawasdee, Lucida Grande, sans-serif;
   border-bottom: 1px dotted #aaa;
 }
 

data/plugins/project_search/lib/project_search/views/_file.html.erb

@@ -27,8 +27,8 @@
       <% line_index += 1 %>
       <tr class="result file_<%= file_num %> line_<%= this_line_num %> <%= (line_index % 2 == 0 ? 'even' : 'odd') %>" data-href='<%= CGI::escapeHTML(file) %>' data-line_num='<%= this_line_num %>'>
         <td class='line_num'><%= this_line_num %></td>
-        <% text = CGI.escapeHTML(context_line).gsub(@word_search.regex) { "<span>#{$&}</span>" } %>
-        <td class='text'><pre><%= text.chomp + " " %></pre></td> <!-- extra space to ensure line-height is respected -->
+        <% text = CGI.escapeHTML(context_line.gsub(@word_search.regex) { "__span__#{$&}__span__" }) %>
+        <td class='text'><pre><%= text.gsub(/__span__(.*?)__span__/,"<span>\\1</span>").chomp + " " %></pre></td> <!-- extra space to ensure line-height is respected -->
       </tr>
     <% end %>
   <% end %>
@@ -37,8 +37,8 @@
   <% last_displayed_line_num = display_line_num %>
   <tr class="result file_<%= file_num %> line_<%= display_line_num %> <%= (line_index % 2 == 0 ? 'even' : 'odd') %>" data-href='<%= CGI::escapeHTML(file) %>' data-line_num='<%= display_line_num %>'>
   <td class='line_num'><%= display_line_num %></td>
-    <% text = CGI.escapeHTML(hit.line).gsub(@word_search.regex) { "<span>#{$&}</span>" } %>
-    <td class='text'><pre><%= text.chomp + " " %></pre></td> <!-- extra space to ensure line-height is respected -->
+    <% text = CGI.escapeHTML(hit.line.gsub(@word_search.regex) { "__span__#{$&}__span__" }) %>
+    <td class='text'><pre><%= text.gsub(/__span__(.*?)__span__/,"<span>\\1</span>").chomp + " " %></pre></td> <!-- extra space to ensure line-height is respected -->
   </tr>
 
   <% hit.post_context.each_with_index do |context_line, i| %>
@@ -48,8 +48,8 @@
       <% line_index += 1 %>
       <tr class="result file_<%= file_num %> line_<%= this_line_num %> <%= (line_index % 2 == 0 ? 'even' : 'odd') %>" data-href='<%= CGI::escapeHTML(file) %>' data-line_num='<%= this_line_num %>'>
       <td class='line_num'><%= this_line_num %></td>
-        <% text = CGI.escapeHTML(context_line).gsub(@word_search.regex) { "<span>#{$&}</span>" } %>
-        <td class='text'><pre><%= text.chomp + " " %></pre></td> <!-- extra space to ensure line-height is respected -->
+        <% text = CGI.escapeHTML(context_line.gsub(@word_search.regex) { "__span__#{$&}__span__" }) %>
+        <td class='text'><pre><%= text.gsub(/__span__(.*?)__span__/,"<span>\\1</span>").chomp + " " %></pre></td> <!-- extra space to ensure line-height is respected -->
       </tr>
     <% end %>
   <% end %>

data/plugins/project_search/lib/project_search/views/index.html.erb

@@ -7,17 +7,17 @@
 
 <% plugin_css = File.expand_path(File.join(plugin_root, %w(lib project_search stylesheets style.css))) %>
 <style>
-<% font_size = (Redcar::EditView.font_size * 1.5).to_i %>
+<% font_size = 12 %>
 #results .text pre, #results .text pre span, #query,#results .line_num, #recent_queries {
   font-family: <%= Redcar::EditView.font %>;
-  font-size: <%= font_size - 6 %>px;
+  font-size: <%= font_size%>px;
 }
 #results .line_num {
-  font-size:<%= font_size - 8 %>px;
-  line-height:<%= font_size - 8 %>px;
+  font-size:<%= font_size - 2 %>px;
+  line-height:<%= font_size - 2 %>px;
 }
 #results .text pre {
-  font-size: <%= font_size - 6 %>px;
+  font-size: <%= font_size - 1 %>px;
   line-height: <%= font_size - 3 %>px;
 }
 </style>
@@ -147,7 +147,7 @@
 
     $('.file_link').live('click',function() {
       $('body').animate({
-          scrollTop: $("#"+$(this).attr('id').replace("link_","")).offset().top - 120
+          scrollTop: $("#"+$(this).attr('id').replace("link_","")).offset().top - 100
       }, 0);
     });
   });

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

@@ -13,19 +13,19 @@ class ProjectSearch
       @match_case   = !!match_case
       @context_size = context_size
     end
-    
+
     def match_case?
       @match_case
     end
-    
+
     def context?
       @context_size > 0
     end
-    
+
     def matching_line?(line)
       line =~ regex
     end
-    
+
     def regex
       @regex ||= begin
         regexp_text = Regexp.escape(@query_string)
@@ -37,11 +37,11 @@ class ProjectSearch
         match_case? ? /#{regexp_text}/ : /#{regexp_text}/i
       end
     end
-    
+
     def on_file_results(&block)
       @on_file_results_block = block
     end
-    
+
     def generate_results
       hits = []
       doc_ids.each do |doc_id|
@@ -58,9 +58,9 @@ class ProjectSearch
               remove_hits << hit
             end
           end
-          
+
           hits_needing_post_context -= remove_hits
-          
+
           if matching_line?(line)
             hit = Hit.new(doc_id, line_num, line, regex, pre_context.dup, [])
             hits << hit
@@ -78,13 +78,13 @@ class ProjectSearch
       end
       hits
     end
-    
+
     def send_file_results(hits)
       if @on_file_results_block
         @on_file_results_block.call(hits)
       end
     end
-    
+
     def results
       @results ||= generate_results
     end
@@ -95,18 +95,32 @@ class ProjectSearch
         "contents",
         StandardAnalyzer.new(Version::LUCENE_29)
       )
-      parser.parse(query_string).to_s
+      begin
+        text = query_string.gsub(/^\W+/,"").gsub(/\(|\)/," ").strip
+        unless text.empty?
+          query = parser.parse(text)
+          return query.to_s.gsub("_*","*").gsub(/_|\./," ").strip
+        end
+      rescue => e
+        p e.message
+        p e.backtrace
+      end
+      return ""
     end
 
     def doc_ids
       @doc_ids ||= begin
         index = ProjectSearch.indexes[project.path].lucene_index
         doc_ids = nil
-        doc_ids = index.find(formatted_query).map {|doc| doc.id}
-        doc_ids.reject {|doc_id| Redcar::Project::FileList.hide_file_path?(doc_id) }
+        if text = formatted_query and not text.empty?
+          doc_ids = index.find(text).map {|doc| doc.id}.uniq
+          doc_ids.reject {|doc_id| Redcar::Project::FileList.hide_file_path?(doc_id) }
+        else
+          []
+        end
       end
     end
-  
+
     def ignore_regexes
       self.class.shared_storage['ignored_file_patterns']
     end

metadata

@@ -2,7 +2,7 @@
 name: redcar-dev
 version: !ruby/object:Gem::Version 
   prerelease: 7
-  version: 0.12.15dev
+  version: 0.12.16dev
 platform: java
 authors: 
   - Daniel Lucraft
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-19 00:00:00 +01:00
+date: 2011-08-20 00:00:00 +01:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency