2019-02-15 15:39:39 +05:30
|
|
|
# frozen_string_literal: true
|
|
|
|
|
2015-04-26 12:48:37 +05:30
|
|
|
module Gitlab
|
|
|
|
module Diff
|
|
|
|
class Parser
|
|
|
|
include Enumerable
|
|
|
|
|
2018-11-08 19:23:39 +05:30
|
|
|
def parse(lines, diff_file: nil)
|
2021-07-02 01:05:55 +05:30
|
|
|
return [] if lines.blank? || Git::Diff.has_binary_notice?(lines.first)
|
2016-06-02 11:05:42 +05:30
|
|
|
|
2015-04-26 12:48:37 +05:30
|
|
|
@lines = lines
|
|
|
|
line_obj_index = 0
|
|
|
|
line_old = 1
|
|
|
|
line_new = 1
|
|
|
|
type = nil
|
2017-08-17 22:00:37 +05:30
|
|
|
context = nil
|
2015-04-26 12:48:37 +05:30
|
|
|
|
2016-06-02 11:05:42 +05:30
|
|
|
# By returning an Enumerator we make it possible to search for a single line (with #find)
|
|
|
|
# without having to instantiate all the others that come after it.
|
|
|
|
Enumerator.new do |yielder|
|
|
|
|
@lines.each do |line|
|
2018-03-17 18:26:18 +05:30
|
|
|
# We're expecting a filename parameter only in a meta-part of the diff content
|
|
|
|
# when type is defined then we're already in a content-part
|
|
|
|
next if filename?(line) && type.nil?
|
2016-06-16 23:09:34 +05:30
|
|
|
|
2016-06-02 11:05:42 +05:30
|
|
|
full_line = line.delete("\n")
|
2016-06-16 23:09:34 +05:30
|
|
|
|
2017-08-17 22:00:37 +05:30
|
|
|
if line =~ /^@@ -/
|
2016-06-02 11:05:42 +05:30
|
|
|
type = "match"
|
2016-06-16 23:09:34 +05:30
|
|
|
|
2022-08-27 11:52:29 +05:30
|
|
|
diff_hunk = Gitlab::WordDiff::Segments::DiffHunk.new(line)
|
|
|
|
line_old = diff_hunk.pos_old
|
|
|
|
line_new = diff_hunk.pos_new
|
2016-06-16 23:09:34 +05:30
|
|
|
|
2022-08-27 11:52:29 +05:30
|
|
|
# not using diff_hunk.first_line? because of defaults
|
2016-06-16 23:09:34 +05:30
|
|
|
next if line_old <= 1 && line_new <= 1 # top of file
|
2018-03-17 18:26:18 +05:30
|
|
|
|
2018-11-08 19:23:39 +05:30
|
|
|
yielder << Gitlab::Diff::Line.new(full_line, type, line_obj_index, line_old, line_new, parent_file: diff_file)
|
2016-06-02 11:05:42 +05:30
|
|
|
line_obj_index += 1
|
|
|
|
next
|
|
|
|
elsif line[0] == '\\'
|
2017-08-17 22:00:37 +05:30
|
|
|
type = "#{context}-nonewline"
|
|
|
|
|
2018-11-08 19:23:39 +05:30
|
|
|
yielder << Gitlab::Diff::Line.new(full_line, type, line_obj_index, line_old, line_new, parent_file: diff_file)
|
2016-06-02 11:05:42 +05:30
|
|
|
line_obj_index += 1
|
|
|
|
else
|
|
|
|
type = identification_type(line)
|
2018-11-08 19:23:39 +05:30
|
|
|
yielder << Gitlab::Diff::Line.new(full_line, type, line_obj_index, line_old, line_new, parent_file: diff_file)
|
2016-06-02 11:05:42 +05:30
|
|
|
line_obj_index += 1
|
|
|
|
end
|
2016-06-16 23:09:34 +05:30
|
|
|
|
2016-06-02 11:05:42 +05:30
|
|
|
case line[0]
|
|
|
|
when "+"
|
|
|
|
line_new += 1
|
2017-08-17 22:00:37 +05:30
|
|
|
context = :new
|
2016-06-02 11:05:42 +05:30
|
|
|
when "-"
|
|
|
|
line_old += 1
|
2017-08-17 22:00:37 +05:30
|
|
|
context = :old
|
|
|
|
when "\\" # rubocop:disable Lint/EmptyWhen
|
2016-06-02 11:05:42 +05:30
|
|
|
# No increment
|
|
|
|
else
|
|
|
|
line_new += 1
|
|
|
|
line_old += 1
|
|
|
|
end
|
2015-04-26 12:48:37 +05:30
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
def empty?
|
|
|
|
@lines.empty?
|
|
|
|
end
|
|
|
|
|
|
|
|
private
|
|
|
|
|
|
|
|
def filename?(line)
|
2016-01-19 16:12:03 +05:30
|
|
|
line.start_with?( '--- /dev/null', '+++ /dev/null', '--- a', '+++ b',
|
|
|
|
'+++ a', # The line will start with `+++ a` in the reverse diff of an orphan commit
|
|
|
|
'--- /tmp/diffy', '+++ /tmp/diffy')
|
2015-04-26 12:48:37 +05:30
|
|
|
end
|
|
|
|
|
|
|
|
def identification_type(line)
|
2016-01-29 22:53:50 +05:30
|
|
|
case line[0]
|
|
|
|
when "+"
|
2015-04-26 12:48:37 +05:30
|
|
|
"new"
|
2016-01-29 22:53:50 +05:30
|
|
|
when "-"
|
2015-04-26 12:48:37 +05:30
|
|
|
"old"
|
|
|
|
else
|
|
|
|
nil
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|