Merge pull request #6799 from Datacom/bug/parallel_diff_missing_lines_pr

Fix missing lines in Parallel Diff

Merge pull request #6799 from Datacom/bug/parallel_diff_missing_lines_pr
Fix missing lines in Parallel Diff
Dmitriy Zaporozhets
2 parents aefdac00 5ef7fdbd
Showing 1 changed file with 1 additions and 1 deletions Show diff stats
app/helpers/commits_helper.rb
@@ -117,7 +117,7 @@ module CommitsHelper
         added_lines[line_new]   = { line_code: line_code, type: type, line: line }
       end
     end
-    max_length = old_file ? old_file.sloc + added_lines.length : file.sloc
+    max_length = old_file ? [old_file.loc, file.loc].max : file.loc
  
     offset1 = 0
     offset2 = 0
...	...	@@ -117,7 +117,7 @@ module CommitsHelper
117	117	added_lines[line_new] = { line_code: line_code, type: type, line: line }
118	118	end
119	119	end
120		- max_length = old_file ? old_file.sloc + added_lines.length : file.sloc
	120	+ max_length = old_file ? [old_file.loc, file.loc].max : file.loc
121	121
122	122	offset1 = 0
123	123	offset2 = 0
...	...