redcar 0.3.4.3 → 0.3.5

data/plugins/declarations/lib/declarations/parser.rb

@@ -0,0 +1,94 @@
+
+module Redcar
+  JAVA_YAML=<<-YAML
+  - regex:    "class\\s+(\\w+)"
+    capture:  1
+    type:     id
+  - regex:    "interface\\s+(\\w+)"
+    capture:  1
+    type:     id
+  - regex:    "(public|private).*\\s+(\\w+)\s*\\("
+    capture:  2
+    type:     id
+  YAML
+  
+  RUBY_YAML=<<-YAML
+  - regex:    "^[^#]*(class|module)\\s+(?:\\w*::)*(\\w+)(?:$|\\s|<)"
+    capture:  2
+    type:     id
+  - regex:    "^[^#]*def (self\\.)?(\\w+)"
+    capture:  2
+    type:     id
+  - regex:    "^[^#]*attr(_reader|_accessor|_writer)(.*)$"
+    capture:  2
+    type:     id-list
+  - regex:    "^[^#]*alias\s+:(\\w+)"
+    capture:  1
+    type:     id
+  - regex:    "^[^#]*alias_method\s+:(\\w+)"
+    capture:  1
+    type:     id
+  - regex:    "^\\s*([A-Z]\\w*)\\s*="
+    capture:  1
+    type:     id
+  YAML
+  
+  class Declarations
+    class Parser
+      DEFINITIONS = {
+        /\.rb$/   => YAML.load(RUBY_YAML),
+        /\.java$/ => YAML.load(JAVA_YAML)
+      }
+      
+      attr_reader :tags
+      
+      def initialize
+        @tags = []
+      end
+      
+      def parse(files)
+        files.each do |path|
+          @tags += match_in_file(path)
+        end
+      end
+      
+      private
+      
+      def decls_for_file(path)
+        DEFINITIONS.each do |fn_re, decls|
+          if path =~ fn_re
+            return decls
+          end
+        end
+        nil
+      end
+      
+      def match_in_file(path)
+        tags = []
+        begin
+          file = ::File.read(path)
+          if decls = decls_for_file(path)
+            decls.each do |decl| 
+              file.each_line do |line| 
+                if md = line.match(Regexp.new(decl["regex"]))
+                  capture = md[decl["capture"]]
+                  case decl["type"]
+                  when "id"
+                    tags << [capture, path, md[0]]
+                  when "id-list"
+                    tags += capture.scan(/\w+/).map {|id| [id, path, md[0]] }
+                  end
+                end
+              end
+            end
+          end
+          tags
+        rescue
+          []
+        end
+      end
+      
+    end
+  end
+end
+

data/plugins/declarations/lib/declarations/select_tag_dialog.rb

@@ -0,0 +1,44 @@
+module Redcar
+  class Declarations
+    class SelectTagDialog < FilterListDialog
+
+      def initialize(matches)
+        super()
+        @matches = matches
+      end
+
+      def close
+        super
+      end
+
+      def update_list(filter)
+        @last_list = @matches
+        filtered_list = @last_list
+        if filter.length >= 1
+          filtered_list = filter_and_rank_by(filtered_list, filter, filtered_list.length) do |match|
+            match[:file].split(::File::SEPARATOR).last
+          end
+        end
+        align_matches_for_display(filtered_list)
+      end
+
+      def selected(text, ix, closing=false)
+        if @last_list
+          close
+          Redcar::Declarations.go_to_definition(@last_list[ix])
+        end
+      end
+      
+      private
+      
+      def align_matches_for_display(filtered_list)
+        filtered_list.collect do |match|
+          file_path     = match[:file]
+          file          = file_path.split(::File::SEPARATOR).last
+          relative_path = file_path.gsub(Regexp.compile(Project::Manager.focussed_project.path + '/'), '')
+          "%s (%s)" % [file, relative_path]
+        end
+      end
+    end
+  end
+end

data/plugins/declarations/plugin.rb

@@ -0,0 +1,7 @@
+Plugin.define do
+  name    "declarations"
+  version "0.1.0"
+  file    "lib", "declarations"
+  object  "Redcar::Declarations"
+  dependencies "project", ">0"
+end

data/plugins/declarations/spec/declarations/file_spec.rb

