2015-12-30 05:52:50 +00:00
|
|
|
module Gitlab
|
|
|
|
module Diff
|
|
|
|
class Highlight
|
2016-06-20 16:51:48 +00:00
|
|
|
attr_reader :diff_file, :diff_lines, :raw_lines, :repository
|
2016-01-08 03:37:01 +00:00
|
|
|
|
2016-01-14 21:38:37 +00:00
|
|
|
delegate :old_path, :new_path, :old_ref, :new_ref, to: :diff_file, prefix: :diff
|
2016-01-08 03:37:01 +00:00
|
|
|
|
2016-06-20 16:51:48 +00:00
|
|
|
def initialize(diff_lines, repository: nil)
|
|
|
|
@repository = repository
|
|
|
|
|
2016-01-22 00:43:06 +00:00
|
|
|
if diff_lines.is_a?(Gitlab::Diff::File)
|
2016-01-22 00:53:01 +00:00
|
|
|
@diff_file = diff_lines
|
|
|
|
@diff_lines = @diff_file.diff_lines
|
2016-01-22 00:43:06 +00:00
|
|
|
else
|
|
|
|
@diff_lines = diff_lines
|
|
|
|
end
|
2016-01-14 21:28:07 +00:00
|
|
|
@raw_lines = @diff_lines.map(&:text)
|
2015-12-30 05:52:50 +00:00
|
|
|
end
|
|
|
|
|
2016-01-14 21:28:07 +00:00
|
|
|
def highlight
|
2016-01-22 01:10:58 +00:00
|
|
|
@diff_lines.map.with_index do |diff_line, i|
|
|
|
|
diff_line = diff_line.dup
|
2015-12-31 02:44:12 +00:00
|
|
|
# ignore highlighting for "match" lines
|
2016-06-20 16:51:48 +00:00
|
|
|
next diff_line if diff_line.meta?
|
2016-01-14 21:28:07 +00:00
|
|
|
|
2016-01-29 18:37:17 +00:00
|
|
|
rich_line = highlight_line(diff_line) || diff_line.text
|
2016-01-15 13:39:43 +00:00
|
|
|
|
|
|
|
if line_inline_diffs = inline_diffs[i]
|
|
|
|
rich_line = InlineDiffMarker.new(diff_line.text, rich_line).mark(line_inline_diffs)
|
|
|
|
end
|
|
|
|
|
2016-01-29 18:37:17 +00:00
|
|
|
diff_line.text = rich_line
|
2016-01-15 13:39:43 +00:00
|
|
|
|
2016-01-22 01:10:58 +00:00
|
|
|
diff_line
|
|
|
|
end
|
2016-01-14 21:28:07 +00:00
|
|
|
end
|
|
|
|
|
2016-01-15 13:39:43 +00:00
|
|
|
private
|
|
|
|
|
2016-01-29 18:37:17 +00:00
|
|
|
def highlight_line(diff_line)
|
|
|
|
return unless diff_file && diff_file.diff_refs
|
2016-01-20 17:44:27 +00:00
|
|
|
|
2016-07-06 23:29:41 +00:00
|
|
|
rich_line =
|
|
|
|
if diff_line.unchanged? || diff_line.added?
|
|
|
|
new_lines[diff_line.new_pos - 1]
|
|
|
|
elsif diff_line.removed?
|
|
|
|
old_lines[diff_line.old_pos - 1]
|
|
|
|
end
|
2016-01-14 21:28:07 +00:00
|
|
|
|
|
|
|
# Only update text if line is found. This will prevent
|
|
|
|
# issues with submodules given the line only exists in diff content.
|
2016-07-20 16:25:36 +00:00
|
|
|
if rich_line
|
|
|
|
line_prefix = diff_line.text.match(/\A(.)/) ? $1 : ' '
|
|
|
|
"#{line_prefix}#{rich_line}".html_safe
|
|
|
|
end
|
2016-01-14 21:28:07 +00:00
|
|
|
end
|
|
|
|
|
2016-01-15 13:39:43 +00:00
|
|
|
def inline_diffs
|
2016-01-29 18:37:17 +00:00
|
|
|
@inline_diffs ||= InlineDiff.for_lines(@raw_lines)
|
2015-12-30 05:52:50 +00:00
|
|
|
end
|
|
|
|
|
2016-01-08 03:37:01 +00:00
|
|
|
def old_lines
|
2016-01-22 00:43:06 +00:00
|
|
|
return unless diff_file
|
2016-06-20 17:15:44 +00:00
|
|
|
@old_lines ||= Gitlab::Highlight.highlight_lines(self.repository, diff_old_ref, diff_old_path)
|
2016-01-08 03:37:01 +00:00
|
|
|
end
|
|
|
|
|
|
|
|
def new_lines
|
2016-01-22 00:43:06 +00:00
|
|
|
return unless diff_file
|
2016-06-20 17:15:44 +00:00
|
|
|
@new_lines ||= Gitlab::Highlight.highlight_lines(self.repository, diff_new_ref, diff_new_path)
|
2016-01-14 21:38:37 +00:00
|
|
|
end
|
2015-12-30 05:52:50 +00:00
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|