redcar 0.4.1 → 0.5

data/plugins/auto_indenter/lib/auto_indenter/commands.rb

@@ -15,9 +15,11 @@ module Redcar
         rules = AutoIndenter.rules_for_scope(doc.cursor_scope)
         analyzer = Analyzer.new(rules, doc, doc.edit_view.tab_width, doc.edit_view.soft_tabs?)
         indentation = doc.indentation
-        start_line.upto(end_line) do |line_ix|
-          indentation.set_level(line_ix, analyzer.calculate_for_line(line_ix, false))
-          indentation.trim_trailing_whitespace(line_ix)
+        doc.edit_view.compound do
+          start_line.upto(end_line) do |line_ix|
+            indentation.set_level(line_ix, analyzer.calculate_for_line(line_ix, false))
+            indentation.trim_trailing_whitespace(line_ix)
+          end
         end
         
         return unless selection

data/plugins/auto_indenter/spec/spec_helper.rb

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

data/plugins/connection_manager/views/index.html.erb

@@ -21,7 +21,7 @@
     
     <% connections.each do |c| %>
       <tr id='row-<%= c.name %>'>
-        <td><a href='javscript:void(0);' class='activate connection-name'><%= c.name %></a></td>
+        <td><a href='javascript:void(0);' class='activate connection-name'><%= c.name %></a></td>
         <td><%= c.protocol %></td>
         <td><%= c.host %></td>
         <td><%= c.port %></td>

data/plugins/core/spec/core/resource_spec.rb

@@ -1,124 +1,125 @@
 
