redcar 0.3.2dev → 0.3.3

data/plugins/edit_view/lib/edit_view/actions/arrow_keys.rb

@@ -0,0 +1,121 @@
+module Redcar
+  class EditView
+    module Actions
+  
+      class ArrowHandler
+        def self.real_offset_to_imaginary(line, width, offset)
+          before = line[0...offset]
+          before.length + (width - 1)*before.scan("\t").length
+        end
+  
+        def self.imaginary_offset_to_real(line, width, offset)
+          real_ix = 0
+          imaginary_ix = 0
+          prev_real_ix = 0
+          prev_imaginary_ix = 0
+          sc = StringScanner.new(line)
+          while sc.skip(/[^\t]*\t/)
+            prev_real_ix = real_ix
+            prev_imaginary_ix = imaginary_ix
+            imaginary_ix += sc.pos - real_ix + width - 1
+            real_ix = sc.pos
+            if imaginary_ix > offset
+              return prev_real_ix + (offset - prev_imaginary_ix)
+            elsif imaginary_ix == offset
+              return real_ix
+            end
+          end
+          real_ix + offset - imaginary_ix
+        end
+      end
+      
+      class ArrowLeftHandler < ArrowHandler
+        def self.handle(edit_view, modifiers)
+          return if (modifiers & %w(Alt Cmd Ctrl)).any?
+          return if edit_view.document.block_selection_mode?
+          doc = edit_view.document
+          if modifiers.include?("Shift")
+            old_selection_offset = doc.selection_offset
+            doc.set_selection_range(move_left_offset(edit_view), old_selection_offset)
+          else
+            doc.cursor_offset = move_left_offset(edit_view)
+          end
+        end
+        
+        def self.move_left_offset(edit_view)
+          doc = edit_view.document
+          return 0                     if doc.cursor_offset == 0
+          return doc.cursor_offset - 1 if doc.cursor_line_offset == 0
+          if edit_view.soft_tabs?
+            line = doc.get_line(doc.cursor_line)
+            width = edit_view.tab_width
+            imaginary_cursor_offset = real_offset_to_imaginary(line, width, doc.cursor_line_offset)
+            if imaginary_cursor_offset % width == 0
+              tab_stop = imaginary_cursor_offset/width - 1
+            else
+              tab_stop = imaginary_cursor_offset/width
+            end
+            tab_stop_offset = tab_stop*width
+            next_tab_stop_offset = tab_stop_offset + width
+            if line.length >= imaginary_offset_to_real(line, width, next_tab_stop_offset)
+              before_line = line[imaginary_offset_to_real(line, width, tab_stop_offset)...doc.cursor_line_offset]
+              if match = before_line.match(/\s+$/)
+                doc.cursor_offset - match[0].length
+              else
+                doc.cursor_offset - 1
+              end
+            else
+              doc.cursor_offset - 1
+            end
+          else
+            doc.cursor_offset - 1
+          end
+        end
+      end
+      
+      class ArrowRightHandler < ArrowHandler
+        def self.handle(edit_view, modifiers)
+          return if (modifiers & %w(Alt Cmd Ctrl)).any?
+          return if edit_view.document.block_selection_mode?
+          doc = edit_view.document
+          
+          if modifiers.include?("Shift")
+            old_selection_offset = doc.selection_offset
+            doc.set_selection_range(move_right_offset(edit_view), old_selection_offset)
+          else
+            doc.cursor_offset = move_right_offset(edit_view)
+          end
+        end
+        
+        def self.move_right_offset(edit_view)
+          doc = edit_view.document
+          [move_right_offset1(edit_view), doc.length].min
+        end
+        
+        def self.move_right_offset1(edit_view)
+          doc = edit_view.document
+          return doc.length if doc.cursor_offset == doc.length - 1
+          if edit_view.soft_tabs?
+            line = doc.get_line(doc.cursor_line)
+            width = edit_view.tab_width
+            imaginary_cursor_offset = real_offset_to_imaginary(line, width, doc.cursor_line_offset)
+            tab_stop = imaginary_cursor_offset/width + 1
+            tab_stop_offset = tab_stop*width
+            if line.length >= imaginary_offset_to_real(line, width, tab_stop_offset)
+              after_line = line[doc.cursor_line_offset...imaginary_offset_to_real(line, width, tab_stop_offset)]
+              if match = after_line.match(/^\s+/)
+                doc.cursor_offset + match[0].length
+              else
+                doc.cursor_offset + 1
+              end
+            else
+              doc.cursor_offset + 1
+            end
+          else
+            doc.cursor_offset + 1
+          end
+        end
+      end
+    end
+  end
+end

