redcar 0.3.4.3 → 0.3.5

data/plugins/auto_indenter/lib/auto_indenter/commands.rb

@@ -0,0 +1,34 @@
+
+module Redcar
+  class AutoIndenter
+    
+    class IndentCommand < Redcar::EditTabCommand
+      
+      def execute
+        if doc.selection?
+          selection = true
+          start_line, end_line = *[doc.selection_line, doc.cursor_line].sort
+        else
+          selection = false
+          start_line = end_line = doc.cursor_line
+        end
+        rules = AutoIndenter.rules_for_scope(doc.cursor_scope)
+        analyzer = Analyzer.new(rules, doc, doc.edit_view.tab_width, doc.edit_view.soft_tabs?)
+        indentation = doc.indentation
+        start_line.upto(end_line) do |line_ix|
+          indentation.set_level(line_ix, analyzer.calculate_for_line(line_ix, false))
+        end
+        
+        return unless selection
+        
+        start_offset = doc.offset_at_line(start_line)
+        if end_line == doc.line_count - 1
+          end_offset = doc.length
+        else
+          end_offset = doc.offset_at_line(end_line + 1)
+        end
+        doc.set_selection_range(start_offset, end_offset)
+      end
+    end
+  end
+end

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

@@ -3,24 +3,79 @@ module Redcar
   class AutoIndenter
     class DocumentController
       include Redcar::Document::Controller
+      include Redcar::Document::Controller::ModificationCallbacks
       include Redcar::Document::Controller::NewlineCallback
       
-      def after_newline(line_ix)
-        if line_ix > 0
-          previous_line     = document.get_line(line_ix - 1).gsub(document.delim, "")
-          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
+      def disable
+        increase_ignore
+        result = yield
+        decrease_ignore
+        result
+      end
+      
+      def ignore?
+        @ignore
+      end
+      
+      def increase_ignore
+        @ignore ||= 0
+        @ignore += 1
+      end
+      
+      def decrease_ignore
+        @ignore -= 1
+        @ignore = nil if @ignore == 0
+      end
+      
+      def before_modify(start_offset, end_offset, text)
+        return if ignore? or in_snippet?
+        
+        @start_offset, @end_offset, @text = start_offset, end_offset, text
+        line = document.get_line(document.cursor_line)
+        rules = AutoIndenter.rules_for_scope(document.cursor_scope)
+        @flags = get_flags(line, rules)
+      end
+      
+      def in_snippet?
+        snippet_controller = document.controllers(Snippets::DocumentController).first and
+         snippet_controller.in_snippet?
+      end
+      
+      def get_flags(line, rules)
+        [rules.increase_indent?(line), rules.decrease_indent?(line), rules.indent_next_line?(line), rules.unindented_line?(line)]
+      end
+      
+      def after_modify
+        return if ignore? or in_snippet?
+        start_line_ix = document.line_at_offset(@start_offset)
+        end_line_ix   = document.line_at_offset([[@start_offset + @text.length, document.length - 1].min, 0].max)
+        if start_line_ix == end_line_ix
+          rules = AutoIndenter.rules_for_scope(document.cursor_scope)
+          line = document.get_line(start_line_ix)
+          if get_flags(line, rules) != @flags
+            edit_view = document.edit_view
+            analyzer = Analyzer.new(rules, document, edit_view.tab_width, edit_view.soft_tabs?)
+            increase_ignore
+            document.indentation.set_level(start_line_ix, analyzer.calculate_for_line(start_line_ix, true))
+            decrease_ignore
           end
         end
       end
       
-      private
-      
-      def whitespace_prefix(string)
-        string[/^(\s*)(?:[^\s]|$)/, 1]
+      def after_newline(line_ix)
+        return if ignore? or in_snippet?
+        rules = AutoIndenter.rules_for_scope(document.cursor_scope)
+        if line_ix > 0
+          indentation = document.indentation
+          current_level = indentation.get_level(line_ix - 1)
+          edit_view = document.edit_view
+          analyzer = Analyzer.new(rules, document, edit_view.tab_width, edit_view.soft_tabs?)
+          increase_ignore
+          indentation.set_level(line_ix, analyzer.calculate_for_line(line_ix, true))
+          decrease_ignore
+          prefix = indentation.whitespace_prefix(line_ix)
+          document.cursor_offset = document.offset_at_line(line_ix) + prefix.length
+        end
       end
     end
   end

data/plugins/auto_indenter/lib/auto_indenter/rules.rb