-require 'java'
-
-require File.join(File.dirname(__FILE__), *%w".. spec_helper")
-
-TaskQueue = Redcar::TaskQueue
-Task      = Redcar::Task
-Resource  = Redcar::Resource
-
-describe Resource do
-  before do
-    $started_tasks = []
-    @block_runs = 0
-    @started_flag = false
-    @finish_flag  = false
-    $wait_task_finish = false
-    @q = TaskQueue.new
-    Resource.stub!(:task_queue).and_return(@q)
-  end
-  
-  after do
-    @q.stop
-  end
-  
-  describe "synchronous get" do
-    it "should let you synchronously get the value" do
-      resource = Resource.new { 101 }
-      resource.value.should == 101
-    end
-    
-    it "should cache the value across multiple calls" do
-      resource = Resource.new { @block_runs += 1; 101 }
-      resource.value
-      resource.value
-      resource.value.should == 101
-      @block_runs.should == 1
-    end
-      
-    it "should wait for a background job to finish if one is already in progress" do
-      resource = Resource.new do
-        @block_runs += 1
-        1 until @finish_flag
-      end
-      resource.compute
-      Thread.new do
-        resource.value
-      end
-      sleep 0.1
-      @finish_flag = true
-      @block_runs.should == 1
-    end
-    
-    it "should not wait for a background job if it pending, because it may have a long wait" do
-      @q.submit(BlockingTask.new)
-      resource = Resource.new do
-        @block_runs += 1
-        911
-      end
-      resource.compute
-      Thread.new do
-        resource.value
-      end
-      sleep 0.1
-      resource.value.should == 911
-      @block_runs.should == 1
-    end
-    
-    it "should cancel background jobs that it overtakes" do
-      @q.submit(BlockingTask.new)
-      resource = Resource.new do
-        @block_runs += 1
-        911
-      end
-      resource.compute
-      task = resource.task
-      Thread.new do
-        resource.value
-      end
-      sleep 0.1
-      task.should be_cancelled
-    end
-  end
-  
-  it "should let you compute the resource in the background" do
-    resource = Resource.new do
-      1 until @started_flag
-      @block_runs += 1
-      @finish_flag = true
-    end
-    resource.compute
-    @block_runs.should == 0
-    @started_flag = true
-    1 until @finish_flag
-    @block_runs.should == 1
-  end
-  
-  it "should have the background computed value" do
-    resource = Resource.new do
-      @block_runs += 1
-      @started_flag = true
-      999
-    end
-    resource.compute
-    1 until @started_flag
-    sleep 0.1
-    resource.value.should == 999
-    @block_runs.should == 1
-  end
-  
-  it "should not compute lots of times" do
-    resource = Resource.new do
-      @block_runs += 1
-      1 until @finish_flag
-      999
-    end
-    20.times { resource.compute }
-    @finish_flag = true
-    resource.value.should == 999
-    1 until @block_runs == 2
-    @block_runs.should == 2
-  end
-end
-
-
+#require 'java'
+#
+#require File.join(File.dirname(__FILE__), *%w".. spec_helper")
+#
+#TaskQueue = Redcar::TaskQueue
+#Task      = Redcar::Task
+#Resource  = Redcar::Resource
+#
+#describe Resource do
+#  before do
+#    $started_tasks = []
+#    @block_runs = 0
+#    @started_flag = false
+#    @finish_flag  = false
+#    $wait_task_finish = false
+#    @q = TaskQueue.new
+#    Resource.stub!(:task_queue).and_return(@q)
+#  end
+#  
+#  after do
+#    @q.stop
+#  end
+#  
+#  describe "synchronous get" do
+#    it "should let you synchronously get the value" do
+#      resource = Resource.new { 101 }
+#      resource.value.should == 101
+#    end
+#    
+#    it "should cache the value across multiple calls" do
+#      resource = Resource.new { @block_runs += 1; 101 }
+#      resource.value
+#      resource.value
+#      resource.value.should == 101
+#      @block_runs.should == 1
+#    end
+#      
+#    it "should wait for a background job to finish if one is already in progress" do
+#      resource = Resource.new do
+#        @block_runs += 1
+#        1 until @finish_flag
+#      end
+#      resource.compute
+#      Thread.new do
+#        resource.value
+#      end
+#      sleep 0.1
+#      @finish_flag = true
+#      @block_runs.should == 1
+#    end
+#    
+#    it "should not wait for a background job if it pending, because it may have a long wait" do
+#      @q.submit(BlockingTask.new)
+#      resource = Resource.new do
+#        @block_runs += 1
+#        911
+#      end
+#      resource.compute
+#      Thread.new do
+#        resource.value
+#      end
+#      sleep 0.1
+#      resource.value.should == 911
+#      @block_runs.should == 1
+#    end
+#    
+#    it "should cancel background jobs that it overtakes" do
+#      @q.submit(BlockingTask.new)
+#      resource = Resource.new do
+#        @block_runs += 1
+#        911
+#      end
+#      resource.compute
+#      task = resource.task
+#      Thread.new do
+#        resource.value
+#      end
+#      sleep 0.1
+#      task.should be_cancelled
+#    end
+#  end
+#  
+#  it "should let you compute the resource in the background" do
+#    resource = Resource.new do
+#      1 until @started_flag
+#      @block_runs += 1
+#      @finish_flag = true
+#    end
+#    resource.compute
+#    @block_runs.should == 0
+#    @started_flag = true
+#    1 until @finish_flag
+#    @block_runs.should == 1
+#  end
+#  
+#  it "should have the background computed value" do
+#    resource = Resource.new do
+#      @block_runs += 1
+#      @started_flag = true
+#      999
+#    end
+#    resource.compute
+#    1 until @started_flag
+#    sleep 0.1
+#    resource.value.should == 999
+#    @block_runs.should == 1
+#  end
+#  
+#  it "should not compute lots of times" do
+#    resource = Resource.new do
+#      @block_runs += 1
+#      1 until @finish_flag
+#      999
+#    end
+#    20.times { resource.compute }
+#    @finish_flag = true
+#    resource.value.should == 999
+#    1 until @block_runs == 2
+#    @block_runs.should == 2
+#  end
+#end
+#
+#
+#

data/plugins/core/spec/spec_helper.rb

@@ -2,7 +2,7 @@ $:.push File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
 
 require 'redcar'
 Redcar.environment = :test
