Backport some changes from EE

4 files changed, 81 insertions, 0 deletions

diff --git a/app/helpers/snippets_helper.rb b/app/helpers/snippets_helper.rb
index 906cb12cd48..bc36434f549 100644
--- a/app/helpers/snippets_helper.rb
+++ b/app/helpers/snippets_helper.rb
@@ -17,4 +17,79 @@ module SnippetsHelper
       snippet_path(snippet)
     end
   end
+
+  # Get an array of line numbers surrounding a matching
+  # line, bounded by min/max.
+  #
+  # @returns Array of line numbers
+  def bounded_line_numbers(line, min, max, surrounding_lines)
+    lower = line - surrounding_lines > min ? line - surrounding_lines : min
+    upper = line + surrounding_lines < max ? line + surrounding_lines : max
+    (lower..upper).to_a
+  end
+
+  # Returns a sorted set of lines to be included in a snippet preview.
+  # This ensures matching adjacent lines do not display duplicated
+  # surrounding code.
+  #
+  # @returns Array, unique and sorted.
+  def matching_lines(lined_content, surrounding_lines)
+    used_lines = []
+    lined_content.each_with_index do |line, line_number|
+      used_lines.concat bounded_line_numbers(
+        line_number,
+        0,
+        lined_content.size,
+        surrounding_lines
+      ) if line.include?(query)
+    end
+
+    used_lines.uniq.sort
+  end
+
+  # 'Chunkify' entire snippet.  Splits the snippet data into matching lines +
+  # surrounding_lines() worth of unmatching lines.
+  #
+  # @returns a hash with {snippet_object, snippet_chunks:{data,start_line}}
+  def chunk_snippet(snippet, surrounding_lines = 3)
+    lined_content = snippet.content.split("\n")
+    used_lines = matching_lines(lined_content, surrounding_lines)
+
+    snippet_chunk = []
+    snippet_chunks = []
+    snippet_start_line = 0
+    last_line = -1
+
+    # Go through each used line, and add consecutive lines as a single chunk
+    # to the snippet chunk array.
+    used_lines.each do |line_number|
+      if last_line < 0
+        # Start a new chunk.
+        snippet_start_line = line_number
+        snippet_chunk << lined_content[line_number]
+      elsif last_line == line_number - 1
+        # Consecutive line, continue chunk.
+        snippet_chunk << lined_content[line_number]
+      else
+        # Non-consecutive line, add chunk to chunk array.
+        snippet_chunks << {
+          data: snippet_chunk.join("\n"),
+          start_line: snippet_start_line + 1
+        }
+
+        # Start a new chunk.
+        snippet_chunk = [lined_content[line_number]]
+        snippet_start_line = line_number
+      end
+      last_line = line_number
+    end
+    # Add final chunk to chunk array
+    snippet_chunks << {
+      data: snippet_chunk.join("\n"),
+      start_line: snippet_start_line + 1
+    }
+
+    # Return snippet with chunk array
+    { snippet_object: snippet, snippet_chunks: snippet_chunks }
+  end
 end
diff --git a/app/models/issue.rb b/app/models/issue.rb
index 7beba984608..5f58c0508fd 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -38,6 +38,7 @@ class Issue < ActiveRecord::Base
 
   scope :cared, ->(user) { where(assignee_id: user) }
   scope :open_for, ->(user) { opened.assigned_to(user) }
+  scope :in_projects, ->(project_ids) { where(project_id: project_ids) }
 
   state_machine :state, initial: :opened do
     event :close do
diff --git a/app/models/project.rb b/app/models/project.rb
index 5579710a476..4bd51449c25 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -904,4 +904,8 @@ class Project < ActiveRecord::Base
   def runners_token
     ensure_runners_token!
   end
+
+  def wiki
+    @wiki ||= ProjectWiki.new(self, self.owner)
+  end
 end
diff --git a/app/models/project_wiki.rb b/app/models/project_wiki.rb
index 8ce47495971..c847eba8d1c 100644
--- a/app/models/project_wiki.rb
+++ b/app/models/project_wiki.rb
@@ -12,6 +12,7 @@ class ProjectWiki
   # Returns a string describing what went wrong after
   # an operation fails.
   attr_reader :error_message
+  attr_reader :project
 
   def initialize(project, user = nil)
     @project = project