diff options
author | Kornelius Kalnbach <murphy@rubychan.de> | 2015-12-24 14:57:34 +0100 |
---|---|---|
committer | Kornelius Kalnbach <murphy@rubychan.de> | 2015-12-24 14:57:34 +0100 |
commit | e93cdf6cc6b8fb9179fa82a1f9bad77eae1e9830 (patch) | |
tree | 71d532341f1e5603fadd8a3e880c346f77ae72d3 /lib | |
parent | 7aa6ea080d05b7e6a70b076b25f37b72fd7669ad (diff) | |
parent | cb18c6af5f53cba503fb9704ce656596ae3db075 (diff) | |
download | coderay-e93cdf6cc6b8fb9179fa82a1f9bad77eae1e9830.tar.gz |
Merge branch 'master' into possible-speedups
Diffstat (limited to 'lib')
-rw-r--r-- | lib/coderay/scanners/diff.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/coderay/scanners/diff.rb b/lib/coderay/scanners/diff.rb index fd1aed6..74a6c27 100644 --- a/lib/coderay/scanners/diff.rb +++ b/lib/coderay/scanners/diff.rb @@ -100,7 +100,7 @@ module Scanners 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")) && changed_lines_count <= 100_000 && 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(/.*/) } |