redcar 0.2.9dev → 0.3.0dev

data/plugins/auto_indenter/lib/auto_indenter.rb

@@ -0,0 +1,12 @@
+
+require 'auto_indenter/document_controller'
+
+module Redcar
+  class AutoIndenter
+    
+    def self.load
+      Document.register_controller_type(AutoIndenter::DocumentController)
+    end
+  end
+end
+

data/plugins/auto_indenter/lib/auto_indenter/document_controller.rb

@@ -0,0 +1,27 @@
+
+module Redcar
+  class AutoIndenter
+    class DocumentController
+      include Redcar::Document::Controller
+      include Redcar::Document::Controller::NewlineCallback
+      
+      def after_newline(line_ix)
+        if line_ix > 0
+          previous_line     = document.get_line(line_ix - 1)
+          whitespace_prefix = whitespace_prefix(previous_line)
+          offset            = document.offset_at_line(line_ix)
+          document.insert(offset, whitespace_prefix)
+          if document.cursor_offset == offset
+            document.cursor_offset = offset + whitespace_prefix.length
+          end
+        end
+      end
+      
+      private
+      
+      def whitespace_prefix(string)
+        string[/^(\s*)(?:[^\s]|$)/, 1]
+      end
+    end
+  end
+end

data/plugins/auto_indenter/plugin.yaml

@@ -0,0 +1,12 @@
+--- !ruby/object:FreeBASE::PluginConfiguration
+name: auto_indenter
+description: Automatic indenter
+version: 1.0
+author: Daniel Lucraft
+autoload: true
+require_path: auto_indenter/lib/auto_indenter.rb
+startup_module: Redcar::AutoIndenter
+load_dependencies: 
+  edit_view: "*"
+start_dependencies: 
+  edit_view: "*"

data/plugins/edit_view/features/step_definitions/notebook_steps.rb

@@ -5,7 +5,7 @@ module NotebookSwtHelper
   end
   
   def ctab_folders
-    sash.children.to_a.select do |c| 
+    sash.children.to_a[1].children.to_a.select do |c| 
       c.class == Java::OrgEclipseSwtCustom::CTabFolder
     end
   end

data/plugins/edit_view/features/step_definitions/tab_steps.rb

@@ -1,4 +1,15 @@
 
+Given /^there is an edit tab containing "([^\"]*)"$/ do |contents|
+  contents = eval(contents.inspect.gsub("\\\\", "\\"))
+  tab = Redcar::Top::NewCommand.new.run
+  cursor_offset = (contents =~ /<c>/)
+  contents = contents.gsub("<c>", "")
+  tab.edit_view.document.text = contents
+  if cursor_offset
+    tab.edit_view.document.cursor_offset = cursor_offset
+  end
+end
+
 When /^I open a new edit tab$/ do 
   Redcar::Top::NewCommand.new.run
 end

data/plugins/edit_view/features/step_definitions/window_steps.rb

@@ -73,8 +73,8 @@ Then /the window "(.*)" should have (\d+) tabs?/ do |win_title, tab_num|
   display = Swt::Widgets::Display.get_current
   shells  = display.get_shells.to_a
   shell   = shells.detect {|s| s.text == win_title}
-  sash_form = shell.getChildren.to_a.first
-  tab_folders = sash_form.children.to_a.select{|c| c.is_a? Swt::Custom::CTabFolder}
+  sash_form = shell.children.to_a.first
+  tab_folders = sash_form.children.to_a[1].children.select{|c| c.is_a? Swt::Custom::CTabFolder}
   items = tab_folders.map{|f| f.getItems.to_a}.flatten
   items.map {|i| model_tab_for_item(i)}.length.should == tab_num
 end

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

@@ -4,8 +4,8 @@ module SwtTabHelpers
   def get_tab_folder
     display = Redcar::ApplicationSWT.display
     shell   = display.get_shells.to_a.first
-    sash_form = shell.getChildren.to_a.first
-    tab_folders = sash_form.children.to_a
+    sash_form = shell.children.to_a.first
+    tab_folders = sash_form.children.to_a[1].children.to_a
     tab_folders.length.should == 1
     tab_folders.first
   end
@@ -18,8 +18,8 @@ module SwtTabHelpers
   def get_tabs
     display = Redcar::ApplicationSWT.display
     shell   = display.get_shells.to_a.first