data/plugins/edit_view/lib/edit_view/actions/deletion.rb

@@ -0,0 +1,30 @@
+
+module Redcar
+  class EditView
+    module Actions
+      class DeleteHandler
+        def self.handle(edit_view, modifiers)
+          return if modifiers.any?
+          return if edit_view.document.selection?
+          return if edit_view.document.block_selection_mode?
+          doc = edit_view.document
+          old_offset = doc.cursor_offset
+          new_offset = ArrowRightHandler.move_right_offset(edit_view)
+          doc.delete(old_offset, new_offset - old_offset)
+        end
+      end
+      
+      class BackspaceHandler
+        def self.handle(edit_view, modifiers)
+          return if modifiers.any?
+          return if edit_view.document.selection?
+          return if edit_view.document.block_selection_mode?
+          doc = edit_view.document
+          old_offset = doc.cursor_offset
+          new_offset = ArrowLeftHandler.move_left_offset(edit_view)
+          doc.delete(new_offset, old_offset - new_offset)
+        end
+      end
+    end
+  end
+end

data/plugins/edit_view/lib/edit_view/actions/tab.rb

@@ -0,0 +1,66 @@
+module Redcar
+  class EditView
+    module Actions
+      class IndentTabHandler
+        def self.handle(edit_view, modifiers)
+          return false if modifiers.any?
+          doc = edit_view.document
+          if doc.block_selection_mode?
+            if edit_view.soft_tabs?
+              selections = doc.selection_ranges.map do |selection_range|
+                line = doc.line_at_offset(selection_range.begin)
+                line_offset = doc.offset_at_line(line)
+                line_offset_start = selection_range.begin - line_offset
+                line_offset_end = selection_range.end - line_offset
+                [line, line_offset_start, line_offset_end]
+              end
+              length = 0
+              selections.each do |line, line_offset_start, line_offset_end|
+                line_offset = doc.offset_at_line(line)
+                doc.replace(line_offset + line_offset_start, line_offset_end - line_offset_start, " "*(line_offset_end - line_offset_start))
+                length = line_offset_end - line_offset_start
+              end
+              line = doc.get_line(doc.cursor_line)
+              width = edit_view.tab_width
+              imaginary_cursor_offset = ArrowHandler.real_offset_to_imaginary(line, width, doc.cursor_line_offset)
+              next_tab_stop_offset = (imaginary_cursor_offset/width + 1)*width
+              insert_string = " "*(next_tab_stop_offset - imaginary_cursor_offset)
+              selections.each do |line, line_offset_start, line_offset_end|
+                line_offset = doc.offset_at_line(line)
+                doc.insert(line_offset + line_offset_start, insert_string)
+              end
+              new_selection_ranges = selections.map do |line, line_offset_start, line_offset_end|
+                offset = doc.offset_at_line(line) + line_offset_end + insert_string.length
+                [offset, offset]
+              end
+              doc.set_selection_range(new_selection_ranges.last.last, new_selection_ranges.first.first)
+              true
+            else
+              false
+            end
+          else
+            if doc.selection?
+              bits = [doc.cursor_offset, doc.selection_offset].sort
+              start = bits.first
+              length = bits.last - bits.first
+              doc.delete(start, length)
+            end
+            if edit_view.soft_tabs?
+              line = doc.get_line(doc.cursor_line)
+              width = edit_view.tab_width
+              imaginary_cursor_offset = ArrowHandler.real_offset_to_imaginary(line, width, doc.cursor_line_offset)
+              next_tab_stop_offset = (imaginary_cursor_offset/width + 1)*width
+              insert_string = " "*(next_tab_stop_offset - imaginary_cursor_offset)
+              doc.insert(doc.cursor_offset, insert_string)
+              doc.cursor_offset = doc.cursor_offset + insert_string.length
+            else
+              doc.insert(doc.cursor_offset, "\t")
+              doc.cursor_offset += 1
+            end
+            true
+          end
+        end
+      end
+    end
+  end
+end

