feat(coroutines): refactor processIfClause to be suspend function and update related calls #379

Author: phodal

exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/compiler/DevInsCompiler.kt

@@ -205,7 +205,9 @@ class DevInsCompiler(
                 handleNextSiblingForChild(next) {
                     when (it) {
                         is DevInIfClause, is DevInElseifClause, is DevInElseClause -> {
-                            handleNextSiblingForChild(it, ::processIfClause)
+                            handleNextSiblingForChild(it) {
+                                runBlocking { processIfClause(it) }
+                            }
                         }
 
                         else -> output.append(it.text)
@@ -225,7 +227,7 @@ class DevInsCompiler(
         }
     }
 
-    private fun processIfClause(clauseContent: PsiElement) {
+    suspend fun processIfClause(clauseContent: PsiElement) {
         when (clauseContent) {
             is DevInExpr -> {
                 addVariable(clauseContent)
@@ -234,7 +236,7 @@ class DevInsCompiler(
 
             is DevInVelocityBlock -> {
                 DevInFile.fromString(myProject, clauseContent.text).let { file ->
-                    val compile = runBlocking { DevInsCompiler(myProject, file).compile() }
+                    val compile = DevInsCompiler(myProject, file).compile()
                     compile.let {
                         output.append(it.output)
                         variableTable.addVariable(it.variableTable)

exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/run/DevInsProgramRunner.kt

@@ -1,54 +1,67 @@
 package cc.unitmesh.devti.language.run
 
+import cc.unitmesh.devti.language.run.flow.DevInsProcessProcessor
+import cc.unitmesh.devti.language.run.runner.ShireConsoleView
+import cc.unitmesh.devti.language.status.DevInsRunListener
+import cc.unitmesh.devti.util.AutoDevCoroutineScope
+import com.intellij.execution.ExecutionResult
 import com.intellij.execution.configurations.RunProfile
 import com.intellij.execution.configurations.RunProfileState
 import com.intellij.execution.configurations.RunnerSettings
+import com.intellij.execution.process.ProcessEvent
 import com.intellij.execution.runners.ExecutionEnvironment
 import com.intellij.execution.runners.GenericProgramRunner
 import com.intellij.execution.runners.showRunContent
 import com.intellij.execution.ui.RunContentDescriptor
 import com.intellij.openapi.Disposable
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.fileEditor.FileDocumentManager
+import kotlinx.coroutines.launch
 import java.util.concurrent.atomic.AtomicReference
 
 class DevInsProgramRunner : GenericProgramRunner<RunnerSettings>(), Disposable {
     private val RUNNER_ID: String = "DevInsProgramRunner"
 
     private val connection = ApplicationManager.getApplication().messageBus.connect(this)
 
-//    private var isSubscribed = false
+    private var isSubscribed = false
 
     override fun getRunnerId(): String = RUNNER_ID
 
     override fun canRun(executorId: String, profile: RunProfile) = profile is DevInsConfiguration
 
     override fun doExecute(state: RunProfileState, environment: ExecutionEnvironment): RunContentDescriptor? {
         if (environment.runProfile !is DevInsConfiguration) return null
-        val configuration = environment.runProfile as DevInsConfiguration
-        val devInState = state as DevInsRunConfigurationProfileState
+        val shireState = state as DevInsRunConfigurationProfileState
 
-        FileDocumentManager.getInstance().saveAllDocuments()
+        var executeResult: ExecutionResult?
 
         val result = AtomicReference<RunContentDescriptor>()
 
-//        if (!isSubscribed) {
-//            connection.subscribe(DevInsRunListener.TOPIC, object : DevInsRunListener {
-//                override fun runFinish(string: String, event: ProcessEvent, scriptPath: String) {
-//                    environment.project.service<DevInsProcessProcessor>().process(string, event, scriptPath)
-//                }
-//            })
-//
-//            isSubscribed = true
-//        }
-
         ApplicationManager.getApplication().invokeAndWait {
-            val executionResult = devInState.execute(environment.executor, this)
-            if (configuration.showConsole) {
-                val showRunContent = showRunContent(executionResult, environment)
-                result.set(showRunContent)
-            } else {
-                result.set(null)
+            if (!isSubscribed) {
+                connection.subscribe(DevInsRunListener.TOPIC, object : DevInsRunListener {
+                    override fun runFinish(
+                        allOutput: String,
+                        llmOutput: String,
+                        event: ProcessEvent,
+                        scriptPath: String,
+                        consoleView: ShireConsoleView?,
+                    ) {
+                        AutoDevCoroutineScope.scope(environment.project).launch {
+                            environment.project.getService(DevInsProcessProcessor::class.java)
+                                .process(allOutput, event, scriptPath, consoleView)
+                        }
+                    }
+                })
+
+                isSubscribed = true
+            }
+
+            executeResult = shireState.execute(environment.executor, this)
+
+            if (shireState.isShowRunContent) {
+                result.set(showRunContent(executeResult, environment))
             }
         }
 

exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/run/DevInsRunConfigurationProfileState.kt

@@ -64,7 +64,7 @@ open class DevInsRunConfigurationProfileState(
 
         console.attachToProcess(processHandler)
 
-        val shireFile: DevInFile? =DevInFile.lookup(myProject, configuration.getScriptPath())
+        val shireFile: DevInFile? = DevInFile.lookup(myProject, configuration.getScriptPath())
         if (shireFile == null) {
             console.print("File not found: ${configuration.getScriptPath()}", ConsoleViewContentType.ERROR_OUTPUT)
             processHandler.exitWithError()
@@ -222,11 +222,10 @@ open class DevInsRunConfigurationProfileState(
             if (stringFlow != null) {
                 AutoDevCoroutineScope.scope(myProject).launch {
                     val llmResult = StringBuilder()
-                    runBlocking {
-                        stringFlow.collect {
-                            llmResult.append(it)
-                            console.print(it, ConsoleViewContentType.NORMAL_OUTPUT)
-                        }
+
+                    stringFlow.collect {
+                        llmResult.append(it)
+                        console.print(it, ConsoleViewContentType.NORMAL_OUTPUT)
                     }
 
                     console.print("\nDone!", ConsoleViewContentType.SYSTEM_OUTPUT)
@@ -258,11 +257,9 @@ open class DevInsRunConfigurationProfileState(
 
             AutoDevCoroutineScope.scope(myProject).launch {
                 val llmResult = StringBuilder()
-                runBlocking {
-                    llm.stream(output, "", true).collect {
-                        llmResult.append(it)
-                        console.print(it, ConsoleViewContentType.NORMAL_OUTPUT)
-                    }
+                llm.stream(output, "", true).collect {
+                    llmResult.append(it)
+                    console.print(it, ConsoleViewContentType.NORMAL_OUTPUT)
                 }
 
                 console.print("\nDone!", ConsoleViewContentType.SYSTEM_OUTPUT)