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

Add line code to parallel diff for linking.

Browse source
This commit is contained in:
Marin Jankovski 2014-09-09 11:36:29 +02:00
parent 9c3935c5b0
commit ac6a107ac7
2 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/helpers/diff_helper.rb
View file

@ -36,7 +36,7 @@ module DiffHelper
# Building array of lines # 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| diff_file.diff_lines.each do |line|
@ -53,10 +53,10 @@ module DiffHelper
next_line = next_line.text next_line = next_line.text
end 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? if type == 'match' || type.nil?
# line in the right panel is the same as in the left one # 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) lines.push(line)
elsif type == 'old' elsif type == 'old'
if next_type == 'new' if next_type == 'new'
@ -78,7 +78,7 @@ module DiffHelper
next next
else else
# Change is only on the right side, left side has no change # 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) lines.push(line)
end end
end end

17
app/views/projects/diffs/_parallel_view.html.haml
View file

@ -5,21 +5,22 @@
- type_left = line[0] - type_left = line[0]
- line_number_left = line[1] - line_number_left = line[1]
- line_content_left = line[2] - line_content_left = line[2]
- type_right = line[3] - line_code = line[3]
- line_number_right = line[4] - type_right = line[4]
- line_content_right = line[5] - 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' - if type_left == 'match'
= render "projects/diffs/match_line_parallel", { line: line_content_left, = render "projects/diffs/match_line_parallel", { line: line_content_left,
line_old: line_number_left, line_new: line_number_right } line_old: line_number_left, line_new: line_number_right }
- elsif type_left == 'old' || type_left.nil? - elsif type_left == 'old' || type_left.nil?
%td.old_line{class: "#{type_left}"} %td.old_line{class: "#{type_left}"}
= link_to raw(line_number_left) = link_to raw(line_number_left), "##{line_code}", id: line_code
%td.line_content{class: "parallel noteable_line #{type_left}" }= raw line_content_left %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 }} %td.new_line{ class: "#{type_right == 'new' ? 'new' : nil}", data: { linenumber: line_number_right }}
= link_to raw(line_number_right) = link_to raw(line_number_right), "##{line_code}", id: line_code
%td.line_content.parallel{class: "noteable_line #{type_right == 'new' ? 'new' : nil}"}= raw line_content_right %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? - if diff_file.diff.diff.blank? && diff_file.mode_changed?
.file-mode-changed .file-mode-changed