redcar 0.8.1 → 0.9.0

data/plugins/comment/lib/comment.rb

@@ -27,11 +27,17 @@ module Redcar
       @map ||=begin
         c = File.read(Comment.comment_lib_path)
         map = JSON.parse(c)
-        Comment.comment_extension_paths.each do |path|
-          json = File.read(path)
-          JSON.parse(json).each do |item,content|
-            map[item] = content
+        begin
+          path = Comment.comment_extension_path
+          if File.exist?(path)
+            json = File.read(path)
+            JSON.parse(json).each do |item,content|
+              map[item] = content
+            end
           end
+        rescue Object => e
+          Redcar::Application::Dialog.message_box("There was an error parsing Comment extensions file: #{e.message}")
+          map = JSON.parse(c)
         end
         map
       end
@@ -40,16 +46,11 @@ module Redcar
     def self.extensions_file;"comment_extensions.json";end
     
     def self.comment_lib_path
-      File.dirname(__FILE__) + "/../vendor/comment_lib.json"
+      File.join(File.dirname(__FILE__),"..","vendor","comment_lib.json")
     end
     
-    def self.comment_extension_paths
-      project = Redcar::Project::Manager.focussed_project
-      if project
-        project.config_files(Comment.extensions_file)
-      else
-        Dir[File.join(Redcar.user_dir,Comment.extensions_file)]
-      end
+    def self.comment_extension_path
+      File.join(Redcar.user_dir,Comment.extensions_file)
     end
 
     def self.keymaps
@@ -108,7 +109,7 @@ module Redcar
                 doc.replace_line(line,text)
               else
                 replacement  = "#{start}#{text}#{ending}"
-                replacement += "\n" if doc.get_line(line) =~ /\n$/
+                replacement << "\n" if doc.get_line(line) =~ /\n$/
                 doc.replace_line(line,replacement)
               end
             end
@@ -156,7 +157,7 @@ module Redcar
         md[1].length
       end
       
-	    def execute
+      def execute
         type = Comment.comment_map["#{tab.edit_view.grammar.gsub("\"","")}"]
         if type
           @comment = type["line_comment"]
@@ -198,7 +199,8 @@ module Redcar
             
             (start_line..end_line).each do |line|
               text = doc.get_line(line)
-              if text.length <= insertion_column + 1 and text =~ /^\s*$/
+              
+              if text =~ /^\s*$/
               else
                 insertion_column = [insertion_column, comment_insertion_point_for(text)].min
               end
@@ -254,7 +256,7 @@ module Redcar
             end
           end
         end
-        
+
         if selected
           doc.set_selection_range(cursor_offset, selection_offset)
         else

data/plugins/connection_manager/lib/connection_manager/commands.rb

@@ -5,7 +5,7 @@ module Redcar
 
       def execute
         controller = Controller.new
-        tab = win.new_tab(HtmlTab)
+        tab = win.new_tab(ConfigTab)
         tab.html_view.controller = controller
         tab.focus
       end

data/plugins/connection_manager/lib/connection_manager/private_key_store.rb

@@ -11,9 +11,11 @@ module Redcar
         paths = []
         default_key_globs.each do |default_key_glob|
           Dir[default_key_glob].each do |filename|
-            first = File.open(filename).read(100)
-            if first =~ /PRIVATE KEY/
-              paths << filename
+            unless File.directory?(filename) || !File.readable?(filename)
+              first = File.open(filename).read(100)
+              if first =~ /PRIVATE KEY/
+                paths << filename
+              end
             end
           end
         end

data/plugins/declarations/lib/declarations.rb

@@ -17,7 +17,7 @@ module Redcar
 
     def self.keymaps
       linwin = Keymap.build("main", [:linux, :windows]) do
-        link "Ctrl+G", Declarations::GoToTagCommand
+        link "Alt+G", Declarations::GoToTagCommand
       end
 
       osx = Keymap.build("main", :osx) do

data/plugins/declarations/lib/declarations/parser.rb

@@ -1,6 +1,6 @@
 
 module Redcar
-  JAVA_YAML=<<-YAML
+  GROOVY_YAML=<<-YAML
   - regex:    "class\\s+(\\w+)"
     capture:  1
     type:     id
@@ -9,18 +9,53 @@ module Redcar
     capture:  1
     type:     id
     kind:     interface
