fix(diff-simplifier): improve handling of real-world diffs #51

The diff simplifier now correctly handles diffs with multiple changes on the same line, including those with comments and blank lines.

Author: phodal

src/main/kotlin/cc/unitmesh/devti/vcs/DiffSimplifier.kt

@@ -247,7 +247,15 @@ class DiffSimplifier(val project: Project) {
 
                         val startLine = substringBefore
                             .substring("--- a/".length).trim()
-                        val withoutEnd = nextLine.substring("+++ b/".length, nextLine.indexOf("(date")).trim()
+                        var endIndex = nextLine.indexOf("(date")
+                        if (endIndex == -1) {
+                            endIndex = nextLine.indexOf("(revision")
+                        }
+                        if (endIndex == -1) {
+                            endIndex = nextLine.length
+                        }
+
+                        val withoutEnd = nextLine.substring("+++ b/".length, endIndex).trim()
 
                         if (startLine == withoutEnd) {
                             index += 2

src/test/kotlin/cc/unitmesh/devti/prompting/diff/DiffSimplifierTest.kt

@@ -123,4 +123,33 @@ change import from com.thoughtworks.archguard.code.module.domain.dubbo.ServiceCo
             """modify file server/src/test/kotlin/com/thoughtworks/archguard/code/clazz/domain/CodeTreeTest.kt"""
         )
     }
+
+    @Test
+    fun testHandleForRealWorld() {
+        val code = """Index: src/main/java/cc/unitmesh/untitled/demo/controller/BlogCategoryController.java
+===================================================================
+diff --git a/src/main/java/cc/unitmesh/untitled/demo/controller/BlogCategoryController.java b/src/main/java/cc/unitmesh/untitled/demo/controller/BlogCategoryController.java
+--- a/src/main/java/cc/unitmesh/untitled/demo/controller/BlogCategoryController.java	(revision 9b4b04de55fe5be5372eae67987b27f7d329e1f3)
++++ b/src/main/java/cc/unitmesh/untitled/demo/controller/BlogCategoryController.java	(revision 768efa678ecb9c044aea7c5c4873ed218357773b)
+@@ -6,7 +6,5 @@
+ public class BlogCategoryController {
+     // devti://story/github/1
+ 
+-    //    银行账户管理
+-
+     // Close a bank account
+ }"""
+
+        val postProcess = DiffSimplifier.postProcess(code)
+        assertEquals(
+            postProcess,
+            """modify file src/main/java/cc/unitmesh/untitled/demo/controller/BlogCategoryController.java
+ public class BlogCategoryController {
+     // devti://story/github/1
+-    //    银行账户管理
+-
+     // Close a bank account
+ }"""
+        )
+    }
 }