2018-11-05 23:45:35 -05:00
|
|
|
# frozen_string_literal: true
|
|
|
|
|
2014-09-08 09:25:50 -04:00
|
|
|
module Gitlab
|
|
|
|
module Diff
|
|
|
|
class Parser
|
|
|
|
include Enumerable
|
|
|
|
|
2018-06-21 08:22:40 -04:00
|
|
|
def parse(lines, diff_file: nil)
|
2016-03-15 20:51:27 -04:00
|
|
|
return [] if lines.blank?
|
|
|
|
|
2015-02-02 23:58:28 -05:00
|
|
|
@lines = lines
|
2014-09-08 09:25:50 -04:00
|
|
|
line_obj_index = 0
|
|
|
|
line_old = 1
|
|
|
|
line_new = 1
|
|
|
|
type = nil
|
2017-03-13 16:09:43 -04:00
|
|
|
context = nil
|
2014-09-08 09:25:50 -04:00
|
|
|
|
2016-03-03 12:38:44 -05:00
|
|
|
# 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|
|
2017-10-12 11:59:02 -04:00
|
|
|
# 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-05-31 18:33:46 -04:00
|
|
|
|
2016-04-27 20:22:46 -04:00
|
|
|
full_line = line.delete("\n")
|
2016-05-31 18:33:46 -04:00
|
|
|
|
2017-02-21 19:16:48 -05:00
|
|
|
if line =~ /^@@ -/
|
2016-03-03 12:38:44 -05:00
|
|
|
type = "match"
|
2016-05-31 18:33:46 -04:00
|
|
|
|
2016-03-03 12:38:44 -05:00
|
|
|
line_old = line.match(/\-[0-9]*/)[0].to_i.abs rescue 0
|
|
|
|
line_new = line.match(/\+[0-9]*/)[0].to_i.abs rescue 0
|
2016-05-31 18:33:46 -04:00
|
|
|
|
|
|
|
next if line_old <= 1 && line_new <= 1 # top of file
|
2017-11-14 04:02:39 -05:00
|
|
|
|
2018-06-21 08:22:40 -04:00
|
|
|
yielder << Gitlab::Diff::Line.new(full_line, type, line_obj_index, line_old, line_new, parent_file: diff_file)
|
2016-03-03 12:38:44 -05:00
|
|
|
line_obj_index += 1
|
|
|
|
next
|
|
|
|
elsif line[0] == '\\'
|
2017-03-13 16:09:43 -04:00
|
|
|
type = "#{context}-nonewline"
|
|
|
|
|
2018-06-21 08:22:40 -04:00
|
|
|
yielder << Gitlab::Diff::Line.new(full_line, type, line_obj_index, line_old, line_new, parent_file: diff_file)
|
2016-03-03 12:38:44 -05:00
|
|
|
line_obj_index += 1
|
|
|
|
else
|
|
|
|
type = identification_type(line)
|
2018-06-21 08:22:40 -04:00
|
|
|
yielder << Gitlab::Diff::Line.new(full_line, type, line_obj_index, line_old, line_new, parent_file: diff_file)
|
2016-03-03 12:38:44 -05:00
|
|
|
line_obj_index += 1
|
|
|
|
end
|
2016-05-31 18:33:46 -04:00
|
|
|
|
2016-03-03 12:38:44 -05:00
|
|
|
case line[0]
|
|
|
|
when "+"
|
|
|
|
line_new += 1
|
2017-03-13 16:09:43 -04:00
|
|
|
context = :new
|
2016-03-03 12:38:44 -05:00
|
|
|
when "-"
|
|
|
|
line_old += 1
|
2017-03-13 16:09:43 -04:00
|
|
|
context = :old
|
2017-02-10 15:26:23 -05:00
|
|
|
when "\\" # rubocop:disable Lint/EmptyWhen
|
2016-03-03 12:38:44 -05:00
|
|
|
# No increment
|
|
|
|
else
|
|
|
|
line_new += 1
|
|
|
|
line_old += 1
|
|
|
|
end
|
2014-09-08 09:25:50 -04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
def empty?
|
|
|
|
@lines.empty?
|
|
|
|
end
|
|
|
|
|
|
|
|
private
|
|
|
|
|
|
|
|
def filename?(line)
|
2016-01-14 07:09:36 -05:00
|
|
|
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')
|
2014-09-08 09:25:50 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
def identification_type(line)
|
2016-01-20 13:20:13 -05:00
|
|
|
case line[0]
|
|
|
|
when "+"
|
2014-09-08 09:25:50 -04:00
|
|
|
"new"
|
2016-01-20 13:20:13 -05:00
|
|
|
when "-"
|
2014-09-08 09:25:50 -04:00
|
|
|
"old"
|
|
|
|
else
|
|
|
|
nil
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|