redcar 0.3.2dev → 0.3.3

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

@@ -8,7 +8,7 @@ end
 
 When /^I select from (\d+) to (\d+)$/ do |start_offset, end_offset|
   doc = Redcar.app.focussed_window.focussed_notebook.focussed_tab.edit_view.document
-  doc.set_selection_range((start_offset.to_i)..(end_offset.to_i))
+  doc.set_selection_range(start_offset.to_i, end_offset.to_i)
 end
 
 When /^I copy text$/ do
@@ -26,4 +26,93 @@ end
 When /^I move the cursor to (\d+)$/ do |offset|
   doc = Redcar.app.focussed_window.focussed_notebook.focussed_tab.edit_view.document
   doc.cursor_offset = offset.to_i
-end
+end
+
+Then /^the cursor should be at (\d+)$/ do |offset|
+  doc = Redcar::EditView.focussed_tab_edit_view.document
+  doc.cursor_offset.should == offset.to_i
+end
+
+When /^tabs are hard$/ do
+  Redcar::EditView.focussed_tab_edit_view.soft_tabs = false
+end
+
+When /^tabs are soft, (\d+) spaces$/ do |int|
+  Redcar::EditView.focussed_tab_edit_view.soft_tabs = true
+  Redcar::EditView.focussed_tab_edit_view.tab_width = int.to_i
+end
+
+When /^I press the Tab key in the edit tab$/ do
+  edit_view = Redcar::EditView.focussed_tab_edit_view
+  edit_view.tab_pressed([])
+end
+
+When /^I press the Left key in the edit tab$/ do
+  edit_view = Redcar::EditView.focussed_tab_edit_view
+  edit_view.left_pressed([])
+end
+
+When /^I press the Right key in the edit tab$/ do
+  edit_view = Redcar::EditView.focussed_tab_edit_view
+  edit_view.right_pressed([])
+end
+
+When /^I press Shift\+Left key in the edit tab$/ do
+  edit_view = Redcar::EditView.focussed_tab_edit_view
+  edit_view.left_pressed(["Shift"])
+end
+
+When /^I press Shift\+Right key in the edit tab$/ do
+  edit_view = Redcar::EditView.focussed_tab_edit_view
+  edit_view.right_pressed(["Shift"])
+end
+
+When /^I press the Delete key in the edit tab$/ do
+  edit_view = Redcar::EditView.focussed_tab_edit_view
+  edit_view.delete_pressed([])
+end
+
+When /^I press the Backspace key in the edit tab$/ do
+  edit_view = Redcar::EditView.focussed_tab_edit_view
+  edit_view.backspace_pressed([])
+end
+
+Then /^the contents should be "([^\"]*)"$/ do |text|
+  expected = text.gsub("\\t", "\t").gsub("\\n", "\n")
+  doc = Redcar::EditView.focussed_edit_view_document
+  actual = doc.to_s
+  if expected.include?("<c>")
+    curoff = doc.cursor_offset
+    actual = actual.insert(curoff, "<c>")
+    seloff = doc.selection_offset
+    if seloff > curoff
+      seloff += 3
+    end
+    actual = actual.insert(seloff, "<s>") unless curoff == seloff
+  end
+  actual.should == expected
+end
+
+Then /^the contents of the edit tab should be "([^\"]*)"$/ do |text|
+  text = text.gsub("\\t", "\t").gsub("\\n", "\n")
+  Redcar::EditView.focussed_edit_view_document.to_s.should == text
+end
+
+When /^I block select from (\d+) to (\d+)$/ do |from_str, to_str|
+  doc = Redcar::EditView.focussed_edit_view_document
+  doc.block_selection_mode = true
+  doc.set_selection_range(from_str.to_i, to_str.to_i)
+end
+
+Then /^the selection range should be from (\d+) to (\d+)$/ do |from_str, to_str|
+  doc = Redcar::EditView.focussed_edit_view_document
+  doc.block_selection_mode = true
+  r = doc.selection_range
+  r.begin.should == from_str.to_i
+  r.end.should == to_str.to_i
+end
+ 
+ 
+ 
+ 
+ 

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

@@ -19,7 +19,7 @@ When /^I close the focussed tab$/ do
 end
 
 When /^I replace the contents with "([^\"]*)"$/ do |arg1|
-  arg1 = arg1.gsub("\\n", "\n")
+  arg1 = arg1.gsub("\\n", "\n").gsub("\\t", "\t")
   win = Redcar.app.windows.first
   tab = win.focussed_notebook.focussed_tab
   tab.edit_view.document.text = arg1

