redcar 0.3.3 → 0.3.4

data/plugins/project/lib/project/drb_service.rb

@@ -15,18 +15,7 @@ module Redcar
       def open_item_drb(full_path)
         begin
           puts 'drb opening ' + full_path if $VERBOSE
-          if File.file? full_path
-            
-            Redcar::ApplicationSWT.sync_exec {            
-              if Redcar.app.windows.length == 0              
-                Project.restore_last_session
-              end
-              
-              FileOpenCommand.new(full_path).execute
-              Redcar.app.focussed_window.controller.bring_to_front          
-            }
-            'ok'
-          elsif File.directory? full_path
+          if File.directory? full_path
             Redcar::ApplicationSWT.sync_exec {
             
               # open in any existing window that already has that dir open as a tree
@@ -59,8 +48,15 @@ module Redcar
             }
             'ok'
           else
-            puts 'remote load: unexpected: file not found ' + full_path
-            'fail'
+            # existing or not (yet) existing file
+            Redcar::ApplicationSWT.sync_exec {
+              if Redcar.app.windows.length == 0
+                Project.restore_last_session
+              end
+              FileOpenCommand.new(full_path).execute
+              Redcar.app.focussed_window.controller.bring_to_front
+            }
+            'ok'            
           end
         rescue Exception => e
           # normally drb would swallow these
@@ -71,5 +67,4 @@ module Redcar
       
     end
   end
-end
-    
+end

data/plugins/project/lib/project/find_file_dialog.rb

@@ -2,54 +2,44 @@ module Redcar
   class Project
   
     class FindFileDialog < FilterListDialog
-      MAX_ENTRIES = 20
-      
       def self.clear
-        # unfortunately we receive a :focussed
-        # message when the FindFileDialog
-        # itself exits
-        # so we only really clear when we receive an *unexpected* message
-        if @expect_a_clear
-           @expect_a_clear = false
-        else
-          if storage['clear_cache_on_refocus']
-            @cached_dir_lists.clear 
-          end
+        if storage['clear_cache_on_refocus']
+          cached_dir_lists.clear 
         end
-    
       end
       
-      @cached_dir_lists = {}
-      @expect_a_clear = false
-      
-      class << self
-       attr_reader :cached_dir_lists
-       attr_accessor :expect_a_clear
-      end
+      def self.storage
+        @storage ||= begin
+          storage = Plugin::Storage.new('find_file_dialog')
+          storage.set_default('clear_cache_on_refocus', true)
+          storage
+        end
+      end    
       
-      def initialize win
-        super()        
-        # add a :focussed listener to the window if it hasn't
-        # been set before
-        win.add_listener_at_most_once(FindFileDialog, :focussed) {
-          FindFileDialog.clear
-        }
-        FindFileDialog.expect_a_clear = true
+      def self.cached_dir_lists
+        @cached_dir_lists ||= {}
       end
-      
+
       def self.storage
         @storage ||= begin
           storage = Plugin::Storage.new('find_file_dialog')
           storage.set_default('clear_cache_on_refocus', true)
+          storage.set_default('ignore_files_that_match_these_regexes', [])
+          storage.set_default('ignore_files_that_match_these_regexes_example_for_reference', [/.*\.class/i])
           storage
         end
       end    
+
+      def close
+        super
+      end
       
       def update_list(filter)
         if filter.length < 2
-          paths = Project.recent_files
+          paths = Project.recent_files_for(Project.focussed_project_path)
         else
-          paths = find_files_from_list(filter, Project.recent_files) + find_files(filter, Redcar.app.focussed_window.treebook.trees.last.tree_mirror.path)             
+          paths = find_files_from_list(filter, Project.recent_files_for(Project.focussed_project_path)) + 
+                  find_files(filter, Project.focussed_project_path)             
           paths.uniq! # in case there's some dupe's between the two lists
         end
                 
@@ -57,13 +47,13 @@ module Redcar
         full_paths = paths
         display_paths = full_paths.map { |path| display_path(path) }
         if display_paths.uniq.length < full_paths.length
