redcar 0.5 → 0.5.1dev

data/plugins/edit_view_swt/spec/spec_helper.rb

@@ -2,4 +2,4 @@ $:.push File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
 
 require 'redcar'
 Redcar.environment = :test
-Redcar.load_unthreaded
+Redcar.load

data/plugins/edit_view_swt/vendor/java-mateview.rb

@@ -1,3 +1,4 @@
+
 require "java-mateview-#{Redcar::VERSION}"
 
 module JavaMateView
@@ -33,4 +34,4 @@ module JavaMateView
   end
 end
 
- 
+ 

data/plugins/file_parser/lib/file_parser.rb

@@ -15,7 +15,6 @@ module Redcar
     end
 
     def each_file(&block)
-      file_index = 0
       Find.find(root_path) do |path|
         fullpath = File.expand_path(path)
         path = Pathname.new(fullpath)
@@ -23,87 +22,24 @@ module Redcar
         if path.directory?
           Find.prune if excluded_dirs.include?(path.basename.to_s) || is_excluded_pattern
         else
-          skipped = skip_types.find { |st| path.send("#{st}?") }
-          excluded = excluded_files.include?(path.basename.to_s) || is_excluded_pattern
-          unless !path.readable? || path.read.is_binary_data? || skipped || excluded
-            yield(FileResult.new(path, file_index))
-            file_index += 1
+          if path.readable? && !skip_types.find { |st| path.send("#{st}?") }
+            yield(path) unless path.read.is_binary_data? || excluded_files.include?(path.basename.to_s) || is_excluded_pattern
           end
         end
       end
     end
 
     def each_line(&block)
+      file_no = 0
       each_file do |file|
+        file_no += 1
+        line_no = 0
         file.each_line do |line|
-          yield(line)
+          line_no += 1
+          yield(line, line_no, file, file_no)
         end
       end
     end
 
-    class FileResult
-
-      attr_reader :path, :index, :lines
-
-      def initialize(path, index)
-        @path, @index = path, index
-        @lines = @path.read.split("\n")
-      end
-
-      def num
-        index + 1
-      end
-
-      def name
-        @project_path ||= Project::Manager.focussed_project.path
-        path.realpath.to_s.gsub("#{@project_path}/", '')
-      end
-
-      def each_line(&block)
-        lines.each_with_index do |text, index|
-          yield(LineResult.new(self, index, text))
-        end
-      end
-
-      def inspect
-        "#<FileResult path=#{path.to_s} index=#{index} lines=#{lines.size}>"
-      end
-
-    end
-
-    class LineResult
-
-      attr_reader :file, :index, :text
-
-      def initialize(file, index, text)
-        @file, @index, @text = file, index, text
-      end
-
-      def num
-        index + 1
-      end
-
-      def context(amount = 5)
-        before, after = Array.new, Array.new
-        if index > 0
-          from = (index - amount)
-          from = 0 if from < 0
-          before = ((from)..(index - 1)).collect { |b_index| LineResult.new(file, b_index, file.lines[b_index]) }
-        end
-        last_line_index = (file.lines.size - 1)
-        if index < last_line_index
-          to = (index + amount)
-          to = last_line_index if to > last_line_index
-          after = ((index + 1)..(to)).collect { |a_index| LineResult.new(file, a_index, file.lines[a_index]) }
-        end
-        { :before => before, :after => after }
-      end
-
-      def inspect
-        "#<LineResult index=#{index} file=#{file.to_s}>"
-      end
-
-    end
-
   end
 end

data/plugins/find-in-project/TODO.md

@@ -1,3 +1,5 @@
+* Reimplement with_context functionality in new ruby search
+* A line to summarize results, e.g. 18 lines matched in 5 files
 * Remember literal match, match case, and with context settings
 * Better handle long lines
 * Add stop searching functionality

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

@@ -21,7 +21,6 @@ module Redcar
         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/lib/find_in_project/controllers.rb

@@ -26,9 +26,6 @@ module Redcar
 
         execute("$('#cached_query').val(\"#{escape_javascript(@query)}\");")
         execute("$('#results').html(\"<div id='no_results'>Searching...</div>\");")
-        execute("$('#results_summary').hide();")
-        execute("$('#file_results_count').html(0);")
-        execute("$('#line_results_count').html(0);")
         search_in_background
 
         nil
@@ -81,43 +78,33 @@ module Redcar
         @thread = nil
 
         @thread = Thread.new do
-          matched_lines = false
-          last_matching_line = nil
+          found_lines = false
+          last_file = nil
 