@@ -0,0 +1,62 @@
+
+require File.join(File.dirname(__FILE__), "..", "spec_helper")
+
+module Redcar
+  describe Declarations::File do
+    before do
+      @tags_file = File.join(File.dirname(__FILE__), "..", "tags")
+    end
+    
+    after do
+      FileUtils.rm_f(@tags_file)
+    end
+    
+    describe "dump and load from file" do
+      describe "with no existing tags file" do
+        before do
+          @file = Declarations::File.new(@tags_file)
+        end
+        
+        it "should have no tags" do
+          @file.tags.should be_empty
+        end
+        
+        it "should add new tags" do
+          @file.add_tags([%w"Abc /foo class:Abc"])
+          @file.tags.length.should == 1
+        end
+        
+        describe "with tags added" do
+          before do
+            @file.add_tags([%w"Abc /foo class:Abc"])
+          end
+          
+          it "should dump a tags file" do
+            @file.dump
+            File.exist?(@tags_file).should be_true
+          end
+        end
+      end
+      
+      describe "with existing tags file" do
+        before do
+          file = Declarations::File.new(@tags_file)
+          file.add_tags([%w"Abc /foo class:Abc"])
+          file.last_updated = Time.now
+          @last_updated = Time.now
+          file.dump
+          @file = Declarations::File.new(@tags_file)
+        end
+        
+        it "should load up the tags" do
+          @file.tags.should == [%w"Abc /foo class:Abc"]
+        end
+        
+        it "should know the timestamp of when it was last updated" do
+          @file.last_updated.to_s.should == @last_updated.to_s
+        end
+      end
+    end
+    
+  end
+end

data/plugins/declarations/spec/fixtures/federalist.rb

@@ -0,0 +1,15 @@
+
+class James
+  def madison
+  end
+  
+  def self.alexander
+  end
+  
+  module Hamilton
+  end
+end
+
+module James::Hamilton
+  attr_accessor :john, :jay
+end

data/plugins/declarations/spec/spec_helper.rb

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

data/plugins/edit_view/features/indentation_commands.feature

@@ -0,0 +1,40 @@
+Feature: Indentation commands
+
+  Scenario: Increase indent, soft tabs, width 2
+    When I open a new edit tab
+    And tabs are soft, 2 spaces
+    And I run the command Redcar::Top::IncreaseIndentCommand
+    Then the contents should be "  "
+    
+  Scenario: Decrease indent, soft tabs, width 2
+    When I open a new edit tab
+    And tabs are soft, 2 spaces
+    And I replace the contents with "<c>    "
+    And I run the command Redcar::Top::DecreaseIndentCommand
+    Then the contents should be "  "
+
+  Scenario: Increase indent, soft tabs, width 3
+    When I open a new edit tab
+    And tabs are soft, 3 spaces
+    And I run the command Redcar::Top::IncreaseIndentCommand
+    Then the contents should be "   "
+    
+  Scenario: Decrease indent, soft tabs, width 3
+    When I open a new edit tab
+    And tabs are soft, 3 spaces
+    And I replace the contents with "<c>      "
+    And I run the command Redcar::Top::DecreaseIndentCommand
+    Then the contents should be "   "
+
+  Scenario: Increase indent, hard tabs, width 2
+    When I open a new edit tab
+    And tabs are hard
+    And I run the command Redcar::Top::IncreaseIndentCommand
+    Then the contents should be "\t"
+    
+  Scenario: Decrease indent, hard tabs, width 2
+    When I open a new edit tab
+    And tabs are hard
+    And I replace the contents with "<c>\t\t"
+    And I run the command Redcar::Top::DecreaseIndentCommand
+    Then the contents should be "\t"

data/plugins/edit_view/features/line_delimiter.feature