-         # search out and expand duplicates
-          duplicates = display_paths.duplicates_as_hash
-          display_paths.each_with_index{|dp, i|
+          # search out and expand duplicates
+          duplicates = duplicates_as_hash(display_paths)
+          display_paths.each_with_index do |dp, i|
             if duplicates[dp]
-              display_paths[i] = display_path(full_paths[i], Redcar.app.focussed_window.treebook.trees.last.tree_mirror.path.split('/')[0..-2].join('/'))
+              display_paths[i] = display_path(full_paths[i], Project.focussed_project_path.split('/')[0..-2].join('/'))
             end
-          }
+          end
         end
         display_paths
       end
@@ -76,29 +66,28 @@ module Redcar
       end
       
       private
-      
-      def remove_from_list(path)
-        self.class.recent_files.delete(path)
+          
+      def duplicates_as_hash(enum)
+        enum.inject(Hash.new(0)) {|h,v| h[v] += 1; h }.reject {|k,v| v == 1 }
       end
-      
+
       def display_path(path, first_remove_this_prefix = nil)
         n = -3
-        if first_remove_this_prefix && path.index(first_remove_this_prefix) == 0
+        if first_remove_this_prefix and path.index(first_remove_this_prefix) == 0
           path = path[first_remove_this_prefix.length..-1]
           # show the full subdirs in the case of collisions
           n = -100
         end
         
         if path.count('/') > 0
-            count_back = [-path.count('/'), n].max
-            path.split("/").last +
+          count_back = [-path.count('/'), n].max
+          path.split("/").last +
             " (" +
-              path.split("/")[count_back..-2].join("/") +
+            path.split("/")[count_back..-2].join("/") +
             ")"
         else
-           path
+          path
         end
-          
       end
       
       def files(directories)
@@ -110,7 +99,7 @@ module Redcar
           end
           took = Time.now - s
           puts "find files (#{directories.length} dirs) took #{took}s"
-          files.reject!{|f|
+          files.reject do |f|
             begin
               File.directory?(f)
             rescue Errno::ENOENT
@@ -119,65 +108,31 @@ module Redcar
               # unicode in them.
               true
             end
-          }
-          files
+          end
+        end
+      end
+      
+      def not_on_ignore_list(filename)
+        self.class.storage['ignore_files_that_match_these_regexes'].each do |re|
+          if re =~ filename
+            return false
+          end
         end
+        true
       end
       
       def find_files_from_list(text, file_list)
         re = make_regex(text)
