e116fcab41
This is an issue that can only be seen through EE. Further details can be seen on https://gitlab.com/gitlab-org/gitlab-ee/issues/9876. In general we should always use the latest diff version of a file in order to both create and apply suggestions.
60 lines
1.7 KiB
Ruby
60 lines
1.7 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
module Suggestions
|
|
class CreateService
|
|
def initialize(note)
|
|
@note = note
|
|
end
|
|
|
|
def execute
|
|
return unless @note.supports_suggestion?
|
|
|
|
diff_file = @note.latest_diff_file
|
|
|
|
return unless diff_file
|
|
|
|
suggestions = Banzai::SuggestionsParser.parse(@note.note)
|
|
|
|
# For single line suggestion we're only looking forward to
|
|
# change the line receiving the comment. Though, in
|
|
# https://gitlab.com/gitlab-org/gitlab-ce/issues/53310
|
|
# we'll introduce a ```suggestion:L<x>-<y>, so this will
|
|
# slightly change.
|
|
comment_line = @note.position.new_line
|
|
|
|
rows =
|
|
suggestions.map.with_index do |suggestion, index|
|
|
from_content = changing_lines(diff_file, comment_line, comment_line)
|
|
|
|
# The parsed suggestion doesn't have information about the correct
|
|
# ending characters (we may have a line break, or not), so we take
|
|
# this information from the last line being changed (last
|
|
# characters).
|
|
endline_chars = line_break_chars(from_content.lines.last)
|
|
to_content = "#{suggestion}#{endline_chars}"
|
|
|
|
{
|
|
note_id: @note.id,
|
|
from_content: from_content,
|
|
to_content: to_content,
|
|
relative_order: index
|
|
}
|
|
end
|
|
|
|
rows.in_groups_of(100, false) do |rows|
|
|
Gitlab::Database.bulk_insert('suggestions', rows)
|
|
end
|
|
end
|
|
|
|
private
|
|
|
|
def changing_lines(diff_file, from_line, to_line)
|
|
diff_file.new_blob_lines_between(from_line, to_line).join
|
|
end
|
|
|
|
def line_break_chars(line)
|
|
match = /\r\n|\r|\n/.match(line)
|
|
match[0] if match
|
|
end
|
|
end
|
|
end
|