Read about our upcoming Code of Conduct on this issue

commits_helper.rb 1.52 KB
Newer Older
gitlabhq's avatar
gitlabhq committed
1
module CommitsHelper
Valeriy Sizov's avatar
Valeriy Sizov committed
2
  def identification_type(line)
3
4
5
6
    if line[0] == "+"
      "new"
    elsif line[0] == "-"
      "old"
7
    else
8
9
10
11
      nil
    end
  end

Valeriy Sizov's avatar
Valeriy Sizov committed
12
  def build_line_anchor(index, line_new, line_old)
13
14
15
16
17
18
19
    "#{index}_#{line_old}_#{line_new}"
  end

  def each_diff_line(diff_arr, index)
    line_old = 1
    line_new = 1
    type = nil
Andrey Kumanyaev's avatar
Andrey Kumanyaev committed
20

Valeriy Sizov's avatar
Valeriy Sizov committed
21
    lines_arr = ::Gitlab::InlineDiff.processing diff_arr
22
    lines_arr.each do |line|
23
24
25
26
27
      next if line.match(/^\-\-\- \/dev\/null/)
      next if line.match(/^\+\+\+ \/dev\/null/)
      next if line.match(/^\-\-\- a/)
      next if line.match(/^\+\+\+ b/)

28
      full_line = html_escape(line.gsub(/\n/, ''))
Valeriy Sizov's avatar
Valeriy Sizov committed
29
      full_line = ::Gitlab::InlineDiff.replace_markers full_line
30

31
32
33
34
35
      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
36

Valeriy Sizov's avatar
Valeriy Sizov committed
37
        next if line_old == 1 && line_new == 1 #top of file
38
        yield(full_line, type, nil, nil, nil)
39
40
        next
      else
Valeriy Sizov's avatar
Valeriy Sizov committed
41
42
        type = identification_type(line)
        line_code = build_line_anchor(index, line_new, line_old)
43
44
45
46
47
48
49
50
51
52
53
54
        yield(full_line, type, line_code, line_new, line_old)
      end


      if line[0] == "+"
        line_new += 1
      elsif line[0] == "-"
        line_old += 1
      else
        line_new += 1
        line_old += 1
      end
55
56
    end
  end
57
58
59
60
61
62
63
64
65
66

  def image_diff_class(diff)
    if diff.deleted_file
      "diff_image_removed"
    elsif diff.new_file
      "diff_image_added"
    else
      nil
    end
  end
67

gitlabhq's avatar
gitlabhq committed
68
end