data/plugins/edit_view/features/tabs.feature

@@ -0,0 +1,146 @@
+Feature: Insert a tab
+
+  Scenario: Inserts hard tab at the start of a line
+    When I open a new edit tab
+    And tabs are hard
+    And I press the Tab key in the edit tab
+    Then the contents of the edit tab should be "\t"
+    
+  Scenario: Inserts hard tab at the end of a line
+    When I open a new edit tab
+    And tabs are hard
+    And I replace the contents with "Hacker"
+    And I move the cursor to 6
+    And I press the Tab key in the edit tab
+    Then the contents of the edit tab should be "Hacker\t"
+    
+  Scenario: Inserts 2 space soft tab at the start of a line
+    When I open a new edit tab
+    And tabs are soft, 2 spaces
+    And I press the Tab key in the edit tab
+    Then the contents of the edit tab should be "  "
+    
+  Scenario: Inserts 2 space soft tab at the end of a line
+    When I open a new edit tab
+    And tabs are soft, 2 spaces
+    And I replace the contents with "Hacker"
+    And I move the cursor to 6
+    And I press the Tab key in the edit tab
+    Then the contents of the edit tab should be "Hacker  "
+    
+  Scenario: Inserts 4 space soft tab at the start of a line
+    When I open a new edit tab
+    And tabs are soft, 4 spaces
+    And I press the Tab key in the edit tab
+    Then the contents of the edit tab should be "    "
+    
+  Scenario: Inserts 4 space soft tab at the end of a line
+    When I open a new edit tab
+    And tabs are soft, 4 spaces
+    And I replace the contents with "Hacker"
+    And I move the cursor to 6
+    And I press the Tab key in the edit tab
+    Then the contents of the edit tab should be "Hacker  "
+
+  Scenario: Inserts soft tabs correctly if there is selected text
+    When I open a new edit tab
+    And tabs are soft, 4 spaces
+    And I replace the contents with "Ha"
+    And I move the cursor to 0
+    And I press Shift+Right key in the edit tab
+    And I press Shift+Right key in the edit tab
+    And I press the Tab key in the edit tab
+    Then the contents of the edit tab should be "    "
+
+  Scenario: Inserts hard tabs correctly if there is selected text
+    When I open a new edit tab
+    And tabs are hard
+    And I replace the contents with "Ha"
+    And I move the cursor to 0
+    And I press Shift+Right key in the edit tab
+    And I press Shift+Right key in the edit tab
+    And I press the Tab key in the edit tab
+    Then the contents of the edit tab should be "\t"
+
+  Scenario: Inserts soft tabs correctly if there is selected text that covers a tab
+    When I open a new edit tab
+    And tabs are soft, 4 spaces
+    And I replace the contents with "H\t"
+    And I move the cursor to 0
+    And I press Shift+Right key in the edit tab
+    And I press Shift+Right key in the edit tab
+    And I press the Tab key in the edit tab
+    Then the contents of the edit tab should be "    "
+
+  Scenario: Inserts 4 space soft tab at the end of a line, with a tab character
+    When I open a new edit tab
+    And tabs are soft, 4 spaces
+    And I replace the contents with "\tHacker"
+    And I move the cursor to 7
+    And I press the Tab key in the edit tab
+    Then the contents of the edit tab should be "\tHacker  "
+
+  @block_selection
+  Scenario: In block selection mode inserts 4 space soft tab on 1 line
+    When I open a new edit tab
+    And tabs are soft, 4 spaces
+    And I replace the contents with "Jim\nHacker"
+    And I block select from 0 to 0
+    And I press the Tab key in the edit tab
+    Then the contents of the edit tab should be "    Jim\nHacker"
+    And the selection range should be from 4 to 4
+
+  @block_selection
+  Scenario: In block selection mode inserts 4 space soft tab on 2 lines
+    When I open a new edit tab
+    And tabs are soft, 4 spaces
+    And I replace the contents with "Jim\nHacker"
+    And I block select from 0 to 4
+    And I press the Tab key in the edit tab
+    Then the contents of the edit tab should be "    Jim\n    Hacker"
+    And the selection range should be from 4 to 12
+
+  @block_selection
+  Scenario: In block selection mode inserts 4 space soft tab on 3 lines
+    When I open a new edit tab
+    And tabs are soft, 4 spaces
+    And I replace the contents with "Jim\nHacker\nMP"
+    And I block select from 0 to 11
+    And I press the Tab key in the edit tab
+    Then the contents of the edit tab should be "    Jim\n    Hacker\n    MP"
+    And the selection range should be from 4 to 23
+
+  @block_selection
+  Scenario: In block selection mode inserts 4 space soft tab overwriting text on 1 line
+    When I open a new edit tab
+    And tabs are soft, 4 spaces
+    And I replace the contents with "Jim\nHacker"
+    And I block select from 0 to 2
+    And I press the Tab key in the edit tab
+    Then the contents of the edit tab should be "    m\nHacker"
+    And the selection range should be from 4 to 4
+
+  @block_selection
+  Scenario: In block selection mode inserts 4 space soft tab overwriting text on 2 lines
+    When I open a new edit tab
+    And tabs are soft, 4 spaces
+    And I replace the contents with "Jim\nHacker"
+    And I block select from 0 to 6
+    And I press the Tab key in the edit tab
+    Then the contents of the edit tab should be "    m\n    cker"
+    And the selection range should be from 4 to 10
+
+  @block_selection
+  Scenario: In block selection mode inserts 4 space soft tab overwriting text on 3 lines
+    When I open a new edit tab
+    And tabs are soft, 4 spaces
+    And I replace the contents with "Jim\nHacker\nMP"
+    And I block select from 0 to 13
+    And I press the Tab key in the edit tab
+    Then the contents of the edit tab should be "    m\n    cker\n    "
+    And the selection range should be from 4 to 19
+
+
+
+
+

