Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.0-rc43

2 files changed, 22 insertions, 1 deletions

diff --git a/lib/gitlab/word_diff/chunk_collection.rb b/lib/gitlab/word_diff/chunk_collection.rb
index dd388f75302..d5c3e59d405 100644
--- a/lib/gitlab/word_diff/chunk_collection.rb
+++ b/lib/gitlab/word_diff/chunk_collection.rb
@@ -18,6 +18,27 @@ module Gitlab
       def reset
         @chunks = []
       end
+
+      def marker_ranges
+        start = 0
+
+        @chunks.each_with_object([]) do |element, ranges|
+          mode = mode_for_element(element)
+
+          ranges << Gitlab::MarkerRange.new(start, start + element.length - 1, mode: mode) if mode
+
+          start += element.length
+        end
+      end
+
+      private
+
+      def mode_for_element(element)
+        return Gitlab::MarkerRange::DELETION if element.removed?
+        return Gitlab::MarkerRange::ADDITION if element.added?
+
+        nil
+      end
     end
   end
 end
diff --git a/lib/gitlab/word_diff/parser.rb b/lib/gitlab/word_diff/parser.rb
index 3b6d4d4d384..e611abb5692 100644
--- a/lib/gitlab/word_diff/parser.rb
+++ b/lib/gitlab/word_diff/parser.rb
@@ -31,7 +31,7 @@ module Gitlab
               @chunks.add(segment)
 
             when Segments::Newline
-              yielder << build_line(@chunks.content, nil, parent_file: diff_file)
+              yielder << build_line(@chunks.content, nil, parent_file: diff_file).tap { |line| line.set_marker_ranges(@chunks.marker_ranges) }
 
               @chunks.reset
               counter.increase_pos_num