redcar 0.3.4.3 → 0.3.5

data/plugins/redcar/plugin.rb

@@ -8,6 +8,7 @@ Plugin.define do
                "application",       ">0",
                "project",           ">0",
                "Auto Completer",    ">0",
+               "auto_indenter",    ">0",
                "HTML View",         ">=0.3.2",
                "Plugin Manager UI", ">=0.3.2"
 end

data/plugins/redcar/redcar.rb

@@ -1,5 +1,18 @@
 module Redcar
   module Top
+    class QuitCommand < Command
+      
+      def execute
+        EditView::ModifiedTabsChecker.new(
+          Redcar.app.all_tabs.select {|t| t.is_a?(EditTab)},
+          "Save all before quitting?",
+          :none     => lambda { Redcar.app.quit },
+          :continue => lambda { Redcar.app.quit },
+          :cancel   => nil
+        ).check
+      end
+    end
+    
     class NewCommand < Command
       
       def execute
@@ -38,7 +51,50 @@ module Redcar
       end
     
       def execute
-        (@window||win).close
+        check_for_modified_tabs_and_close_window
+        quit_if_no_windows if [:linux, :windows].include?(Redcar.platform)
+        @window = nil
+      end
+      
+      private
+      
+      def quit_if_no_windows
+        if Redcar.app.windows.length == 0
+          if Application.storage['stay_resident_after_last_window_closed'] && !(ARGV.include?("--multiple-instance"))
+            puts 'continuing to run to wait for incoming drb connections later'
+          else
+            QuitCommand.new.run
+          end
+        end
+      end
+      
+      def check_for_modified_tabs_and_close_window
+        EditView::ModifiedTabsChecker.new(
+          win.notebooks.map(&:tabs).flatten.select {|t| t.is_a?(EditTab)}, 
+          "Save all before closing the window?",
+          :none     => lambda { win.close },
+          :continue => lambda { win.close },
+          :cancel   => nil
+        ).check
+      end
+      
+      def win
+        @window || super
+      end
+    end
+    
+    class FocusWindowCommand < Command
+      def initialize(window=nil)
+        @window = window
+      end
+    
+      def execute
+        win.focus
+        @window = nil
+      end
+      
+      def win
+        @window || super
       end
     end
     
@@ -84,41 +140,28 @@ 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.title= 'About'
+        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.title= 'About'
+        new_tab.edit_view.reset_undo
+        new_tab.document.set_modified(false)
       end
     end
 
     class ChangelogCommand < Command
       def execute
-          new_tab = Top::NewCommand.new.run          
-          new_tab.document.text = File.read(File.join(File.dirname(__FILE__), "..", "..", "CHANGES"))
-          new_tab.title = 'Changes'
+        new_tab = Top::NewCommand.new.run          
+        new_tab.document.text = File.read(File.join(File.dirname(__FILE__), "..", "..", "CHANGES"))
+        new_tab.title = 'Changes'
+        new_tab.edit_view.reset_undo
+        new_tab.edit_view.document.set_modified(false)
       end
     end
 
-    class PrintContents < EditTabCommand
-      
-      def execute
-        puts "printing contents"
-        p tab.edit_view.document.to_s
-      end
-    end
-    
-    class PrintHistoryCommand < Command
-      def execute
-        Redcar.app.history.each do |c|
-          puts c
-        end
-      end
-    end
-    
-    
     class PrintScopeTreeCommand < Command
       def execute
         puts tab.edit_view.controller.mate_text.parser.root.pretty(0)
@@ -127,22 +170,41 @@ module Redcar
 
     class PrintScopeCommand < Command
       def execute
-        p tab.edit_view.document.cursor_scope
+        Application::Dialog.tool_tip(tab.edit_view.document.cursor_scope.gsub(" ", "\n"))
       end
     end
     
-    class CloseTabCommand < Command
+    class CloseTabCommand < TabCommand
+      def initialize(tab=nil)
+        @tab = tab
+      end
+      
+      def tab
+        @tab || super
+      end
       
       def execute
-        if tab = win.focussed_notebook_tab
+        if tab.is_a?(EditTab)
+          if tab.edit_view.document.modified?
+            result = Application::Dialog.message_box(
+              "This tab has unsaved changes. \n\nSave before closing?",
+              :buttons => :yes_no_cancel
+            )
+            case result
+            when :yes
+              tab.edit_view.document.save!
+              tab.close
+            when :no
+              tab.close
+            when :cancel
+            end
+          else
+            tab.close
+          end
+        else
           tab.close
         end