@@ -0,0 +1,41 @@
+
+module Redcar
+  class AutoIndenter
+    class Rules
+      def initialize(increase_indent_pattern, 
+                      decrease_indent_pattern,
+                      indent_next_line_pattern=nil,
+                      unindented_line_pattern=nil)
+        @increase_indent_pattern  = increase_indent_pattern
+        @decrease_indent_pattern  = decrease_indent_pattern
+        @indent_next_line_pattern = indent_next_line_pattern
+        @unindented_line_pattern  = unindented_line_pattern
+      end
+      
+      def increase_indent?(line)
+        if @increase_indent_pattern
+          !!(line =~ @increase_indent_pattern)
+        end
+      end
+      
+      def decrease_indent?(line)
+        if @decrease_indent_pattern
+          !!(line =~ @decrease_indent_pattern)
+        end
+      end
+      
+      def indent_next_line?(line)
+        if @indent_next_line_pattern
+          !!(line =~ @indent_next_line_pattern)
+        end
+      end
+      
+      def unindented_line?(line)
+        if @unindented_line_pattern
+          !!(line =~ @unindented_line_pattern)
+        end
+      end
+    end
+  end
+end
+

data/plugins/auto_indenter/spec/auto_indenter/analyzer_spec.rb

@@ -0,0 +1,151 @@
+
+require File.join(File.dirname(__FILE__), "..", "spec_helper")
+
+include Redcar
+
+describe AutoIndenter::Analyzer do
+  class FakeDocument
+    def initialize(string, tab_width, soft_tabs)
+      @string = string
+      @tab_width, @soft_tab = tab_width, soft_tabs
+    end
+    
+    def get_line(ix)
+      lines[ix] + "\n"
+    end
+    
+    def lines
+      @string.split("\n")
+    end
+    
+    def indentation
+      Document::Indentation.new(self, @tab_width, @soft_tabs)
+    end
+  end
+  
+  describe "with indentation rules like Ruby's" do
+    def should_indent(src, options)
+      simple_rules = AutoIndenter::Rules.new(/def/, /end/)
+      analyzer = AutoIndenter::Analyzer.new(simple_rules, FakeDocument.new(src, 2, true), 2, true)
+      analyzer.calculate_for_line(options[:line]).should == options[:indent]
+    end
+  
+    it "should indent after an increase indent line" do
+      should_indent(<<RUBY, :line => 1, :indent => 1)
+def foo
+# should be indented
+RUBY
+    end
+    
+    it "should decrease indent for a decrease indent line" do
+      should_indent(<<RUBY, :line => 1, :indent => 1)
+    p :adsf
+    end # should be dedented
+  p :adsf
+RUBY
+    end
+  
+    it "should set indent to match previous line" do
+      should_indent(<<RUBY, :line => 3, :indent => 0)
+def foo
+  
+end
+  p :asdf # should be dedented
+RUBY
+    end
+    
+    it "should set indent to match previous line if an increase cancels out a decrease" do
+      should_indent(<<RUBY, :line => 1, :indent => 0)
+def foo
+  end # should be dedented
+RUBY
+    end
+  end
+  
+  describe "with indentation rules like C's" do
+    def should_indent(options)
+      simple_rules = AutoIndenter::Rules.new(
+                        /\{/, 
+                        /\}/, 
+                        /^(?!.*;\s*\/\/).*[^\s;{}]\s*$/, 
+                        /^\s*(\/\/|#).*$/
+                      )
+      analyzer = AutoIndenter::Analyzer.new(simple_rules, FakeDocument.new(source, 4, false), 4, false)
+      analyzer.calculate_for_line(options[:line]).should == options[:indent]
+    end
+    
+    def source
+      t=<<-CSOURCE
+int main (int argc, char const* argv[]) {
+	while(true) {
+		if(something())
+			break;
+#if 3
+		play_awful_music();
+		#else
+		play_nice_music();
+#endif
+	}
+	return 0;
+}
+ 
+if (foo)
+  break;
+ 
+if (foo)
+{
+  d;
+ 
+CSOURCE
+    end
+    
+    it "should set indentation on the first line to 0" do
+      should_indent(:line => 0, :indent => 0)
+    end
+    
+    it "should increase indent" do
+      should_indent(:line => 1,  :indent => 1)
+    end
+    
+    it "should increase indent (2)" do
+      should_indent(:line => 2,  :indent => 2)
+    end
+    
+    it "should indent next line" do
+      should_indent(:line => 3,  :indent => 3)
+      should_indent(:line => 14,  :indent => 1)
+    end
+    
+    it "should leave unindented lines as they are" do
+      should_indent(:line => 4,  :indent => 0)
+      should_indent(:line => 6,  :indent => 2)
+      should_indent(:line => 8,  :indent => 0)
+    end
+    
+    it "should return to indent after unindented line" do
+      should_indent(:line => 7,  :indent => 2)
+    end
+    
+    it "should return to indent after unindented line, and next-line indent before that" do
+      should_indent(:line => 5,  :indent => 2)
+    end
+    
+    it "should decrease indent" do
+      should_indent(:line => 9, :indent => 1)
+      should_indent(:line => 11, :indent => 0)
+    end
+    
+    it "should match indent" do
+      should_indent(:line => 10, :indent => 1)
+    end
+
+    it "should not indent next lines if the next line matches the increase indent" do
+      should_indent(:line => 17, :indent => 0)
+    end
+
+    it "should still increase the indent after an increase indent line after an increase next line" do
+      should_indent(:line => 18, :indent => 1)
+    end
+  end
+end  
+

data/plugins/auto_indenter/spec/spec_helper.rb

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

data/plugins/auto_pairer/lib/auto_pairer.rb

@@ -9,3 +9,4 @@ module Redcar
     end
   end
 end
+

data/plugins/auto_pairer/lib/auto_pairer/document_controller.rb

@@ -93,50 +93,51 @@ module Redcar
       def after_modify
         return if ignore?
         @done = nil
-        
-        # Deleted start of a mark pair
-        if @end_offset == @start_offset + 1 and !@ignore_delete
-          mark_pair = find_mark_pair_by_start(@start_offset)
-          if mark_pair
+        document.controllers(AutoIndenter::DocumentController).first.disable do
+          # Deleted start of a mark pair
+          if @end_offset == @start_offset + 1 and !@ignore_delete
+            mark_pair = find_mark_pair_by_start(@start_offset)
+            if mark_pair
+              @ignore_delete = true
+              document.delete(mark_pair.end_mark.get_offset, 1)
+              @ignore_delete = false
+              @mark_pairs.delete(mark_pair)
+              @deletion = nil
+            end
+          end
+          
+          # Type over ends
+          if @type_over_end
+            @type_over_end = false
             @ignore_delete = true
-            document.delete(mark_pair.end_mark.get_offset, 1)
-            @ignore_delete = false
-            @mark_pairs.delete(mark_pair)
-            @deletion = nil
+            document.delete(@end_offset, 1)
+            @ignore_delete = nil
+            document.cursor_offset += 1
+            #@buffer.parser.start_parsing
+            @done = true
+          end
+          
+          # Insert matching ends
+          if @insert_end and !@ignore_insert
+            @ignore_insert = true
+            endtext = @rules[@text]
+            document.insert(@start_offset + 1, endtext)
+            mark1 = document.create_mark(@start_offset - 1,     :right)
+            mark2 = document.create_mark(@start_offset, :right)
+            add_mark_pair(MarkPair.new(mark1, mark2, @text, endtext))
+            @ignore_insert = false
+            #@buffer.parser.start_parsing
+            @insert_end = false
+          end
+          
+          if @selected_text and !@ignore_insert
+            @ignore_insert = true
+            offset = document.cursor_offset
+            document.insert(@start_offset, @selected_text)
+            document.cursor_offset = offset + @selected_text.length + 1
+            @ignore_insert = false
+            @selected_text = nil
           end
-        end
-        
-        # Type over ends
-        if @type_over_end
-          @type_over_end = false
-          @ignore_delete = true
-          document.delete(@end_offset, 1)
-          @ignore_delete = nil
-          document.cursor_offset += 1
-          #@buffer.parser.start_parsing
-          @done = true
-        end
-
-        # Insert matching ends
-        if @insert_end and !@ignore_insert
-          @ignore_insert = true
-          endtext = @rules[@text]
-          document.insert(@start_offset + 1, endtext)
-          mark1 = document.create_mark(@start_offset - 1,     :right)
-          mark2 = document.create_mark(@start_offset, :right)
-          add_mark_pair(MarkPair.new(mark1, mark2, @text, endtext))
-          @ignore_insert = false
-          #@buffer.parser.start_parsing
-          @insert_end = false
-        end
-        
-        if @selected_text and !@ignore_insert
-          @ignore_insert = true
-          offset = document.cursor_offset
-          document.insert(@start_offset, @selected_text)
-          document.cursor_offset = offset + @selected_text.length + 1
-          @ignore_insert = false
-          @selected_text = nil
         end
         false
       end

data/plugins/auto_pairer/lib/auto_pairer/pairs_for_scope.rb

@@ -5,10 +5,7 @@ module Redcar
         @autopair_rules ||= begin
           rules = Hash.new {|h, k| h[k] = {}}
           @autopair_default = nil
-          start = Time.now
-          pair_settings = Textmate.all_settings.select do |setting|
-            setting.is_a?(Textmate::SmartTypingPairsSetting)
-          end
+          pair_settings = Textmate.settings(Textmate::SmartTypingPairsSetting)
           pair_settings.each do |setting|
             if setting.scope
               rules[setting.scope] = Hash[*setting.pairs.flatten]
@@ -19,7 +16,6 @@ module Redcar
           if @autopair_default
             @autopair_default1 = @autopair_default.invert
           end
-          puts "loaded autopair rules in #{Time.now - start}s"
           rules.default = nil
           rules
         end