redcar 0.10 → 0.11.0dev

data/plugins/document_search/lib/document_search/find_speedbar.rb

@@ -1,102 +1,159 @@
-module DocumentSearch
-  class FindSpeedbar < Redcar::Speedbar
-    class << self
-      attr_accessor :previous_query, :previous_options
-    end
-    @previous_query = ''
-    @previous_options = QueryOptions.new
+module Redcar
+  module DocumentSearch
+    class FindSpeedbar < Redcar::Speedbar
+      class << self
+        attr_accessor :previous_query, :previous_replace, :previous_options
+      end
+      @previous_query = ''
+      @previous_replace = ''
+      @previous_options = QueryOptions.new
 
-    attr_accessor :initial_query
+      attr_accessor :initial_query
 
-    def doc
-      win = Redcar.app.focussed_window
-      tab = win.focussed_notebook_tab
-      tab.document if tab
-    end
+      NotFoundMessage = 'Not found!'
 
-    def after_draw
-      FindSpeedbar.previous_query ||= ""
-      self.query.value = @initial_query || FindSpeedbar.previous_query
-      self.query_type.value = QueryOptions.query_type_to_text(
-          FindSpeedbar.previous_options.query_type)
-      self.match_case.value = FindSpeedbar.previous_options.match_case
-      self.wrap_around.value = FindSpeedbar.previous_options.wrap_around
-      self.query.edit_view.document.select_all
-    end
+      ### UI DEFINITION ###
 
-    label :label, "Find:"
-    textbox :query do |value|
-      if doc
-        update_options_from_ui
-        FindSpeedbar.find_incremental
+      # Override num_columns to control number of rows.
+      def num_columns
+        return 7
       end
-    end
 
-    combo :query_type, ["Plain", "Regex", "Glob"], "Plain" do |val|
-      FindSpeedbar.previous_options.query_type = QueryOptions.query_type_to_symbol(val)
-      update_options_from_ui
-      FindSpeedbar.find_incremental
-    end
+      label :label_find, 'Find:'
+      textbox :query do |val|
+        FindSpeedbar.previous_query = val
+      end
 
-    toggle :match_case, 'Match case', nil, false do |val|
-      FindSpeedbar.previous_options.match_case = val
-      update_options_from_ui
-      FindSpeedbar.find_incremental
-    end
+      toggle :is_regex, 'Regex', nil, false do |val|
+        FindSpeedbar.previous_options.is_regex = val
+      end
 
-    toggle :wrap_around, 'Wrap around', nil, true do |val|
-      FindSpeedbar.previous_options.wrap_around = val
-      update_options_from_ui
-      FindSpeedbar.find_incremental
-    end
+      toggle :match_case, 'Match case', nil, false do |val|
+        FindSpeedbar.previous_options.match_case = val
+      end
 
-    button :previous, "Previous", "Alt+Return" do
-      if doc
-        update_options_from_ui
-        FindSpeedbar.find_previous
+      toggle :wrap_around, 'Wrap around', nil, true do |val|
+        FindSpeedbar.previous_options.wrap_around = val
       end
-    end
 
-    button :next, "Next", "Return" do
-      if doc
-        update_options_from_ui
-        FindSpeedbar.find_next
+      label :label_not_found, NotFoundMessage   # Hack: Set label for sizing, clear in after_draw
+      label :label_space_end_row1, ""
+      label :label_spacer_start_row2, ""
+
+      label :label_replace, 'Replace:'
+      textbox :replace do |val|
+        FindSpeedbar.previous_replace = val
       end
-    end
 
-    def update_options_from_ui
-      if doc and self.query.value and self.query.value != ""
-        FindSpeedbar.previous_query = self.query.value
-        FindSpeedbar.previous_options.query_type =
-            QueryOptions.query_type_to_symbol(self.query_type.value)
-        FindSpeedbar.previous_options.match_case = self.match_case.value
-        FindSpeedbar.previous_options.wrap_around = self.wrap_around.value
+      button :replace_find, 'Replace && Find', 'Alt+Return' do
+        FindSpeedbar.replace_and_find(
+            FindSpeedbar.previous_query,
+            FindSpeedbar.previous_replace,
+            FindSpeedbar.previous_options) or not_found
       end
-    end
 
