Add latest changes from gitlab-org/gitlab@master

2 files changed, 36 insertions, 1 deletions

diff --git a/app/presenters/blob_presenter.rb b/app/presenters/blob_presenter.rb
index 3a71d2b87f3..e0077db8d5c 100644
--- a/app/presenters/blob_presenter.rb
+++ b/app/presenters/blob_presenter.rb
@@ -9,7 +9,7 @@ class BlobPresenter < Gitlab::View::Presenter::Delegated
     Gitlab::Highlight.highlight(
       blob.path,
       limited_blob_data(to: to),
-      language: blob.language_from_gitattributes,
+      language: language,
       plain: plain
     )
   end
@@ -37,4 +37,8 @@ class BlobPresenter < Gitlab::View::Presenter::Delegated
   def all_lines
     @all_lines ||= blob.data.lines
   end
+
+  def language
+    blob.language_from_gitattributes
+  end
 end
diff --git a/app/presenters/snippet_blob_presenter.rb b/app/presenters/snippet_blob_presenter.rb
new file mode 100644
index 00000000000..9baaacdbb24
--- /dev/null
+++ b/app/presenters/snippet_blob_presenter.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+class SnippetBlobPresenter < BlobPresenter
+  def highlighted_data
+    return if blob.binary?
+
+    if blob.rich_viewer&.partial_name == 'markup'
+      blob.rendered_markup
+    else
+      highlight
+    end
+  end
+
+  def raw_path
+    if snippet.is_a?(ProjectSnippet)
+      raw_project_snippet_path(snippet.project, snippet)
+    else
+      raw_snippet_path(snippet)
+    end
+  end
+
+  private
+
+  def snippet
+    blob.snippet
+  end
+
+  def language
+    nil
+  end
+end