diff options
| author | Kornelius Kalnbach <murphy@rubychan.de> | 2016-02-13 16:01:53 +0100 |
|---|---|---|
| committer | Kornelius Kalnbach <murphy@rubychan.de> | 2016-02-13 16:01:53 +0100 |
| commit | 5fdb49307543a218e4bc47e181003c77f181eccf (patch) | |
| tree | b29a9d9d99877980c8d29c33a11f838830859104 /lib/coderay/scanners/diff.rb | |
| parent | d79c6ba2008bff7b65029bc50717ca679c43fb5f (diff) | |
| parent | 0a1f500d524ff0fb5eeafef051ccbb641954a87a (diff) | |
| download | coderay-5fdb49307543a218e4bc47e181003c77f181eccf.tar.gz | |
Merge branch 'master' into escape-utils
Diffstat (limited to 'lib/coderay/scanners/diff.rb')
| -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(/.*/) } |