redcar 0.4.1 → 0.5

data/plugins/find-in-project/lib/find_in_project/stylesheets/style.css

@@ -70,39 +70,29 @@
   right: 34px;
 }
 
-#recent_options {
-  position: absolute;
-  top: 69px;
-  left: 124px;
-  right: 34px;
-}
-
-#recent_queries,
-#recent_options {
+#recent_queries {
   border: 1px solid #000;
   background-color: #fff;
 }
 
-#recent_queries ul,
-#recent_options ul {
+#recent_queries ul {
   list-style: none;
   height: 100px;
   overflow: auto;
 }
 
-#recent_queries ul li,
-#recent_options ul li {
+#recent_queries ul li {
   padding: 3px 10px;
 }
 
-#recent_queries ul li:hover,
-#recent_options ul li:hover {
+#recent_queries ul li:hover {
   background-color: #EDEDFD;
   cursor: hand;
 }
 
 #results_container {
-  margin-top: 130px;
+  margin-top: 95px;
+  margin-bottom: 25px;
 }
 
 #no_results,
@@ -124,17 +114,17 @@
 }
 
 #results .filename,
-#results .line_no {
+#results .line_num {
   background-color: #eee;
   padding: 3px 10px;
 }
 
 #results .even {
-  background-color: #fff;
+  background-color: #EDEDFD;
 }
 
 #results .odd {
-  background-color: #EDEDFD;
+  background-color: #fff;
 }
 
 #results .file_heading {
@@ -156,7 +146,7 @@
   height: 16px;
 }
 
-#results .line_no {
+#results .line_num {
   text-align: right;
   padding: 0 5px;
   min-width: 20px;
@@ -164,7 +154,11 @@
   font-size: 13px;
 }
 
-#results .divider .line_no {
+#results .divider .line_num {
+  cursor: default;
+}
+
+#results .divider .line_num {
   text-align: center;
   background-color: #fff;
 }
@@ -184,17 +178,13 @@
   font-size: 13px;
 }
 
-#results .divider .text {
-  background-color: #fff;
-}
-
-#results .nomatch .line_no,
+#results .nomatch .line_num,
 #results .nomatch .text {
   color: #aaa;
 }
 
 #results .break {
-  height: 20px;
+  height: 12px;
 }
 
 #errors {
@@ -203,3 +193,21 @@
   margin: 0 30px;
   padding: 15px;
 }
+
+#results_summary {
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  right: 0;
+}
+
+#results_summary .text {
+  width: 300px;
+  margin: 0 auto;
+  background-color: #eee;
+  border: 1px solid #ddd;
+  text-align: center;
+  border-top-left-radius: 1em;
+  border-top-right-radius: 1em;
+  padding: 3px 5px;
+}

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

@@ -0,0 +1,10 @@
+<% image_path = File.expand_path(File.join(@plugin_root, %w(lib find_in_project images))) %>
+
+<tr>
+  <td class="file_heading" colspan="2">
+    <a class="expand_collapse" data-file_num="<%= @file.num %>">
+      <img src="<%= image_path %>/expanded.png" />
+      <%= CGI::escapeHTML(@file.name) %>
+    </a>
+  </td>
+</tr>

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

