2014-09-08 09:25:50 -04:00
|
|
|
module Gitlab
|
|
|
|
module Diff
|
|
|
|
class Parser
|
|
|
|
include Enumerable
|
|
|
|
|
2014-09-08 14:54:52 -04:00
|
|
|
def parse(lines)
|
2015-02-02 23:58:28 -05:00
|
|
|
@lines = lines
|
2014-09-08 09:25:50 -04:00
|
|
|
lines_obj = []
|
|
|
|
line_obj_index = 0
|
|
|
|
line_old = 1
|
|
|
|
line_new = 1
|
|
|
|
type = nil
|
|
|
|
|
|
|
|
lines_arr = ::Gitlab::InlineDiff.processing lines
|
|
|
|
|
|
|
|
lines_arr.each do |line|
|
|
|
|
raw_line = line.dup
|
|
|
|
|
|
|
|
next if filename?(line)
|
|
|
|
|
|
|
|
full_line = html_escape(line.gsub(/\n/, ''))
|
|
|
|
full_line = ::Gitlab::InlineDiff.replace_markers full_line
|
|
|
|
|
|
|
|
if line.match(/^@@ -/)
|
|
|
|
type = "match"
|
|
|
|
|
|
|
|
line_old = line.match(/\-[0-9]*/)[0].to_i.abs rescue 0
|
|
|
|
line_new = line.match(/\+[0-9]*/)[0].to_i.abs rescue 0
|
|
|
|
|
2015-02-20 04:23:34 -05:00
|
|
|
next if line_old <= 1 && line_new <= 1 #top of file
|
2014-09-08 09:25:50 -04:00
|
|
|
lines_obj << Gitlab::Diff::Line.new(full_line, type, line_obj_index, line_old, line_new)
|
|
|
|
line_obj_index += 1
|
|
|
|
next
|
|
|
|
else
|
|
|
|
type = identification_type(line)
|
2014-09-08 14:54:52 -04:00
|
|
|
lines_obj << Gitlab::Diff::Line.new(full_line, type, line_obj_index, line_old, line_new)
|
2014-09-08 09:25:50 -04:00
|
|
|
line_obj_index += 1
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
if line[0] == "+"
|
|
|
|
line_new += 1
|
|
|
|
elsif line[0] == "-"
|
|
|
|
line_old += 1
|
|
|
|
else
|
|
|
|
line_new += 1
|
|
|
|
line_old += 1
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
lines_obj
|
|
|
|
end
|
|
|
|
|
|
|
|
def empty?
|
|
|
|
@lines.empty?
|
|
|
|
end
|
|
|
|
|
|
|
|
private
|
|
|
|
|
|
|
|
def filename?(line)
|
|
|
|
line.start_with?('--- /dev/null', '+++ /dev/null', '--- a', '+++ b',
|
|
|
|
'--- /tmp/diffy', '+++ /tmp/diffy')
|
|
|
|
end
|
|
|
|
|
|
|
|
def identification_type(line)
|
|
|
|
if line[0] == "+"
|
|
|
|
"new"
|
|
|
|
elsif line[0] == "-"
|
|
|
|
"old"
|
|
|
|
else
|
|
|
|
nil
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2014-09-25 18:07:40 -04:00
|
|
|
def html_escape(str)
|
2014-09-08 09:25:50 -04:00
|
|
|
replacements = { '&' => '&', '>' => '>', '<' => '<', '"' => '"', "'" => ''' }
|
2015-02-03 00:59:28 -05:00
|
|
|
str.gsub(/[&"'><]/, replacements)
|
2014-09-08 09:25:50 -04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|