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