redcar 0.3.4.1 → 0.3.4.2

data/CHANGES

@@ -16,6 +16,10 @@ Internal changes:
   * Textmate plugin for dealing with Textmate bundles.
   * Application focus in/out events.
   
+Fixes:
+
+  * Respects Windows style line delimiters
+  
 New contributors:
 
   * Aaron McLeod

data/Rakefile

@@ -75,7 +75,7 @@ end
 
 spec = Gem::Specification.new do |s|
   s.name              = "redcar"
-  s.version           = "0.3.4.1"
+  s.version           = "0.3.4.2"
   s.summary           = "A JRuby text editor."
   s.author            = "Daniel Lucraft"
   s.email             = "dan@fluentradical.com"

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

@@ -7,7 +7,7 @@ module Redcar
       
       def after_newline(line_ix)
         if line_ix > 0
-          previous_line     = document.get_line(line_ix - 1).gsub("\n", "")
+          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)

data/plugins/core/spec/core/storage_spec.rb

@@ -64,7 +64,7 @@ describe Redcar::Plugin::Storage do
     storage['a'].should == 'b'
     sleep 1 # windows doesn't have finer granularity than this
     File.open(storage.send(:path), 'w') do |f|
-      f.write "---
+      f.write "---
                 a: new"
     end    
     storage['a'].should == 'new'

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

@@ -44,8 +44,8 @@ module Redcar
         
         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
+          return 0                                    if doc.cursor_offset == 0
+          return doc.cursor_offset - doc.delim.length if doc.cursor_line_offset == 0
           if edit_view.soft_tabs?
             line = doc.get_line(doc.cursor_line)
             width = edit_view.tab_width

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

@@ -96,7 +96,7 @@ module Redcar
         end
       end
       @controllers[Controller::NewlineCallback].each do |controller|
-        if text == "\n" or text == "\r\n"
+        if text == line_delimiter
           rescue_document_controller_error(controller) do
             controller.after_newline(line_at_offset(start_offset) + 1)
           end
@@ -129,6 +129,17 @@ module Redcar
       controller.single_line?
     end
     
+    # Returns the line delimiter for this document. Either
+    # \n or \r\n. It will attempt to detect the delimiter from the document
+    # or it will default to the platform delimiter.
+    #
+    # @return [String]
+    def line_delimiter
+      controller.get_line_delimiter
+    end
+
+    alias :delim :line_delimiter 
+    
     # Is there any text selected? (Or equivalently, is the length
     # of the selection equal to 0)
     #
@@ -142,7 +153,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?
+      text = text.gsub(delim, "") if single_line?
       replace(offset, 0, text)
     end
     
@@ -167,7 +178,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?
+      text = text.gsub(delim, "") if single_line?
       controller.replace(offset, length, text)
     end
     
@@ -359,14 +370,14 @@ module Redcar
       replace(start_offset, end_offset - start_offset, text)
     end
     
-    # Get the offset at the end of a given line, *before* the newline character.
+    # Get the offset at the end of a given line, *before* the line delimiter.
     #
     # @param [Integer] line_ix  a zero-based line index
     def offset_at_inner_end_of_line(line_ix)
       if line_ix == line_count - 1
         length
       else
-        offset_at_line(line_ix + 1) - 1
+        offset_at_line(line_ix + 1) - delim.length
       end
     end
     

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

@@ -33,6 +33,10 @@ module Redcar
         jface_document.get_number_of_lines
       end
       
+      def get_line_delimiter
+        styledText.get_line_delimiter
+      end
+      
       def line_at_offset(offset)
         jface_document.get_line_of_offset(offset)
       end

data/plugins/project/lib/project/file_mirror.rb

@@ -55,7 +55,7 @@ module Redcar
       #
       # @return [String]
       def title
-        @path.split("/").last
+        @path.split(/\/|\\/).last
       end
       
       private

data/plugins/redcar/redcar.rb

@@ -544,7 +544,7 @@ module Redcar
 
         link "Cmd+Shift+R",     PluginManagerUi::ReloadLastReloadedCommand
         
-        link "Cmd+Shift+S", Snippets::OpenSnippetExplorer
+        link "Cmd+Alt+S", Snippets::OpenSnippetExplorer
         #Textmate.attach_keybindings(self, :osx)
       end
 
@@ -586,7 +586,7 @@ module Redcar
         link "Ctrl+Page Down",     SwitchTabUpCommand
         link "Ctrl+Shift+R",     PluginManagerUi::ReloadLastReloadedCommand
         
-        link "Ctrl+Shift+S", Snippets::OpenSnippetExplorer
+        link "Ctrl+Alt+S", Snippets::OpenSnippetExplorer
         #Textmate.attach_keybindings(self, :linux)
 
       end

data/plugins/repl/lib/repl/internal_mirror.rb

@@ -106,13 +106,13 @@ module Redcar
           orig_stdout = $stdout
           stdout_handler = StringIO.new
           $stdout = stdout_handler
-
-          result = eval(command, @binding)
-
-          $stdout.rewind
-          @output = $stdout.read
-
-          $stdout = orig_stdout
+          begin
+            result = eval(command, @binding)
+          ensure
+            $stdout.rewind
+            @output = $stdout.read
+            $stdout = orig_stdout
+          end
           result
         end
       end

data/plugins/textmate/lib/textmate/environment.rb

@@ -9,7 +9,9 @@ module Redcar
         current_scope = nil
         if document = Redcar::EditView.focussed_edit_view_document
           line = document.get_line(document.cursor_line)
-          line = line[0..-2] if line[-1..-1] == "\n"
+          if line =~ /#{document.delim}$/
+            line = line[0..(-1*document.delim.length - 1)]
+          end
           @env['TM_CURRENT_LINE'] = line
           @env['TM_LINE_INDEX'] = document.cursor_line_offset.to_s
           @env['TM_LINE_NUMBER'] = (document.cursor_line + 1).to_s

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: redcar
 version: !ruby/object:Gem::Version 
-  version: 0.3.4.1
+  version: 0.3.4.2
 platform: ruby
 authors: 
 - Daniel Lucraft
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-07 00:00:00 +00:00
+date: 2010-03-08 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency