redcar 0.3.0dev → 0.3.1dev

data/plugins/project/lib/project.rb

@@ -1,23 +1,63 @@
 
+require "project/project_command"
 require "project/file_mirror"
+require "project/find_file_dialog"
 require "project/dir_mirror"
 require "project/dir_controller"
 
 module Redcar
   class Project
-    def self.open_tree(win, tree)
+    def self.load
+    end
+    
+    def self.start
+      @open_project_sensitivity = 
+        Sensitivity.new(:open_project, Redcar.app, false, [:focussed_window]) do
+          if win = Redcar.app.focussed_window
+            win.treebook.trees.detect {|t| t.tree_mirror.is_a?(DirMirror) }
+          end
+        end
+    end
+    
+    class << self
+      attr_reader :open_project_sensitivity
+    end
+  
+  	def self.window_trees
       @window_trees ||= {}
-      if @window_trees[win]
-        old_tree = @window_trees[win]
+    end
+  
+    def self.open_tree(win, tree)
+      if window_trees[win]
+        old_tree = window_trees[win]
         set_tree(win, tree)
         win.treebook.remove_tree(old_tree)
       else
         set_tree(win, tree)
       end
+      Project.open_project_sensitivity.recompute
     end
     
     def self.close_tree(win)
-      win.treebook.remove_tree(@window_trees[win])
+      win.treebook.remove_tree(window_trees[win])
+      Project.open_project_sensitivity.recompute
+    end
+    
+    def self.refresh_tree(win)
+      if tree = window_trees[win]
+        tree.refresh
+      end
+    end
+    
+    def self.open_file_tab(path)
+      path = File.expand_path(path)
+      all_tabs = Redcar.app.windows.map {|win| win.notebooks}.flatten.map {|nb| nb.tabs }.flatten
+      all_tabs.find do |t| 
+        t.is_a?(Redcar::EditTab) and 
+        t.edit_view.document.mirror and 
+        t.edit_view.document.mirror.is_a?(FileMirror) and 
+        File.expand_path(t.edit_view.document.mirror.path) == path 
+      end
     end
     
     private
@@ -37,14 +77,18 @@ module Redcar
       end
     
       def execute
-        tab  = win.new_tab(Redcar::EditTab)
         path = get_path
         if path
-          puts "open file: " + path.to_s
-          mirror = FileMirror.new(path)
-          tab.edit_view.document.mirror = mirror
+          if already_open_tab = Project.open_file_tab(path)
+            already_open_tab.focus
+          else
+            tab  = win.new_tab(Redcar::EditTab)
+            mirror = FileMirror.new(path)
+            tab.edit_view.document.mirror = mirror
+            tab.edit_view.reset_undo
+            tab.focus
+          end
         end
-        tab.focus
       end
       
       private
@@ -63,8 +107,11 @@ module Redcar
 
       def execute
         tab = win.focussed_notebook.focussed_tab
-        puts "saving document"
-        tab.edit_view.document.save!
+        if tab.edit_view.document.mirror
+          tab.edit_view.document.save!
+        else
+          FileSaveAsCommand.new.run
+        end
       end
     end
     
@@ -72,7 +119,6 @@ module Redcar
       key :osx     => "Cmd+Shift+S",
           :linux   => "Ctrl+Shift+S",
           :windows => "Ctrl+Shift+S"
-
       
       def initialize(path = nil)
         @path = path
@@ -81,12 +127,12 @@ module Redcar
       def execute
         tab = win.focussed_notebook.focussed_tab
         path = get_path
-        puts "saving document as #{path}"
         if path
           contents = tab.edit_view.document.to_s
           new_mirror = FileMirror.new(path)
           new_mirror.commit(contents)
           tab.edit_view.document.mirror = new_mirror
+          Project.refresh_tree(win)
         end
       end
       
@@ -103,28 +149,53 @@ module Redcar
       key :osx     => "Cmd+Shift+O",
           :linux   => "Ctrl+Shift+O",
           :windows => "Ctrl+Shift+O"
-
+          
+      def initialize(path=nil)
+        @path = path
+      end
+      
       def execute
-        tree = Tree.new(Project::DirMirror.new(get_path),
-                        Project::DirController.new)
-        Project.open_tree(win, tree)
+        if path = get_path
+          tree = Tree.new(Project::DirMirror.new(path),
+                          Project::DirController.new)
+          Project.open_tree(win, tree)
+        end
       end
       
       private
 
       def get_path
         @path || begin
