redcar 0.3.7.1 → 0.3.8

data/plugins/application_swt/lib/application_swt/window.rb

@@ -103,8 +103,7 @@ module Redcar
       def create_treebook_controller
         treebook = @window.treebook
         controller = ApplicationSWT::Treebook.new(
-          @tree_composite, 
-          @tree_layout, 
+          self, 
           treebook)
         treebook.controller = controller
       end
@@ -204,10 +203,10 @@ module Redcar
         @shell.dispose
         @menu_controller.close
       end
-        
-      private
       
-      attr_reader :right_composite
+      attr_reader :right_composite, :left_composite, :tree_composite, :tree_layout, :tree_sash
+
+      private
       
       def create_shell
         @shell = Swt::Widgets::Shell.new(ApplicationSWT.display)
@@ -225,21 +224,17 @@ module Redcar
       def create_sashes(window_model)
         orientation = horizontal_vertical(window_model.notebook_orientation)
         
-        @tree_composite = Swt::Widgets::Composite.new(@shell, Swt::SWT::NONE)
-        @tree_layout = Swt::Custom::StackLayout.new
-        @tree_composite.setLayout(@tree_layout)
-        
+        @left_composite = Swt::Widgets::Composite.new(@shell, Swt::SWT::NONE)
+        @left_composite.layout = Swt::Layout::GridLayout.new(1, false).tap do |l|
+          l.verticalSpacing = 0
+          l.marginHeight = 0
+          l.horizontalSpacing = 0
+          l.marginWidth = 0
+        end
+                
         @sash = Swt::Widgets::Sash.new(@shell, Swt::SWT::VERTICAL)
+
         @right_composite = Swt::Widgets::Composite.new(@shell, Swt::SWT::NONE)
-        
-        
-        @tree_composite.layout_data = Swt::Layout::FormData.new.tap do |l|
-          l.left = Swt::Layout::FormAttachment.new(0, 5)
-          l.right = Swt::Layout::FormAttachment.new(@sash, 0)
-          l.top = Swt::Layout::FormAttachment.new(0, 5)
-          l.bottom = Swt::Layout::FormAttachment.new(100, -5)
-        end
-        
         @right_composite.layout = Swt::Layout::GridLayout.new(1, false).tap do |l|
           l.verticalSpacing = 0
           l.marginHeight = 0
@@ -268,6 +263,13 @@ module Redcar
           end
         end
         
+        @left_composite.layout_data = Swt::Layout::FormData.new.tap do |l|
+          l.left = Swt::Layout::FormAttachment.new(0, 5)
+          l.right = Swt::Layout::FormAttachment.new(@sash, 0)
+          l.top = Swt::Layout::FormAttachment.new(0, 5)
+          l.bottom = Swt::Layout::FormAttachment.new(100, -5)
+        end
+
         @right_composite.layout_data = Swt::Layout::FormData.new.tap do |d|
           d.left = Swt::Layout::FormAttachment.new(@sash, 0)
           d.right = Swt::Layout::FormAttachment.new(100, -5)
@@ -275,6 +277,10 @@ module Redcar
           d.bottom = Swt::Layout::FormAttachment.new(100, -5)
         end
                 
+        @tree_sash = Swt::Custom::SashForm.new(@left_composite, orientation)
+        grid_data = Swt::Layout::GridData.new(Swt::Layout::GridData::FILL_BOTH)
+        @tree_sash.layout_data = grid_data
+        
         @notebook_sash = Swt::Custom::SashForm.new(@right_composite, orientation)
         grid_data = Swt::Layout::GridData.new(Swt::Layout::GridData::FILL_BOTH)
         @notebook_sash.layout_data = grid_data

data/plugins/auto_completer/lib/auto_completer.rb

@@ -5,7 +5,7 @@ require 'auto_completer/word_iterator'
 require 'auto_completer/word_list'
 
 module Redcar
-  class AutoCompleter
+  class AutoCompleter    
     WORD_CHARACTERS = /\w|_/ # /(\s|\t|\.|\r|\(|\)|,|;)/
     
     def self.document_controller_types
@@ -82,31 +82,16 @@ module Redcar
         word_list
       end
       
-      # returns the prefix that is being touched by the cursor and an array 
-      # containing [left, right] document offsets of the prefix.
+      # returns the prefix that is being touched by the cursor and a range 
+      # containing offsets of the prefix.
       def touched_prefix
         line = doc.get_line(doc.cursor_line)
-        left, right = word_range(line)
+        cur_offset = doc.cursor_offset
+        left, right = doc.word_range_at_offset(cur_offset).first, cur_offset
         prefix = doc.get_range(left, right - left)
         return nil if prefix.length == 0
         return prefix, left, right
       end