-      end
-    end
-    
-    class ListTabsCommand < Command
-      def execute
-        p win.focussed_notebook.tabs.map {|tab| tab.class}
+        @tab = nil
       end
     end
     
@@ -182,6 +244,7 @@ module Redcar
         doc = tab.edit_view.document
         line_ix = doc.line_at_offset(doc.cursor_offset)
         doc.cursor_offset = doc.offset_at_line(line_ix)
+        doc.ensure_visible(doc.cursor_offset)
       end
     end
     
@@ -195,30 +258,35 @@ module Redcar
         else
           doc.cursor_offset = doc.offset_at_line(line_ix + 1) - 1
         end
+        doc.ensure_visible(doc.cursor_offset)
       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)
+        doc.compound do
+          doc.edit_view.delay_parsing do
+            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
-          doc.set_selection_range(start_selection, end_selection)
-        else
-          indent_line(doc, doc.cursor_line)
         end
       end
     end
@@ -229,12 +297,21 @@ module Redcar
         use_spaces = true
         num_spaces = 2
         line = doc.get_line(line_ix)
-        if line[0..0] == "\t"
+        if doc.edit_view.soft_tabs?
           line_start = doc.offset_at_line(line_ix)
-          to         = line_start + 1
-        elsif line[0...num_spaces] == " "*num_spaces
+          re = /^ {0,#{doc.edit_view.tab_width}}/
+          if md = line.match(re)
+            to = line_start + md[0].length
+          else
+            to = line_start
+          end
+        else
           line_start = doc.offset_at_line(line_ix)
-          to         = line_start + num_spaces
+          if line =~ /^\t/
+            to = line_start + 1
+          else
+            to = line_start
+          end
         end
         doc.delete(line_start, to - line_start) unless line_start == to
       end
@@ -244,18 +321,15 @@ module Redcar
       
       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)
+        if doc.edit_view.soft_tabs?
+          whitespace = " "*doc.edit_view.tab_width
+        else
+          whitespace = "\t"
+        end
+        doc.insert(doc.offset_at_line(line_ix), whitespace)
       end
     end
 
-    class StripWhitespaceCommand < Redcar::EditTabCommand
-    
-      def execute
-        doc.text = doc.to_s.gsub(/\s+$/, "\n")
-      end
-    end
-    
     class SelectAllCommand < Redcar::EditTabCommand
     
       def execute
@@ -338,12 +412,32 @@ module Redcar
             doc.offset_at_line(line_ix) + line_offset,
             text
           )
+          doc.cursor_offset = doc.offset_at_line(line_ix) + line_offset + text.length
         end
-        new_offset = doc.offset_at_line(cursor_line) + cursor_line_offset + Redcar.app.clipboard.last.first.length
-        doc.cursor_offset = new_offset
       end
     end
     
+    class DuplicateCommand < Redcar::DocumentCommand
+    
+      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)
+          text = doc.get_slice(doc.offset_at_line(first_line_ix),
+                               doc.offset_at_line_end(last_line_ix))
+        else
+          last_line_ix = doc.cursor_line
+          text = doc.get_line(doc.cursor_line)
+        end          
+        if last_line_ix == (doc.line_count - 1)
+          text = "\n#{text}"
+        end
+        doc.insert(doc.offset_at_line_end(last_line_ix), text)
+        doc.scroll_to_line(last_line_ix + 1)
+      end        
+    end
+    
     class DialogExample < Redcar::Command
       def execute
       	builder = Menu::Builder.new do
@@ -506,6 +600,23 @@ module Redcar
       end
     end
     
+    # define commands from SelectTab1Command to SelectTab9Command
+    (1..9).each do |tab_num|
+      const_set("SelectTab#{tab_num}Command", Class.new(Redcar::Command)).class_eval do
+        define_method :execute do
+          notebook = Redcar.app.focussed_window_notebook
+          notebook.tabs[tab_num-1].focus if notebook.tabs[tab_num-1]
+        end
+      end
+    end
+    
+    class ToggleInvisibles < Redcar::EditTabCommand
+      def execute
+        EditView.show_invisibles = !EditView.show_invisibles?
+      end
+    end
+
+    
     def self.keymaps
       osx = Redcar::Keymap.build("main", :osx) do
         link "Cmd+N",       NewCommand