data/plugins/edit_view/lib/edit_view/command.rb

@@ -3,8 +3,6 @@ module Redcar
 
     sensitize :edit_tab_focussed
     
-    private
-    
     def doc
       tab.edit_view.document
     end

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

@@ -57,6 +57,17 @@ module Redcar
       @mirror ? @mirror.title : nil
     end
     
+    # helper method to get
+    # the mirror's path
+    # if it has one
+    def path
+      if @mirror && @mirror.respond_to?(:path) && @mirror.path
+        @mirror.path
+      else
+        nil
+      end
+    end
+    
     def mirror=(new_mirror)
       notify_listeners(:new_mirror, new_mirror) do
         @mirror = new_mirror
@@ -81,7 +92,7 @@ module Redcar
         controller.after_modify
       end
       @controllers[Controller::NewlineCallback].each do |controller|
-        if text == "\n"
+        if text == "\n" or text == "\r\n"
           controller.after_newline(line_at_offset(start_offset) + 1)
         end
       end
@@ -100,28 +111,8 @@ module Redcar
       notify_listeners(:selection_range_changed, start_offset..end_offset)
     end
     
-    # The line index the cursor is on (zero-based)
-    #
-    # @return [Integer]
-    def cursor_line
-      line_at_offset(cursor_offset)
-    end
-    
-    
-    def cursor_line_start_offset
-      offset_at_line(cursor_line)
-    end
-    
-    def cursor_line_end_offset
-      offset_at_line_end(cursor_line)
-    end
-    
-    def offset_at_line_end(line_ix)
-      if line_ix == line_count - 1
-        end_offset = length
-      else
-        end_offset = offset_at_line(line_ix + 1)
-      end
+    def single_line?
+      controller.single_line?
     end
     
     # Is there any text selected? (Or equivalently, is the length
@@ -137,6 +128,7 @@ module Redcar
     # @param [Integer] offset  character offset from the start of the document
     # @param [String] text  text to insert
     def insert(offset, text)
+      text = text.gsub("\n", "") if single_line?
       replace(offset, 0, text)
     end
     
@@ -154,6 +146,7 @@ module Redcar
     # @param [Integer] length  length of text to replace
     # @param [String] text  replacement text
     def replace(offset, length, text)
+      text = text.gsub("\n", "") if single_line?
       controller.replace(offset, length, text)
     end
     
@@ -183,6 +176,10 @@ module Redcar
     # @param [String] text  new text
     def text=(text)
       controller.text = text
+    end    
+	
+    def controller_text
+      controller.text
     end
     
     # Get the line index of the given offset
@@ -219,6 +216,29 @@ module Redcar
       controller.cursor_offset = offset
     end
     
+    # The line index the cursor is on (zero-based)
+    #
+    # @return [Integer]
+    def cursor_line
+      line_at_offset(cursor_offset)
+    end
+    
+    def cursor_line_start_offset
+      offset_at_line(cursor_line)
+    end
+    
+    def cursor_line_end_offset
+      offset_at_line_end(cursor_line)
+    end
+    
+    def offset_at_line_end(line_ix)
+      if line_ix == line_count - 1
+        end_offset = length
+      else
+        end_offset = offset_at_line(line_ix + 1)
+      end
+    end
+    
     # The range of text selected by the user.
     #
     # @return [Range<Integer>] a range between two character offsets
@@ -233,11 +253,21 @@ module Redcar
       controller.selection_ranges
     end
     
-    # Set the range of text selected by the user.
+    def selection_offset
+      controller.selection_offset
+    end
+    
+    # Set the range of text selected by the user. 
     #