@@ -0,0 +1,6 @@
+<tr class="result file_<%= @file.num %> line_<%= @line.num %> <%= (@line_index % 2 == 0 ? 'even' : 'odd') %>" data-href='<%= CGI::escapeHTML(@file.name) %>' data-line_num='<%= @line.num %>'>
+  <td class='line_num'><%= @line.num %></td>
+  <% regexp_text = CGI.escapeHTML((@literal_match ? Regexp.escape(@query) : @query)) %>
+  <% text = CGI.escapeHTML(@line.text).gsub((@match_case ? /(#{regexp_text})/ : /(#{regexp_text})/i)) { "<span>#{$1}</span>" } %>
+  <td class='text'><pre><%= text %></pre></td>
+</tr>

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

@@ -13,10 +13,14 @@
         <td class="label"><label for="query">Search Term</label></td>
         <td class="field">
           <input id="query" type="text" value="<%= @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| %>
-                <li><%= query %></li>
+                <li><%= CGI::escapeHTML(query) %></li>
               <% end %>
             </ul>
           </div>
@@ -25,26 +29,12 @@
           <a href="#" title="Toggle Recent Queries" id="toggle_recent_queries">&darr;</a>
         </td>
       </tr>
-      <tr class="input">
-        <td class="label"><label for="options">Options</label></td>
-        <td class="field">
-          <input id="options" type="text" value="<%= @options %>" />
-          <div id="recent_options" style="display: none;">
-            <ul>
-              <% (@settings['recent_options'] || []).each do |option| %>
-                <li><%= option %></li>
-              <% end %>
-            </ul>
-          </div>
-        </td>
-        <td class="expand">
-          <a href="#" title="Toggle Recent Options" id="toggle_recent_options">&darr;</a>
-        </td>
-      </tr>
       <tr>
         <td></td>
         <td class="controls">
           <input id="search" type="submit" value="Find In Project" />
+          <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="match_case">Match case</label>
           <input type="checkbox" id="with_context" <%="checked=checked" if @with_context %>>
@@ -57,8 +47,16 @@
 </div>
 
 <div id="results_container">
-  <div id="no_results">
-    Please provide a search term above.
+  <div id="results">
+    <div id="no_results">
+      Please provide a search term above.
+    </div>
+  </div>
+</div>
+
+<div id="results_summary" style="display: none;">
+  <div class="text">
+    <span id="line_results_count">0</span> lines matched in <span id="file_results_count">0</span> files
   </div>
 </div>
 
@@ -69,9 +67,10 @@
     $('#search_form').submit(function(ev) {
       ev.preventDefault();
       try {
+        if ($("#literal_match").attr('checked')) { var literal_match = 'true'; } else { var literal_match = 'false'; }
         if ($("#match_case").attr('checked')) { var match_case = 'true'; } else { var match_case = 'false'; }
         if ($("#with_context").attr('checked')) { var with_context = 'true'; } else { var with_context = 'false'; }
-        Controller.search($("#query").val(), $("#options").val(), match_case, with_context);
+        Controller.search($("#query").val(), literal_match, match_case, with_context);
       } catch(e) {
         alert(e.message);
       }
@@ -95,26 +94,43 @@
       }
     });
 
+    // in the case the user wants to search for things like <table>, we need to unescape the entities
+    String.prototype.unescapeHTML = function() {
+      var t = document.createElement('div');
+      t.innerHTML = this;
+      return t.firstChild.nodeValue;
+    }
+
     $('#recent_queries li').click(function(ev) {
       ev.preventDefault();
-      $('#query').val($(this).html());
+      $('#query').val($(this).html().unescapeHTML());
       $('#query').trigger('keyup');
       $('#recent_queries').hide();
     });
 
-    $('#toggle_recent_options').click(function(ev) {
+    // need to use live here so that results added will be caught
+    $('.result').live('click', function(ev) {
       ev.preventDefault();
-      if ($('#recent_options').is(":visible")) {
-        $('#recent_options').hide();
-      } else {
-        $('#recent_options').show();
+      try {
+        if ($("#literal_match").attr('checked')) { var literal_match = 'true'; } else { var literal_match = 'false'; }
+        if ($("#match_case").attr('checked')) { var match_case = 'true'; } else { var match_case = 'false'; }
+        Controller.openFile($(this).attr('data-href'), $(this).attr('data-line_num'), $("#cached_query").val(), literal_match, match_case);
+      } catch(e) {
+        alert(e.message);
       }
     });
 
-    $('#recent_options li').click(function(ev) {
+    // need to use live here so that results added will be caught
+    $('.expand_collapse').live('click', function(ev) {
       ev.preventDefault();
-      $('#options').val($(this).html());
-      $('#recent_options').hide();
+      var file_num = $(this).attr('data-file_num');
+      if ($(".file_" + file_num).first().is(":visible")) {
+        $('img', this).attr('src', '<%= image_path %>/collapsed.png');
+        $(".file_" + file_num).hide();
+      } else {
+        $('img', this).attr('src', '<%= image_path %>/expanded.png');
+        $(".file_" + file_num).show();
+      }
     });
   });
 </script>

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

@@ -1,24 +1,10 @@
 require 'find_in_project/controllers'
 require 'find_in_project/commands'
-require 'find_in_project/engines/ack'
-require 'find_in_project/engines/grep'
 
 module Redcar
   class FindInProject
-    def self.keymaps
-      osx = Keymap.build('main', :osx) do
-        link "Cmd+Shift+F", FindInProject::OpenSearch
-      end
-
-      linwin = Keymap.build('main', [:linux, :windows]) do
-        link "Ctrl+Shift+F", FindInProject::OpenSearch
-      end
-
-      [linwin, osx]
-    end
-
     def self.menus
-      Menu::Builder.build do
+      Redcar::Menu::Builder.build do
         sub_menu "Plugins" do
           sub_menu "Find In Project", :priority => 64 do
             item "Find In Project!", Redcar::FindInProject::OpenSearch
@@ -30,27 +16,12 @@ module Redcar
 
     def self.storage
       @storage ||= begin
-        storage = Plugin::Storage.new('find_in_project')
-        unless storage['search_engine']
-          engines = Array.new
-
-          # TODO: Ack search engine is broken, don't auto detect it yet
-          #ack = Redcar::FindInProject::Engines::Ack.detect
-          #if ack
-          #  storage.set_default('ack_path', ack)
-          #  engines << 'ack'
-          #end
-
-          grep = Redcar::FindInProject::Engines::Grep.detect
-          if grep
-            storage.set_default('grep_path', grep)
-            engines << 'grep'
-          end
-
-          storage.set_default('search_engine', engines.first)
-        end
-        storage.set_default('recent_queries', %w{})
-        storage.set_default('recent_options', %w{})
+        storage = Redcar::Plugin::Storage.new('find_in_project')
+        storage.set_default('recent_queries', [])
+        storage.set_default('excluded_dirs', ['.git', '.svn', '.redcar'])
+        storage.set_default('excluded_files', [])
+        storage.set_default('excluded_patterns', [/tags$/, /\.log$/])
+        storage.set_default('context_lines', 2)
         storage.save
       end
     end

data/plugins/find-in-project/plugin.rb

@@ -5,6 +5,7 @@ Plugin.define do
   object  "Redcar::FindInProject"
   file    "lib", "find_in_project"
 
-  dependencies "core",      ">0",
-               "HTML View", ">=0.3.2"
+  dependencies "core",        ">0",
+               "HTML View",   ">=0.3.2",
+               "file_parser", "=0.1.0"
 end

data/plugins/html_view/features/step_definitions/html_view_steps.rb

@@ -1,5 +1,3 @@
-require 'ruby-debug'
-
 Then /^the HTML tab (should say|says) "([^"]*)"$/ do |_, needle|
   limit = 5
   contents = nil
@@ -14,7 +12,11 @@ Then /^the HTML tab (should say|says) "([^"]*)"$/ do |_, needle|
       sleep 0.1
     end    
   end
-
+  
   Redcar.gui.yield_until { started && !thread.alive? }
-  contents.should match needle
+  
+  # For now, just skip on windows. We can't get browser exec results
+  # on current version of SWT and XulRunner. More info at:
+  # https://bugs.eclipse.org/bugs/show_bug.cgi?id=259687
+  contents.should match needle unless Redcar.platform == :windows
 end

data/plugins/html_view/plugin.rb

@@ -7,6 +7,7 @@ Plugin.define do
   file "lib", "html_view"
   
   dependencies "core", ">0",
-               "application", ">0"
+               "application", ">0",
+               "application_swt", ">0"
   
 end

data/plugins/plugin_manager_ui/lib/plugin_manager_ui.rb

@@ -60,10 +60,14 @@ module Redcar
             name = plugin.is_a?(PluginManager::PluginDefinition) ? plugin.name : plugin
             str << "<tr class=\"#{highlight ? "grey" : ""}\">"
             str << "<td class=\"plugin\"><span class=\"plugin-name\">" + name + "</span></td>"
-            if plugin.load_time > 1
-              clss = "red"
-            elsif plugin.load_time > 0.1
-              clss = "yellow"
+            if plugin.load_time
+              if plugin.load_time > 1
+                clss = "red"
+              elsif plugin.load_time > 0.1
+                clss = "yellow"
+              else
+                clss = ""
+              end
             else
               clss = ""
             end