-    def self.find_incremental
-      cmd = FindIncrementalCommand.new(FindSpeedbar.previous_query, FindSpeedbar.previous_options)
-      cmd.run(:env => {:edit_view => Redcar::EditView.focussed_tab_edit_view})
-    end
+      button :replace_all, 'Replace All', nil do
+        FindSpeedbar.replace_all(
+            FindSpeedbar.previous_query,
+            FindSpeedbar.previous_replace,
+            FindSpeedbar.previous_options) or not_found
+      end
 
-    def self.find_next
-      cmd = FindNextCommand.new(FindSpeedbar.previous_query, FindSpeedbar.previous_options)
-      cmd.run(:env => {:edit_view => Redcar::EditView.focussed_tab_edit_view})
-    end
+      button :replace_all_in_selection, 'Replace in Selection', nil do
+        FindSpeedbar.replace_all_in_selection(
+            FindSpeedbar.previous_query,
+            FindSpeedbar.previous_replace,
+            FindSpeedbar.previous_options) or not_found
+      end
 
-    def self.find_previous
-      cmd = FindPreviousCommand.new(FindSpeedbar.previous_query, FindSpeedbar.previous_options)
-      cmd.run(:env => {:edit_view => Redcar::EditView.focussed_tab_edit_view})
-    end
+      button :find_previous, 'Previous', 'Shift+Return' do
+        FindSpeedbar.find_previous or not_found
+      end
+
+      button :find_next, 'Next', 'Return' do
+        FindSpeedbar.find_next or not_found
+      end
+
+      ### UI OPERATIONS ###
+
+      # Initializes UI elements.
+      def after_draw
+        clear_not_found
+        # If the current selection (from @initial_query) is equal to previous_replace, we ignore
+        # that selection and just use the previous value for the query.
+        #
+        # This is especially important in the following command sequence: Select; Use selection for
+        # query; Select; Use selection for replace; Open Find speedbar. Without the fix, the prior
+        # selection for the query gets overwritten with the current selection, which is annoying and
+        # useless.
+        if ((FindSpeedbar.previous_replace.length > 0) &&
+            (@initial_query == FindSpeedbar.previous_replace))
+          self.query.value = FindSpeedbar.previous_query
+        else
+          self.query.value = @initial_query || FindSpeedbar.previous_query
+        end
+        self.replace.value = FindSpeedbar.previous_replace || ""
+        self.is_regex.value = FindSpeedbar.previous_options.is_regex
+        self.match_case.value = FindSpeedbar.previous_options.match_case
+        self.wrap_around.value = FindSpeedbar.previous_options.wrap_around
+        self.query.edit_view.document.select_all
+      end
+
+      # Sets the "Not found" label message, invoking the system beep.
+      def not_found
+        Swt::Widgets::Display.get_current.beep
+        self.label_not_found.text = NotFoundMessage
+      end
+
+      # Clears the "Not found" label message.
+      def clear_not_found
+        self.label_not_found.text = ''
+      end
+
+      ### COMMANDS ###
+
+      def self.find_next
+        cmd = FindNextCommand.new(FindSpeedbar.previous_query, FindSpeedbar.previous_options)
+        cmd.run(:env => {:edit_view => Redcar::EditView.focussed_tab_edit_view})
+      end
+
+      def self.find_previous
+        cmd = FindPreviousCommand.new(FindSpeedbar.previous_query, FindSpeedbar.previous_options)
+        cmd.run(:env => {:edit_view => Redcar::EditView.focussed_tab_edit_view})
+      end
+
+      # Note: The assumption that we set find only from selected text means we don't have to update
+      # search.
+      def self.use_selection_for_find(doc, active_speedbar=nil)
+        return unless doc.selection?
+        FindSpeedbar.previous_query = doc.selected_text
+        if active_speedbar && (active_speedbar.is_a? FindSpeedbar)
+          active_speedbar.query.value = FindSpeedbar.previous_query
+        end
+      end
+
+      def self.replace_and_find(query, replace, options)
+        cmd = ReplaceAndFindCommand.new(query, replace, options)
+        cmd.run(:env => {:edit_view => Redcar::EditView.focussed_tab_edit_view})
+      end
+
+      def self.replace_all(query, replace, options)
+        cmd = ReplaceAllCommand.new(query, replace, options, false)
+        cmd.run(:env => {:edit_view => Redcar::EditView.focussed_tab_edit_view})
+      end
+
+      def self.replace_all_in_selection(query, replace, options)
+        cmd = ReplaceAllCommand.new(query, replace, options, true)
+        cmd.run(:env => {:edit_view => Redcar::EditView.focussed_tab_edit_view})
+      end
 