data/plugins/edit_view/lib/edit_view.rb

@@ -1,19 +1,139 @@
 
+require "edit_view/actions/arrow_keys"
+require "edit_view/actions/deletion"
+require "edit_view/actions/tab"
 require "edit_view/command"
 require "edit_view/document"
+require "edit_view/document/command"
 require "edit_view/document/controller"
 require "edit_view/document/mirror"
 require "edit_view/edit_tab"
+require "edit_view/tab_settings"
+require "edit_view/info_speedbar"
 
 module Redcar
   class EditView
     include Redcar::Model
+    extend Redcar::Observable
     include Redcar::Observable
     
     extend Forwardable
 
+    module Handler
+      include Interface::Abstract
+
+      def handle(edit_view, modifiers)
+      end
+    end
+    
     class << self
       attr_reader :undo_sensitivity, :redo_sensitivity
+      attr_reader :focussed_edit_view
+    end
+    
+    def self.tab_settings
+      @tab_settings ||= TabSettings.new
+    end
+
+    # unused?      
+    def self.storage
+      @storage ||= Plugin::Storage.new('edit_view_plugin')
+    end
+
+    def self.all_handlers(type)
+      result = []
+      Redcar.plugin_manager.loaded_plugins.each do |plugin|
+        if plugin.object.respond_to?(:"#{type}_handlers")
+          result += plugin.object.send(:"#{type}_handlers")
+        end
+      end
+      result.each {|h| Handler.verify_interface!(h) }
+    end
+
+    def self.arrow_left_handlers
+      [Actions::ArrowLeftHandler]
+    end
+    
+    def self.arrow_right_handlers
+      [Actions::ArrowRightHandler]
+    end
+    
+    def self.tab_handlers
+      [Actions::IndentTabHandler]
+    end
+    
+    def self.backspace_handlers
+      [Actions::BackspaceHandler]
+    end
+    
+    def self.delete_handlers
+      [Actions::DeleteHandler]
+    end
+    
+    def self.all_tab_handlers
+      all_handlers(:tab)
+    end
+    
+    def self.all_esc_handlers
+      all_handlers(:esc)
+    end
+
+    def self.all_arrow_left_handlers
+      all_handlers(:arrow_left)
+    end
+
+    def self.all_arrow_right_handlers
+      all_handlers(:arrow_right)
+    end
+
+    def self.all_delete_handlers
+      all_handlers(:delete)
+    end
+
+    def self.all_backspace_handlers
+      all_handlers(:backspace)
+    end
+
+    def handle_key(handlers, modifiers)
+      handlers.detect do |h|
+        begin
+          h.handle(self, modifiers)
+        rescue => e
+          puts "*** Error in key handler: #{e.class} #{e.message}"
+          puts e.backtrace.map {|l| " - " + l }
+        end
+      end
+    end
+
+    def tab_pressed(modifiers)
+      handle_key(EditView.all_tab_handlers, modifiers)
+    end
+    
+    def esc_pressed(modifiers)
+      handle_key(EditView.all_esc_handlers, modifiers)
+    end
+    
+    def left_pressed(modifiers)
+      handle_key(EditView.all_arrow_left_handlers, modifiers)
+    end
+    
+    def right_pressed(modifiers)
+      handle_key(EditView.all_arrow_right_handlers, modifiers)
+    end
+    
+    def delete_pressed(modifiers)
+      handle_key(EditView.all_delete_handlers, modifiers)
+    end
+    
+    def backspace_pressed(modifiers)
+      handle_key(EditView.all_backspace_handlers, modifiers)
+    end
+    
+    # Called by the GUI whenever an EditView is focussed or
+    # loses focus. Sends :focussed_edit_view event.
+    def self.focussed_edit_view=(edit_view)
+      @focussed_edit_view = edit_view
+      notify_listeners(:focussed_edit_view, edit_view)
     end
     
     def self.sensitivities
