866bef8059
Return the `text` as plain string in the response instead of including HTML tags but keep `rich_text` as is. The fix is to modify `Blob::UnfoldPresenter#diff_files` to map each raw diff line (limited by the range specified) to a corresponding line in an array of highlighted lines to use as `rich_text`.
87 lines
2.2 KiB
Ruby
87 lines
2.2 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
require 'gt_one_coercion'
|
|
|
|
module Blobs
|
|
class UnfoldPresenter < BlobPresenter
|
|
include Virtus.model
|
|
include Gitlab::Utils::StrongMemoize
|
|
|
|
attribute :full, Boolean, default: false
|
|
attribute :since, GtOneCoercion
|
|
attribute :to, GtOneCoercion
|
|
attribute :bottom, Boolean
|
|
attribute :unfold, Boolean, default: true
|
|
attribute :offset, Integer
|
|
attribute :indent, Integer, default: 0
|
|
|
|
def initialize(blob, params)
|
|
# Load all blob data first as we need to ensure they're all loaded first
|
|
# so we can accurately show the rest of the diff when unfolding.
|
|
load_all_blob_data
|
|
|
|
@subject = blob
|
|
@all_lines = blob.data.lines
|
|
super(params)
|
|
|
|
if full?
|
|
self.attributes = { since: 1, to: @all_lines.size, bottom: false, unfold: false, offset: 0, indent: 0 }
|
|
end
|
|
end
|
|
|
|
# Returns an array of Gitlab::Diff::Line with match line added
|
|
def diff_lines
|
|
diff_lines = lines.map.with_index do |line, index|
|
|
full_line = limited_blob_lines[index].delete("\n")
|
|
|
|
Gitlab::Diff::Line.new(full_line, nil, nil, nil, nil, rich_text: line)
|
|
end
|
|
|
|
add_match_line(diff_lines)
|
|
|
|
diff_lines
|
|
end
|
|
|
|
def lines
|
|
@lines ||= limit(highlight.lines).map(&:html_safe)
|
|
end
|
|
|
|
def match_line_text
|
|
return '' if bottom?
|
|
|
|
lines_length = lines.length - 1
|
|
line = [since, lines_length].join(',')
|
|
"@@ -#{line}+#{line} @@"
|
|
end
|
|
|
|
private
|
|
|
|
def add_match_line(diff_lines)
|
|
return unless unfold?
|
|
|
|
if bottom? && to < @all_lines.size
|
|
old_pos = to - offset
|
|
new_pos = to
|
|
elsif since != 1
|
|
old_pos = new_pos = since
|
|
end
|
|
|
|
# Match line is not needed when it reaches the top limit or bottom limit of the file.
|
|
return unless new_pos
|
|
|
|
match_line = Gitlab::Diff::Line.new(match_line_text, 'match', nil, old_pos, new_pos)
|
|
|
|
bottom? ? diff_lines.push(match_line) : diff_lines.unshift(match_line)
|
|
end
|
|
|
|
def limited_blob_lines
|
|
@limited_blob_lines ||= limit(@all_lines)
|
|
end
|
|
|
|
def limit(lines)
|
|
return lines if full?
|
|
|
|
lines[since - 1..to - 1]
|
|
end
|
|
end
|
|
end
|