Highlight code search results

Dmitriy Zaporozhets
1 parent 3fafac3e
Showing 2 changed files with 3 additions and 3 deletions Show diff stats
app/views/search/results/_blob.html.haml
app/views/shared/_file_hljs.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
 %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
...	...	@@ -6,5 +6,4 @@
6	6	%strong
7	7	= blob.filename
8	8	.file-content.code.term
9		- %div{class: user_color_scheme_class}
10		- = raw blob.colorize( formatter: :gitlab, options: { first_line_number: blob.startline } )
	9	+ = render 'shared/file_hljs', blob: blob, first_line_number: blob.startline
...	...
1	1	%div.highlighted-data{class: user_color_scheme_class}
2	2	.line-numbers
3	3	- blob.data.lines.size.times do \|index\|
4		- - i = index + 1
	4	+ - offset = defined?(first_line_number) ? first_line_number : 1
	5	+ - i = index + offset
5	6	= link_to "#L#{i}", id: "L#{i}", rel: "#L#{i}" do
6	7	%i.icon-link
7	8	= i
...	...