diff

app/services/create_diff_record_service.rb

@@ -26,23 +26,25 @@ class CreateDiffRecordService < ApplicationService
     fragment_size = 1
     Rails.logger.info("diff_line_content:#{Diffy::Diff.new(before, after)}")
     Diffy::Diff.new(before, after).each do |line|
-      unless line =~ /^[\+-]/
+      unless line.include?("\\ 文件尾没有 newline 字符")
-        if arr.empty? && index < fragment_size
+        unless line =~ /^[\+-]/
-          content += line
+          if arr.empty? && index < fragment_size
-          index += 1
+            content += line
-        else
+            index += 1
-          index = 0
+          else
-          arr << line
+            index = 0
-          arr.shift if arr.size > fragment_size
+            arr << line
+            arr.shift if arr.size > fragment_size
+          end
+          next
         end
-        next
-      end
 
-      content += arr.join('') if arr.present?
+        content += arr.join('') if arr.present?
-      Rails.logger.info("diff_line_arr:#{arr.join('')}")
+        Rails.logger.info("diff_line_arr:#{arr.join('')}")
-      content += line
+        content += line
-      arr.clear
+        arr.clear
-      Rails.logger.info("diff_line:#{line}")
+        Rails.logger.info("diff_line:#{line}")
+      end
     end
     content
   end