@@ -0,0 +1,40 @@
+Feature: Line delimiter
+
+  Scenario: Chooses line delimiter by text put in the tab (Windows)
+    When I open a new edit tab
+    And I replace the contents with "foo\r\nbar\r\nbaz\r\n"
+    Then the line delimiter should be "\r\n"
+
+  Scenario: Delete at end of line deletes delimiter (Windows)
+    When I open a new edit tab
+    And I replace the contents with "foo\r\nbar\r\nbaz\r\n"
+    And I move the cursor to 3
+    And I press the Delete key in the edit tab
+    Then the contents should be "foobar\r\nbaz\r\n"
+    
+  Scenario: Backspace at start of line deletes delimiter (Windows)
+    When I open a new edit tab
+    And I replace the contents with "foo\r\nbar\r\nbaz\r\n"
+    And I move the cursor to 5
+    And I press the Backspace key in the edit tab
+    Then the contents should be "foobar\r\nbaz\r\n"
+    
+  Scenario: Chooses line delimiter by text put in the tab (Unix)
+    When I open a new edit tab
+    And I replace the contents with "foo\nbar\nbaz\n"
+    Then the line delimiter should be "\n"
+
+  Scenario: Delete at end of line deletes delimiter (Unix)
+    When I open a new edit tab
+    And I replace the contents with "foo\nbar\nbaz\n"
+    And I move the cursor to 3
+    And I press the Delete key in the edit tab
+    Then the contents should be "foobar\nbaz\n"
+    
+  Scenario: Backspace at start of line deletes delimiter (Windows)
+    When I open a new edit tab
+    And I replace the contents with "foo\nbar\nbaz\n"
+    And I move the cursor to 4
+    And I press the Backspace key in the edit tab
+    Then the contents should be "foobar\nbaz\n"
+    

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

@@ -1,6 +1,6 @@
 
 def unescape_text(text)
-  text.gsub("\\t", "\t").gsub("\\n", "\n").gsub("\\\"", "\"")
+  text.gsub("\\t", "\t").gsub("\\n", "\n").gsub("\\r", "\r").gsub("\\\"", "\"")
 end
 
 When /^I undo$/ do
@@ -133,7 +133,19 @@ Then /^the selection range should be from (\d+) to (\d+)$/ do |from_str, to_str|
   r.end.should == to_str.to_i
 end
  
- 
- 
- 
+Then /the line delimiter should be "(.*)"/ do |delim|
+  doc = Redcar::EditView.focussed_edit_view_document
+  doc.delim.should == unescape_text(delim)
+end
+
+When /^I move to line (\d+)$/ do |num|
+  doc = Redcar::EditView.focussed_edit_view_document
+  doc.cursor_offset = doc.offset_at_line(num.to_i)
+end
+
+Then /^the cursor should be on line (\d+)$/ do |num|
+  doc = Redcar::EditView.focussed_edit_view_document
+  doc.cursor_line.should == num.to_i
+end
+
  

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

@@ -1,7 +1,7 @@
 
 module NotebookSwtHelper
   def sash
-    sash = first_shell.children.to_a.first
+    sash = active_shell.children.to_a.first
   end
   
   def ctab_folders

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 |contents|
-  contents = contents.gsub("\\n", "\n").gsub("\\t", "\t")
+  contents = unescape_text(contents)
   win = Redcar.app.windows.first
   tab = win.focussed_notebook.focussed_tab
   cursor_offset = (contents =~ /<c>/)

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

@@ -14,7 +14,11 @@ Then /^there should be (no|one|\d+) windows?$/ do |num|
   # in the gui
   display = Swt::Widgets::Display.get_current
   shells  = display.get_shells.to_a
-  shells.length.should == num
+  
+  # on OSX there is always an invisible window
+  diff = Redcar.platform == :osx ? 1 : 0
+  
+  shells.length.should == num + diff
 end
 
 When /I open a new window(?: with title "(.*)")?/ do |title|

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

@@ -3,8 +3,7 @@ RequireSupportFiles File.dirname(__FILE__) + "/../../../application/features/"
 module SwtTabHelpers
   def get_tab_folder
     display = Redcar::ApplicationSWT.display
-    shell   = display.get_shells.to_a.first
-    sash_form = shell.children.to_a.first
+    sash_form = active_shell.children.to_a.first
     tab_folders = sash_form.children.to_a[1].children.to_a[0].children.to_a
     tab_folders.length.should == 1
     tab_folders.first
@@ -16,13 +15,12 @@ module SwtTabHelpers
   end
   
   def focussed_tab
-    Redcar.app.windows.first.focussed_notebook.focussed_tab
+    Redcar.app.focussed_window.focussed_notebook.focussed_tab
   end
   
   def get_tabs
     display = Redcar::ApplicationSWT.display
-    shell   = display.get_shells.to_a.first
-    sash_form = shell.children.to_a.first
+    sash_form = active_shell.children.to_a.first
     tab_folders = sash_form.children.to_a[1].children.to_a[0].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)}

