redcar 0.5.2dev → 0.5.3dev

data/plugins/application_swt/plugin.rb

@@ -4,5 +4,6 @@ Plugin.define do
   version "1.0"
   file    "lib", "application_swt"
   object  "Redcar::ApplicationSWT"
-  dependencies "application", ">0"
+  dependencies "application", ">0",
+               "swt",         ">0"
 end

data/plugins/application_swt/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
 
 Spec::Runner.configure do |config|
   config.before(:suite) do

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/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/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/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/edit_view_swt/lib/edit_view_swt.rb

@@ -13,8 +13,9 @@ module Redcar
     include Redcar::Observable
     
     def self.start
-      gui = ApplicationSWT.gui
-      gui.register_controllers(Redcar::EditTab => EditViewSWT::Tab)
+      if gui = Redcar.gui
+        gui.register_controllers(Redcar::EditTab => EditViewSWT::Tab)
+      end
       load_textmate_assets
     end
     

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
+Redcar.load_unthreaded

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})
+        new_node = DirMirror::Node.create_from_path(adapter, {:fullname => new_path, :type => node.type})
         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)
-            Redcar::ApplicationSWT.sync_exec do
+            Swt.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
-            Redcar::ApplicationSWT.sync_exec do
+            Swt.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'          
-            Redcar::ApplicationSWT.sync_exec do
+            Swt.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)
-            Redcar::ApplicationSWT.sync_exec do
+            Swt.sync_exec do
               if Redcar.app.windows.length == 0
                 Project::Manager.restore_last_session
               end

data/plugins/project/plugin.rb

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

data/plugins/project/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
 
 def write_dir_contents(dirname, files)
   FileUtils.mkdir_p(dirname)

data/plugins/redcar/redcar.rb

@@ -5,17 +5,17 @@ module Redcar
       yield
     rescue => e
       message = "Error in: " + (text || e.message)
-      Application::Dialog.message_box(
-        message,
-        :type => :error, :buttons => :ok)
       puts message
       puts e.class.to_s + ": " + e.message
       puts e.backtrace
+      Application::Dialog.message_box(
+        message,
+        :type => :error, :buttons => :ok)
     end
   end
 
   def self.update_gui
-    ApplicationSWT.sync_exec do
+    Swt.sync_exec do
       safely do
         yield
       end
@@ -224,11 +224,12 @@ module Redcar
     class AboutCommand < Command
       def execute
         new_tab = Top::NewCommand.new.run
-        new_tab.document.text = "About: Redcar\nVersion: #{Redcar::VERSION}\n" +
-          "Ruby Version: #{RUBY_VERSION}\n" +
-          "Jruby version: #{JRUBY_VERSION}\n" +
-          "Redcar.environment: #{Redcar.environment}\n" +
-          "http://redcareditor.com"
+        new_tab.document.text = <<-TXT
+About: Redcar\nVersion: #{Redcar::VERSION}
+Ruby Version: #{RUBY_VERSION}
+Jruby version: #{JRUBY_VERSION}
+Redcar.environment: #{Redcar.environment}
+        TXT
         new_tab.title= 'About'
         new_tab.edit_view.reset_undo
         new_tab.document.set_modified(false)
@@ -553,29 +554,31 @@ module Redcar
         cursor_line  = doc.cursor_line
         cursor_line_offset = doc.cursor_line_offset
         diff = 0
