feat(diff): enhance SingleFileDiffView with editor param and optimize stream handling

Author: phodal

core/src/main/kotlin/cc/unitmesh/devti/diff/DiffStreamHandler.kt

@@ -36,7 +36,6 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.cancellable
 import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.launch
-import java.awt.EventQueue.invokeLater
 import kotlin.math.min
 
 
@@ -120,26 +119,47 @@ class DiffStreamHandler(
         resetState()
     }
 
-    fun streamDiffLinesToEditor(originContent: String, prompt: String, editor: Editor) {
+    fun streamDiffLinesToEditor(originContent: String, prompt: String) {
+        val lines = originContent.lines()
+
         isRunning = true
         val flow: Flow<String> = LlmFactory.create(project).stream(prompt, "", false)
+        var lastLineNo = 0
         AutoDevCoroutineScope.scope(project).launch {
             val suggestion = StringBuilder()
             flow.cancellable().collect { char ->
                 suggestion.append(char)
                 val code = CodeFence.parse(suggestion.toString())
-                if (code.text.isNotEmpty()) {
-                    invokeLater {
-                        runWriteAction {
-                            editor.document.setText(code.text)
+                var value: List<String> = code.text.lines()
+                if (value.isEmpty()) return@collect
+
+                val newLines = if (lastLineNo < value.size) {
+                    value.subList(lastLineNo, value.size)
+                } else {
+                    listOf()
+                }
+
+                if (newLines.isEmpty()) return@collect
+
+                val flowValue: Flow<String> = flowOf(*newLines.toTypedArray())
+                val oldLinesContent = if (lastLineNo + newLines.size <= lines.size) {
+                    lines.subList(lastLineNo, lastLineNo + newLines.size)
+                } else {
+                    listOf()
+                }
+                lastLineNo = value.size
+
+                streamDiff(oldLinesContent, flowValue).collect {
+                    ApplicationManager.getApplication().invokeLater {
+                        WriteCommandAction.runWriteCommandAction(project) {
+                            updateByDiffType(it)
                         }
                     }
                 }
             }
 
             val code = CodeFence.parse(suggestion.toString())
             newCode = code.text
-            normalDiff(originContent, code.text)
             handleFinishedResponse(code.text)
         }
     }

core/src/main/kotlin/cc/unitmesh/devti/sketch/ui/patch/SingleFileDiffView.kt

@@ -2,13 +2,19 @@ package cc.unitmesh.devti.sketch.ui.patch
 
 import cc.unitmesh.devti.AutoDevBundle
 import cc.unitmesh.devti.diff.DiffStreamHandler
+import cc.unitmesh.devti.llms.LlmFactory
 import cc.unitmesh.devti.sketch.ui.LangSketch
 import cc.unitmesh.devti.template.GENIUS_CODE
 import cc.unitmesh.devti.template.TemplateRender
 import cc.unitmesh.devti.template.context.TemplateContext
+import cc.unitmesh.devti.util.AutoDevCoroutineScope
+import cc.unitmesh.devti.util.parser.CodeFence
 import com.intellij.diff.editor.DiffVirtualFileBase
 import com.intellij.icons.AllIcons
 import com.intellij.lang.Language
+import com.intellij.openapi.application.ApplicationManager
+import com.intellij.openapi.application.ModalityState
+import com.intellij.openapi.application.runWriteAction
 import com.intellij.openapi.command.CommandProcessor
 import com.intellij.openapi.command.WriteCommandAction
 import com.intellij.openapi.command.undo.UndoManager
@@ -28,6 +34,9 @@ import com.intellij.ui.JBColor
 import com.intellij.ui.components.JBLabel
 import com.intellij.ui.components.panels.HorizontalLayout
 import com.intellij.ui.components.panels.VerticalLayout
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.cancellable
+import kotlinx.coroutines.launch
 import java.awt.BorderLayout
 import java.awt.event.MouseAdapter
 import java.awt.event.MouseEvent
@@ -228,7 +237,21 @@ fun applyDiffRepairSuggestion(project: Project, editor: Editor, oldCode: String,
     templateRender.context = DiffRepairContext(oldCode, patchedCode)
     val prompt = templateRender.renderTemplate(template)
 
-    diffStreamHandler.streamDiffLinesToEditor(oldCode, prompt, editor)
+    val flow: Flow<String> = LlmFactory.create(project).stream(prompt, "", false)
+    AutoDevCoroutineScope.scope(project).launch {
+        val suggestion = StringBuilder()
+        flow.cancellable().collect { char ->
+            suggestion.append(char)
+            val code = CodeFence.parse(suggestion.toString())
+            if (code.text.isNotEmpty()) {
+                ApplicationManager.getApplication().invokeLater({
+                    runWriteAction {
+                        editor.document.setText(code.text)
+                    }
+                }, ModalityState.defaultModalityState())
+            }
+        }
+    }
 }
 
 data class DiffRepairContext(

core/src/main/resources/genius/zh/code/sketch.vm

@@ -109,8 +109,8 @@ have created a routes.py and main.js file, and updated the main.html file.
 </devin>
 // step 4.1, call tools to create test code and run test code
 <devin>
-/patch:src/test/test_routes.py
-```patch
+/write:src/test/test_routes.py
+```python
 // the test code
 ```
 </devin>