fix(compiler): wrap parsing operations in read actions

Wrap parsing operations in `runReadAction` blocks in `FrontmatterParser.kt` and `ShireRunFileAction.kt` to ensure thread safety during read operations. This change helps to prevent potential concurrency issues.
phodal · Jun 29, 2024 · 97c8d15 · 97c8d15
1 parent 76e1700
commit 97c8d15
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 9 deletions.
diff --git a/shirelang/src/main/kotlin/com/phodal/shirelang/actions/ShireRunFileAction.kt b/shirelang/src/main/kotlin/com/phodal/shirelang/actions/ShireRunFileAction.kt
@@ -10,6 +10,8 @@ import com.intellij.execution.runners.ExecutionEnvironmentBuilder
 import com.intellij.openapi.actionSystem.ActionUpdateThread
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.CommonDataKeys
+import com.intellij.openapi.application.ApplicationManager
+import com.intellij.openapi.application.ModalityState
 import com.intellij.openapi.application.runReadAction
 import com.intellij.openapi.project.DumbAwareAction
 import com.intellij.openapi.project.Project
@@ -19,6 +21,8 @@ import com.phodal.shirelang.psi.ShireFile
 import com.phodal.shirelang.run.ShireConfiguration
 import com.phodal.shirelang.run.ShireConfigurationType
 import com.phodal.shirelang.run.ShireRunConfigurationProducer
+import com.phodal.shirelang.utils.ShireCoroutineScope
+import kotlinx.coroutines.launch
 import org.jetbrains.annotations.NonNls
 
 class ShireRunFileAction : DumbAwareAction() {
@@ -73,15 +77,18 @@ class ShireRunFileAction : DumbAwareAction() {
         }
 
         fun runFile(myProject: Project, fileName: String): Any {
-            // first search fileName in project
             val file = runReadAction {
                 ShireActionStartupActivity.obtainShireFiles(myProject).find {
                     it.name == fileName
                 }
             } ?: return "File not found"
 
-            val config = DynamicShireActionConfig.from(file)
-            return executeShireFile(myProject, config, null)
+            ApplicationManager.getApplication().invokeLater({
+                val config = DynamicShireActionConfig.from(file)
+                executeShireFile(myProject, config, null)
+            }, ModalityState.NON_MODAL)
+
+            return ""
         }
     }
 }
diff --git a/shirelang/src/main/kotlin/com/phodal/shirelang/compiler/FrontmatterParser.kt b/shirelang/src/main/kotlin/com/phodal/shirelang/compiler/FrontmatterParser.kt
@@ -1,5 +1,6 @@
 package com.phodal.shirelang.compiler
 
+import com.intellij.openapi.application.invokeAndWaitIfNeeded
 import com.intellij.openapi.application.runReadAction
 import com.intellij.openapi.diagnostic.logger
 import com.intellij.psi.PsiElement

diff --git a/...lang/src/main/kotlin/com/phodal/shirelang/compiler/hobbit/execute/PatternFuncProcessor.kt b/...lang/src/main/kotlin/com/phodal/shirelang/compiler/hobbit/execute/PatternFuncProcessor.kt
@@ -1,5 +1,7 @@
 package com.phodal.shirelang.compiler.hobbit.execute
 
+import com.intellij.openapi.application.ApplicationManager
+import com.intellij.openapi.application.invokeAndWaitIfNeeded
 import com.intellij.openapi.diagnostic.logger
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.project.guessProjectDir