-    sash_form = shell.getChildren.to_a.first
-    tab_folders = sash_form.children.to_a.select{|c| c.is_a? Swt::Custom::CTabFolder}
+    sash_form = shell.children.to_a.first
+    tab_folders = sash_form.children.to_a[1].children.to_a.select{|c| c.is_a? Swt::Custom::CTabFolder}
     items = tab_folders.map{|f| f.getItems.to_a}.flatten
     items.map {|i| model_tab_for_item(i)}
   end
@@ -42,25 +42,3 @@ def putsall
   p Redcar.app.windows.first.notebooks.first.tabs
   p Redcar.app.windows.first.notebooks.last.tabs
 end
-
-After do
-  Redcar.app.windows.each do |win|
-    win.notebooks.each do |notebook|
-      while tab = notebook.tabs.first
-        Redcar::ApplicationSWT.sync_exec do
-          tab.close
-        end
-      end
-    end
-    if win.notebooks.length == 2
-      Redcar::ApplicationSWT.sync_exec do
-        win.close_notebook
-      end
-    end
-  end
-  while Redcar.app.windows.length > 1
-    Redcar::ApplicationSWT.sync_exec do
-      Redcar.app.windows.last.close
-    end
-  end
-end

data/plugins/edit_view/lib/edit_view.rb

@@ -1,7 +1,8 @@
 
 require "edit_view/command"
 require "edit_view/document"
-require "edit_view/mirror"
+require "edit_view/document/controller"
+require "edit_view/document/mirror"
 require "edit_view/edit_tab"
 
 module Redcar

data/plugins/edit_view/lib/edit_view/document.rb

@@ -8,31 +8,44 @@ module Redcar
   class Document
     include Redcar::Model
     include Redcar::Observable
+    extend Forwardable
+    
+    def_delegators :controller, 
+                      :length, :line_count, :to_s, :text=,
+                      :line_at_offset, :get_line, :offset_at_line,
+                      :insert, :cursor_offset, :cursor_offset=
+    
+    def self.register_controller_type(controller_type)
+      unless controller_type.ancestors.include?(Document::Controller)
+        raise "expected #{Document::Controller}"
+      end
+      (@document_controller_types ||= []) << controller_type
+    end
     
     class << self
       attr_accessor :default_mirror
+      attr_reader :document_controller_types
     end
     
     attr_reader :mirror
     
     def initialize(edit_view)
       @edit_view = edit_view
+      get_controllers
     end
     
-    def to_s
-      controller.to_s
-    end
-    
-    def text=(text)
-      controller.text = text
-    end
-    
-    def length
-      controller.length
-    end
-    
-    def line_count
-      controller.line_count
+    def get_controllers
+      @controllers = {
+        Controller::ModificationCallbacks => [],
+        Controller::NewlineCallback => []
+      }
+      Document.document_controller_types.each do |type|
+        @controllers.each do |key, value|
+          if type.ancestors.include?(key)
+            value << type.new(self)
+          end
+        end
+      end
     end
     
     def save!
@@ -53,6 +66,25 @@ module Redcar
       end
     end
     
+    def verify_text(start_offset, end_offset, text)
+      @change = [start_offset, end_offset, text]
+      @controllers[Controller::ModificationCallbacks].each do |controller|
+        controller.before_modify(start_offset, end_offset, text)
+      end
+    end
+    
+    def modify_text
+      @controllers[Controller::ModificationCallbacks].each do |controller|
+        controller.after_modify
+      end
+      @controllers[Controller::NewlineCallback].each do |controller|
+        if @change[2] == "\n"
+          controller.after_newline(line_at_offset(@change[1]) + 1)
+        end
+      end
+      @change = nil
+    end
+    
     private
     
     def update_from_mirror

data/plugins/edit_view/lib/edit_view/document/controller.rb

@@ -0,0 +1,30 @@
+
+module Redcar
+  class Document
+    module Controller
+      def initialize(document)
+        @document = document
+      end
+      
+      def document
+        @document
+      end
+      
+      module ModificationCallbacks
+        def before_modify(start_offset, end_offset, text)
+          raise "not implemented"
+        end
+      
+        def after_modify
+          raise "not implemented"
+        end
+      end
+      
+      module NewlineCallback
+        def after_newline(line_ix)
+          raise "not implemented"
+        end
+      end
+    end
+  end
+end

data/plugins/edit_view/lib/edit_view/{mirror.rb → document/mirror.rb}

@@ -1,6 +1,6 @@
 
 module Redcar
-  class EditView
+  class Document
     # Abstract interface. A Mirror allows an EditView contents to reflect 
     # some other resource. They have methods for loading the contents from the 
     # resource and commiting changes.

