diff_helper.rb 4.1 KB
Newer Older
1
module DiffHelper
2 3 4
  def mark_inline_diffs(old_line, new_line)
    old_diffs, new_diffs = Gitlab::Diff::InlineDiff.new(old_line, new_line).inline_diffs

5 6
    marked_old_line = Gitlab::Diff::InlineDiffMarker.new(old_line).mark(old_diffs, mode: :deletion)
    marked_new_line = Gitlab::Diff::InlineDiffMarker.new(new_line).mark(new_diffs, mode: :addition)
7 8 9 10

    [marked_old_line, marked_new_line]
  end

D
Douwe Maan 已提交
11
  def diff_view
12 13 14 15 16 17 18
    diff_views = %w(inline parallel)

    if diff_views.include?(cookies[:diff_view])
      cookies[:diff_view]
    else
      diff_views.first
    end
D
Douwe Maan 已提交
19 20
  end

J
Jacob Vosmaer 已提交
21 22
  def diff_hard_limit_enabled?
    params[:force_show_diff].present?
23 24
  end

J
Jacob Vosmaer 已提交
25
  def diff_options
A
Alfredo Sumaran 已提交
26
    options = { ignore_whitespace_change: hide_whitespace? }
A
Alex Lossent 已提交
27
    if diff_hard_limit_enabled?
J
Jacob Vosmaer 已提交
28
      options.merge!(Commit.max_diff_options)
29
    end
J
Jacob Vosmaer 已提交
30
    options
31 32
  end

33
  def safe_diff_files(diffs, diff_refs)
J
Jacob Vosmaer 已提交
34
    diffs.decorate! { |diff| Gitlab::Diff::File.new(diff, diff_refs) }
35
  end
36

D
Douwe Maan 已提交
37 38 39 40
  def generate_line_code(file_path, line)
    Gitlab::Diff::LineCode.generate(file_path, line.new_pos, line.old_pos)
  end

41
  def unfold_bottom_class(bottom)
42
    bottom ? 'js-unfold-bottom' : ''
43 44
  end

45
  def unfold_class(unfold)
46
    unfold ? 'unfold js-unfold' : ''
47 48
  end

49
  def diff_line_content(line, line_type = nil)
50
    if line.blank?
51
      "  ".html_safe
52
    else
A
Annabel Dunstone 已提交
53
      line[0] = ' ' if %w[new old].include?(line_type)
54
      line
55 56
    end
  end
57

D
Douwe Maan 已提交
58 59
  def organize_comments(left, right)
    notes_left = notes_right = nil
60

D
Douwe Maan 已提交
61 62
    unless left[:type].nil? && right[:type] == 'new'
      notes_left = @grouped_diff_notes[left[:line_code]]
63 64
    end

D
Douwe Maan 已提交
65 66
    unless left[:type].nil? && right[:type].nil?
      notes_right = @grouped_diff_notes[right[:line_code]]
67 68
    end

D
Douwe Maan 已提交
69
    [notes_left, notes_right]
70
  end
71 72

  def inline_diff_btn
73
    diff_btn('Inline', 'inline', diff_view == 'inline')
74 75 76
  end

  def parallel_diff_btn
77
    diff_btn('Side-by-side', 'parallel', diff_view == 'parallel')
78
  end
H
Headless 已提交
79

80 81
  def submodule_link(blob, ref, repository = @repository)
    tree, commit = submodule_links(blob, ref, repository)
H
Headless 已提交
82
    commit_id = if commit.nil?
83
                  Commit.truncate_sha(blob.id)
H
Headless 已提交
84
                else
85
                  link_to Commit.truncate_sha(blob.id), commit
H
Headless 已提交
86 87 88 89 90 91 92 93
                end

    [
      content_tag(:span, link_to(truncate(blob.name, length: 40), tree)),
      '@',
      content_tag(:span, commit_id, class: 'monospace'),
    ].join(' ').html_safe
  end
94

D
Douwe Maan 已提交
95 96
  def commit_for_diff(diff_file)
    if diff_file.deleted_file
97
      @base_commit || @commit.parent || @commit
98 99 100 101 102 103 104 105 106 107 108 109 110 111 112
    else
      @commit
    end
  end

  def diff_file_html_data(project, diff_commit, diff_file)
    {
      blob_diff_path: namespace_project_blob_diff_path(project.namespace, project,
                                                       tree_join(diff_commit.id, diff_file.file_path))
    }
  end

  def editable_diff?(diff)
    !diff.deleted_file && @merge_request && @merge_request.source_project
  end
113 114 115 116 117 118 119 120 121 122

  private

  def diff_btn(title, name, selected)
    params_copy = params.dup
    params_copy[:view] = name

    # Always use HTML to handle case where JSON diff rendered this button
    params_copy.delete(:format)

A
Alfredo Sumaran 已提交
123
    link_to url_for(params_copy), id: "#{name}-diff-btn", class: (selected ? 'btn active' : 'btn'), data: { view_type: name } do
124 125 126
      title
    end
  end
127

128
  def commit_diff_whitespace_link(project, commit, options)
A
Alfredo Sumaran 已提交
129
    url = namespace_project_commit_path(project.namespace, project, commit.id, params_with_whitespace)
130
    toggle_whitespace_link(url, options)
A
Alfredo Sumaran 已提交
131 132
  end

133
  def diff_merge_request_whitespace_link(project, merge_request, options)
A
Alfredo Sumaran 已提交
134
    url = diffs_namespace_project_merge_request_path(project.namespace, project, merge_request, params_with_whitespace)
135
    toggle_whitespace_link(url, options)
A
Alfredo Sumaran 已提交
136 137 138 139
  end

  private

A
Alfredo Sumaran 已提交
140
  def hide_whitespace?
141 142 143 144
    params[:w] == '1'
  end

  def params_with_whitespace
A
Alfredo Sumaran 已提交
145
    hide_whitespace? ? request.query_parameters.except(:w) : request.query_parameters.merge(w: 1)
146 147
  end

148 149 150 151 152
  def toggle_whitespace_link(url, options)
    options[:class] ||= ''
    options[:class] << ' btn btn-default'

    link_to "#{hide_whitespace? ? 'Show' : 'Hide'} whitespace changes", url, class: options[:class]
153
  end
154
end