fix(runner): An unexpected exception occurred, causing the shire proc…

…ess cannot be canceled
phodal · Sep 6, 2024 · 7eba18c · 7eba18c
1 parent a47db5d
commit 7eba18c
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 10 deletions.
diff --git a/core/src/main/kotlin/com/phodal/shirecore/config/interaction/task/ChatCompletionTask.kt b/core/src/main/kotlin/com/phodal/shirecore/config/interaction/task/ChatCompletionTask.kt
@@ -21,7 +21,7 @@ import java.awt.event.KeyEvent
 import javax.swing.KeyStroke
 
 open class ChatCompletionTask(private val request: CodeCompletionRequest) :
-    Task.Backgroundable(request.project, ShireCoreBundle.message("intentions.chat.code.complete.name")) {
+    ShireInteractionTask(request.project, ShireCoreBundle.message("intentions.chat.code.complete.name"), request.postExecute) {
     private val logger = logger<ChatCompletionTask>()
 
     private var isCanceled: Boolean = false
@@ -87,7 +87,7 @@ open class ChatCompletionTask(private val request: CodeCompletionRequest) :
             indicator.fraction = 0.8
             logger.info("Suggestion: $suggestion")
 
-            val textRange: TextRange = TextRange(modifyStart, modifyEnd)
+            val textRange = TextRange(modifyStart, modifyEnd)
 
             request.postExecute.invoke(suggestion.toString(), textRange)
             indicator.fraction = 1.0

diff --git a/core/src/main/kotlin/com/phodal/shirecore/config/interaction/task/CodeCompletionTask.kt b/core/src/main/kotlin/com/phodal/shirecore/config/interaction/task/CodeCompletionTask.kt
@@ -21,7 +21,7 @@ import kotlinx.coroutines.flow.cancellable
 import kotlinx.coroutines.launch
 
 class CodeCompletionTask(private val request: CodeCompletionRequest) :
-    Task.Backgroundable(request.project, ShireCoreBundle.message("intentions.chat.code.complete.name")) {
+    ShireInteractionTask(request.project, ShireCoreBundle.message("intentions.chat.code.complete.name"), request.postExecute) {
 
     private var isCanceled: Boolean = false
 

diff --git a/core/src/main/kotlin/com/phodal/shirecore/config/interaction/task/FileGenerateTask.kt b/core/src/main/kotlin/com/phodal/shirecore/config/interaction/task/FileGenerateTask.kt
@@ -27,9 +27,9 @@ open class FileGenerateTask(
     val fileName: String?,
     private val codeOnly: Boolean = false,
     private val taskName: String = ShireCoreBundle.message("intentions.request.background.process.title"),
-    val postExecute: PostFunction,
+    postExecute: PostFunction,
 ) :
-    Task.Backgroundable(project, taskName) {
+    ShireInteractionTask(project, taskName, postExecute) {
     private val projectRoot = project.guessProjectDir()!!
 
     override fun run(indicator: ProgressIndicator) {
@@ -74,7 +74,7 @@ open class FileGenerateTask(
             refreshAndOpenInEditor(Path(projectRoot.path), projectRoot)
         }
 
-        postExecute.invoke(result, null)
+        postExecute?.invoke(result, null)
     }
 
     private fun refreshAndOpenInEditor(file: Path, parentDir: VirtualFile) = runBlocking {

diff --git a/core/src/main/kotlin/com/phodal/shirecore/config/interaction/task/ShireInteractionTask.kt b/core/src/main/kotlin/com/phodal/shirecore/config/interaction/task/ShireInteractionTask.kt
@@ -0,0 +1,22 @@
+package com.phodal.shirecore.config.interaction.task
+
+import com.intellij.openapi.progress.Task.Backgroundable
+import com.intellij.openapi.project.Project
+import com.phodal.shirecore.config.interaction.PostFunction
+import java.util.concurrent.CompletableFuture
+
+/**
+ * @author lk
+ */
+abstract class ShireInteractionTask(project: Project, taskName: String, val postExecute: PostFunction?): Backgroundable(project, taskName) {
+
+    /**
+     * An unexpected exception occurred, causing the shire process cannot be canceled,
+     * postExecute was not executed,it may have used the [CompletableFuture].
+     */
+    override fun onThrowable(error: Throwable) {
+        super.onThrowable(error)
+        postExecute?.invoke(null, null)
+    }
+
+}
diff --git a/shirelang/src/main/kotlin/com/phodal/shirelang/run/ShireProcessHandler.kt b/shirelang/src/main/kotlin/com/phodal/shirelang/run/ShireProcessHandler.kt
@@ -4,7 +4,7 @@ import com.intellij.build.process.BuildProcessHandler
 import java.io.OutputStream
 
 class ShireProcessHandler(private val myExecutionName: String) : BuildProcessHandler() {
-    override fun detachIsDefault(): Boolean = false
+    override fun detachIsDefault(): Boolean = true
     override fun destroyProcessImpl() = Unit
     override fun detachProcessImpl() {
         try {

diff --git a/shirelang/src/main/kotlin/com/phodal/shirelang/run/executor/ShireDefaultLlmExecutor.kt b/shirelang/src/main/kotlin/com/phodal/shirelang/run/executor/ShireDefaultLlmExecutor.kt
@@ -84,7 +84,7 @@ class ShireDefaultLlmExecutor(
                 postFunction(response, null)
                 context.processHandler.detachProcess()
             }
-        }, ModalityState.NON_MODAL)
+        }, ModalityState.nonModal())
     }
 }
 
diff --git a/shirelang/src/main/kotlin/com/phodal/shirelang/run/runner/ShireRunner.kt b/shirelang/src/main/kotlin/com/phodal/shirelang/run/runner/ShireRunner.kt
@@ -256,8 +256,8 @@ class ShireRunner(
             currentFile = file,
             editor = editor,
             compiledVariables = compiledVariables,
-        )
-        PostCodeHandleContext.putData(context)
+        ).also { PostCodeHandleContext.putData(it) }
+
         hobbitHole?.setupStreamingEndProcessor(project, context)
 
     }