redcar 0.11.0dev → 0.11

data/plugins/edit_view/lib/edit_view.rb

@@ -144,7 +144,21 @@ module Redcar
         end
       end
     end
-
+    
+    def self.quit_guard
+      EditView::ModifiedTabsChecker.new(
+        Redcar.app.all_tabs.select {|t| t.is_a?(EditTab)},
+        "Save all before quitting?"
+      ).check
+    end
+    
+    def self.close_window_guard(win)
+      EditView::ModifiedTabsChecker.new(
+        win.notebooks.map(&:tabs).flatten.select {|t| t.is_a?(EditTab)},
+        "Save all before closing the window?"
+      ).check
+    end
+    
     def self.all_handlers(type)
       result = []
       method_name = :"#{type}_handlers"

data/plugins/edit_view/lib/edit_view/modified_tabs_checker.rb

@@ -1,8 +1,8 @@
 module Redcar
   class EditView
     class ModifiedTabsChecker
-      def initialize(tabs, message, options)
-        @tabs, @message, @options = tabs, message, options
+      def initialize(tabs, message)
+        @tabs, @message = tabs, message
       end
       
       def check
@@ -17,16 +17,16 @@ module Redcar
           when :yes
             modified_edit_tabs.each do |t|
               t.focus
-              Project::FileSaveCommand.new(t).run
+              Project::SaveFileCommand.new(t).run
             end
-            @options[:continue] ? @options[:continue].call : nil
+            true
           when :no
-            @options[:continue] ? @options[:continue].call : nil
+            true
           when :cancel
-            @options[:cancel] ? @options[:cancel].call : nil
+            false
           end
         else
-          @options[:none] ? @options[:none].call : nil
+          true
         end
       end
     end

data/plugins/edit_view_swt/lib/edit_view_swt.rb

@@ -70,13 +70,14 @@ module Redcar
     end
 
     def self.load_textmate_assets
-      s = Time.now
-      load_textmate_assets_from_dir(Redcar.root + "/plugins/textmate/vendor/redcar-bundles")
-      Redcar.plugin_manager.loaded_plugins.each do |plugin|
-        load_textmate_assets_from_dir(File.dirname(plugin.definition_file) + "/")
+      Redcar.log.info("loaded JavaMateView #{JavaMateView::MateText.VERSION}")
+      Redcar.log.benchmark("load textmate assets") do
+        load_textmate_assets_from_dir(Redcar.root + "/plugins/textmate/vendor/redcar-bundles")
+        Redcar.plugin_manager.loaded_plugins.each do |plugin|
+          load_textmate_assets_from_dir(File.dirname(plugin.definition_file) + "/")
+        end
+        load_textmate_assets_from_dir(Redcar.user_dir + "/")
       end
-      load_textmate_assets_from_dir(Redcar.user_dir + "/")
-      puts "took #{Time.now - s}s to load textmate assets"
       EditView.themes.unshift(*JavaMateView::ThemeManager.themes.to_a.map {|th| th.name })
     end
 

data/plugins/execute_current_tab/lib/execute_current_tab.rb

@@ -30,7 +30,7 @@ module Redcar
       
       def output_tab
         tabs = win.notebooks.map {|nb| nb.tabs }.flatten
-        tabs.detect {|t| t.title == TITLE} || Top::NewCommand.new.run
+        tabs.detect {|t| t.title == TITLE} || Top::OpenNewEditTabCommand.new.run
       end
 
       def execute_file(path)

data/plugins/groovy/lib/groovy.rb

@@ -17,7 +17,7 @@ module Redcar
       Redcar::Menu::Builder.build do
         sub_menu "Plugins" do
           sub_menu "REPL" do
-            item "Open Groovy REPL", GroovyOpenREPL
+            item "Open Groovy REPL", OpenGroovyREPL
           end
         end
       end
@@ -25,11 +25,11 @@ module Redcar
 
     def self.keymaps
       osx = Keymap.build("main", :osx) do
