From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 30 Jan 2014 11:31:56 +0000 (+0200)
Subject: Highlight code search results
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=89ab7e79adb76752f46ced38e74e396b020e84ff;p=wvm%2Fgitlab.git

Highlight code search results
---

diff --git a/app/views/search/results/_blob.html.haml b/app/views/search/results/_blob.html.haml
index a2e4a00b7..f9d217e84 100644
--- a/app/views/search/results/_blob.html.haml
+++ b/app/views/search/results/_blob.html.haml
@@ -6,5 +6,4 @@
         %strong
           = blob.filename
     .file-content.code.term
-      %div{class: user_color_scheme_class}
-        = raw blob.colorize( formatter: :gitlab, options: { first_line_number: blob.startline } )
+      = render 'shared/file_hljs', blob: blob, first_line_number: blob.startline
diff --git a/app/views/shared/_file_hljs.html.haml b/app/views/shared/_file_hljs.html.haml
index ad2a2fc33..166a13bd7 100644
--- a/app/views/shared/_file_hljs.html.haml
+++ b/app/views/shared/_file_hljs.html.haml
@@ -1,7 +1,8 @@
 %div.highlighted-data{class: user_color_scheme_class}
   .line-numbers
     - blob.data.lines.size.times do |index|
-      - i = index + 1
+      - offset = defined?(first_line_number) ? first_line_number : 1
+      - i = index + offset
       = link_to "#L#{i}", id: "L#{i}", rel: "#L#{i}" do
         %i.icon-link
         = i