-  - regex:    "(public|private).*\\s+(\\w+)\s*\\("
+  - regex:    "^\\s*((public|private|protected|)\\s+|)(static\\s+|)(([\\.\\w]+|)[A-Z]\\w*(<\\w+>|)|void|int|boolean|byte|short|long|char|float|def)\\s+(\\w+\\s*\\((.*)\\))"
+    capture:  7
+    type:     id
+    kind:     method
+  - regex:    "(def|static)\\s+(\\w+)\\s*=\\s*\\{"
     capture:  2
     type:     id
+    kind:     closure
+  - regex:    "enum\\s+(\\w+)"
+    capture:  1
+    type:     id
+    kind:     attribute
+  - regex:    "^\\s*(public|private|protected)\\s+(static\\s+|)([A-Z]\\w+|int|boolean|byte|short|long|char|float|def)\s+(\\w+)\\s*(=|\\n)"
+    capture:  4
+    type:     id
+    kind:     assignment
+  YAML
+
+  JAVA_YAML=<<-YAML
+  - regex:    "class\\s+(\\w+)"
+    capture:  1
+    type:     id
+    kind:     class
+  - regex:    "interface\\s+(\\w+)"
+    capture:  1
+    type:     id
+    kind:     interface
+  - regex:    "^\\s*((public|private|protected|)\\s+|)(static\\s+|)(([\\.\\w]+|)[A-Z]\\w*(<\\w+>|)|void|int|boolean|byte|short|long|char|float)\\s+(\\w+\\s*\\((.*)\\))"
+    capture:  7
+    type:     id
     kind:     method
+  - regex:    "enum\\s+(\\w*)"
+    capture:  1
+    type:     id
+    kind:     attribute
+  - regex:    "^\\s*(public|private|protected)\\s+(static\\s+|)([A-Z]\\w+|int|boolean|byte|short|long|char|float|def)\s+(\\w+)\\s*(=|;)"
+    capture:  4
+    type:     id
+    kind:     assignment
   YAML
-  
+
   RUBY_YAML=<<-YAML
   - regex:    "^[^#]*(class|module)\\s+(?:\\w*::)*(\\w+)(?:$|\\s|<)"
     capture:  2
     type:     id
     kind:     class
-  - regex:    "^[^#]*def (self\\.)?(\\w+[?!]?)"
+  - regex:    "^[^#]*def (self\\.)?(\\w+[?!=]?)(\\(.*\\))?(\\s|\\;)+"
     capture:  2
     type:     id
     kind:     method
@@ -28,11 +63,11 @@ module Redcar
     capture:  2
     type:     id-list
     kind:     attribute
-  - regex:    "^[^#]*alias\s+:(\\w+)"
+  - regex:    "^[^#]*alias\\s+:(\\w+)"
     capture:  1
     type:     id
     kind:     alias
-  - regex:    "^[^#]*alias_method\s+:(\\w+[?!]?)"
+  - regex:    "^[^#]*alias_method\\s+:(\\w+[?!]?)"
     capture:  1
     type:     id
     kind:     alias
@@ -56,27 +91,40 @@ module Redcar
     type:     id
     kind:     method
   YAML
-  
+
+  JS_YAML=<<-YAML
+  - regex:    "function\\s+([A-Z]\\w*)\\(.*\\)"
+    capture:  1
+    type:     id
+    kind:     class
+  - regex:    "function\\s+([a-z]\\w*)\\(.*\\)"
+    capture:  1
+    type:     id
+    kind:     method
+  YAML
+
   class Declarations
     class Parser
       DEFINITIONS = {
-        /\.rb$/   => YAML.load(RUBY_YAML),
-        /\.java$/ => YAML.load(JAVA_YAML),
-        /\.php$/ => YAML.load(PHP_YAML)
+        /\.rb$/     => YAML.load(RUBY_YAML),
+        /\.java$/   => YAML.load(JAVA_YAML),
+        /\.groovy$/ => YAML.load(GROOVY_YAML),
+        /\.php$/    => YAML.load(PHP_YAML),
+        /\.js$/     => YAML.load(JS_YAML)
       }
-      
+
       attr_reader :tags
-      
+
       def initialize
         @tags = []
       end
-      
+
       def parse(files)
         files.each do |path|
           @tags += match_in_file(path)
         end
       end
-      
+
       def decls_for_file(path)
         DEFINITIONS.each do |fn_re, decls|
           if path =~ fn_re
@@ -85,7 +133,7 @@ module Redcar
         end
         nil
       end
-      
+
       def match_kind(path, match)
         if decls = decls_for_file(path)
           decls.each do |decl|
@@ -95,9 +143,9 @@ module Redcar
           end
         end
       end
-      
+
       private
-      
+
       def match_in_file(path)
         tags = []
         begin