-    # Note: The assumption that we set find only from selected text means we don't have to update
-    # search.
-    def self.use_selection_for_find(doc, active_speedbar=nil)
-      return unless doc.selection?
-      FindSpeedbar.previous_query = doc.selected_text
-      if active_speedbar
-        active_speedbar.query.value = FindSpeedbar.previous_query
+      def self.use_selection_for_replace(doc, active_speedbar=nil)
+        return unless doc.selection?
+        FindSpeedbar.previous_replace = doc.selected_text
+        if active_speedbar && (active_speedbar.instance_of? FindSpeedbar)
+          active_speedbar.replace.value = FindSpeedbar.previous_replace
+        end
       end
     end
   end
-end
+end

data/plugins/document_search/lib/document_search/incremental_search_speedbar.rb

@@ -0,0 +1,70 @@
+module Redcar
+  module DocumentSearch
+    class IncrementalSearchSpeedbar < Redcar::Speedbar
+      class << self
+        attr_accessor :previous_query, :previous_options
+      end
+      @previous_query = ''
+      @previous_options = QueryOptions.new
+
+      ### UI ###
+
+      label :label, 'Find:'
+      textbox :query do |value|
+        # Check to avoid multiple searches from duplicate text update events.
+        if IncrementalSearchSpeedbar.previous_query != self.query.value
+          IncrementalSearchSpeedbar.previous_query = self.query.value
+          IncrementalSearchSpeedbar.find_incremental
+        end
+      end
+
+      toggle :is_regex, 'Regex', nil, false do |val|
+        IncrementalSearchSpeedbar.previous_options.is_regex = val
+        IncrementalSearchSpeedbar.find_incremental
+      end
+
+      toggle :match_case, 'Match case', nil, false do |val|
+        IncrementalSearchSpeedbar.previous_options.match_case = val
+        IncrementalSearchSpeedbar.find_incremental
+      end
+
+      toggle :wrap_around, 'Wrap around', nil, true do |val|
+        IncrementalSearchSpeedbar.previous_options.wrap_around = val
+        IncrementalSearchSpeedbar.find_incremental
+      end
+
+      def after_draw
+        IncrementalSearchSpeedbar.previous_query ||= ""
+        self.query.value = IncrementalSearchSpeedbar.previous_query
+        self.is_regex.value = IncrementalSearchSpeedbar.previous_options.is_regex
+        self.match_case.value = IncrementalSearchSpeedbar.previous_options.match_case
+        self.wrap_around.value = IncrementalSearchSpeedbar.previous_options.wrap_around
+        self.query.edit_view.document.select_all
+      end
+
+      ### COMMANDS ###
+
+      def self.find_incremental
+        cmd = FindNextCommand.new(
+            IncrementalSearchSpeedbar.previous_query,
+            IncrementalSearchSpeedbar.previous_options,
+            always_start_within_selection=true)
+        cmd.run(:env => {:edit_view => Redcar::EditView.focussed_tab_edit_view})
+      end
+
+      def self.find_next
+        cmd = FindNextCommand.new(
+            IncrementalSearchSpeedbar.previous_query,
+            IncrementalSearchSpeedbar.previous_options)
+        cmd.run(:env => {:edit_view => Redcar::EditView.focussed_tab_edit_view})
+      end
+
+      def self.find_previous
+        cmd = FindPreviousCommand.new(
+            IncrementalSearchSpeedbar.previous_query,
+            IncrementalSearchSpeedbar.previous_options)
+        cmd.run(:env => {:edit_view => Redcar::EditView.focussed_tab_edit_view})
+      end
+    end
+  end
+end

data/plugins/document_search/lib/document_search/query_options.rb

@@ -1,44 +1,20 @@
-module DocumentSearch
-  # Encapsulates options for search queries.
-  class QueryOptions
-    attr_accessor :query_type
-    attr_accessor :match_case
-    attr_accessor :wrap_around
+module Redcar
+  module DocumentSearch
+    # Encapsulates options for search queries.
+    class QueryOptions
+      attr_accessor :is_regex
+      attr_accessor :match_case
+      attr_accessor :wrap_around
 
