simplify multiline diff regexp

korny · korny · commit c044a7a6eaba · 2011-12-12T04:50:36.000+01:00
diff --git a/lib/coderay/scanners/diff.rb b/lib/coderay/scanners/diff.rb
@@ -102,7 +102,7 @@ def scan_tokens encoder, options
             next
           elsif match = scan(/-/)
             deleted_lines_count += 1
-            if options[:inline_diff] && deleted_lines_count == 1 && (changed_lines_count = 1 + check(/(?>.*(?:\n\-.*)*)/).count("\n")) && match?(/(?>.*(?:\n\-.*){#{changed_lines_count - 1}}(?:\n\+.*){#{changed_lines_count}})$(?!\n\+)/)
+            if options[:inline_diff] && deleted_lines_count == 1 && (changed_lines_count = 1 + check(/.*(?:\n\-.*)*/).count("\n")) && match?(/(?>.*(?:\n\-.*){#{changed_lines_count - 1}}(?:\n\+.*){#{changed_lines_count}})$(?!\n\+)/)
               deleted_lines  = Array.new(changed_lines_count) { |i| skip(/\n\-/) if i > 0; scan(/.*/) }
               inserted_lines = Array.new(changed_lines_count) { |i| skip(/\n\+/)         ; scan(/.*/) }
               
diff --git a/lib/coderay/scanners/erb.rb b/lib/coderay/scanners/erb.rb
@@ -41,7 +41,7 @@ def reset_instance
     end
     
     def scan_tokens encoder, options
-      
+      # FIXME: keep_state
       until eos?
         
         if (match = scan_until(/(?=#{START_OF_ERB})/o) || scan_rest) and not match.empty?