-          path = Application::Dialog.open_directory(win, :filter_path => File.expand_path("~"))
-          File.expand_path(path)
+          if path = Application::Dialog.open_directory(win, :filter_path => File.expand_path("~"))
+            File.expand_path(path)
+          end
         end
       end
     end
     
-    class DirectoryCloseCommand < Command
+    class DirectoryCloseCommand < ProjectCommand
 
       def execute
         Project.close_tree(win)
       end
     end
+    
+    class RefreshDirectoryCommand < ProjectCommand
+    
+      def execute
+        Project.refresh_tree(win)
+      end
+    end
+    
+    class FindFileCommand < ProjectCommand
+      key :osx => "Cmd+T",
+          :linux => "Ctrl+T",
+          :windows => "Ctrl+T"
+     
+      def execute
+        dialog = FindFileDialog.new
+        dialog.open
+      end
+    end
   end
 end

data/plugins/project/lib/project/dir_mirror.rb

@@ -3,6 +3,7 @@ module Redcar
   class Project
     class DirMirror
       include Redcar::Tree::Mirror
+      attr_reader :path
       
       # @param [String] a path to a directory
       def initialize(path)
@@ -32,7 +33,15 @@ module Redcar
       
       class Node
         def self.create_all_from_path(path)
-          Dir[path + "/*"].sort_by {|fn| fn.downcase }.map {|fn| Node.new(fn)}
+          Dir[path + "/*"].sort_by {|fn| fn.downcase }.map {|fn| create_from_path(fn) }
+        end
+        
+        def self.create_from_path(path)
+          cache[path] ||= Node.new(path)
+        end
+        
+        def self.cache
+          @cache ||= {}
         end
         
         include Redcar::Tree::Mirror::NodeMirror

data/plugins/project/lib/project/file_mirror.rb

@@ -10,6 +10,8 @@ module Redcar
     class FileMirror
       include Redcar::Document::Mirror
       
+      attr_reader :path
+      
       # @param [String] a path to a file
       def initialize(path)
         @path = path

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

@@ -0,0 +1,86 @@
+module Redcar
+  class Project
+  
+    class FindFileDialog < FilterListDialog
+      MAX_ENTRIES = 20
+      
+      def update_list(filter)
+        if filter.length < 2
+          []
+        else
+          paths = find_files(filter, Redcar.app.focussed_window.treebook.trees.last.tree_mirror.path)
+          @last_list = paths
+          paths.map {|path| display_path(path) }
+        end
+      end
+      
+      def selected(text, ix)
+        if @last_list
+          close
+          FileOpenCommand.new(@last_list[ix]).run
+        end
+      end
+      
+      private
+      
+      def display_path(path)
+        path.split("/").last + 
+          " (" + 
+          path.split("/")[-3..-2].join("/") + 
+          ")"
+      end
+      
+      def files(directories)
+        @files ||= begin
+          files = []
+          s = Time.now
+          directories.each do |dir|
+            files += Dir[File.expand_path(dir + "/**/*")]
+          end
+          took = Time.now - s
+          puts "find files #{directories.inspect} took #{took}s"
+          files
+        end
+      end
+      
+      def find_files(text, directories)
+        re = make_regex(text)
+
+        score_match_pairs = []
+        cutoff = 10000000
+
+        results = files(directories).each do |fn| 
+          unless File.directory?(fn)
+            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
+          end
+        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

data/plugins/project/lib/project/project_command.rb

@@ -0,0 +1,5 @@
+module Redcar
+  class ProjectCommand < Command
+    sensitize :open_project
+  end
+end

data/plugins/project/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 $:.push File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
 
 require 'redcar'
-Redcar.require
+Redcar.boot
+Redcar.require_files

data/plugins/redcar/plugin.yaml

@@ -11,10 +11,8 @@ load_dependencies:
   application: "*"
   application_swt: "*"
   project: "*"
-  repl: "*"
 start_dependencies: 
   core: "*"
   application: "*"
   application_swt: "*"
   project: "*"
-  repl: "*"

data/plugins/redcar/redcar.rb

@@ -7,7 +7,6 @@ module Redcar
           :windows => "Ctrl+N"
       
       def execute