data/plugins/edit_view_swt/lib/edit_view_swt.rb

@@ -98,6 +98,8 @@ module Redcar
             &method(:update_grammar))
       h2 = @model.add_listener(:grammar_changed, &method(:model_grammar_changed))
       @mate_text.getTextWidget.addFocusListener(FocusListener.new(self))
+      @mate_text.getTextWidget.addVerifyListener(VerifyListener.new(@model.document, self))
+      @mate_text.getTextWidget.addModifyListener(ModifyListener.new(@model.document, self))
       @handlers << [@model.document, h1] << [@model, h2]
     end
     
@@ -166,5 +168,25 @@ module Redcar
 
       def focusLost(_); end
     end
+    
+    class VerifyListener
+      def initialize(document, obj)
+        @document, @obj = document, obj
+      end
+      
+      def verify_text(e)
+        @document.verify_text(e.start, e.end, e.text)
+      end
+    end
+    
+    class ModifyListener
+      def initialize(document, obj)
+        @document, @obj = document, obj
+      end
+      
+      def modify_text(_)
+        @document.modify_text
+      end
+    end
   end
 end

data/plugins/edit_view_swt/lib/edit_view_swt/document.rb

@@ -22,6 +22,35 @@ module Redcar
         @swt_document.get_number_of_lines
       end
       
+      def line_at_offset(offset)
+        jface.get_line_of_offset(offset)
+      end
+      
+      def offset_at_line(line_ix)
+        jface.get_line_offset(line_ix)
+      end
+      
+      def get_line(line_ix)
+        line_info = jface.get_line_information(line_ix)
+        jface.get(line_info.offset, line_info.length)
+      end
+      
+      def insert(offset, text)
+        jface.replace(offset, 0, text)
+      end
+      
+      def cursor_offset
+        @swt_document.styledText.get_caret_offset
+      end
+      
+      def cursor_offset=(offset)
+        @swt_document.styledText.set_caret_offset(offset)
+      end
+      
+      def jface
+        @swt_document.getJFaceDocument
+      end
+      
       def text=(text)
         @swt_document.set(text)
         notify_listeners(:set_text)

data/plugins/project/features/open_directory_tree.feature

@@ -0,0 +1,17 @@
+Feature: Open directory tree
+
+  Scenario: Open directory
+    Given I will choose "." from the "open_directory" dialog
+    When I open a directory
+    Then I should see "bin,config,lib,plugins" in the tree
+
+  Scenario: Open directory then another directory
+    Given I will choose "." from the "open_directory" dialog
+    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
+  
+  
+  
+  

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

@@ -0,0 +1,4 @@
+
+When /I open a directory/ do
+  Redcar::Project::DirectoryOpenCommand.new.run
+end

data/plugins/project/lib/project.rb

@@ -1,9 +1,32 @@
 
 require "project/file_mirror"
 require "project/dir_mirror"
+require "project/dir_controller"
 
 module Redcar
   class Project
+    def self.open_tree(win, tree)
+      @window_trees ||= {}
+      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
+    end
+    
+    def self.close_tree(win)
+      win.treebook.remove_tree(@window_trees[win])
+    end
+    
+    private
+    
+    def self.set_tree(win, tree)
+      @window_trees[win] = tree
+      win.treebook.add_tree(tree)
+    end
+    
     class FileOpenCommand < Command
       key :osx     => "Cmd+O",
           :linux   => "Ctrl+O",
@@ -75,5 +98,33 @@ module Redcar
         end
       end
     end
+    
+    class DirectoryOpenCommand < Command
+      key :osx     => "Cmd+Shift+O",
+          :linux   => "Ctrl+Shift+O",
+          :windows => "Ctrl+Shift+O"
+
+      def execute
+        tree = Tree.new(Project::DirMirror.new(get_path),
+                        Project::DirController.new)
+        Project.open_tree(win, tree)
+      end
+      
+      private
+
+      def get_path
+        @path || begin
+          path = Application::Dialog.open_directory(win, :filter_path => File.expand_path("~"))
+          File.expand_path(path)
+        end
+      end
+    end
+    
+    class DirectoryCloseCommand < Command
+
+      def execute
+        Project.close_tree(win)
+      end
+    end
   end
 end

data/plugins/project/lib/project/dir_controller.rb

@@ -0,0 +1,14 @@
+
+module Redcar
+  class Project
+    class DirController
+      def activated(node)
+        if node.leaf?
+          FileOpenCommand.new(node.path).run
+        end
+      end
+    end
+  end
+end
+
+