Don't modify "match" diff lines. #3945
This commit is contained in:
parent
8b079315d9
commit
fd100e1ef1
2 changed files with 11 additions and 1 deletions
|
@ -25,7 +25,12 @@ module Gitlab
|
|||
|
||||
def update_diff_lines
|
||||
@highlighted_code.lines.each_with_index do |line, i|
|
||||
@diff_lines[i].text = "#{@diff_line_prefixes[i]}#{line}"
|
||||
diff_line = @diff_lines[i]
|
||||
|
||||
# ignore highlighting for "match" lines
|
||||
next if diff_line.type == 'match'
|
||||
|
||||
diff_line.text = "#{@diff_line_prefixes[i]}#{line}"
|
||||
end
|
||||
|
||||
@diff_lines
|
||||
|
|
|
@ -24,5 +24,10 @@ describe Gitlab::Diff::Highlight, lib: true do
|
|||
it 'should keep the inline diff markup' do
|
||||
expect(diff_lines[5].text).to match(Regexp.new(Regexp.escape('<span class="idiff">RuntimeError, </span>')))
|
||||
end
|
||||
|
||||
it 'should not modify "match" lines' do
|
||||
expect(diff_lines[0].text).to eq('@@ -6,12 +6,18 @@ module Popen')
|
||||
expect(diff_lines[22].text).to eq('@@ -19,6 +25,7 @@ module Popen')
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue