avoid empty tokens in Diff output, fix split_into_parts

korny · korny · commit 667d4262e42b · 2013-06-09T06:24:29.000+02:00
diff --git a/lib/coderay/scanners/diff.rb b/lib/coderay/scanners/diff.rb
@@ -45,7 +45,7 @@ def scan_tokens encoder, options
           if match = scan(/--- |\+\+\+ |=+|_+/)
             encoder.begin_line line_kind = :head
             encoder.text_token match, :head
-            if match = scan(/.*?(?=$|[\t\n\x00]|  \(revision)/)
+            if match = scan(/.+?(?=$|[\t\n\x00]|  \(revision)/)
               encoder.text_token match, :filename
               if options[:highlight_code] && match != '/dev/null'
                 file_type = CodeRay::FileType.fetch(match, :text)
diff --git a/lib/coderay/tokens.rb b/lib/coderay/tokens.rb
@@ -93,6 +93,7 @@ def method_missing meth, options = {}
     # This method is used by @Scanner#tokenize@ when called with an Array
     # of source strings. The Diff encoder uses it for inline highlighting.
     def split_into_parts *sizes
+      return Array.new(sizes.size) { Tokens.new } if size == 2 && first == ''
       parts = []
       opened = []
       content = nil