-          Redcar::FileParser.new(@project_path, @settings).each_line do |line|
+          @file_index, @line_index = 0, 0
+
+          Redcar::FileParser.new(@project_path, @settings).each_line do |line, line_no, file, file_no|
             next unless matching_line?(line)
 
             # Add an initial <tr></tr>  so that tr:last can be used
             execute("if ($('#results table').size() == 0) { $('#results').html(\"<table><tr></tr></table>\"); }")
-            execute("if ($('#results_summary').first().is(':hidden')) { $('#results_summary').show(); }")
-
-            parsing_new_file = (!last_matching_line || last_matching_line.file != line.file)
 
-            if parsing_new_file
-              execute("$('#file_results_count').html(parseInt($('#file_results_count').html()) + 1);")
-              execute("$('#results table tr:last').after(\"<tr><td class='break' colspan='2'></td></tr>\");") if matched_lines
-              @file = line.file
+            if last_file != file # new file
+              file_name = file.realpath.to_s.gsub("#{@project_path}/", '')
+              @file_index, @file_name = ((@file_index || 0) + 1), file_name
+              execute("$('#results table tr:last').after(\"<tr><td class='break' colspan='2'></td></tr>\");") unless last_file.nil?
               execute("$('#results table tr:last').after(\"#{escape_javascript(render('_file_heading'))}\");")
               @line_index = 0 # reset line row styling
             end
 
-            if @with_context && !parsing_new_file && (line.num - last_matching_line.num) > (@settings['context_lines'] * 2)
-              divider = "<tr class='divider'><td class='line_num file_#{@line.file.num}'>...</td><td></td></tr>"
-              execute("$('#results table tr:last').after(\"#{divider}\");")
-            end
-
-            context = line.context(@settings['context_lines']) if @with_context
-            context[:before].each { |b_line| render_line(b_line) } if @with_context
-            render_line(line)
-            context[:after].each { |a_line| render_line(a_line) } if @with_context
+            @line_index, @line_no, @line = ((@line_index || 0) + 1), line_no, line
+            execute("$('#results table tr:last').after(\"#{escape_javascript(render('_file_line'))}\");")
 
-            execute("$('#line_results_count').html(parseInt($('#line_results_count').html()) + 1);")
-
-            matched_lines = true
-            last_matching_line = line
+            found_lines = true
+            last_file = file
           end
 
-          if matched_lines
+          if found_lines
             # Remove the blank tr we added initially
             execute("$('#results table tr:first').remove();")
           else
@@ -133,20 +120,12 @@ module Redcar
       def matching_line?(line)
         regexp_text = @literal_match ? Regexp.escape(@query) : @query
         regexp = @match_case ? /#{regexp_text}/ : /#{regexp_text}/i
-        line.text =~ regexp
+        line =~ regexp
       end
 
-      def escape_javascript(text)
+      def escape_javascript(javascript)
         escape_map = { '\\' => '\\\\', '</' => '<\/', "\r\n" => '\n', "\n" => '\n', "\r" => '\n', '"' => '\\"', "'" => "\\'" }
-        text.to_s.gsub(/(\\|<\/|\r\n|[\n\r"'])/) { escape_map[$1] }
-      end
-
-      def render_line(line)
-        @line_index += 1
-        @line, @file = line, line.file
-        execute("if ($('#results tr.file_#{@file.num}.line_#{@line.num}').size() == 0) {
-          $('#results table tr:last').after(\"#{escape_javascript(render('_file_line'))}\");
-        }")
+        javascript.to_s.gsub(/(\\|<\/|\r\n|[\n\r"'])/) { escape_map[$1] }
       end
     end
   end

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

@@ -92,7 +92,6 @@
 
 #results_container {
   margin-top: 95px;
-  margin-bottom: 25px;
 }
 
 #no_results,
@@ -114,7 +113,7 @@
 }
 
 #results .filename,
-#results .line_num {
+#results .line_no {
   background-color: #eee;
   padding: 3px 10px;
 }
@@ -146,7 +145,7 @@
   height: 16px;
 }
 
-#results .line_num {
+#results .line_no {
   text-align: right;
   padding: 0 5px;
   min-width: 20px;
@@ -154,11 +153,7 @@
   font-size: 13px;
 }
 
-#results .divider .line_num {
-  cursor: default;
-}
-
-#results .divider .line_num {
+#results .divider .line_no {
   text-align: center;
   background-color: #fff;
 }
@@ -178,7 +173,11 @@
   font-size: 13px;
 }
 
-#results .nomatch .line_num,
+#results .divider .text {
+  background-color: #fff;
+}
+
+#results .nomatch .line_no,
 #results .nomatch .text {
   color: #aaa;
 }
@@ -193,21 +192,3 @@
   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

@@ -2,9 +2,9 @@
 
 <tr>
   <td class="file_heading" colspan="2">
