redcar 0.10 → 0.11.0dev

data/plugins/{find-in-project/lib/find_in_project → project_search/lib/project_search}/stylesheets/style.css

@@ -3,6 +3,7 @@
   padding: 0;
   font-weight: normal;
   font-size: 14px;
+  font-family: sans-serif;
 }
 
 #search_form_container {
@@ -34,6 +35,7 @@
 #search_form_container .input .field input {
   width: 100%;
   height: 20px;
+  font-family: monospace;
 }
 
 #search_form_container .input .expand {
@@ -122,7 +124,7 @@
 }
 
 #results .even {
-  background-color: #EDEDFD;
+  background-color: #F4F4F4;
 }
 
 #results .odd {
@@ -141,6 +143,7 @@
 
 #results .file_heading a {
   font-weight: bold;
+  font-family: sans-serif;
 }
 
 #results .expand_collapse img {
@@ -155,6 +158,7 @@
   cursor: hand;
   font-size: 12px;
   line-height: 12px;
+  font-family: sans-serif;
 }
 
 #results .divider .line_num {
@@ -168,17 +172,22 @@
   padding: 3px 10px;
   width: 100%;
   cursor: hand;
+}
+
+#results .text pre {
   font-size: 14px;
   line-height: 17px;
+  font-family: monospace;
 }
 
 #results .divider .text {
   cursor: default;
 }
 
-#results .text span {
-  background-color: yellow;
+#results .text pre span {
+  background-color: #FFCCCC;
   font-weight: bold;
+  font-family: monospace;
 }
 
 #results .break {
@@ -190,6 +199,8 @@
   bottom: 0;
   left: 0;
   right: 0;
+  font-size: 1.5em;
+  font-family: sans-serif;
 }
 
 #results_summary .text {

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

@@ -0,0 +1,60 @@
+
+<tr><td class='break' colspan='2'></td></tr>
+<tr>
+  <td class="file_heading" colspan="2">
+    <a class="expand_collapse" data-file_num="<%= file %>">
+      <img src="<%= image_path %>/expanded.png" />
+      <%= CGI::escapeHTML(file.gsub(@word_search.project.path + "/", "")) %>
+    </a>
+  </td>
+</tr>
+
+<% line_index = 0 %>
+<% last_matching_line_num = nil %>
+<% last_displayed_line_num = -1 %>
+<% hits.each_with_index do |hit, i| %>
+  <% next_hit = hits[i + 1] %>
+  <% next_hit_line_num = next_hit ? next_hit.line_num : 100_000_000 %>
+  
+  <% if @word_search.context? and last_matching_line_num and (hit.line_num - last_matching_line_num) > (@word_search.context_size * 2) %>
+    <tr class="divider file_<%= file_num %>">
+      <td class="line_num">. . .</td>
+      <td class="text">&nbsp;</td> <!-- extra space to ensure line-height is respected -->
+    </tr>
+  <% end %>
+  
+  <% hit.pre_context.each_with_index do |context_line, i| %>
+    <% this_line_num = hit.line_num - @word_search.context_size + i %>
+    <% unless this_line_num <= last_displayed_line_num %>
+      <% 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 -->
+      </tr>
+    <% end %>
+  <% end %>
+  
+  <% line_index += 1 %>
+  <% last_displayed_line_num = hit.line_num %>
+  <tr class="result file_<%= file_num %> line_<%= hit.line_num %> <%= (line_index % 2 == 0 ? 'even' : 'odd') %>" data-href='<%= CGI::escapeHTML(file) %>' data-line_num='<%= hit.line_num %>'>
+  <td class='line_num'><%= hit.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 -->
+  </tr>
+
+  <% hit.post_context.each_with_index do |context_line, i| %>
+    <% this_line_num = hit.line_num + i + 1%>
+    <% unless this_line_num >= next_hit_line_num %>
+      <% last_displayed_line_num = this_line_num %>
+      <% 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 -->
+      </tr>
+    <% end %>
+  <% end %>
+  
+  <% last_matching_line_num = hit.line_num %>
+<% end %>

data/plugins/{find-in-project/lib/find_in_project → project_search/lib/project_search}/views/index.html.erb

@@ -3,10 +3,10 @@
 <% 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))) %>
+<% plugin_css = File.expand_path(File.join(plugin_root, %w(lib project_search stylesheets style.css))) %>
 <link rel="stylesheet" href="file://<%= plugin_css %>" type="text/css" media="screen">
 
-<% image_path = File.expand_path(File.join(@plugin_root, %w(lib find_in_project images))) %>
+<% image_path = File.expand_path(File.join(plugin_root, %w(lib project_search images))) %>
 
 <div id="search_form_container">
   <form id="search_form">
@@ -14,14 +14,14 @@
       <tr class="input">
         <td class="label"><label for="query">Search Term</label></td>
         <td class="field">
-          <input id="query" type="text" value="<%= @query %>" />
-
+          <input id="query" type="text" value="<%= default_query %>" />
+          
           <!-- keeps a cache of the current query so if the user changes the query field, this remains the same as the results -->
           <input id="cached_query" type="hidden" />
 
           <div id="recent_queries" style="display: none;">
             <ul>