@@ -517,6 +628,7 @@ module Redcar
         link "Cmd+Shift+S", Project::FileSaveAsCommand
         link "Cmd+W",       CloseTabCommand
         link "Cmd+Shift+W", CloseWindowCommand
+        link "Cmd+Q",       QuitCommand
 
         link "Cmd+Shift+E", EditView::InfoSpeedbarCommand
         link "Cmd+Z",       UndoCommand
@@ -524,10 +636,12 @@ module Redcar
         link "Cmd+X",       CutCommand
         link "Cmd+C",       CopyCommand
         link "Cmd+V",       PasteCommand
+        link "Cmd+D",       DuplicateCommand        
         link "Ctrl+A",      MoveHomeCommand
         link "Ctrl+E",      MoveEndCommand
         link "Cmd+[",       DecreaseIndentCommand
         link "Cmd+]",       IncreaseIndentCommand
+        link "Cmd+Shift+I", AutoIndenter::IndentCommand
         link "Cmd+L",       GotoLineCommand
         link "Cmd+F",       SearchForwardCommand
         link "Cmd+G",       RepeatPreviousSearchForwardCommand
@@ -542,10 +656,18 @@ module Redcar
         link "Cmd+Shift+[",     SwitchTabDownCommand
         link "Cmd+Shift+]",     SwitchTabUpCommand
 
+        link "Ctrl+Shift+P",    PrintScopeCommand
+        
         link "Cmd+Shift+R",     PluginManagerUi::ReloadLastReloadedCommand
         
         link "Cmd+Alt+S", Snippets::OpenSnippetExplorer
         #Textmate.attach_keybindings(self, :osx)
+
+        # map SelectTab<number>Command
+        (1..9).each do |tab_num|
+          link "Cmd+#{tab_num}", Top.const_get("SelectTab#{tab_num}Command")
+        end
+
       end
 
       linwin = Redcar::Keymap.build("main", [:linux, :windows]) do
@@ -558,18 +680,21 @@ module Redcar
         link "Ctrl+Shift+S", Project::FileSaveAsCommand
         link "Ctrl+W",       CloseTabCommand
         link "Ctrl+Shift+W", CloseWindowCommand
-        
+        link "Ctrl+Q",       QuitCommand
+
         link "Ctrl+Shift+E", EditView::InfoSpeedbarCommand
         link "Ctrl+Z",       UndoCommand
         link "Ctrl+Y",       RedoCommand
         link "Ctrl+X",       CutCommand
         link "Ctrl+C",       CopyCommand
         link "Ctrl+V",       PasteCommand
+        link "Ctrl+D",       DuplicateCommand
         link "Ctrl+A",       MoveHomeCommand
         link "Ctrl+E",       MoveEndCommand
         link "Ctrl+[",       DecreaseIndentCommand
         link "Ctrl+]",       IncreaseIndentCommand
-        link "Ctrl+G",       GotoLineCommand
+        link "Ctrl+Shift+[", AutoIndenter::IndentCommand
+        link "Ctrl+L",       GotoLineCommand
         link "Ctrl+F",       SearchForwardCommand
         link "F3",           RepeatPreviousSearchForwardCommand
         link "Ctrl+A",       SelectAllCommand
@@ -580,6 +705,8 @@ module Redcar
         link "Ctrl+T",           Project::FindFileCommand
         link "Ctrl+Shift+Alt+O", MoveTabToOtherNotebookCommand
         
+        link "Ctrl+Shift+P",    PrintScopeCommand
+
         link "Ctrl+Alt+O",       SwitchNotebookCommand
         
         link "Ctrl+Page Up",       SwitchTabDownCommand
@@ -589,6 +716,11 @@ module Redcar
         link "Ctrl+Alt+S", Snippets::OpenSnippetExplorer
         #Textmate.attach_keybindings(self, :linux)
 
+        # map SelectTab<number>Command
+        (1..9).each do |tab_num|
+          link "Alt+#{tab_num}", Top.const_get("SelectTab#{tab_num}Command")
+        end
+
       end
       
       [linwin, osx]
@@ -602,7 +734,7 @@ module Redcar
           item "New Window", NewWindowCommand
           item "Open", Project::FileOpenCommand
           item "Open Directory", Project::DirectoryOpenCommand