@@ -21,6 +141,9 @@ module Redcar
         Sensitivity.new(:edit_tab_focussed, Redcar.app, false, [:tab_focussed]) do |tab|
           tab and tab.is_a?(EditTab)
         end,
+        Sensitivity.new(:edit_view_focussed, EditView, false, [:focussed_edit_view]) do |edit_view|
+          edit_view
+        end,
         Sensitivity.new(:selected_text, Redcar.app, false, [:focussed_tab_selection_changed, :tab_focussed]) do
           if win = Redcar.app.focussed_window
             tab = win.focussed_notebook.focussed_tab
@@ -43,10 +166,48 @@ module Redcar
       ]
     end
 
+    def self.font_info
+      if Redcar.platform == :osx
+        default_font = "Monaco"
+        default_font_size = 15
+      elsif Redcar.platform == :linux
+        default_font = "Monospace"
+        default_font_size = 11
+      elsif Redcar.platform == :windows
+        default_font = "Courier New"
+        default_font_size = 9
+      end
+      [ ARGV.option("font") || default_font, 
+        (ARGV.option("font-size") || default_font_size).to_i ]
+    end
+    
+    def self.font
+      font_info[0]
+    end
+    
+    def self.font_size
+      font_info[1]
+    end
+    
+    def self.theme
+      ARGV.option("theme") || "Twilight"
+    end    
+    
+    def self.focussed_tab_edit_view
+      Redcar.app.focussed_notebook_tab.edit_view if Redcar.app.focussed_notebook_tab and Redcar.app.focussed_notebook_tab.edit_tab?
+    end
+    
+    def self.focussed_edit_view_document
+      focussed_tab_edit_view.document if focussed_tab_edit_view
+    end
+    
+    def self.focussed_document_mirror
+      focussed_edit_view_document.mirror if focussed_edit_view_document
+    end
+    
     attr_reader :document
     
-    def initialize(tab)
-      @tab = tab
+    def initialize
       create_document
       @grammar = nil
       @focussed = nil
@@ -56,10 +217,6 @@ module Redcar
       @document = Redcar::Document.new(self)
     end
     
-    def title=(title)
-      @tab.title = title
-    end
-    
     def_delegators :controller, :undo,      :redo,
                                 :undoable?, :redoable?,
                                 :reset_undo,
@@ -71,18 +228,48 @@ module Redcar
     end
     
     def grammar=(name)
-      @grammar = name
+      set_grammar(name)
       notify_listeners(:grammar_changed, name)
     end
     
     def set_grammar(name)
       @grammar = name
+      self.tab_width = EditView.tab_settings.width_for(name)
+      self.soft_tabs = EditView.tab_settings.softness_for(name)
     end
     
-    def gained_focus
+    def focus
       notify_listeners(:focussed)
     end
+
+    def tab_width
+      @tab_width
+    end
+    
+    def tab_width=(val)
+      @tab_width = val
+      EditView.tab_settings.set_width_for(grammar, val)
+      notify_listeners(:tab_width_changed, val)
+    end
+    
+    def set_tab_width(val)
+      @tab_width = val
+    end
+    
+    def soft_tabs?
+      @soft_tabs
+    end
     
+    def soft_tabs=(bool)
+      @soft_tabs = bool
+      EditView.tab_settings.set_softness_for(grammar, bool)
+      notify_listeners(:softness_changed, bool)
+    end
+
+    def title=(title)
+      notify_listeners(:title_changed, title)
+    end
+
     def serialize
       { :contents      => document.to_s,
         :cursor_offset => cursor_offset,
@@ -94,5 +281,7 @@ module Redcar
       document.text      = data[:contents]
       self.cursor_offset = data[:cursor_offset]
     end
+    
   end
 end
+