@@ -117,7 +165,7 @@ module Redcar
           []
         end
       end
-      
+
       def process_file(path, &block)
         if decls = decls_for_file(path)
           decls.each do |decl|
@@ -127,11 +175,11 @@ module Redcar
           end
         end
       end
-      
+
       def file(path)
         ::File.read(path)
       end
-      
+
     end
   end
 end

data/plugins/document_search/features/replace.feature

@@ -92,6 +92,24 @@ Feature: Replace in file
     And the selected text should be "Rab"
     And the selection should be on line 3
 
+  Scenario: Replace all replaces two on the same line
+    When I replace the contents with "abcabc"
+    And I run the command DocumentSearch::SearchAndReplaceCommand
+    And I type "bc" into the "Search" field in the speedbar
+    And I type "xx" into the "Replace" field in the speedbar
+    Then I should see a message box containing "Replaced 2 occurrences"
+    When I press "Replace All" in the speedbar
+    Then the contents should be "axxaxx"
+
+  Scenario: Replace all replaces overlapping occurences on the same line
+    When I replace the contents with "deedeedeed"
+    And I run the command DocumentSearch::SearchAndReplaceCommand
+    And I type "deed" into the "Search" field in the speedbar
+    And I type "misdeed" into the "Replace" field in the speedbar
+    Then I should see a message box containing "Replaced 2 occurrences"
+    When I press "Replace All" in the speedbar
+    Then the contents should be "misdeedeemisdeed"
+
   Scenario: Replace next occurrence test bug
     When I replace the contents with "the\n* Speedbars have access to the properties of the widgets in them."
     And I move the cursor to 0

data/plugins/document_search/lib/document_search.rb

@@ -1,5 +1,7 @@
-require "document_search/search"
-require "document_search/replace"
+require 'strscan'
+require "document_search/replace_command"
+require "document_search/replace_all_command"
+require "document_search/replace_next_command"
 require "document_search/search_and_replace"
 
 module DocumentSearch
@@ -15,14 +17,14 @@ module DocumentSearch
       end
     end
   end
-  
+
   def self.toolbars
     Redcar::ToolBar::Builder.build do
       item "Search Document", :command => DocumentSearch::SearchForwardCommand, :icon => File.join(Redcar::ICONS_DIRECTORY, "magnifier.png"), :barname => :edit
       item "Repeat Last Search", :command => DocumentSearch::RepeatPreviousSearchForwardCommand, :icon => File.join(Redcar::ICONS_DIRECTORY, "magnifier--arrow.png"), :barname => :edit
     end
   end
-  
+
   class SearchSpeedbar < Redcar::Speedbar
     class << self
       attr_accessor :previous_query
@@ -31,7 +33,7 @@ module DocumentSearch
     end
 
     attr_accessor :initial_query
-    
+
     def after_draw
       SearchSpeedbar.previous_query ||= ""
       self.query.value = @initial_query || SearchSpeedbar.previous_query
@@ -39,26 +41,26 @@ module DocumentSearch
       self.match_case.value = SearchSpeedbar.previous_match_case
       self.query.edit_view.document.select_all
     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
@@ -68,9 +70,9 @@ module DocumentSearch
       cmd.run_in_focussed_tab_edit_view
     end
   end
-    
+
   class SearchForwardCommand < Redcar::EditTabCommand
-    
+
     def execute
       @speedbar = SearchSpeedbar.new
       if doc.selection?
@@ -79,13 +81,13 @@ module DocumentSearch
       win.open_speedbar(@speedbar)
     end
   end
-  
+
   class RepeatPreviousSearchForwardCommand < Redcar::EditTabCommand
     def execute
       SearchSpeedbar.repeat_query
     end
   end
-  
+
   class SearchAndReplaceCommand < Redcar::EditTabCommand
     def execute
       @speedbar = SearchAndReplaceSpeedbar.new
@@ -101,51 +103,32 @@ module DocumentSearch
       @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
+      position = doc.cursor_offset
+      sc = StringScanner.new(doc.get_all_text)
+      sc.pos = position
+      sc.scan_until(@re)
+
+      if @wrap and !sc.matched?
+        # No match was found in the remainder of the document, search from beginning
+        sc.reset
+        sc.scan_until(@re)
       end
+
+      if sc.matched?
+        endoff   = sc.pos
+        startoff = sc.pos - sc.matched_size
+        doc.set_selection_range(sc.pos, sc.pos - sc.matched_size)
+        doc.scroll_to_line(doc.line_at_offset(startoff))
+        return true
+      end
+      false
     end
   end
-    
+
 end