Merge pull request #52 from devchat-ai/handle-add-to-devchat-before-initialization

Handle add to devchat before initialization

Author: pplam

.idea/kotlinc.xml

@@ -13,7 +13,11 @@ object PathUtils {
     fun copyResourceDirToPath(resourceDir: String, outputPath: String) {
         val uri = javaClass.getResource(resourceDir)!!.toURI()
         val path = if (uri.scheme == "jar") {
-            val fileSystem = FileSystems.newFileSystem(uri, emptyMap<String, Any>())
+            val fileSystem = try {
+                FileSystems.newFileSystem(uri, emptyMap<String, Any>())
+            } catch (e: FileSystemAlreadyExistsException) {
+                FileSystems.getFileSystem(uri)
+            }
             fileSystem.getPath("/$resourceDir")
         } else {
             Paths.get(uri)

src/main/kotlin/ai/devchat/common/PathUtils.kt

@@ -29,7 +29,7 @@ class DevChatSetupThread : Thread() {
             ProjectUtils.executeJS("onInitializationFinish")
             DevChatNotifier.info("DevChat initialization has completed successfully.")
         } catch (e: Exception) {
-            Log.error("Failed to install DevChat CLI: " + e.message)
+            Log.error("Failed to install DevChat CLI: $e\n" + e.stackTrace.joinToString("\n"))
             DevChatNotifier.error("DevChat initialization has failed. Please check the logs for more details.")
         }
     }

src/main/kotlin/ai/devchat/idea/DevChatSetupThread.kt

@@ -32,6 +32,10 @@ class DevChatToolWindow : ToolWindowFactory, DumbAware {
         DevChatSetupThread().start()
 //        LanguageServer(project).start()
     }
+
+    companion object {
+        var loaded: Boolean = false
+    }
 }
 
 internal class DevChatToolWindowContent(project: Project) {

src/main/kotlin/ai/devchat/idea/DevChatToolWindow.kt

@@ -2,6 +2,8 @@ package ai.devchat.idea
 
 import ai.devchat.common.Log.info
 import ai.devchat.devchat.ActionHandlerFactory
+import ai.devchat.devchat.handler.AddContextNotifyHandler
+import ai.devchat.idea.action.AddToDevChatAction
 import com.alibaba.fastjson.JSON
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.ui.jcef.JBCefBrowser
@@ -55,6 +57,14 @@ class JSJavaBridge(private val jbCefBrowser: JBCefBrowser) {
                     "", 0
                 )
             }
+
+            override fun onLoadEnd(browser: CefBrowser?, frame: CefFrame?, httpStatusCode: Int) {
+                if (AddToDevChatAction.cache != null) {
+                    AddContextNotifyHandler(null, AddToDevChatAction.cache).executeAction()
+                    AddToDevChatAction.cache = null
+                }
+                DevChatToolWindow.loaded = true
+            }
         }, jbCefBrowser.cefBrowser)
     }
 }

src/main/kotlin/ai/devchat/idea/JSJavaBridge.kt

@@ -5,7 +5,7 @@ import ai.devchat.devchat.handler.AddContextNotifyHandler
 import com.alibaba.fastjson.JSONObject
 
 class AddToDevChatAction {
-    fun execute(filePath: String, fileContent: String, language: String, startLine: Int) {
+    fun execute(filePath: String, fileContent: String, language: String, startLine: Int, invokeLater: Boolean = false) {
         info(
             "Add to DevChat -> path: " + filePath +
                     " content: " + fileContent +
@@ -17,7 +17,14 @@ class AddToDevChatAction {
         payload["content"] = fileContent
         payload["languageId"] = language
         payload["startLine"] = startLine
-        val addContextNotifyHandler = AddContextNotifyHandler(null, payload)
-        addContextNotifyHandler.executeAction()
+        if (invokeLater) {
+            cache = payload
+        } else {
+            AddContextNotifyHandler(null, payload).executeAction()
+        }
+    }
+
+    companion object {
+        var cache: JSONObject? = null
     }
 }

src/main/kotlin/ai/devchat/idea/action/AddToDevChatAction.kt

@@ -1,5 +1,6 @@
 package ai.devchat.idea.action
 
+import ai.devchat.idea.DevChatToolWindow
 import com.intellij.openapi.actionSystem.ActionUpdateThread
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
@@ -26,7 +27,7 @@ class AddToDevChatEditorAction : AnAction() {
         val fileType = virtualFile.fileType
         val language = fileType.name
         if (editor != null) {
-            ToolWindowManager.getInstance(project).getToolWindow("DevChat")?.show() {
+            ToolWindowManager.getInstance(project).getToolWindow("DevChat")?.show {
                 val selectionModel = editor.selectionModel
                 var selectedText = selectionModel.selectedText
                 if (selectedText.isNullOrEmpty()) {
@@ -36,7 +37,7 @@ class AddToDevChatEditorAction : AnAction() {
                 val startOffset = selectionModel.selectionStart
                 val document = editor.document
                 val startLine = document.getLineNumber(startOffset) + 1
-                addToDevChatAction.execute(relativePath, selectedText, language, startLine)
+                addToDevChatAction.execute(relativePath, selectedText, language, startLine, !DevChatToolWindow.loaded)
             }
         }
     }

src/main/kotlin/ai/devchat/idea/action/AddToDevChatEditorAction.kt

@@ -1,5 +1,6 @@
 package ai.devchat.idea.action
 
+import ai.devchat.idea.DevChatToolWindow
 import com.intellij.openapi.actionSystem.ActionUpdateThread
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
@@ -35,7 +36,7 @@ class AddToDevChatFileAction : AnAction() {
                 ToolWindowManager.getInstance(project).getToolWindow("DevChat")?.show {
                     val bytes = virtualFile.contentsToByteArray()
                     val content = String(bytes, StandardCharsets.UTF_8)
-                    addToDevChatAction.execute(relativePath, content, language, 0)
+                    addToDevChatAction.execute(relativePath, content, language, 0, !DevChatToolWindow.loaded)
                 }
             } catch (ex: IOException) {
                 ex.printStackTrace()