Merge branch 'diff_bug'

Valeriy Sizov
2 parents d8833270 bd5334ab
Showing 1 changed file with 2 additions and 3 deletions Show diff stats
lib/gitlab/inline_diff.rb
@@ -21,14 +21,13 @@ module Gitlab
             end
           end
           first_token = first_line[0..first_the_same_symbols][1..-1]
-
           diff_arr[index+1].sub!(first_token, first_token + START)
           diff_arr[index+2].sub!(first_token, first_token + START)
-
           last_the_same_symbols = 0
           (1..max_length + 1).each do |i|
             last_the_same_symbols = -i
-            if first_line[-i] != second_line[-i]
+            shortest_line = second_line.size > first_line.size ? first_line : second_line
+            if ( first_line[-i] != second_line[-i] ) || "#{first_token}#{START}".size == shortest_line[1..-i].size
               break
             end
           end
...	...	@@ -21,14 +21,13 @@ module Gitlab
21	21	end
22	22	end
23	23	first_token = first_line[0..first_the_same_symbols][1..-1]
24		-
25	24	diff_arr[index+1].sub!(first_token, first_token + START)
26	25	diff_arr[index+2].sub!(first_token, first_token + START)
27		-
28	26	last_the_same_symbols = 0
29	27	(1..max_length + 1).each do \|i\|
30	28	last_the_same_symbols = -i
31		- if first_line[-i] != second_line[-i]
	29	+ shortest_line = second_line.size > first_line.size ? first_line : second_line
	30	+ if ( first_line[-i] != second_line[-i] ) \|\| "#{first_token}#{START}".size == shortest_line[1..-i].size
32	31	break
33	32	end
34	33	end
...	...