-    <a class="expand_collapse" data-file_num="<%= @file.num %>">
+    <a class="expand_collapse" data-file_index="<%= @file_index %>">
       <img src="<%= image_path %>/expanded.png" />
-      <%= CGI::escapeHTML(@file.name) %>
+      <%= CGI::escapeHTML(@file_name) %>
     </a>
   </td>
 </tr>

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

@@ -1,6 +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>
+<tr class="result line_for_<%= @file_index %> <%= (@line_index % 2 == 0 ? 'even' : 'odd') %>" data-href='<%= CGI::escapeHTML(@file_name) %>' data-line_no='<%= @line_no %>'>
+  <td class='line_no'><%= @line_no %></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>" } %>
+  <% text = CGI.escapeHTML(@line.strip).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

@@ -37,8 +37,8 @@
           <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 %>>
-          <label for="with_context">With context</label>
+          <!-- <input type="checkbox" id="with_context" <%="checked=checked" if @with_context %>>
+          <label for="with_context">With context</label> -->
         </td>
         <td></td>
       </tr>
@@ -54,12 +54,6 @@
   </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>
-
 <script type="text/javascript">
   $(document).ready(function() {
     $('#query').trigger('focus');
@@ -114,7 +108,7 @@
       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);
+        Controller.openFile($(this).attr('data-href'), $(this).attr('data-line_no'), $("#cached_query").val(), literal_match, match_case);
       } catch(e) {
         alert(e.message);
       }
@@ -123,13 +117,13 @@
     // need to use live here so that results added will be caught
     $('.expand_collapse').live('click', function(ev) {
       ev.preventDefault();
-      var file_num = $(this).attr('data-file_num');
-      if ($(".file_" + file_num).first().is(":visible")) {
+      var file_index = $(this).attr('data-file_index');
+      if ($(".line_for_" + file_index).first().is(":visible")) {
         $('img', this).attr('src', '<%= image_path %>/collapsed.png');
-        $(".file_" + file_num).hide();
+        $(".line_for_" + file_index).hide();
       } else {
         $('img', this).attr('src', '<%= image_path %>/expanded.png');
-        $(".file_" + file_num).show();
+        $(".line_for_" + file_index).show();
       }
     });
   });

data/plugins/html_view/plugin.rb

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

data/plugins/project/lib/project.rb

@@ -8,8 +8,6 @@ unless defined?(DRb)
   require 'drb/drb'
 end
 
-require 'openssl'
-
 require "project/adapters/remote_protocols/protocol"
 require "project/adapters/remote_protocols/sftp"
 require "project/adapters/remote_protocols/ftp"

data/plugins/project/lib/project/dir_controller.rb

@@ -251,7 +251,7 @@ module Redcar
         adapter = DirController.adapter(node, tree)
         adapter.mv(node.path, new_path)
         tree.refresh
-        new_node = DirMirror::Node.create_from_path(adapter, {:fullname => new_path, :type => node.type})
+        new_node = DirMirror::Node.create_from_path(adapter, {:fullname => new_path})
         tree.select(new_node)
       end
       

data/plugins/project/lib/project/drb_service.rb

@@ -14,7 +14,7 @@ module Redcar
         begin
           puts 'drb opening untitled ' + full_path if $VERBOSE
           if File.file?(path)
-            Swt.sync_exec do
+            Redcar::ApplicationSWT.sync_exec do
               Project::Manager.open_untitled_path(path)
               Redcar.app.focussed_window.controller.bring_to_front
             end
@@ -30,7 +30,7 @@ module Redcar
         begin
           puts 'drb opening ' + full_path if $VERBOSE
           if File.directory? full_path
-            Swt.sync_exec do
+            Redcar::ApplicationSWT.sync_exec do
               if Redcar.app.windows.length == 0 and Application.storage['last_open_dir'] == full_path
                 Project::Manager.restore_last_session
               end
@@ -48,7 +48,7 @@ module Redcar
             end
             'ok'
           elsif full_path == 'just_bring_to_front'          
-            Swt.sync_exec do
+            Redcar::ApplicationSWT.sync_exec do
               if Redcar.app.windows.length == 0
                 Project::Manager.restore_last_session
               end
@@ -56,7 +56,7 @@ module Redcar
             end
             'ok'
           elsif File.file?(full_path)
-            Swt.sync_exec do
+            Redcar::ApplicationSWT.sync_exec do
               if Redcar.app.windows.length == 0
                 Project::Manager.restore_last_session
               end

data/plugins/project/plugin.rb

@@ -7,6 +7,5 @@ Plugin.define do
   dependencies "edit_view", ">0",
                "HTML View", ">0",
                "connection_manager", ">0",
-               "application", ">=1.1",
-               "tree", ">=0"
+               "application", ">=1.1"
 end