data/plugins/edit_view/features/undo_and_redo.feature

@@ -49,4 +49,25 @@ Feature: Undo and Redo
     And I redo
     Then the menu item "Edit|Undo" should be active
     And the menu item "Edit|Redo" should be inactive
+    
+  Scenario: Compound undo steps work
+    When I open a new edit tab
+    And tabs are hard
+    And I replace the contents with "Bolzano\nWeierstrass"
+    And I select from 0 to 19
+    And tabs are hard
+    And I run the command Redcar::Top::IncreaseIndentCommand
+    Then the contents should be "\tBolzano\n\tWeierstrass"
+    And I undo
+    Then the contents should be "Bolzano\nWeierstrass"
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     

data/plugins/edit_view/lib/edit_view.rb

@@ -7,8 +7,10 @@ require "edit_view/command"
 require "edit_view/document"
 require "edit_view/document/command"
 require "edit_view/document/controller"
+require "edit_view/document/indentation"
 require "edit_view/document/mirror"
 require "edit_view/edit_tab"
+require "edit_view/modified_tabs_checker"
 require "edit_view/tab_settings"
 require "edit_view/info_speedbar"
 
@@ -43,10 +45,9 @@ module Redcar
 
     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
+      method_name = :"#{type}_handlers"
+      Redcar.plugin_manager.objects_implementing(method_name).each do |object|
+        result += object.send(method_name)
       end
       result.each {|h| Handler.verify_interface!(h) }
     end
@@ -139,6 +140,7 @@ module Redcar
     # loses focus. Sends :focussed_edit_view event.
     def self.focussed_edit_view=(edit_view)
       @focussed_edit_view = edit_view
+      edit_view.check_for_updated_document if edit_view
       notify_listeners(:focussed_edit_view, edit_view)
     end
     
@@ -211,6 +213,10 @@ module Redcar
       focussed_edit_view_document.mirror if focussed_edit_view_document
     end
     
+    def self.all_edit_views
+      Redcar.app.windows.map {|w| w.notebooks.map {|n| n.tabs}.flatten }.flatten.select {|t| t.is_a?(EditTab)}.map {|t| t.edit_view}
+    end
+    
     attr_reader :document
     
     def initialize
@@ -242,6 +248,7 @@ module Redcar
       @grammar = name
       self.tab_width = EditView.tab_settings.width_for(name)
       self.soft_tabs = EditView.tab_settings.softness_for(name)
+      refresh_show_invisibles
     end
     
     def focus
@@ -271,6 +278,24 @@ module Redcar
       EditView.tab_settings.set_softness_for(grammar, bool)
       notify_listeners(:softness_changed, bool)
     end
+    
+    def show_invisibles?
+      @show_invisibles
+    end
+
+    def self.show_invisibles?
+      EditView.tab_settings.show_invisibles?
+    end
+
+    def self.show_invisibles=(bool)
+      EditView.tab_settings.set_show_invisibles(bool)
+      all_edit_views.each {|ev| ev.refresh_show_invisibles }
+    end
+    
+    def refresh_show_invisibles
+      @show_invisibles = EditView.tab_settings.show_invisibles?
+      notify_listeners(:invisibles_changed, @show_invisibles)
+    end
 
     def title=(title)
       notify_listeners(:title_changed, title)
@@ -291,6 +316,34 @@ module Redcar
     def delay_parsing
       controller.delay_parsing { yield }
     end
+    
+    def reset_last_checked
+      @last_checked = Time.now
+    end
+    
+    def check_for_updated_document
+      # awful forward dependency on the Project plugin here....
+      if document and 
+            document.mirror and 
+            document.mirror.is_a?(Project::FileMirror) and 
+            document.mirror.changed_since?(@last_checked)
+        if document.modified?
+          result = Application::Dialog.message_box(
+                     "This file has been changed on disc, and you have unsaved changes in Redcar.\n\n" + 
+                     "Revert to version on disc (and lose your changes)?",
+                     :buttons => :yes_no
+                    )
+          case result
+          when :yes
+            document.update_from_mirror
+          end
+        else
+          puts "updating document as has changed since #{@last_checked}"
+          document.update_from_mirror
+        end
+      end
+      @last_checked = Time.now
+    end
   end
 end