diff options
Diffstat (limited to 'lib/gitlab/conflict/file.rb')
| -rw-r--r-- | lib/gitlab/conflict/file.rb | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/gitlab/conflict/file.rb b/lib/gitlab/conflict/file.rb index 598bf2a2612..bbabcf265f3 100644 --- a/lib/gitlab/conflict/file.rb +++ b/lib/gitlab/conflict/file.rb @@ -75,11 +75,17 @@ module Gitlab return @sections if @sections chunked_lines = lines.chunk { |line| line.type.nil? } + last_candidate_match_header = nil + match_line_header = nil match_line = nil @sections = chunked_lines.flat_map.with_index do |(no_conflict, lines), i| section = nil + lines.each do |line| + last_candidate_match_header = " #{line.text}" if line.text.match(/\A[A-Za-z$_]/) + end + if no_conflict conflict_before = i > 0 conflict_after = chunked_lines.peek @@ -88,6 +94,7 @@ module Gitlab if lines.length > CONTEXT_LINES * 2 tail_lines = lines.last(CONTEXT_LINES) first_tail_line = tail_lines.first + match_line_header = last_candidate_match_header match_line = Gitlab::Diff::Line.new('', 'match', first_tail_line.index, @@ -107,7 +114,7 @@ module Gitlab end if match_line && !section - match_line.text = "@@ -#{match_line.old_pos},#{lines.last.old_pos} +#{match_line.new_pos},#{lines.last.new_pos} @@" + match_line.text = "@@ -#{match_line.old_pos},#{lines.last.old_pos} +#{match_line.new_pos},#{lines.last.new_pos} @@#{match_line_header}" end section ||= { conflict: !no_conflict, lines: lines } |