debian-mirror-gitlab/lib/gitlab/diff/parallel_diff.rb

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

64 lines
1.7 KiB
Ruby
Raw Normal View History

2019-02-15 15:39:39 +05:30
# frozen_string_literal: true
2016-01-29 22:53:50 +05:30
module Gitlab
module Diff
class ParallelDiff
attr_accessor :diff_file
def initialize(diff_file)
@diff_file = diff_file
end
def parallelize
2016-08-24 12:49:21 +05:30
i = 0
free_right_index = nil
lines = []
2016-01-29 22:53:50 +05:30
highlighted_diff_lines = diff_file.highlighted_diff_lines
highlighted_diff_lines.each do |line|
2017-09-10 17:25:29 +05:30
if line.removed?
2016-08-24 12:49:21 +05:30
lines << {
2016-09-13 17:45:13 +05:30
left: line,
right: nil
2016-08-24 12:49:21 +05:30
}
# Once we come upon a new line it can be put on the right of this old line
free_right_index ||= i
i += 1
2016-09-13 17:45:13 +05:30
elsif line.added?
2016-08-24 12:49:21 +05:30
if free_right_index
# If an old line came before this without a line on the right, this
# line can be put to the right of it.
2016-09-13 17:45:13 +05:30
lines[free_right_index][:right] = line
2016-08-24 12:49:21 +05:30
# If there are any other old lines on the left that don't yet have
# a new counterpart on the right, update the free_right_index
next_free_right_index = free_right_index + 1
free_right_index = next_free_right_index < i ? next_free_right_index : nil
2016-01-29 22:53:50 +05:30
else
lines << {
2016-09-13 17:45:13 +05:30
left: nil,
right: line
2016-01-29 22:53:50 +05:30
}
2016-08-24 12:49:21 +05:30
free_right_index = nil
i += 1
2016-01-29 22:53:50 +05:30
end
2022-06-21 17:19:12 +05:30
elsif line.meta? || line.unchanged? || !line.has_mapping_in_raw?
2017-09-10 17:25:29 +05:30
# line in the right panel is the same as in the left one
lines << {
left: line,
right: line
}
free_right_index = nil
i += 1
2016-01-29 22:53:50 +05:30
end
end
2016-08-24 12:49:21 +05:30
lines
2016-01-29 22:53:50 +05:30
end
end
end
end