diff --git a/shirelang/src/main/kotlin/com/phodal/shirelang/run/ShireProgramRunner.kt b/shirelang/src/main/kotlin/com/phodal/shirelang/run/ShireProgramRunner.kt
@@ -11,7 +11,6 @@ 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 java.util.concurrent.atomic.AtomicReference
 
 class ShireProgramRunner : GenericProgramRunner<RunnerSettings>(), Disposable {
@@ -29,7 +28,8 @@ class ShireProgramRunner : GenericProgramRunner<RunnerSettings>(), Disposable {
         if (environment.runProfile !is ShireConfiguration) return null
         val shireState = state as ShireRunConfigurationProfileState
 
-        FileDocumentManager.getInstance().saveAllDocuments()
+//        FileDocumentManager.getInstance().saveAllDocuments()
+
         val result = AtomicReference<RunContentDescriptor>()
 
         if(!isSubscribed) {
@@ -38,6 +38,7 @@ class ShireProgramRunner : GenericProgramRunner<RunnerSettings>(), Disposable {
                     val consoleView = (environment.state as? ShireRunConfigurationProfileState)?.console
                     environment.project.getService(ShireProcessProcessor::class.java)
                         .process(string, event, scriptPath, consoleView)
+
                 }
             })
 

diff --git a/shirelang/src/main/kotlin/com/phodal/shirelang/run/ShireRunConfigurationProfileState.kt b/shirelang/src/main/kotlin/com/phodal/shirelang/run/ShireRunConfigurationProfileState.kt
@@ -11,6 +11,7 @@ import com.intellij.execution.process.ProcessEvent
 import com.intellij.execution.process.ProcessTerminatedListener
 import com.intellij.execution.runners.ProgramRunner
 import com.intellij.execution.ui.ConsoleViewContentType
+import com.intellij.openapi.Disposable
 import com.intellij.openapi.actionSystem.ActionManager
 import com.intellij.openapi.actionSystem.DefaultActionGroup
 import com.intellij.openapi.application.ApplicationManager
@@ -38,7 +39,7 @@ import javax.swing.JComponent
 open class ShireRunConfigurationProfileState(
     private val myProject: Project,
     private val configuration: ShireConfiguration,
-) : RunProfileState {
+) : RunProfileState, Disposable {
     private var executionConsole: ConsoleViewImpl? = null
     var console: ShireConsoleView? = null
 
@@ -140,6 +141,11 @@ open class ShireRunConfigurationProfileState(
 
         console.print("\n--------------------\n", ConsoleViewContentType.NORMAL_OUTPUT)
     }
+
+    override fun dispose() {
+        console?.dispose()
+        executionConsole?.dispose()
+    }
 }
 
 class ShireConsoleView(private val executionConsole: ConsoleViewImpl) :
@@ -156,6 +162,11 @@ class ShireConsoleView(private val executionConsole: ConsoleViewImpl) :
         toolbar.targetComponent = baseComponent
         myPanel.add(toolbar.component, BorderLayout.EAST)
     }
+
+    override fun dispose() {
+        super.dispose()
+        executionConsole.dispose()
+    }
 }
 
 class ShireProcessAdapter(private val sb: StringBuilder, val configuration: ShireConfiguration) : ProcessAdapter() {

diff --git a/shirelang/src/main/kotlin/com/phodal/shirelang/run/runner/ShireDefaultRunner.kt b/shirelang/src/main/kotlin/com/phodal/shirelang/run/runner/ShireDefaultRunner.kt
@@ -4,6 +4,7 @@ import com.intellij.execution.console.ConsoleViewWrapperBase
 import com.intellij.execution.process.ProcessHandler
 import com.intellij.execution.ui.ConsoleViewContentType
 import com.intellij.openapi.application.ApplicationManager
+import com.intellij.openapi.application.ModalityState
 import com.intellij.openapi.project.Project
 import com.phodal.shire.llm.LlmProvider
 import com.phodal.shirelang.ShireBundle
@@ -22,7 +23,7 @@ class ShireDefaultRunner(
     private val isLocalMode: Boolean,
 ) : ShireRunner(configuration, processHandler, console, myProject, prompt) {
     override fun execute(postFunction: (response: String) -> Unit) {
-        ApplicationManager.getApplication().invokeLater {
+        ApplicationManager.getApplication().invokeLater({
             if (isLocalMode) {
                 console.print(ShireBundle.message("shire.run.local.mode"), ConsoleViewContentType.SYSTEM_OUTPUT)
                 processHandler.detachProcess()
@@ -48,7 +49,7 @@ class ShireDefaultRunner(
             postFunction(response)
             processHandler.detachProcess()
                 }
-        }
+        }, ModalityState.NON_MODAL)
     }
 }
 
diff --git a/shirelang/src/test/kotlin/com/phodal/shirelang/ShireLifecycleTest.kt b/shirelang/src/test/kotlin/com/phodal/shirelang/ShireLifecycleTest.kt
@@ -35,6 +35,8 @@ class ShireLifecycleTest : BasePlatformTestCase() {
     }
 
     fun testShouldHandleWhenAfterStreaming() {
+
+        val code2 = "hi"
         val code = """
             ---
             afterStreaming: {
@@ -46,7 +48,7 @@ class ShireLifecycleTest : BasePlatformTestCase() {
                 case condition {
                   "error"       { notify("Failed to Generate JSON") }
                   "success"     { notify("Success to Generate JSON") }
-                  "json-result" { execute("sample.shire") }
+                  "json-result" { execute("sample2.shire") }
                   default       { notify("Failed to Generate JSON") /* mean nothing */ }
                 }
               }
@@ -55,6 +57,7 @@ class ShireLifecycleTest : BasePlatformTestCase() {
             ${'$'}allController
         """.trimIndent()
 
+        myFixture.addFileToProject("sample2.shire", code2)
         val file = myFixture.addFileToProject("sample.shire", code)
 
         myFixture.openFileInEditor(file.virtualFile)