-    # Initializes with default options.
-    def initialize
-      @query_type = :query_plain
-      @match_case = false
-      @wrap_around = true
-    end
-
-    ### UTILITY ###
-
-    # Maps a search type combo box value to the corresponding search type symbol.
-    def self.query_type_to_symbol(query_type_text)
-      case query_type_text
-      when "Plain"
-        :query_plain
-      when "Regex"
-        :query_regex
-      when "Glob"
-        :query_glob
-      else
-        raise "Invalid query type: #{query_type_text}"
-      end
-    end
+      DEFAULT_IS_REGEX  = false
+      DEFAULT_MATCH_CASE  = false
+      DEFAULT_WRAP_AROUND = true
 
-    # Maps a search type symbol to a text value for the search type combo box.
-    def self.query_type_to_text(query_type_symbol)
-      case query_type_symbol
-      when :query_plain
-        'Plain'
-      when :query_regex
-        'Regex'
-      when :query_glob
-        'Glob'
-      else
-        raise "Invalid query type symbol: #{query_type_symbol}"
+      # Initializes with default options.
+      def initialize
+        @is_regex = DEFAULT_IS_REGEX
+        @match_case  = DEFAULT_MATCH_CASE
+        @wrap_around = DEFAULT_WRAP_AROUND
       end
     end
   end

data/plugins/document_search/plugin.rb

@@ -3,6 +3,6 @@ Plugin.define do
   name    "document_search"
   version "1.0"
   file    "lib", "document_search"
-  object  "DocumentSearch"
+  object  "Redcar::DocumentSearch"
   dependencies "edit_view", ">0"
 end

data/plugins/edit_view/features/step_definitions/editing_steps.rb

@@ -108,7 +108,7 @@ When /^I press the Backspace key in the edit tab$/ do
   edit_view.backspace_pressed([])
 end
 
-Then /^the contents should be "(.*)"$/ do |text|
+Then /^the contents should (not )?be "(.*)"$/ do |negative,text|
   expected = unescape_text(text)
   doc = Redcar::EditView.focussed_edit_view_document
   actual = doc.to_s
@@ -121,7 +121,11 @@ Then /^the contents should be "(.*)"$/ do |text|
     end
     actual = actual.insert(actual.char_offset_to_byte_offset(char_seloff), "<s>") unless char_curoff == char_seloff
   end
-  actual.should == expected
+  if negative
+    actual.should_not == expected
+  else
+    actual.should == expected
+  end
 end
 
 Then /^the contents of the edit tab should be "(.*)"$/ do |text|

data/plugins/edit_view_swt/lib/edit_view_swt.rb

@@ -195,7 +195,7 @@ module Redcar
     end
 
     def create_undo_manager
-      @undo_manager = JFace::Text::TextViewerUndoManager.new(500)
+      @undo_manager = JFace::Text::TextViewerUndoManager.new(5000)
       @undo_manager.connect(@mate_text.viewer)
     end
 
@@ -527,7 +527,7 @@ module Redcar
     def biggest_visible_line
       @mate_text.viewer.get_bottom_index
     end
-
+    
     def ensure_visible(offset)
       line = @document.line_at_offset(offset)
       line_start_offset = @document.offset_at_line(line)

data/plugins/file_parser/lib/file_parser.rb

@@ -21,6 +21,11 @@ module Redcar
       self.skip_types = options['skip_types'] || [:executable, :mountpoint, :symlink, :zero]
     end
 
+    def directory?(pathname)
+      f = java.io.File.new(pathname.path.to_java)
+      f.directory?
+    end
+    
     def each_file(&block)
       file_index, excluded_paths = 0, []
       structure = Dir.glob("#{root_path}/**/*", File::FNM_DOTMATCH)
@@ -29,7 +34,7 @@ module Redcar
         next if excluded_paths.any? { |ep| fullpath =~ /^#{Regexp.escape(ep)}(\/|$)/ }
         path = Pathname.new(fullpath)
         is_excluded_pattern = excluded_patterns.any? { |pattern| fullpath =~ pattern }
-        if path.directory?
+        if directory?(path)
           excluded_paths << path if excluded_dirs.include?(path.basename.to_s) || is_excluded_pattern
         else
           skipped = skip_types.find { |st| path.send("#{st}?") }

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

@@ -0,0 +1,12 @@
+
+Then /I should see "(.*)" in the web view/ do |expected|
+  body.include?(expected)
+end
+
+Given /^I fill in "(.*)" with "(.*)" in the web view$/ do |field, value|
+  fill_in(field, :with => value)
+end
+
+When /I press "(.*)" in the web view/ do |button_name|
+  click_button(button_name)
+end