-              <% (@settings['recent_queries'] || []).each do |query| %>
+              <% (settings['recent_queries'] || []).each do |query| %>
                 <li><%= CGI::escapeHTML(query) %></li>
               <% end %>
             </ul>
@@ -36,12 +36,15 @@
         <td class="controls">
           <input id="search" type="submit" value="Find In Project" />
           <img id="spinner" src="<%= image_path %>/spinner.gif" style="display:none;" />
+          <% if show_literal_match_option? %>
           <input type="checkbox" id="literal_match" <%="checked=checked" if @literal_match %>>
-          <label for="literal_match">Literal Match</label>
-          <input type="checkbox" id="match_case" <%="checked=checked" if @match_case %>>
+            <label for="literal_match">Literal Match</label>
+          <% end %>
+          <input type="checkbox" id="match_case" <%="checked=checked" if match_case? %>>
           <label for="match_case">Match case</label>
-          <input type="checkbox" id="with_context" <%="checked=checked" if @with_context %>>
+          <input type="checkbox" id="with_context" <%="checked=checked" if context? %>>
           <label for="with_context">With context</label>
+          <%= search_copy %>
           <a href="#" title="Edit Preferences" id="edit_preferences">Edit Preferences...</a>
         </td>
         <td></td>
@@ -99,7 +102,7 @@
     });
     
     $('#edit_preferences').click(function(ev) {
-      Controller.preferences();
+      Controller.editPreferences();
     });
 
     // in the case the user wants to search for things like <table>, we need to unescape the entities

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

@@ -0,0 +1,105 @@
+
+class ProjectSearch
+  class WordSearch
+    attr_reader :query_string, :context_size, :project
+    
+    def initialize(project, query_string, match_case, context_size)
+      @project      = project
+      @query_string = query_string
+      @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)
+        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|
+        next unless File.exist?(doc_id)
+        contents = File.read(doc_id).split(/\n|\r/)
+        pre_context = []
+        hits_needing_post_context = []
+        remove_hits = []
+        file_hits = []
+        contents.each_with_index do |line, line_num|
+          hits_needing_post_context.each do |hit|
+            hit.post_context << line
+            if hit.post_context.length == context_size
+              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
+            file_hits << hit
+            if context_size > 0
+              hits_needing_post_context << hit
+            end
+          end
+          
+          if pre_context.length == context_size
+            pre_context.shift
+          end
+          pre_context << line
+        end
+        send_file_results(file_hits)
+      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
+    
+    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)}
+    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
+        doc_ids
+      end
+    end
+  end
+end
+

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

@@ -0,0 +1,207 @@
+
+class ProjectSearch
+  class WordSearchController
+    include Redcar::HtmlController
+
+    TITLE = "Project Search"
+
+    def title
+      TITLE
+    end
+    
+    def search_copy
+      "Search for complete words only"
+    end
+    
+    def show_literal_match_option?
+      false
+    end
+
+    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
+
+    def edit_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 open_file(file, line, query, literal_match, match_case)
+      Redcar::Project::Manager.open_file(File.expand_path(file, Redcar::Project::Manager.focussed_project.path))
+      doc.cursor_offset = doc.offset_at_line(line.to_i - 1)
+      regexp_text = literal_match ? Regexp.escape(query) : query
+      regex = match_case ? /(#{regexp_text})/ : /(#{regexp_text})/i
+      index = doc.get_line(line.to_i - 1).index(regex)
+      if index
+        length = doc.get_line(line.to_i - 1).match(regex)[1].length
+        doc.set_selection_range(doc.cursor_line_start_offset + index, doc.cursor_line_start_offset + index + length)
+      end
+      doc.scroll_to_line(line.to_i)
+      nil
+    end
+
+    def close
+      Thread.kill(@thread) if @thread
+      @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
+
+    def add_or_move_to_top(item, array)
+      return array if item.strip.empty?
+      array.delete_at(array.index(item)) if array.include?(item)
+      array.unshift(item)
+    end
+
+    def search(query, literal_match, match_case, with_context)
+      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
+      @thread = Thread.new do
+        begin
+          initialize_search_output
+          file_num = 0
+          line_num = 0
+          have_prepared_table = false
+          have_results = false
+          
+          @word_search.on_file_results do |hits|
+            next unless hits.any?
+            have_results = true
+            file_num += 1
+            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_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
+        rescue => e
+          puts e.message
+          puts e.backtrace
+        end
+      end
+      nil
+    end
+    
+    def initialize_search_output
+      execute("$('#cached_query').val(\"#{escape_javascript(@word_search.query_string)}\");")
+      execute("$('#results').html(\"<div id='no_results'>Searching...</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(); }")
+    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 remove_initial_blank_tr
+      execute("$('#results table tr:first').remove();")
+    end
+
+    def render_no_results
+      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
+
+    def escape_javascript(text)
+      escape_map = { '\\' => '\\\\', '</' => '<\/', "\r\n" => '\n', "\n" => '\n', "\r" => '\n', '"' => '\\"', "'" => "\\'" }
+      text.to_s.gsub(/(\\|<\/|\r\n|[\n\r"'])/) { escape_map[$1] }
+    end
+
+    def image_path
+      File.expand_path(File.join(plugin_root, %w(lib project_search images)))
+    end
+  end
+end