-        file_list.select{|fn| 
+        file_list.select { |fn| 
           fn.split('/').last =~ re
         }.compact
       end
       
       def find_files(text, directories)
-        re = make_regex(text)
-
-        score_match_pairs = []
-        cutoff = 10000000
-        results = files(directories).each do |fn|
-          begin
-            bit = fn.split("/")
-            if m = bit.last.match(re)
-              cs = []
-              diffs = 0
-              m.captures.each_with_index do |_, i|
-                cs << m.begin(i + 1)
-                if i > 0
-                  diffs += cs[i] - cs[i-1]
-                end
-              end
-              # lower score is better
-              score = (cs[0] + diffs)*100 + bit.last.length
-              if score < cutoff
-                score_match_pairs << [score, fn]
-                score_match_pairs.sort!
-                if score_match_pairs.length == MAX_ENTRIES
-                  cutoff = score_match_pairs.last.first
-                  score_match_pairs.pop
-                end
-              end
-            end
-          rescue Errno::ENOENT
-            # File.directory? can throw no such file or directory even if File.exist?
-            # has returned true. For example this happens on some awful textmate filenames
-            # unicode in them.
-          end
+        filter_and_rank_by(files(directories), text) do |fn|
+          fn.split("/").last
         end
-        score_match_pairs.map {|a| a.last }
-      end
-
-      def make_regex(text)
-        re_src = "(" + text.split(//).map{|l| Regexp.escape(l) }.join(").*?(") + ")"
-        Regexp.new(re_src, :options => Regexp::IGNORECASE)
       end
     end
   end
 end
-
-module Enumerable
-  def duplicates_as_hash
-    inject({}) {|h,v| h[v]=h[v].to_i+1; h}.reject{|k,v| v==1}
-  end
-end

data/plugins/project/lib/project/recent_directories.rb

@@ -0,0 +1,41 @@
+module Redcar
+  class Project
+    # Purpose of this class is to have a menu that shows the 5 most recent opened directories
+    # This way users can quickly go to directories they have recently opened, or use frequently
+    class RecentDirectories
+      MAX_LENGTH = 10
+      
+      # Create menus for recent directories
+      def self.storage
+        @storage ||= begin
+          storage = Plugin::Storage.new('recent_directories')
+          storage.set_default('list', [])
+          storage
+        end
+      end
+      
+      def self.generate_menu(builder)
+        directories = storage['list']
+        directories.each do |dir|
+          builder.item(File.basename(dir)) do 
+            Project.open_dir(dir)
+          end
+        end
+      end
+      
+      # Stores the given path to the text file, to appear in the recent directories menu.
+      #
+      # @param [String] path  the path of a directory to be saved
+      def self.store_path(path)
+        path = File.expand_path(path)
+        storage["list"].delete(path)
+        storage["list"].unshift(path)
+        if storage["list"].length == MAX_LENGTH + 1
+          storage["list"].pop
+        end
+        storage.save
+        Redcar.app.refresh_menu!
+      end
+    end
+  end
+end

data/plugins/redcar/redcar.rb

@@ -102,7 +102,6 @@ module Redcar
       end
     end
 
-
     class PrintContents < EditTabCommand
       
       def execute
@@ -126,14 +125,17 @@ module Redcar
       end
     end
 
+    class PrintScopeCommand < Command
+      def execute
+        p tab.edit_view.document.cursor_scope
+      end
+    end
+    
     class CloseTabCommand < Command
       
       def execute
         if tab = win.focussed_notebook_tab
           tab.close
-        else
-         # interpret Ctrl+W with no tabs open as "close window", not just close tab
-         win.close
         end
       end
     end
@@ -390,52 +392,60 @@ module Redcar
     
     class SearchForwardCommand < Redcar::EditTabCommand
       
-      class Speedbar < Redcar::Speedbar
+      class SearchSpeedbar < Redcar::Speedbar
         class << self
           attr_accessor :previous_query
+          attr_accessor :previous_is_regex
+          attr_accessor :previous_match_case
         end
         
         def after_draw
-          self.query.value = Speedbar.previous_query || ""
+          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
         end
       
         label :label, "Search:"
         textbox :query        
         
-        toggle :is_regex, 'Regex', nil, true do
-          # it sets is_regex to either true or false
+        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, true do
-          
+        toggle :match_case, 'Match case', nil, false do |v|
+          SearchSpeedbar.previous_match_case = v          
         end      
         
         button :search, "Search", "Return" do
-          current_query = query.value
-          SearchForwardCommand::Speedbar.previous_query = current_query
-          if !is_regex.value
+          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
-          success = FindNextRegex.new(Regexp.new(current_query, !match_case.value), true).run
+          FindNextRegex.new(Regexp.new(current_query, !@previous_match_case), true).run
         end
       end
       
       def execute
-        @speedbar = SearchForwardCommand::Speedbar.new
+        @speedbar = SearchSpeedbar.new
         win.open_speedbar(@speedbar)
       end
-
+      
     end
     
-    class RepeatPreviousSearchForwardCommand < Redcar::EditTabCommand
-      
+    class RepeatPreviousSearchForwardCommand < Redcar::EditTabCommand      
       def execute
-        FindNextRegex.new(Regexp.new(SearchForwardCommand::Speedbar.previous_query), true).run   
+        SearchForwardCommand::SearchSpeedbar.repeat_query
       end
-      
     end
-        
     
     class FindNextRegex < Redcar::EditTabCommand
       def initialize(re, wrap=nil)
@@ -523,8 +533,8 @@ module Redcar
         link "Cmd+G",       RepeatPreviousSearchForwardCommand
         link "Cmd+A",       SelectAllCommand
         link "Cmd+B",       ToggleBlockSelectionCommand
-        link "Ctrl+Escape", AutoCompleter::AutoCompleteCommand
-        link "Cmd+Escape",  AutoCompleter::MenuAutoCompleterCommand
+        #link "Escape", AutoCompleter::AutoCompleteCommand
+        link "Ctrl+Escape",  AutoCompleter::MenuAutoCompleterCommand
         
         link "Cmd+T",           Project::FindFileCommand
         link "Cmd+Shift+Alt+O", MoveTabToOtherNotebookCommand
@@ -533,6 +543,9 @@ module Redcar
         link "Cmd+Shift+]",     SwitchTabUpCommand
 
         link "Cmd+Shift+R",     PluginManagerUi::ReloadLastReloadedCommand
+        
+        link "Cmd+Shift+S", Snippets::OpenSnippetExplorer
+        #Textmate.attach_keybindings(self, :osx)
       end
 
       linwin = Redcar::Keymap.build("main", [:linux, :windows]) do
@@ -548,7 +561,7 @@ module Redcar
         
         link "Ctrl+Shift+E", EditView::InfoSpeedbarCommand
         link "Ctrl+Z",       UndoCommand
-        link "Ctrl+Shift+Z", RedoCommand
+        link "Ctrl+Y",       RedoCommand
         link "Ctrl+X",       CutCommand
         link "Ctrl+C",       CopyCommand
         link "Ctrl+V",       PasteCommand
@@ -556,22 +569,28 @@ module Redcar
         link "Ctrl+E",       MoveEndCommand
         link "Ctrl+[",       DecreaseIndentCommand
         link "Ctrl+]",       IncreaseIndentCommand
-        link "Ctrl+L",       GotoLineCommand
+        link "Ctrl+G",       GotoLineCommand
         link "Ctrl+F",       SearchForwardCommand
-        link "Ctrl+G",       RepeatPreviousSearchForwardCommand
+        link "F3",           RepeatPreviousSearchForwardCommand
         link "Ctrl+A",       SelectAllCommand
         link "Ctrl+B",       ToggleBlockSelectionCommand
-        link "Ctrl+Escape",  AutoCompleter::AutoCompleteCommand
-        link "Escape",       AutoCompleter::MenuAutoCompleterCommand
+        link "Ctrl+Space",       AutoCompleter::AutoCompleteCommand
+        link "Ctrl+Shift+Space", AutoCompleter::MenuAutoCompleterCommand
         
         link "Ctrl+T",           Project::FindFileCommand
         link "Ctrl+Shift+Alt+O", MoveTabToOtherNotebookCommand
+        
         link "Ctrl+Alt+O",       SwitchNotebookCommand
-        link "Ctrl+Shift+Page Up",       SwitchTabDownCommand
-        link "Ctrl+Shift+Page Down",     SwitchTabUpCommand
-
+        
+        link "Ctrl+Page Up",       SwitchTabDownCommand
+        link "Ctrl+Page Down",     SwitchTabUpCommand
         link "Ctrl+Shift+R",     PluginManagerUi::ReloadLastReloadedCommand
+        
+        link "Ctrl+Shift+S", Snippets::OpenSnippetExplorer
+        #Textmate.attach_keybindings(self, :linux)
+
       end
+      
       [linwin, osx]
     end
     
@@ -583,6 +602,10 @@ module Redcar
           item "New Window", NewWindowCommand
           item "Open", Project::FileOpenCommand
           item "Open Directory", Project::DirectoryOpenCommand
+          sub_menu "Open Recent" do
+            Project::RecentDirectories.generate_menu(self)
+          end
+          
           separator
           item "Save", Project::FileSaveCommand
           item "Save As", Project::FileSaveAsCommand
@@ -629,9 +652,11 @@ module Redcar
           item "Print Command History", PrintHistoryCommand
           item "Print Contents", PrintContents
           item "List Tabs", ListTabsCommand
-          item "Print Scope Tree", PrintScopeTreeCommand
           item "Refresh Directory", Project::RefreshDirectoryCommand
           item "Dialog Tester", DialogExample
+          separator
+          item "Print Scope Tree", PrintScopeTreeCommand
+          item "Print Scope at Cursor", PrintScopeCommand
         end
         sub_menu "View" do
           item "Rotate Notebooks", RotateNotebooksCommand
@@ -647,6 +672,11 @@ module Redcar
           item("Edit Preferences") { Project.open_dir(Redcar::Plugin::Storage.storage_dir, Redcar.app.new_window) }
           separator
         end
+        sub_menu "Bundles" do
+          item "Find Snippet", Snippets::OpenSnippetExplorer
+          separator
+          Textmate.attach_menus(self)
+        end
         sub_menu "Help" do
           item "About", AboutCommand
           item "New In This Version", ChangelogCommand
@@ -657,9 +687,7 @@ module Redcar
     def self.start
       Application.start
       ApplicationSWT.start
-      AutoIndenter.start
       EditViewSWT.start
-      AutoCompleter.start
       Redcar.gui = ApplicationSWT.gui
       Redcar.app.controller = ApplicationSWT.new(Redcar.app)