fix(diff): fix file rename message formatting

The diff simplifier was not correctly formatting the file rename message. This commit fixes the issue by adding "from" and "to" keywords to the message.
unit-mesh · Jan 11, 2024 · 2039103 · 2039103
1 parent 8ea8b3f
commit 2039103
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/src/main/kotlin/cc/unitmesh/devti/prompting/diff/DiffSimplifier.kt b/src/main/kotlin/cc/unitmesh/devti/prompting/diff/DiffSimplifier.kt
@@ -97,7 +97,7 @@ class DiffSimplifier(val project: Project) {
                     continue
                 }
 
-                if (line.startsWith("--- /dev/null")) {
+                if (line.startsWith("---\t/dev/null")) {
                     index++
                     continue
                 }
@@ -129,7 +129,7 @@ class DiffSimplifier(val project: Project) {
                     if (nextLine.startsWith("rename to")) {
                         val from = line.substring("rename from ".length)
                         val to = nextLine.substring("rename to ".length)
-                        destination.add("rename file $from $to")
+                        destination.add("rename file from $from to $to")
                         // The next value will be "---" and the value after that will be "+++".
                         index += 4
                         continue
@@ -218,8 +218,11 @@ class DiffSimplifier(val project: Project) {
                     val nextLine = lines[index + 1]
                     if (nextLine.startsWith("+++")) {
                         // remove end date
-                        val startLine = line.substring("--- a/".length).trim()
-                        val withoutEnd = nextLine.substring("+++ b/".length, nextLine.indexOf("(date ")).trim()
+                        val substringBefore = line.substringBefore("(revision")
+
+                        val startLine = substringBefore
+                            .substring("--- a/".length).trim()
+                        val withoutEnd = nextLine.substring("+++ b/".length, nextLine.indexOf("(date")).trim()
 
                         if (startLine == withoutEnd) {
                             index += 2

diff --git a/src/test/kotlin/cc/unitmesh/devti/prompting/diff/DiffSimplifierTest.kt b/src/test/kotlin/cc/unitmesh/devti/prompting/diff/DiffSimplifierTest.kt
@@ -37,7 +37,7 @@ class DiffSimplifierTest {
         val postProcess = DiffSimplifier.postProcess(diff)
         assertEquals(
             postProcess,
-            """rename file server/src/main/kotlin/com/thoughtworks/archguard/code/module/domain/model/LeafManger.kt server/metric-service/src/main/kotlin/org/archguard/arch/LeafManger.kt""".trimMargin()
+            """rename file from server/src/main/kotlin/com/thoughtworks/archguard/code/module/domain/model/LeafManger.kt to server/metric-service/src/main/kotlin/org/archguard/arch/LeafManger.kt""".trimMargin()
         )
     }
 
@@ -106,7 +106,7 @@ change import from com.thoughtworks.archguard.code.module.domain.dubbo.ServiceCo
         val postProcess = DiffSimplifier.postProcess(code)
         assertEquals(
             postProcess,
-            """rename file server/src/main/kotlin/com/thoughtworks/archguard/code/module/domain/model/LeafManger.kt server/metric-service/src/main/kotlin/org/archguard/arch/LeafManger.kt
+            """rename file from server/src/main/kotlin/com/thoughtworks/archguard/code/module/domain/model/LeafManger.kt to server/metric-service/src/main/kotlin/org/archguard/arch/LeafManger.kt
 change import from com.thoughtworks.archguard.code.module.domain.dubbo.ServiceConfig to org.archguard.protocol.dubbo.ServiceConfig"""
         )
     }