Add line code to parallel diff for linking.
This commit is contained in:
parent
9c3935c5b0
commit
ac6a107ac7
|
@ -36,7 +36,7 @@ module DiffHelper
|
|||
|
||||
# Building array of lines
|
||||
#
|
||||
# [left_type, left_line_number, left_line_content, right_line_type, right_line_number, right_line_content]
|
||||
# [left_type, left_line_number, left_line_content, line_code, right_line_type, right_line_number, right_line_content]
|
||||
#
|
||||
diff_file.diff_lines.each do |line|
|
||||
|
||||
|
@ -53,10 +53,10 @@ module DiffHelper
|
|||
next_line = next_line.text
|
||||
end
|
||||
|
||||
line = [type, line_old, full_line, next_type, line_new]
|
||||
line = [type, line_old, full_line, line_code, next_type, line_new]
|
||||
if type == 'match' || type.nil?
|
||||
# line in the right panel is the same as in the left one
|
||||
line = [type, line_old, full_line, type, line_new, full_line]
|
||||
line = [type, line_old, full_line, line_code, type, line_new, full_line]
|
||||
lines.push(line)
|
||||
elsif type == 'old'
|
||||
if next_type == 'new'
|
||||
|
@ -78,7 +78,7 @@ module DiffHelper
|
|||
next
|
||||
else
|
||||
# Change is only on the right side, left side has no change
|
||||
line = [nil, nil, " ", type, line_new, full_line]
|
||||
line = [nil, nil, " ", line_code, type, line_new, full_line]
|
||||
lines.push(line)
|
||||
end
|
||||
end
|
||||
|
|
|
@ -5,21 +5,22 @@
|
|||
- type_left = line[0]
|
||||
- line_number_left = line[1]
|
||||
- line_content_left = line[2]
|
||||
- type_right = line[3]
|
||||
- line_number_right = line[4]
|
||||
- line_content_right = line[5]
|
||||
- line_code = line[3]
|
||||
- type_right = line[4]
|
||||
- line_number_right = line[5]
|
||||
- line_content_right = line[6]
|
||||
|
||||
%tr.line_holder.parallel
|
||||
%tr.line_holder.parallel{id: line_code}
|
||||
- if type_left == 'match'
|
||||
= render "projects/diffs/match_line_parallel", { line: line_content_left,
|
||||
line_old: line_number_left, line_new: line_number_right }
|
||||
- elsif type_left == 'old' || type_left.nil?
|
||||
%td.old_line{class: "#{type_left}"}
|
||||
= link_to raw(line_number_left)
|
||||
%td.line_content{class: "parallel noteable_line #{type_left}" }= raw line_content_left
|
||||
= link_to raw(line_number_left), "##{line_code}", id: line_code
|
||||
%td.line_content{class: "parallel noteable_line #{type_left} #{line_code}", "line_code" => line_code }= raw line_content_left
|
||||
%td.new_line{ class: "#{type_right == 'new' ? 'new' : nil}", data: { linenumber: line_number_right }}
|
||||
= link_to raw(line_number_right)
|
||||
%td.line_content.parallel{class: "noteable_line #{type_right == 'new' ? 'new' : nil}"}= raw line_content_right
|
||||
= link_to raw(line_number_right), "##{line_code}", id: line_code
|
||||
%td.line_content.parallel{class: "noteable_line #{type_right == 'new' ? 'new' : nil} #{line_code}", "line_code" => line_code}= raw line_content_right
|
||||
|
||||
- if diff_file.diff.diff.blank? && diff_file.mode_changed?
|
||||
.file-mode-changed
|
||||
|
|
Loading…
Reference in New Issue