-        link "Cmd+Alt+G", GroovyOpenREPL
+        link "Cmd+Alt+G", OpenGroovyREPL
       end
 
       linwin = Keymap.build("main", [:linux, :windows]) do
-        link "Ctrl+Alt+G", GroovyOpenREPL
+        link "Ctrl+Alt+G", OpenGroovyREPL
       end
 
       [linwin, osx]

data/plugins/groovy/lib/groovy/commands.rb

@@ -1,7 +1,7 @@
 
 module Redcar
   class Groovy
-    class GroovyOpenREPL < Redcar::REPL::OpenREPL
+    class OpenGroovyREPL < Redcar::REPL::OpenREPL
       def execute
         open_repl(ReplMirror.new)
       end

data/plugins/help/lib/help/view_controller.rb

@@ -20,6 +20,11 @@ module Redcar
         rhtml = ERB.new(File.read(File.join(File.dirname(__FILE__), "..", "..", "views", "index.html.erb")))
         rhtml.result(binding)
       end
+      
+      def add_key_binding(key, command)
+        return unless key && key.length > 0
+        Redcar::KeyBindings.add_key_binding key, command
+      end
     end
   end
 end

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

@@ -3,6 +3,15 @@
     <title>Keyboard Shortcuts</title>
     <% redcar_css = File.expand_path(File.join(Redcar.root, %w(plugins help views default.css))) %>
     <link rel="stylesheet" href="file://<%= redcar_css %>" type="text/css" media="screen">
+    <%= javascript_controller_actions %>
+    <script type="text/javascript" src="file://<%= Redcar::HtmlView.jquery_path %>"></script>
+    <script>
+    function addKeyBinding(command) {
+      var key = prompt("Key for " + command, "");
+      Controller.addKeyBinding(key, command);
+      window.location.href = "controller/index";
+    }
+  </script>
   </head>
   <body>
     <h1>Keyboard Shortcuts</h1>
@@ -18,7 +27,7 @@
         <% i = 0 %>
         <% Redcar.app.main_keymap.map.sort_by{|key, command| clean_name(command)}.each do |key, command| %>
         <tr class="<%= i % 2 == 0 ? 'even':'odd'%>">
-          <td><%= clean_name(command) %></td>
+          <td><a href="javascript:addKeyBinding('<%=command %>');"><%= clean_name(command) %></a></td>
           <td><%= key %></td>
           <% i = i + 1%>
         </tr>

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

@@ -60,5 +60,5 @@ When /^I open the browser bar$/ do
 end
 
 When /^I open a web preview$/ do
-  Redcar::HtmlView::FileWebPreview.new.run
+  Redcar::HtmlView::ViewFileInWebBrowserCommand.new.run
 end

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

@@ -25,18 +25,3 @@ After do
   reset_htmlview_fixtures
 end
 
-$:.push("plugins/html_view/vendor/nokogiri/lib")
-require 'nokogiri'
-
-p Nokogiri::HTML("<h1>afso</h1>")
-
-$:.push("plugins/html_view/vendor/capybara/lib")
-require 'capybara'
-require 'capybara/dsl'
-
-$:.push("plugins/html_view/vendor/capybara-sweet/lib")
-require 'capybara/driver/sweet'
-
-Capybara.default_driver = :sweet
-
-World(Capybara)

data/plugins/html_view/lib/html_view.rb

@@ -4,7 +4,6 @@ require 'html_view/browser_bar'
 require 'html_view/html_tab'
 require 'html_controller'
 require 'html_view/default_controller'
-require 'json'
 
 module Redcar
   class HtmlView
@@ -19,7 +18,7 @@ module Redcar
     def self.keymaps
       map = Redcar::Keymap.build("main", [:osx, :linux, :windows]) do
         link "Alt+Shift+B", ToggleBrowserBar
-        link "Alt+Shift+P", FileWebPreview
+        link "Alt+Shift+P", ViewFileInWebBrowserCommand
       end
       [map]
     end
@@ -27,7 +26,7 @@ module Redcar
     def self.menus
       Redcar::Menu::Builder.build do
         sub_menu "File" do
-          item "Web Preview", :command => FileWebPreview, :priority => 8
+          item "Web Preview", :command => ViewFileInWebBrowserCommand, :priority => 8
         end
         sub_menu "View" do
           item "Toggle Browser Bar", :command => ToggleBrowserBar, :priority => 11
@@ -42,7 +41,7 @@ module Redcar
          storage
       end
     end
-
+    
     def self.show_browser_bar?
       if win = Redcar.app.focussed_window and
         win.speedbar and win.speedbar.is_a?(BrowserBar)

data/plugins/html_view/lib/html_view/commands.rb

@@ -30,7 +30,7 @@ module Redcar
       end
     end
 
-    class FileWebPreview < Redcar::EditTabCommand
+    class ViewFileInWebBrowserCommand < Redcar::EditTabCommand
       def execute
         mirror  = doc.mirror
         if mirror and path = mirror.path and File.exists?(path)

data/plugins/key_bindings/lib/key_bindings.rb

@@ -0,0 +1,34 @@
+
+# $:.push(File.expand_path(File.join(File.dirname(__FILE__),
+#   "vendor", "activesupport-3.0.3", "lib")))
+#
+# require 'active_support'
+# require 'active_support/inflections'
+module Redcar
+  # This class is your plugin. Try adding new commands in here
+  # and putting them in the menus.
+  class KeyBindings
+    
+    def self.user_keybindings
+      key_bindings = key_binding_prefs.inject({}) do |h, (key, command_class)|
+        h[key] = eval(command_class)
+        h
+      end
+      key_bindings
+    end
+    
+    def self.storage
+      @storage ||= Plugin::Storage.new('key_bindings')
+    end
+    
+    def self.key_binding_prefs
+      storage["key_bindings"] ||= {}
+    end
+    
+    def self.add_key_binding(key, command)
+      key_binding_prefs[key] = command
+      storage.save
+      Redcar.app.refresh_menu!
+    end
+  end
+end

data/plugins/key_bindings/plugin.rb

@@ -0,0 +1,8 @@
+
+Plugin.define do
+  name    "key_bindings"
+  version "1.0"
+  file    "lib", "key_bindings"
+  object  "Redcar::KeyBindings"
+  dependencies "redcar", ">0"
+end

data/plugins/line_tools/features/lower_text.feature

@@ -13,6 +13,7 @@ Scenario: Lowering a multi-line selection
   And I select from 5 to 9
   And I lower the text
   Then I should see "foo\nbonne\nbar\nbaz" in the edit tab
+  And the selected text should be "bar\nbaz"
 
 Scenario: Lowering the last line of a document
   When I open a new edit tab
@@ -41,8 +42,9 @@ Scenario: Lowering a multi-line selection including the last line of a document
   And I replace the contents with "foo\nbar\nbaz\nbonne"
   And I select from 8 to 12
   And I lower the text
-  Then I should see "foo\nbar\nbaz\nbonne" in the edit tab
+  Then I should see "foo\nbar\nbonne\nbaz" in the edit tab
   And I should not see "foo\nbar\n\nbaz\nbonne" in the edit tab
+  And the selected text should be "baz"
 
 Scenario: Should work with unicode
   When I open a new edit tab
@@ -50,6 +52,3 @@ Scenario: Should work with unicode
   And I move the cursor to 5
   And I lower the text
   Then the contents should be "foo\nbaz\nbść\nbonne"
-  
-  
-  

data/plugins/line_tools/lib/line_tools.rb

@@ -163,7 +163,7 @@ module Redcar
               doc.cursor_offset = insert_idx + cursor_line_offset
               if keep_selection
                 doc.set_selection_range(doc.offset_at_line(first_line_ix-1),
-                doc.offset_at_line(last_line_ix-1) + doc.get_line(last_line_ix-1).length - 1)
+                doc.offset_at_inner_end_of_line(last_line_ix-1))
               end
               doc.scroll_to_line(top)
             end
