kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Extended regexes ignore whitespace, so use \s

Browse source
This commit is contained in:
Douwe Maan 2016-07-12 11:25:39 -05:00
parent f5cc3f63a8
commit e981d6cd0d
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/gitlab/diff/inline_diff.rb
View file

@ -4,7 +4,7 @@ module Gitlab
# Regex to find a run of deleted lines followed by the same number of added lines # Regex to find a run of deleted lines followed by the same number of added lines
REGEX = %r{ REGEX = %r{
# Runs start at the beginning of the string (the first line) or after a space (for an unchanged line) # Runs start at the beginning of the string (the first line) or after a space (for an unchanged line)
(?:\A| ) (?:\A|\s)
# This matches a number of `-`s followed by the same number of `+`s through recursion # This matches a number of `-`s followed by the same number of `+`s through recursion
(?<del_ins> (?<del_ins>
@ -14,7 +14,7 @@ module Gitlab
) )
# Runs end at the end of the string (the last line) or before a space (for an unchanged line) # Runs end at the end of the string (the last line) or before a space (for an unchanged line)
(?= |\z) (?=\s|\z)
}x.freeze }x.freeze
attr_accessor :old_line, :new_line, :offset attr_accessor :old_line, :new_line, :offset