-    # @param [Range<Integer>] range   a range between two character offsets
-    def set_selection_range(range)
-      controller.set_selection_range(range.begin, range.end)
+    # @param [Integer] cursor_offset
+    # @param [Integer] selection_offset
+    def set_selection_range(cursor_offset, selection_offset)
+      controller.set_selection_range(cursor_offset, selection_offset)
+    end
+    
+    # Select all text in the document.
+    def select_all
+      set_selection_range(length, 0)
     end
     
     # Get the text selected by the user. If no text is selected
@@ -277,6 +307,11 @@ module Redcar
       )
     end
     
+    # Get all text
+    def get_all_text
+      get_range(0, length)
+    end
+    
     # Replace a line in the document. This has two modes. In the first, 
     # you supply the replacement text as an argument:
     #

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

@@ -0,0 +1,11 @@
+module Redcar
+  class DocumentCommand < Command
+    sensitize :edit_view_focussed
+    
+    private
+    
+    def doc
+      EditView.focussed_edit_view.document
+    end
+  end
+end

data/plugins/edit_view/lib/edit_view/edit_tab.rb

@@ -9,10 +9,11 @@ module Redcar
     end
     
     def create_edit_view
-      @edit_view = Redcar::EditView.new(self)
+      @edit_view = Redcar::EditView.new
       @edit_view.add_listener(:focussed, &method(:edit_view_focussed))
       @edit_view.document.add_listener(:changed) { notify_listeners(:changed, self) }
       @edit_view.document.add_listener(:selection_range_changed) { notify_listeners(:selection_changed) }
+      @edit_view.add_listener(:title_changed) { |newt| self.title = newt }
     end
     
     def edit_view_focussed

data/plugins/edit_view/lib/edit_view/info_speedbar.rb

@@ -0,0 +1,69 @@
+module Redcar
+  class EditView
+    class InfoSpeedbar < Speedbar
+      def self.grammar_names
+        bundles  = JavaMateView::Bundle.bundles.to_a
+        grammars = bundles.map {|b| b.grammars.to_a}.flatten
+        items    = grammars.map {|g| g.name}.sort_by {|name| name.downcase }
+      end
+      
+      combo :grammar do |new_grammar|
+        @tab.edit_view.grammar = new_grammar
+      end
+      
+      combo :tab_width, TabSettings::TAB_WIDTHS, TabSettings::DEFAULT_TAB_WIDTH do |new_tab_width|
+        @tab.edit_view.tab_width = new_tab_width.to_i
+      end
+      
+      toggle :soft_tabs, "Soft Tabs", nil, true do |new_value|
+        @tab.edit_view.soft_tabs = new_value
+      end
+      
+      def initialize(command, tab)
+        @command = command
+        tab_changed(tab)
+      end
+      
+      def tab_changed(new_tab)
+        if @tab
+          remove_handlers
+        end
+        if new_tab.is_a?(EditTab)
+          @tab = new_tab
+          grammar.items = InfoSpeedbar.grammar_names
+          grammar.value = @tab.edit_view.grammar
+          tab_width.value = @tab.edit_view.tab_width.to_s #EditView.tab_settings.width_for(@tab.edit_view.grammar).to_s
+          soft_tabs.value = @tab.edit_view.soft_tabs?     #EditView.tab_settings.softness_for(@tab.edit_view.grammar)
+          @width_handler = @tab.edit_view.add_listener(:tab_width_changed) do |new_value|
+            tab_width.value = new_value.to_s
+          end
+          @softness_handler = @tab.edit_view.add_listener(:softness_changed) do |new_value|
+            soft_tabs.value = new_value
+          end
+          @grammar_handler = @tab.edit_view.add_listener(:grammar_changed) do |new_grammar|
+            grammar.value = new_grammar
+          end
+        end
+      end
+      
+      def remove_handlers
+        @tab.edit_view.remove_listener(@width_handler)
+        @tab.edit_view.remove_listener(@grammar_handler)
+        @tab.edit_view.remove_listener(@softness_handler)
+      end        
+      
+      def close
+        if @tab
+          remove_handlers
+        end
+      end
+    end
+    
+    class InfoSpeedbarCommand < Redcar::EditTabCommand
+      def execute
+        @speedbar = InfoSpeedbar.new(self, tab)
+        win.open_speedbar(@speedbar)
+      end
+    end
+  end
+end