@@ -179,14 +179,14 @@ module Redcar
         if doc.selection?
           first_line_ix = doc.line_at_offset(doc.selection_range.begin)
           last_line_ix  = doc.line_at_offset(doc.selection_range.end)
-          
+
           if doc.selection_range.begin == doc.offset_at_inner_end_of_line(first_line_ix)
             first_line_ix += 1
           end
           if doc.selection_range.end == doc.offset_at_line(last_line_ix)
             last_line_ix -= 1
           end
-          
+
           text = doc.get_slice(doc.offset_at_line(first_line_ix),
                                doc.offset_at_line_end(last_line_ix))
           keep_selection = true
@@ -211,8 +211,9 @@ module Redcar
               doc.replace(doc.offset_at_line(first_line_ix), swap_text.split(//).length, new_text)
               doc.cursor_offset = doc.offset_at_line(last_line_ix+1) + cursor_line_offset
               if keep_selection
-                doc.set_selection_range(doc.offset_at_line(first_line_ix+1),
-                doc.offset_at_line(last_line_ix+1) + doc.get_line(last_line_ix+1).length - 1)
+                start_selection = doc.offset_at_line(first_line_ix+1)
+                end_selection = doc.offset_at_inner_end_of_line(last_line_ix+1)
+                doc.set_selection_range(start_selection, end_selection)
               end
               doc.scroll_to_line(last_line_ix+1)
             end

data/plugins/mirah/lib/mirah.rb

@@ -10,7 +10,7 @@ module Redcar
       Menu::Builder.build do
         sub_menu "Plugins" do
           sub_menu "REPL" do
-            item "Open Mirah REPL", MirahOpenREPL
+            item "Open Mirah REPL", OpenMirahREPL
           end
         end
       end
@@ -34,7 +34,7 @@ module Redcar
       end
     end
 
-    class MirahOpenREPL < Redcar::REPL::OpenREPL
+    class OpenMirahREPL < Redcar::REPL::OpenREPL
       def execute
         open_repl(ReplMirror.new)
       end

data/plugins/pair_highlighter/lib/pair_highlighter/document_controller.rb

@@ -68,9 +68,11 @@ module Redcar
 
       def clear
         if @highlight.on?
-	        styledText.redrawRange(@highlight.current, 1, false) if @highlight.current < document.length
-	        styledText.redrawRange(@highlight.pair, 1, false) # if on the same line
-          @highlight.clear
+          if @highlight.current < document.length
+            styledText.redrawRange(@highlight.current, 1, false)
+            styledText.redrawRange(@highlight.pair, 1, false) # if on the same line
+            @highlight.clear
+          end
         end
       end
 

data/plugins/project/features/open_directory_tree.feature

@@ -14,7 +14,7 @@ Feature: Open directory tree
     When I open a directory
     Given I will choose "plugins" from the "open_directory" dialog
     When I open a directory
-    Then I should see "core,application,tree" in the tree
+    Then I should see "core,application,tree_view_swt" in the tree
 
   Scenario: Open a directory and then the same using another Redcar invocation
     Given I will choose "plugins/project/spec/fixtures/myproject" from the "open_directory" dialog

data/plugins/project/features/step_definitions/file_steps.rb

@@ -1,6 +1,6 @@
 
 Given /^I have open a file$/ do
-  Redcar::Project::FileOpenCommand.new.run
+  Redcar::Project::OpenFileCommand.new.run
 end
 
 Given /^I will open a large file from the "([^"]*)" dialog$/ do |arg1|
@@ -9,15 +9,15 @@ Given /^I will open a large file from the "([^"]*)" dialog$/ do |arg1|
 end
 
 When /^I open a file$/ do
-  Redcar::Project::FileOpenCommand.new.run
+  Redcar::Project::OpenFileCommand.new.run
 end
 
 Given /^I have opened "([^\"]*)"$/ do |arg1|
