Merge pull request #1026 from gitlabhq/inline_diff

Inline diff

app/assets/stylesheets/sections/commits.scss

@@ -82,6 +82,17 @@
     color:#333;
     font-size: 12px;
     font-family: 'Menlo', 'Liberation Mono', 'Consolas', 'Courier New', 'andale mono','lucida console',monospace;
+    .old{
+      span.idiff{
+        background-color:#FAA;
+      }
+    }
+    .new{
+      span.idiff{
+        background-color:#AFA;
+      }
+    }
+
   }
   .diff_file_content_image {
     background:#eee;

app/helpers/commits_helper.rb

@@ -36,7 +36,7 @@ module CommitsHelper
     line_new = 1
     type = nil
     
-    lines_arr = diff_arr
+    lines_arr = ::Gitlab::InlineDiff.processing diff_arr
     lines_arr.each do |line|
       next if line.match(/^\-\-\- \/dev\/null/)
       next if line.match(/^\+\+\+ \/dev\/null/)
@@ -44,6 +44,7 @@ module CommitsHelper
       next if line.match(/^\+\+\+ b/)
 
       full_line = html_escape(line.gsub(/\n/, ''))
+      full_line = ::Gitlab::InlineDiff.replace_markers full_line
 
       if line.match(/^@@ -/)
         type = "match"
@@ -81,4 +82,5 @@ module CommitsHelper
       nil
     end
   end
+
 end

lib/gitlab/inline_diff.rb

+module Gitlab
+  class InlineDiff
+    class << self
+
+      START  = "#!idiff-start!#"
+      FINISH = "#!idiff-finish!#"
+    
+      def processing diff_arr
+        indexes = _indexes_of_changed_lines diff_arr
+
+        indexes.each do |index|
+          first_line = diff_arr[index+1]
+          second_line = diff_arr[index+2]
+          max_length = [first_line.size, second_line.size].max
+
+          first_the_same_symbols = 0
+          (0..max_length + 1).each do |i|
+            first_the_same_symbols = i - 1
+            if first_line[i] != second_line[i] && i > 0
+              break
+            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]
+              break
+            end
+          end
+          last_the_same_symbols += 1
+          last_token = first_line[last_the_same_symbols..-1]
+          diff_arr[index+1].sub!(/#{Regexp.escape(last_token)}$/, FINISH + last_token)
+          diff_arr[index+2].sub!(/#{Regexp.escape(last_token)}$/, FINISH + last_token)
+        end
+        diff_arr
+      end
+
+      def _indexes_of_changed_lines diff_arr
+        chain_of_first_symbols = ""
+        diff_arr.each_with_index do |line, i|
+          chain_of_first_symbols += line[0]
+        end
+        chain_of_first_symbols.gsub!(/[^\-\+]/, "#")
+
+        offset = 0
+        indexes = []
+        while index = chain_of_first_symbols.index("#-+#", offset)
+          indexes << index
+          offset = index + 1
+        end
+        indexes
+      end
+
+      def replace_markers line
+        line.gsub!(START, "<span class='idiff'>")
+        line.gsub!(FINISH, "</span>")
+        line
+      end
+    
+    end
+
+  end
+end