Fix threading issues with showDocument

src/main/kotlin/com/sourcegraph/cody/agent/CodyAgentClient.kt

@@ -100,17 +100,19 @@ class CodyAgentClient(private val project: Project, private val webview: NativeW
 
   @JsonRequest("textDocument/show")
   fun textDocument_show(params: TextDocument_ShowParams): CompletableFuture<Boolean> {
-    return acceptOnEventThreadAndGet {
-      val selection = params.options?.selection
-      val preserveFocus = params.options?.preserveFocus
-      val vf = CodyEditorUtil.findFileOrScratch(project, params.uri)
-      if (vf != null) {
-        CodyEditorUtil.showDocument(project, vf, selection, preserveFocus)
-        true
-      } else {
-        false
-      }
-    }
+    val vf =
+        acceptOnEventThreadAndGet { CodyEditorUtil.findFileOrScratch(project, params.uri) }.get()
+
+    val result =
+        if (vf != null) {
+          val selection = params.options?.selection
+          val preserveFocus = params.options?.preserveFocus
+          CodyEditorUtil.showDocument(project, vf, selection, preserveFocus)
+        } else {
+          false
+        }
+
+    return CompletableFuture.completedFuture(result)
   }
 
   @JsonRequest("textDocument/openUntitledDocument")

src/main/kotlin/com/sourcegraph/utils/CodyEditorUtil.kt

@@ -31,6 +31,7 @@ import com.intellij.util.withScheme
 import com.sourcegraph.cody.agent.protocol_extensions.toOffsetRange
 import com.sourcegraph.cody.agent.protocol_generated.Range
 import com.sourcegraph.config.ConfigUtil
+import com.sourcegraph.utils.ThreadingUtil.runInEdtAndGet
 import java.net.URI
 import java.net.URISyntaxException
 import kotlin.io.path.createDirectories
@@ -166,24 +167,24 @@ object CodyEditorUtil {
       FileDocumentManager.getInstance().getFile(editor.document)
 
   @JvmStatic
-  @RequiresEdt
   fun showDocument(
       project: Project,
       vf: VirtualFile,
       selection: Range? = null,
       preserveFocus: Boolean? = false
   ): Boolean {
     try {
-      if (selection == null) {
-        OpenFileDescriptor(project, vf).navigate(/* requestFocus= */ preserveFocus != true)
-      } else {
-        OpenFileDescriptor(
+      val descriptor =
+          if (selection == null) {
+            OpenFileDescriptor(project, vf)
+          } else {
+            OpenFileDescriptor(
                 project,
                 vf,
                 selection.start.line.toInt(),
                 /* logicalColumn= */ selection.start.character.toInt())
-            .navigate(/* requestFocus= */ preserveFocus != true)
-      }
+          }
+      runInEdtAndGet { descriptor.navigate(/* requestFocus= */ preserveFocus != true) }
       return true
     } catch (e: Exception) {
       logger.error("Cannot switch view to file ${vf.path}", e)

src/main/kotlin/com/sourcegraph/utils/ThreadingUtil.kt

@@ -1,11 +1,16 @@
 package com.sourcegraph.utils
 
+import com.intellij.openapi.application.ApplicationManager
+import java.awt.EventQueue.invokeAndWait
 import java.util.concurrent.CompletableFuture
-import javax.swing.SwingUtilities.invokeAndWait
 
 object ThreadingUtil {
 
   fun <T> runInEdtAndGet(task: () -> T): T {
+    val app = ApplicationManager.getApplication()
+    if (app.isDispatchThread) {
+      return task()
+    }
     val future = CompletableFuture<T>()
     invokeAndWait {
       try {