-  Redcar::Project::FileOpenCommand.new(File.expand_path(arg1)).run
+  Redcar::Project::OpenFileCommand.new(File.expand_path(arg1)).run
 end
 
 When /^I save the tab$/ do
-  Redcar::Project::FileSaveCommand.new.run
+  Redcar::Project::SaveFileCommand.new.run
 end
 
 When /^I touch the file "([^\"]*)"$/ do |fn|
@@ -30,7 +30,7 @@ When /^I put "([^\"]*)" into the file "([^\"]*)"$/ do |contents, path|
 end
 
 When /^I save the tab as$/ do
-  Redcar::Project::FileSaveAsCommand.new.run
+  Redcar::Project::SaveFileAsCommand.new.run
 end
 
 Then /^the file "([^\"]*)" should contain "([^\"]*)"$/ do |arg1, arg2|

data/plugins/project/features/step_definitions/find_file_steps.rb

@@ -1,9 +1,8 @@
 When /^I prefer not to see files like "([^"]*)" in the find file dialog$/ do |pattern|
-
-  ignored = filter_storage['ignore_files_that_match_these_regexes']
+  ignored = shared_ignored_storage['ignored_file_patterns']
   ignored << /#{pattern}/
   filter_storage['ignore_file_patterns'] = true
-  filter_storage['ignore_files_that_match_these_regexes'] = ignored
+  shared_ignored_storage['ignored_file_patterns'] = ignored
 end
 
 When /^I open the find file dialog$/ do

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

@@ -49,6 +49,10 @@ def filter_storage
   Redcar::Project::FindFileDialog.storage
 end
 
+def shared_ignored_storage
+  Redcar::Project::FindFileDialog.shared_storage
+end
+
 Before do
   reset_project_fixtures
   @original_file_size_limit = Redcar::Project::Manager.file_size_limit

data/plugins/project/lib/project.rb

@@ -86,21 +86,21 @@ module Redcar
       Manager.storage['last_open_dir'] = path
       Project.window_projects[window] = self
     end
-    
+
     def lock
       File.open(lock_filename, "w") do |fout|
         fout.puts "#{$$}: Locked by #{$$} at #{Time.now}"
       end
     end
-    
+
     def lock_filename
       File.join(config_dir, "redcar.lock")
     end
-    
+
     def locked?
       File.exist?(lock_filename)
     end
-    
+
     def unlock
       if locked?
         if locked_by_this_process?
@@ -112,7 +112,7 @@ module Redcar
         raise "project not locked"
       end
     end
-    
+
     def locked_by_this_process?
       return false unless locked?
       locking_pid = File.read(lock_filename).split(":").first
@@ -128,10 +128,10 @@ module Redcar
       this_window.title = Window::DEFAULT_TITLE
       Manager.open_project_sensitivity.recompute
       Redcar.plugin_manager.objects_implementing(:project_closed).each do |i|
-        i.project_closed(self)
+        i.project_closed(self,this_window)
       end
       listeners = {}
-      unlock
+      unlock if locked?
     end
 
     def attach_listeners
@@ -151,12 +151,14 @@ module Redcar
     end
 
     def notebook_focussed(notebook)
-      RevealInProjectCommand.new.run if notebook.focussed_tab && tree
+      if notebook.focussed_tab and tree and Project::Manager.reveal_file?(self)
+        RevealInProjectCommand.new.run
+      end
     end
 
     def notebook_added(notebook)
       @listeners.merge!(notebook => notebook.add_listener(:tab_focussed) do |tab|
-        RevealInProjectCommand.new.run if tree
+        RevealInProjectCommand.new.run if tree and window and Project::Manager.reveal_file?(self)
       end)
     end
 
@@ -253,5 +255,9 @@ module Redcar
       file_glob = File.join("{#{config_dir},#{Redcar.user_dir}}", glob)
       Dir[file_glob]
     end
+    
+    def search(query)
+      ProjectSearch::WordSearch.new(self, query, false, 0)
+    end
   end
 end