-      
-      # returns the range that holds the current word (depending on WORD_CHARACTERS)
-      def word_range(line)
-        left = doc.cursor_line_offset - 1
-        right = doc.cursor_line_offset
-        left_range = 0
-        right_range = 0
-        offset = doc.cursor_offset
-        
-        until left == -1 || WORD_CHARACTERS !~ (line[left].chr)
-          left -= 1
-          left_range -= 1
-        end
-        
-        return [offset+left_range, offset+right_range]
-      end
     end
     
     class MenuAutoCompleterCommand < AutoCompleteCommand

data/plugins/core/lib/core.rb

@@ -1,5 +1,4 @@
 
-require 'java'
 require 'fileutils'
 
 require "core/logger"
@@ -15,9 +14,13 @@ require "core/persistent_cache"
 require "core/plugin"
 require "core/plugin/storage"
 
-require "core/task"
-require "core/task_queue"
-require "core/resource"
+begin
+  require 'java'
+  require "core/task"
+  require "core/task_queue"
+  require "core/resource"
+rescue LoadError => e
+end
 
 module Redcar
   def self.tmp_dir

data/plugins/core/lib/core/observable_struct.rb

@@ -21,10 +21,10 @@ class ObservableStruct
     end
     accessors.each do |accessor|
       klass.class_eval %Q{
-        alias_method :real_#{accessor}=, :#{accessor}=
+        alias_method :set_#{accessor}, :#{accessor}=
         def #{accessor}=(val)
           notify_listeners(:changed_#{accessor}, val) do
-            self.real_#{accessor} = val
+            self.set_#{accessor}(val)
           end
         end
       }

data/plugins/declarations/lib/declarations.rb

@@ -83,7 +83,7 @@ module Redcar
       path = match[:file]
       Project::Manager.open_file(path)
       regexp = Regexp.new(Regexp.escape(match[:match]))
-      Redcar::Top::FindNextRegex.new(regexp, true).run
+      DocumentSearch::FindNextRegex.new(regexp, true).run
     end
 
     class GoToTagCommand < EditTabCommand
@@ -92,22 +92,8 @@ module Redcar
         if doc.selection?
           handle_tag(doc.selected_text)
         else
-          line = doc.get_line(doc.cursor_line)
-          left = doc.cursor_line_offset - 1
-          right = doc.cursor_line_offset
-          left_range = 0
-          right_range = 0
-          offset = doc.cursor_offset
-          
-          until left == -1 || AutoCompleter::WORD_CHARACTERS !~ (line[left].chr)
-            left -= 1
-            left_range -= 1
-          end
-          until right == line.length || AutoCompleter::WORD_CHARACTERS !~ (line[right].chr)
-            right += 1
-            right_range += 1
-          end
-          handle_tag(doc.get_slice(doc.cursor_offset+left_range, doc.cursor_offset+right_range))
+          range = doc.current_word_range
+          handle_tag(doc.get_slice(range.first, range.last))
         end
       end
 

data/plugins/document_search/features/search.feature

@@ -0,0 +1,163 @@
+
+@speedbar
+Feature: Search in file
+
+  Background:
+    Given I open a new edit tab
+
+  Scenario: Open search speedbar
+    When I replace the contents with "Foo\nBar\nBaz"
+    And I move the cursor to 0
+    And I run the command DocumentSearch::SearchForwardCommand
+    Then the DocumentSearch::SearchSpeedbar speedbar should be open
+
+  Scenario: Search for a word should select next occurrence
+    When I replace the contents with "Foo\nBar\nBaz"
+    And I move the cursor to 0
+    And I run the command DocumentSearch::SearchForwardCommand
+    And I type "Bar" into the "Search" field in the speedbar
+    And I press "Search" in the speedbar
+    Then the selected text should be "Bar"
+
+  Scenario: Search twice should move to the next occurrence
+    When I replace the contents with "Foo\nBar\nFoo"
+    And I move the cursor to 0
+    And I run the command DocumentSearch::SearchForwardCommand
+    And I type "Foo" into the "Search" field in the speedbar
+    And I press "Search" in the speedbar
+    And I press "Search" in the speedbar
+    Then the selected text should be "Foo"
+    And the selection should be on line 2
+
+  Scenario: Search for a word adjacent to cursor should select word
+    When I replace the contents with "Foo\nBar\nBaz"
+    And I move the cursor to 0
+    And I run the command DocumentSearch::SearchForwardCommand
+    And I type "Foo" into the "Search" field in the speedbar
+    And I press "Search" in the speedbar
+    Then the selected text should be "Foo"
+
+  Scenario: Search for a word should find occurrence after the cursor
+    When I replace the contents with "Foo\nBar\nBaz\nFoo"
+    And I move the cursor to 1
+    And I run the command DocumentSearch::SearchForwardCommand
+    And I type "Foo" into the "Search" field in the speedbar
+    And I press "Search" in the speedbar
+    Then the selected text should be "Foo"
+    And the selection should be on line 3
+
+  Scenario: Search for a word should wrap to earlier occurrence if none left
+    When I replace the contents with "Foo\nBar\nBaz"
+    And I move the cursor to 1
+    And I run the command DocumentSearch::SearchForwardCommand
+    And I type "Foo" into the "Search" field in the speedbar
+    And I press "Search" in the speedbar
+    Then the selected text should be "Foo"
+    And the selection should be on line 0
+
+  Scenario: Doesn't search for a regex by default
+    When I replace the contents with "Foo\nBar\nBaz"
+    And I move the cursor to 0
+    And I run the command DocumentSearch::SearchForwardCommand
+    And I type "Ba." into the "Search" field in the speedbar
+    And I press "Search" in the speedbar
+    Then there should not be any text selected
+  
+  Scenario: Search for a regex
+    When I replace the contents with "Foo\nBar\nBaz"
+    And I move the cursor to 0
+    And I run the command DocumentSearch::SearchForwardCommand
+    And I type "Ba." into the "Search" field in the speedbar
+    And I check "Regex" in the speedbar
+    And I press "Search" in the speedbar
+    Then the selected text should be "Bar"
+  
+  Scenario: Search for a regex matches a second time
+    When I replace the contents with "Foo\nBar\nBaz"
+    And I move the cursor to 0
+    And I run the command DocumentSearch::SearchForwardCommand
+    And I type "Ba." into the "Search" field in the speedbar
+    And I check "Regex" in the speedbar
+    And I press "Search" in the speedbar
+    And I press "Search" in the speedbar
+    Then the selected text should be "Baz"
+  
+  Scenario: Should not match case by default
+    When I replace the contents with "Foo\nBar\nBaz"
+    And I move the cursor to 0
+    And I run the command DocumentSearch::SearchForwardCommand
+    And I type "foo" into the "Search" field in the speedbar
+    And I press "Search" in the speedbar
+    Then the selected text should be "Foo"
+
+  Scenario: Should match case if requested
+    When I replace the contents with "Foo\nBar\nBaz"
+    And I move the cursor to 0
+    And I run the command DocumentSearch::SearchForwardCommand
+    And I type "foo" into the "Search" field in the speedbar
+    And I check "Match case" in the speedbar
+    And I press "Search" in the speedbar
+    Then there should not be any text selected
+
+  Scenario: Should scroll to the match
+    When I replace the contents with 100 lines of "xxx" then "Foo"
+    And I scroll to the top of the document
+    And I move the cursor to 0
+    And I run the command DocumentSearch::SearchForwardCommand
+    And I type "Foo" into the "Search" field in the speedbar
+    And I press "Search" in the speedbar
+    Then the selected text should be "Foo"
+    And line number 100 should be visible
+
+  Scenario: Should reopen with the same text as the previous search
+    And I run the command DocumentSearch::SearchForwardCommand
+    And I type "foo" into the "Search" field in the speedbar
+    And I press "Search" in the speedbar
+    And I close the speedbar
+    And I run the command DocumentSearch::SearchForwardCommand
+    Then the "Search" field in the speedbar should have text "foo"
+    
+  Scenario: Should reopen with the same value of Regex as the previous search
+    And I run the command DocumentSearch::SearchForwardCommand
+    And I check "Regex" in the speedbar
+    And I press "Search" in the speedbar
+    And I close the speedbar
+    And I run the command DocumentSearch::SearchForwardCommand
+    Then "Regex" should be checked in the speedbar
+
+  Scenario: Should reopen with the same value of Regex as the previous search 2
+    And I run the command DocumentSearch::SearchForwardCommand
+    And I check "Regex" in the speedbar
+    And I press "Search" in the speedbar
+    And I close the speedbar
+    And I run the command DocumentSearch::SearchForwardCommand
+    And I uncheck "Regex" in the speedbar
+    And I press "Search" in the speedbar
+    And I close the speedbar
+    And I run the command DocumentSearch::SearchForwardCommand
+    Then "Regex" should not be checked in the speedbar
+
+  Scenario: Should reopen with the same value of Match case as the previous search
+    And I run the command DocumentSearch::SearchForwardCommand
+    And I check "Match case" in the speedbar
+    And I press "Search" in the speedbar
+    And I close the speedbar
+    And I run the command DocumentSearch::SearchForwardCommand
+    Then "Match case" should be checked in the speedbar
+
+  Scenario: Should initialize query with the currently selected text
+    When I replace the contents with "Foo\nBar\nFoo"
+    And I move the cursor to 0
+    And I select from 0 to 3
+    And I run the command DocumentSearch::SearchForwardCommand
+    Then the "Search" field in the speedbar should have text "Foo"
+
+  Scenario: Should match the next occurence of the currently selected text
+    When I replace the contents with "Foo\nBar\nFoo"
+    And I move the cursor to 0
+    And I select from 0 to 3
+    And I run the command DocumentSearch::SearchForwardCommand
+    And I press "Search" in the speedbar
+    Then the selected text should be "Foo"
+    And line number 2 should be visible
+    

data/plugins/document_search/features/support/env.rb

@@ -0,0 +1,4 @@
+
+RequireSupportFiles File.dirname(__FILE__) + "/../../../edit_view/features/"
+
+

data/plugins/document_search/lib/document_search.rb

@@ -0,0 +1,121 @@
+
+module DocumentSearch
+
+  class SearchSpeedbar < Redcar::Speedbar
+    class << self
+      attr_accessor :previous_query
+      attr_accessor :previous_is_regex
+      attr_accessor :previous_match_case
+      attr_accessor :initial_query
+    end
+  
+    def initial_query=(text)
+      SearchSpeedbar.previous_query = text
+    end
+
+    def after_draw
+      self.query.value = SearchSpeedbar.previous_query || ""
+      self.is_regex.value = SearchSpeedbar.previous_is_regex
+      self.match_case.value = SearchSpeedbar.previous_match_case
+      self.query.edit_view.document.select_all
+      initial_query = nil
+    end
+    
+    label :label, "Search:"
+    textbox :query        
+    
+    toggle :is_regex, 'Regex', nil, false do |v|
+      # v is true or false
+      SearchSpeedbar.previous_is_regex = v          
+    end
+    
+    toggle :match_case, 'Match case', nil, false do |v|
+      SearchSpeedbar.previous_match_case = v          
+    end      
+    
+    button :search, "Search", "Return" do
+      SearchSpeedbar.previous_query = query.value
+      SearchSpeedbar.previous_match_case = match_case.value
+      SearchSpeedbar.previous_is_regex = is_regex.value
+      success = SearchSpeedbar.repeat_query
+    end
+    
+    def self.repeat_query
+      current_query = @previous_query
+      if !@previous_is_regex
+        current_query = Regexp.escape(current_query)
+      end
+      FindNextRegex.new(Regexp.new(current_query, !@previous_match_case), true).run
+    end
+  end
+    
+  class SearchForwardCommand < Redcar::EditTabCommand
+    
+    def execute
+      @speedbar = SearchSpeedbar.new
+      if doc.selection?
+        @speedbar.initial_query = doc.selected_text
+      end
+      win.open_speedbar(@speedbar)
+    end
+  end
+  
+  class RepeatPreviousSearchForwardCommand < Redcar::EditTabCommand
+    def execute
+      SearchSpeedbar.repeat_query
+    end
+  end
+  
+  class FindNextRegex < Redcar::EditTabCommand
+    def initialize(re, wrap=nil)
+      @re = re
+      @wrap = wrap
+    end
+    
+    def to_s
+      "<#{self.class}: @re:#{@re.inspect} wrap:#{!!@wrap}>"
+    end
+    
+    def execute
+      # first search the remainder of the current line
+      curr_line = doc.get_line(doc.cursor_line)
+      cursor_line_offset = doc.cursor_offset - doc.offset_at_line(doc.cursor_line)
+      curr_line = curr_line[cursor_line_offset..-1]
+      if curr_line =~ @re
+        line_start = doc.offset_at_line(doc.cursor_line)
+        startoff = line_start + $`.length + cursor_line_offset
+        endoff   = startoff + $&.length
+        doc.set_selection_range(endoff, startoff)
+      elsif doc.cursor_line < doc.line_count - 1
+        # next search the rest of the lines
+        found_line_offset = nil
+        found_line_num = nil
+        found_length = nil
+        line_nums = ((doc.cursor_line() + 1)..(doc.line_count() - 1)).to_a # the rest of the document
+        if @wrap
+          line_nums += (0..doc.cursor_line()).to_a
+        end
+        for line_num in line_nums do
+          curr_line = doc.get_line(line_num)
+          if new_offset = (curr_line.to_s =~ @re)
+            found_line_offset = new_offset
+            found_line_num = line_num
+            found_length = $&.length
+            break
+          end
+        end
+        if found_line_num
+          line_start = doc.offset_at_line(found_line_num)
+          startoff = line_start + found_line_offset
+          endoff   = startoff + found_length
+          doc.scroll_to_line(found_line_num)
+          doc.set_selection_range(endoff, startoff)
+          true
+        else
+          false
+        end
+      end
+    end
+  end
+    
+end