-          sub_menu "Open Recent" do
+          lazy_sub_menu "Open Recent" do
             Project::RecentDirectories.generate_menu(self)
           end
           
@@ -611,9 +743,16 @@ module Redcar
           item "Save As", Project::FileSaveAsCommand
           separator
           item "Close Tab", CloseTabCommand
+          sub_menu "Switch Tab" do
+             (1..9).each do |num|
+               item "Tab #{num}", Top.const_get("SelectTab#{num}Command")
+             end
+          end
           item "Close Notebook", CloseNotebookCommand
           item "Close Window", CloseWindowCommand
           item "Close Directory", Project::DirectoryCloseCommand
+          separator
+          item "Quit", QuitCommand
         end
         sub_menu "Edit" do
           item "Tab Info",  EditView::InfoSpeedbarCommand
@@ -624,14 +763,14 @@ module Redcar
           item "Cut", CutCommand
           item "Copy", CopyCommand
           item "Paste", PasteCommand
+          item "Duplicate Region", DuplicateCommand
           separator
           item "Home", MoveHomeCommand
           item "End", MoveEndCommand
           separator
           item "Increase Indent", IncreaseIndentCommand
           item "Decrease Indent", DecreaseIndentCommand
-          separator
-          item "Strip Whitespace", StripWhitespaceCommand
+          item "Indent",          AutoIndenter::IndentCommand
           separator
           item "Goto Line", GotoLineCommand
           item "Regex Search",    SearchForwardCommand
@@ -647,15 +786,12 @@ module Redcar
         end
         sub_menu "Project" do
           item "Find File", Project::FindFileCommand
+          item "Refresh Directory", Project::RefreshDirectoryCommand
         end
         sub_menu "Debug" do
-          item "Print Command History", PrintHistoryCommand
-          item "Print Contents", PrintContents
-          item "List Tabs", ListTabsCommand
-          item "Refresh Directory", Project::RefreshDirectoryCommand
-          item "Dialog Tester", DialogExample
+          item "Task Manager", TaskManager::OpenCommand
           separator
-          item "Print Scope Tree", PrintScopeTreeCommand
+          #item "Print Scope Tree", PrintScopeTreeCommand
           item "Print Scope at Cursor", PrintScopeCommand
         end
         sub_menu "View" do
@@ -665,11 +801,13 @@ module Redcar
           separator
           item "Previous Tab", SwitchTabDownCommand
           item "Next Tab", SwitchTabUpCommand
+          separator
+          item "Show/Hide Invisibles", ToggleInvisibles
         end
         sub_menu "Plugins" do
           item "Plugin Manager", PluginManagerUi::OpenCommand
           item "Reload Again", PluginManagerUi::ReloadLastReloadedCommand
-          item("Edit Preferences") { Project.open_dir(Redcar::Plugin::Storage.storage_dir, Redcar.app.new_window) }
+          item("Edit Preferences") { Project::Manager.open_project_for_path(Redcar::Plugin::Storage.storage_dir) }
           separator
         end
         sub_menu "Bundles" do
@@ -684,16 +822,48 @@ module Redcar
       end
     end
     
-    def self.start
+    class ApplicationEventHandler
+      def tab_focus(tab)
+        tab.focus
+      end
+    
+      def tab_close(tab)
+        CloseTabCommand.new(tab).run
+      end
+      
+      def window_close(win)
+        CloseWindowCommand.new(win).run
+      end
+      
+      def application_close(app)
+        QuitCommand.new.run
+      end
+      
+      def window_focus(win)
+        FocusWindowCommand.new(win).run
+      end
+    end
+    
+    def self.application_event_handler
+      ApplicationEventHandler.new
+    end
+    
+    def self.start(args=[])
+      puts "loading plugins took #{Time.now - PROCESS_START_TIME}"
       Application.start
       ApplicationSWT.start
+      s = Time.now
       EditViewSWT.start
+      puts "EditViewSWT.start took #{Time.now - s}s"
+      s = Time.now
       Redcar.gui = ApplicationSWT.gui
       Redcar.app.controller = ApplicationSWT.new(Redcar.app)
-      
       Redcar.app.refresh_menu!
       Redcar.app.load_sensitivities
-      Redcar::Project.start
+      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
     end
   end