-Redcar.load
+Redcar.load_unthreaded
 
 class QuickTask < Redcar::Task
   def initialize(id=nil)

data/plugins/declarations/lib/declarations/select_tag_dialog.rb

@@ -12,12 +12,13 @@ module Redcar
       end
 
       def update_list(filter)
-        @last_list = @matches
-        filtered_list = @last_list
+        @last_list    = @matches
+        filtered_list = @matches
         if filter.length >= 1
           filtered_list = filter_and_rank_by(filtered_list, filter, filtered_list.length) do |match|
             match[:file].split(::File::SEPARATOR).last
           end
+          @last_list = filtered_list
         end
         align_matches_for_display(filtered_list)
       end
@@ -28,9 +29,9 @@ module Redcar
           Redcar::Declarations.go_to_definition(@last_list[ix])
         end
       end
-      
+
       private
-      
+
       def align_matches_for_display(filtered_list)
         filtered_list.collect do |match|
           file_path     = match[:file]

data/plugins/declarations/spec/spec_helper.rb

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

data/plugins/document_search/features/replace.feature

@@ -16,11 +16,11 @@ Feature: Replace in file
     And I move the cursor to 4
     And I run the command DocumentSearch::SearchAndReplaceCommand
     And I type "Rab" into the "Search" field in the speedbar
-    And I type "RAB" into the "Replace" field in the speedbar
+    And I type "RABBIT" into the "Replace" field in the speedbar
     And I press "Replace" in the speedbar
-    Then the contents should be "Foo\nBar RAB Rab\nBaz"
-    And the selected text should be "RAB"
-    And the selection range should be from 8 to 11 
+    Then the contents should be "Foo\nBar RABBIT Rab\nBaz"
+    And the selected text should be "RABBIT"
+    And the selection range should be from 8 to 14 
 
   Scenario: Replace next occurrence on the same line twice
     When I replace the contents with "Foo\nBar Rab Rab\nBaz"
@@ -120,4 +120,17 @@ Feature: Replace in file
     And I press "Replace" in the speedbar
     Then the contents should be "Curry beef"
 
+  Scenario: Replace should move past the current replacement if the query is a substring of the replacement
+    When I replace the contents with "foo\nfoo\nfoo"
+    And I move the cursor to 0
+    And I run the command DocumentSearch::SearchAndReplaceCommand
+    And I type "foo" into the "Search" field in the speedbar
+    And I type "foobar" into the "Replace" field in the speedbar
+    And I press "Replace" in the speedbar
+    And I press "Replace" in the speedbar
+    And I press "Replace" in the speedbar
+    Then the contents should be "foobar\nfoobar\nfoobar"
+    And the selection range should be from 14 to 20
+  
+  
   

data/plugins/document_search/lib/document_search/replace.rb

@@ -5,9 +5,11 @@ module DocumentSearch
     end
     
     def replace_next(query, replace, &body)
-      # Get the current line and then get the line segment from the cursor to the end of the line
-      curr_line = @doc.get_line(@doc.cursor_line)
-      cursor_line_offset = @doc.cursor_offset - @doc.offset_at_line(@doc.cursor_line)
+      # Get the current line and then get the line segment from the cursor or selection to the end of the line
+      latest_point = [@doc.cursor_offset, @doc.selection_offset].max
+      curr_line_number = @doc.line_at_offset(latest_point)
+      cursor_line_offset = latest_point - @doc.offset_at_line(curr_line_number)
+      curr_line = @doc.get_line(curr_line_number)
       line_seg = curr_line[cursor_line_offset..-1]
       
       # Call the search method passed by the caller

data/plugins/document_search/lib/document_search/search.rb

@@ -2,27 +2,26 @@ module DocumentSearch
   class Search
     # An instance of a search type method: Regular expression
     def self.regex_search_method(line, query, replace)