-        doc.selection_ranges.each do |range|
-          doc.delete(range.begin - diff, range.count)
-          diff += range.count
-        end
-        texts = Redcar.app.clipboard.last.dup
-        texts.each_with_index do |text, i|
-          line_ix = start_line + i
-          if line_ix == doc.line_count
-            doc.insert(doc.length, "\n" + " "*line_offset)
-          else
-            line = doc.get_line(line_ix).chomp
-            if line.length < line_offset
-              doc.insert(
+        doc.controllers(AutoIndenter::DocumentController).first.disable do
+          doc.selection_ranges.each do |range|
+            doc.delete(range.begin - diff, range.count)
+            diff += range.count
+          end
+          texts = Redcar.app.clipboard.last.dup
+          texts.each_with_index do |text, i|
+            line_ix = start_line + i
+            if line_ix == doc.line_count
+              doc.insert(doc.length, "\n" + " "*line_offset)
+            else
+              line = doc.get_line(line_ix).chomp
+              if line.length < line_offset
+                doc.insert(
                 doc.offset_at_inner_end_of_line(line_ix),
                 " "*(line_offset - line.length)
-              )
+                )
+              end
             end
-          end
-          doc.insert(
+            doc.insert(
             doc.offset_at_line(line_ix) + line_offset,
             text
-          )
-          doc.cursor_offset = doc.offset_at_line(line_ix) + line_offset + text.length
+            )
+            doc.cursor_offset = doc.offset_at_line(line_ix) + line_offset + text.length
+          end
         end
       end
     end
@@ -682,6 +685,13 @@ module Redcar
       end
     end
 
+    class ToggleToolbar < Redcar::EditTabCommand
+      def execute
+        Redcar.app.toggle_show_toolbar
+        Redcar.app.refresh_toolbar!
+      end
+    end
+
     class SelectNewFont < Command
       def execute
         Redcar::EditView::SelectFontDialog.new.open
@@ -863,6 +873,16 @@ module Redcar
       [linwin, osx]
     end
 
+    def self.toolbars
+      ToolBar::Builder.build do
+        item "New", :command => NewCommand, :icon => :new
+        item "Open", :command => Project::FileOpenCommand, :icon => :open
+        item "Save", :command => Project::FileSaveCommand, :icon => :save
+        item "Undo", :command => UndoCommand, :icon => :undo
+        item "Redo", :command => RedoCommand, :icon => :redo
+      end
+    end
+
     def self.menus
       Menu::Builder.build do
         sub_menu "File", :priority => :first do
@@ -1013,20 +1033,36 @@ module Redcar
 
     def self.start(args=[])
       puts "loading plugins took #{Time.now - PROCESS_START_TIME}"
-      Application.start
-      ApplicationSWT.start
-      EditViewSWT.start
-      s = Time.now
-      Redcar.gui = ApplicationSWT.gui
-      Redcar.app.controller = ApplicationSWT.new(Redcar.app)
-      Redcar.app.refresh_menu!
-      Redcar.app.load_sensitivities
-      puts "initializing gui took #{Time.now - s}s"
-      s = Time.now
-      Redcar::Project::Manager.start(args)
-      puts "project start took #{Time.now - s}s"
-      Redcar.app.make_sure_at_least_one_window_open
+      Redcar.update_gui do
+        Application.start
+        ApplicationSWT.start
+        Swt.splash_screen.inc(1) if Swt.splash_screen
+        EditViewSWT.start
+        Swt.splash_screen.inc(7) if Swt.splash_screen
+        s = Time.now
+        if Redcar.gui
+          Redcar.app.controller = ApplicationSWT.new(Redcar.app)
+        end
+      Redcar.app.refresh_toolbar!
+        Redcar.app.refresh_menu!
+        Redcar.app.load_sensitivities
+        puts "initializing gui took #{Time.now - s}s"
+      end
+      Redcar.update_gui do
+        Swt.splash_screen.inc(2) if Swt.splash_screen
+        s = Time.now
+        Redcar::Project::Manager.start(args)
+        puts "project start took #{Time.now - s}s"
+        Redcar.app.make_sure_at_least_one_window_open
+      end
+      Redcar.update_gui do
+        Swt.splash_screen.close if Swt.splash_screen
+      end
       puts "start time: #{Time.now - $redcar_process_start_time}"
+      if args.include?("--compute-textmate-cache-and-quit")
+        Redcar::Textmate.all_bundles
+        exit
+      end
     end
   end
 end