diff_helper.rb 3.2 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

D
Douwe Maan 已提交
5 6
    marked_old_line = Gitlab::Diff::InlineDiffMarker.new(old_line).mark(old_diffs)
    marked_new_line = Gitlab::Diff::InlineDiffMarker.new(new_line).mark(new_diffs)
7 8 9 10

    [marked_old_line, marked_new_line]
  end

D
Douwe Maan 已提交
11 12 13 14
  def diff_view
    params[:view] == 'parallel' ? 'parallel' : 'inline'
  end

J
Jacob Vosmaer 已提交
15 16
  def diff_hard_limit_enabled?
    params[:force_show_diff].present?
17 18
  end

J
Jacob Vosmaer 已提交
19 20
  def diff_options
    options = { ignore_whitespace_change: params[:w] == '1' }
A
Alex Lossent 已提交
21
    if diff_hard_limit_enabled?
J
Jacob Vosmaer 已提交
22
      options.merge!(Commit.max_diff_options)
23
    end
J
Jacob Vosmaer 已提交
24
    options
25 26
  end

27
  def safe_diff_files(diffs, diff_refs)
J
Jacob Vosmaer 已提交
28
    diffs.decorate! { |diff| Gitlab::Diff::File.new(diff, diff_refs) }
29
  end
30

D
Douwe Maan 已提交
31 32 33 34
  def generate_line_code(file_path, line)
    Gitlab::Diff::LineCode.generate(file_path, line.new_pos, line.old_pos)
  end

35 36 37 38
  def unfold_bottom_class(bottom)
    (bottom) ? 'js-unfold-bottom' : ''
  end

39 40 41 42
  def unfold_class(unfold)
    (unfold) ? 'unfold js-unfold' : ''
  end

43 44
  def diff_line_content(line)
    if line.blank?
45
      "  ".html_safe
46
    else
47
      line
48 49
    end
  end
50 51

  def line_comments
52
    @line_comments ||= @line_notes.select(&:active?).sort_by(&:created_at).group_by(&:line_code)
53
  end
54 55 56 57 58 59 60 61 62 63 64 65 66 67

  def organize_comments(type_left, type_right, line_code_left, line_code_right)
    comments_left = comments_right = nil

    unless type_left.nil? && type_right == 'new'
      comments_left = line_comments[line_code_left]
    end

    unless type_left.nil? && type_right.nil?
      comments_right = line_comments[line_code_right]
    end

    [comments_left, comments_right]
  end
68 69

  def inline_diff_btn
70
    diff_btn('Inline', 'inline', diff_view == 'inline')
71 72 73
  end

  def parallel_diff_btn
74
    diff_btn('Side-by-side', 'parallel', diff_view == 'parallel')
75
  end
H
Headless 已提交
76

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

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

  def commit_for_diff(diff)
    if diff.deleted_file
94
      @base_commit || @commit.parent || @commit
95 96 97 98 99 100 101 102 103 104 105 106 107 108 109
    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
110 111 112 113 114 115 116 117 118 119

  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 已提交
120
    link_to url_for(params_copy), id: "#{name}-diff-btn", class: (selected ? 'btn active' : 'btn'), data: { view_type: name } do
121 122 123
      title
    end
  end
124
end