-      new_line = line.sub(/#{query}/, replace)
-
-      if match = $~
-        startoff = match.pre_match.length
-        endoff   = (startoff + match[0].length) - 1
+      re = /#{query}/
+      if match_data = line.match(re)
+        new_text = match_data.to_s.sub(re, replace)
+        new_line = match_data.pre_match + new_text + match_data.post_match
         
-        return new_line, startoff, startoff + match[0].length
+        startoff = match_data.pre_match.length
+        endoff   = startoff + new_text.length
+          
+        return new_line, startoff, endoff
       end
-      return nil
     end
 
     # An instance of a search type method: Plain text search
     def self.plain_search_method(line, query, replace)
-      i = line.index(query)
-      if i
+      if i = line.index(query)
         startoff = i
         endoff   = i + query.length - 1
         line[startoff..endoff] = replace
         return line, startoff, startoff + replace.length
       end
-      return nil
     end
     
     # An instance of a search type method: Glob text search

data/plugins/edit_view/features/cut_and_paste.feature

@@ -1,23 +1,23 @@
 Feature: Cut and Paste
 
-  Scenario: Cut removes the text
+  Background: 
     When I open a new edit tab
-    And I replace the contents with "Frank"
+
+  Scenario: Cut removes the text
+    When I replace the contents with "Frank"
     And I select from 0 to 3
     And I cut text
     Then I should not see "Fra" in the edit tab  
     And I should see "nk" in the edit tab  
 
   Scenario: Copy leaves the text
-    When I open a new edit tab
-    And I replace the contents with "Frank"
+    When I replace the contents with "Frank"
     And I select from 0 to 3
     And I copy text
     Then I should see "Frank" in the edit tab  
 
   Scenario: Paste inserts the cut text
-    When I open a new edit tab
-    And I replace the contents with "Frank"
+    When I replace the contents with "Frank"
     And I select from 0 to 3
     And I cut text
     And I move the cursor to 2
@@ -25,8 +25,7 @@ Feature: Cut and Paste
     Then the contents should be "nkFra<c>"
 
   Scenario: Paste inserts the copied text
-    When I open a new edit tab
-    And I replace the contents with "Frank"
+    When I replace the contents with "Frank"
     And I select from 0 to 3
     And I copy text
     And I move the cursor to 2
@@ -35,8 +34,7 @@ Feature: Cut and Paste
     Then the contents should be "FrFra<c>ank"
 
   Scenario: Paste pastes the most recent copy
-    When I open a new edit tab
-    And I replace the contents with "Frank"
+    When I replace the contents with "Frank"
     And I select from 0 to 3
     And I copy text
     And I select from 3 to 5

data/plugins/edit_view/lib/edit_view/grammar.rb

@@ -39,7 +39,7 @@ module Redcar
       
       def load_grammar
         grammar_dir = File.expand_path(File.dirname(__FILE__) + "/grammars")
-        Dir.new(grammar_dir).entries.reject {|item| item[-3..-1] != ".rb"}.each do |grammar|
+        Dir.new(grammar_dir).entries.reject {|item| item[-3..-1] != ".rb"}.sort.each do |grammar|
           unless loaded_files.include? grammar
             if require grammar_dir + "/" + grammar[0..-4]
               loaded_files << grammar

data/plugins/edit_view/lib/edit_view/grammars/default.rb

@@ -3,7 +3,7 @@ module Redcar
     module Default
       
       def word
-        /^\w+$/
+        /^\w+$/u
       end
     end
   end

data/plugins/edit_view/lib/edit_view/grammars/ruby.rb

@@ -3,7 +3,7 @@ module Redcar
     module Ruby
 
       def word
-        /^(\w)+(\?|\!)?$/
+        /^(\w)+(\?|\!)?$/u
       end
     end
   end

data/plugins/edit_view/lib/edit_view/select_theme_dialog.rb

@@ -5,6 +5,8 @@ module Redcar
       def initialize
         super()
         @matches = EditView.themes.sort
+        @matches.delete(EditView.theme)
+        @matches.insert(0, EditView.theme + " (Current)")
       end
 
       def close