2017-04-04 18:27:23 -04:00
|
|
|
# Contains functionality shared between `DiffDiscussion` and `LegacyDiffDiscussion`.
|
2017-03-30 20:38:21 -04:00
|
|
|
module DiscussionOnDiff
|
|
|
|
extend ActiveSupport::Concern
|
|
|
|
|
2017-04-12 13:59:35 -04:00
|
|
|
NUMBER_OF_TRUNCATED_DIFF_LINES = 16
|
2017-03-30 20:38:21 -04:00
|
|
|
|
2017-04-12 13:59:35 -04:00
|
|
|
included do
|
2017-03-30 20:38:21 -04:00
|
|
|
delegate :line_code,
|
|
|
|
:original_line_code,
|
|
|
|
:diff_file,
|
|
|
|
:diff_line,
|
|
|
|
:active?,
|
2017-04-30 16:32:09 -04:00
|
|
|
:created_at_diff?,
|
2017-03-30 20:38:21 -04:00
|
|
|
|
|
|
|
to: :first_note
|
|
|
|
|
|
|
|
delegate :file_path,
|
|
|
|
:blob,
|
|
|
|
:highlighted_diff_lines,
|
|
|
|
:diff_lines,
|
|
|
|
|
|
|
|
to: :diff_file,
|
|
|
|
allow_nil: true
|
|
|
|
end
|
|
|
|
|
|
|
|
def diff_discussion?
|
|
|
|
true
|
|
|
|
end
|
|
|
|
|
2017-10-07 00:25:17 -04:00
|
|
|
def file_new_path
|
|
|
|
first_note.position.new_path
|
|
|
|
end
|
|
|
|
|
2017-06-29 17:19:09 -04:00
|
|
|
def on_merge_request_commit?
|
|
|
|
for_merge_request? && commit_id.present?
|
|
|
|
end
|
|
|
|
|
2017-03-30 20:38:21 -04:00
|
|
|
# Returns an array of at most 16 highlighted lines above a diff note
|
|
|
|
def truncated_diff_lines(highlight: true)
|
2018-01-30 10:17:44 -05:00
|
|
|
return [] if diff_line.nil? && first_note.is_a?(LegacyDiffNote)
|
|
|
|
|
2017-03-30 20:38:21 -04:00
|
|
|
lines = highlight ? highlighted_diff_lines : diff_lines
|
2017-12-22 06:49:56 -05:00
|
|
|
|
|
|
|
initial_line_index = [diff_line.index - NUMBER_OF_TRUNCATED_DIFF_LINES + 1, 0].max
|
|
|
|
|
2017-03-30 20:38:21 -04:00
|
|
|
prev_lines = []
|
|
|
|
|
2017-12-22 06:49:56 -05:00
|
|
|
lines[initial_line_index..diff_line.index].each do |line|
|
2017-03-30 20:38:21 -04:00
|
|
|
if line.meta?
|
|
|
|
prev_lines.clear
|
|
|
|
else
|
|
|
|
prev_lines << line
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
prev_lines
|
|
|
|
end
|
2017-05-24 11:10:10 -04:00
|
|
|
|
|
|
|
def line_code_in_diffs(diff_refs)
|
|
|
|
if active?(diff_refs)
|
|
|
|
line_code
|
|
|
|
elsif diff_refs && created_at_diff?(diff_refs)
|
|
|
|
original_line_code
|
|
|
|
end
|
|
|
|
end
|
2017-03-30 20:38:21 -04:00
|
|
|
end
|