-        puts "new tab in #{win.inspect}"
         tab = win.new_tab(Redcar::EditTab)
         tab.title = "untitled"
         tab.focus
@@ -16,6 +15,8 @@ module Redcar
     end
     
     class NewNotebookCommand < Command
+      sensitize :single_notebook
+      
       key :osx     => "Cmd+Alt+N",
           :linux   => "Ctrl+Alt+N",
           :windows => "Ctrl+Alt+N"
@@ -50,6 +51,7 @@ module Redcar
     end
     
     class RotateNotebooksCommand < Command
+      sensitize :multiple_notebooks
           
       def execute
         win.rotate_notebooks
@@ -57,6 +59,7 @@ module Redcar
     end
     
     class CloseNotebookCommand < Command
+      sensitize :multiple_notebooks
           
       def execute
         unless win.notebooks.length == 1
@@ -65,27 +68,40 @@ module Redcar
       end
     end
     
-    class MoveTabToOtherNotebookCommand < Command
-      # TODO: sensitize to multiple notebooks and open tab
+    class SwitchNotebookCommand < Command
+      sensitize :multiple_notebooks, :other_notebook_has_tab
       key :osx     => "Cmd+Alt+O",  
           :linux   => "Ctrl+Alt+O",
           :windows => "Ctrl+Alt+O"
-
+          
       def execute
-        if tab = win.focussed_notebook.focussed_tab
-          current_notebook = tab.notebook
-          target_notebook = win.notebooks.detect {|nb| nb != current_notebook}
-          target_notebook.grab_tab_from(current_notebook, tab)
+        new_notebook = win.nonfocussed_notebook
+        if new_notebook.focussed_tab
+          new_notebook.focussed_tab.focus
         end
       end
     end
+    
+    class MoveTabToOtherNotebookCommand < Command
+      sensitize :multiple_notebooks, :open_tab
+          
+      key :osx     => "Cmd+Shift+Alt+O",  
+          :linux   => "Ctrl+Shift+Alt+O",
+          :windows => "Ctrl+Shift+Alt+O"
+
+      def execute
+        current_notebook = tab.notebook
+        target_notebook = win.notebooks.detect {|nb| nb != current_notebook}
+        target_notebook.grab_tab_from(current_notebook, tab)
+        tab.focus
+      end
+    end
 
     class PrintContents < EditTabCommand
       key "Cmd+P"
       
       def execute
         puts "printing contents"
-        tab = win.focussed_notebook.focussed_tab
         p tab.edit_view.document.to_s
       end
     end
@@ -100,7 +116,6 @@ module Redcar
     
     class PrintScopeTreeCommand < Command
       def execute
-        tab = win.focussed_notebook.focussed_tab
         puts tab.edit_view.controller.mate_text.parser.root.pretty(0)
       end
     end
@@ -124,6 +139,140 @@ module Redcar
       end
     end
     
+    class SwitchTabDownCommand < Command
+      key :osx     => "Cmd+Shift+[",
+          :linux   => "Ctrl+Shift+[",
+          :windows => "Ctrl+Shift+["
+       
+      def execute
+        win.focussed_notebook.switch_down
+      end
+    end
+    
+    class SwitchTabUpCommand < Command
+      key :osx     => "Cmd+Shift+]",
+          :linux   => "Ctrl+Shift+]",
+          :windows => "Ctrl+Shift+]"
+       
+      def execute
+        win.focussed_notebook.switch_up
+      end
+    end
+    
+    class UndoCommand < EditTabCommand
+      sensitize :undoable
+      
+      key :osx     => "Cmd+Z",
+          :linux   => "Ctrl+Z",
+          :windows => "Ctrl+Z"
+      
+      def execute
+        tab.edit_view.undo
+      end
+    end
+    
+    class RedoCommand < EditTabCommand
+      sensitize :redoable
+      
+      key :osx     => "Cmd+Shift+Z",
+          :linux   => "Ctrl+Shift+Z",
+          :windows => "Ctrl+Shift+Z"
+      
+      def execute
+        tab.edit_view.redo
+      end
+    end
+    
+    class MoveHomeCommand < EditTabCommand
+      key "Ctrl+A"
+      
+      def execute
+        doc = tab.edit_view.document
+        line_ix = doc.line_at_offset(doc.cursor_offset)
+        doc.cursor_offset = doc.offset_at_line(line_ix)
+      end
+    end
+    
+    class MoveEndCommand < EditTabCommand
+      key "Ctrl+E"
+      
+      def execute
+        doc = tab.edit_view.document
+        line_ix = doc.line_at_offset(doc.cursor_offset)
+        if line_ix == doc.line_count - 1
+          doc.cursor_offset = doc.length
+        else
+          doc.cursor_offset = doc.offset_at_line(line_ix + 1) - 1
+        end
+      end
+    end
+    
+    class ChangeIndentCommand < EditTabCommand
+      def execute
+        doc = tab.edit_view.document
+        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.end == doc.offset_at_line(last_line_ix)
+            last_line_ix -= 1
+          end
+          first_line_ix.upto(last_line_ix) do |line_ix|
+            indent_line(doc, line_ix)
+          end
+          start_selection = doc.offset_at_line(first_line_ix)
+          if last_line_ix == doc.line_count - 1
+            end_selection = doc.length
+          else
+            end_selection = doc.offset_at_line(last_line_ix + 1)
+          end
+          doc.set_selection_range(start_selection, end_selection)
+        else
+          indent_line(doc, doc.cursor_line)
+        end
+      end
+    end
+    
+    class DecreaseIndentCommand < ChangeIndentCommand
+      key :osx     => "Cmd+[",
+          :linux   => "Ctrl+[",
+          :windows => "Ctrl+["
+      
+      def indent_line(doc, line_ix)
+        use_spaces = true
+        num_spaces = 2
+        line = doc.get_line(line_ix)
+        if line[0..0] == "\t"
+          line_start = doc.offset_at_line(line_ix)
+          to         = line_start + 1
+        elsif line[0...num_spaces] == " "*num_spaces
+          line_start = doc.offset_at_line(line_ix)
+          to         = line_start + num_spaces
+        end
+        doc.delete(line_start, to - line_start) unless line_start == to
+      end
+    end
+
+    class IncreaseIndentCommand < ChangeIndentCommand
+      key :osx     => "Cmd+]",
+          :linux   => "Ctrl+]",
+          :windows => "Ctrl+]"
+      
+      def indent_line(doc, line_ix)
+        line            = doc.get_line(line_ix)
+        whitespace_type = line[/^(  |\t)/, 1] || "  "
+        doc.insert(doc.offset_at_line(line_ix), whitespace_type)
+      end
+    end
+
+    class StripWhitespaceCommand < Redcar::EditTabCommand
+    
+      def execute
+        0.upto(doc.line_count - 1) do |line_ix|
+          doc.replace_line(line_ix) {|line| line.strip }
+        end
+      end
+    end
+    
     def self.start
       Redcar.gui = ApplicationSWT.gui
       Redcar.app.controller = ApplicationSWT.new(Redcar.app)
@@ -143,19 +292,37 @@ module Redcar
           item "Close Window", CloseWindowCommand
           item "Close Directory", Project::DirectoryCloseCommand
         end
+        sub_menu "Edit" do
+          item "Undo", UndoCommand
+          item "Redo", RedoCommand
+          separator
+          item "Home", MoveHomeCommand
+          item "End", MoveEndCommand
+          separator
+          item "Increase Indent", IncreaseIndentCommand
+          item "Decrease Indent", DecreaseIndentCommand
+          separator
+          item "Strip Whitespace", StripWhitespaceCommand
+        end
+        sub_menu "Project" do
+          item "Find File", Project::FindFileCommand
+        end
         sub_menu "Debug" do
           item "Print Command History", PrintHistoryCommand
           item "Print Contents", PrintContents
           item "List Tabs", ListTabsCommand
           item "Print Scope Tree", PrintScopeTreeCommand
-          sub_menu "REPL" do
-            item "Open", REPL::OpenInternalREPL
-            item "Execute", REPL::CommitREPL
-          end
+          item "Refresh Directory", Project::RefreshDirectoryCommand
         end
         sub_menu "View" do
           item "Rotate Notebooks", RotateNotebooksCommand
           item "Move Tab To Other Notebook", MoveTabToOtherNotebookCommand
+          item "Switch Notebooks", SwitchNotebookCommand
+          separator
+          item "Previous Tab", SwitchTabDownCommand
+          item "Next Tab", SwitchTabUpCommand
+        end
+        sub_menu "Plugins" do
         end
         sub_menu "Help" do
           item "Website", PrintHistoryCommand