diff options
| author | Kornelius Kalnbach <murphy@rubychan.de> | 2016-02-13 15:57:11 +0100 |
|---|---|---|
| committer | Kornelius Kalnbach <murphy@rubychan.de> | 2016-02-13 15:57:11 +0100 |
| commit | 8d908474eff99a0a653bbc94f459537d56b83e92 (patch) | |
| tree | 4b066ea50ca5f95f07782d0c58f8081c4c3ef39f /lib/coderay/scanners/diff.rb | |
| parent | bf395bd14ed7f63aab84955f6768f59965e3a73e (diff) | |
| parent | 0a1f500d524ff0fb5eeafef051ccbb641954a87a (diff) | |
| download | coderay-8d908474eff99a0a653bbc94f459537d56b83e92.tar.gz | |
Merge branch 'master' into cleanup-outputcleanup-output
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(/.*/) } |