feat(ext-terminal): refactor suggestCommand method to support new UI context and add TerminalUtil class for message sending #135

phodal · phodal · commit 633e3931eb35 · 2024-04-04T22:56:56.000+08:00
The commit introduces a new class, `TerminalUtil`, which provides a utility method for sending messages to the terminal. It also refactors the `suggestCommand` method to use the new `TerminalUtil` class and to support the new UI context. Additionally, the commit updates the build script to include the new source and resource directories for the `241` platform version, and renames the `NewTerminalUiUtil` class to `TerminalUtil`.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -181,7 +181,7 @@ allprojects {
 
     val testOutput = configurations.create("testOutput")
 
-
+    if(this.name != "ext-terminal") {
     sourceSets {
         main {
             java.srcDirs("src/gen")
@@ -208,6 +208,7 @@ allprojects {
             }
         }
     }
+    }
 
     dependencies {
         compileOnly(kotlin("stdlib-jdk8"))
@@ -606,6 +607,25 @@ project(":exts:ext-terminal") {
     dependencies {
         implementation(project(":"))
     }
+
+    sourceSets {
+        main {
+            resources.srcDirs("src/$platformVersion/main/resources")
+        }
+        test {
+            resources.srcDirs("src/$platformVersion/test/resources")
+        }
+    }
+    kotlin {
+        sourceSets {
+            main {
+                kotlin.srcDirs("src/$platformVersion/main/kotlin")
+            }
+            test {
+                kotlin.srcDirs("src/$platformVersion/test/kotlin")
+            }
+        }
+    }
 }
 
 project(":exts:devins-lang") {
diff --git a/exts/ext-terminal/src/222/main/kotlin/cc/unitmesh/terminal/TerminalUtil.kt b/exts/ext-terminal/src/222/main/kotlin/cc/unitmesh/terminal/TerminalUtil.kt
@@ -1,12 +1,20 @@
 package cc.unitmesh.terminal
 
+import cc.unitmesh.terminal.ShellCommandSuggestAction.Companion.suggestCommand
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.wm.ToolWindowManager
 import com.intellij.terminal.JBTerminalWidget
 import org.jetbrains.plugins.terminal.TerminalToolWindowFactory
 import org.jetbrains.plugins.terminal.TerminalView
 
 object TerminalUtil {
+    fun sendMsg(project: Project, data: String, e: AnActionEvent) {
+        val widget = getCurrentTerminalWidget(project) ?: return
+        suggestCommand(data, project) { string ->
+            widget.terminalStarter?.sendString(string, true)
+        }
+    }
+
     fun getCurrentTerminalWidget(project: Project): JBTerminalWidget? {
         // TODO: test with `e.dataContext.getData(JBTerminalWidget.TERMINAL_DATA_KEY) ?: return`
         val toolWindow = ToolWindowManager.getInstance(project)
diff --git a/exts/ext-terminal/src/233/main/kotlin/cc/unitmesh/terminal/TerminalUtil.kt b/exts/ext-terminal/src/233/main/kotlin/cc/unitmesh/terminal/TerminalUtil.kt
@@ -1,12 +1,20 @@
 package cc.unitmesh.terminal
 
+import cc.unitmesh.terminal.ShellCommandSuggestAction.Companion.suggestCommand
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.wm.ToolWindowManager
 import com.intellij.terminal.JBTerminalWidget
 import org.jetbrains.plugins.terminal.TerminalToolWindowFactory
 import org.jetbrains.plugins.terminal.TerminalToolWindowManager
 
 object TerminalUtil {
+    fun sendMsg(project: Project, data: String, e: AnActionEvent) {
+        val widget = getCurrentTerminalWidget(project) ?: return
+        suggestCommand(data, project) { string ->
+            widget.terminalStarter?.sendString(string, true)
+        }
+    }
+
     fun getCurrentTerminalWidget(project: Project): JBTerminalWidget? {
         val toolWindow = ToolWindowManager.getInstance(project)
             .getToolWindow(TerminalToolWindowFactory.TOOL_WINDOW_ID) ?: return null
diff --git a/exts/ext-terminal/src/241/main/kotlin/cc/unitmesh/terminal/NewTerminalUiUtil.kt b/exts/ext-terminal/src/241/main/kotlin/cc/unitmesh/terminal/NewTerminalUiUtil.kt
diff --git a/exts/ext-terminal/src/241/main/kotlin/cc/unitmesh/terminal/TerminalUtil.kt b/exts/ext-terminal/src/241/main/kotlin/cc/unitmesh/terminal/TerminalUtil.kt
@@ -0,0 +1,47 @@
+package cc.unitmesh.terminal
+
+import cc.unitmesh.terminal.ShellCommandSuggestAction.Companion.suggestCommand
+import com.intellij.openapi.actionSystem.AnActionEvent
+import com.intellij.openapi.project.Project
+import com.intellij.openapi.wm.ToolWindowManager
+import com.intellij.terminal.JBTerminalWidget
+import com.intellij.ui.content.Content
+import org.jetbrains.plugins.terminal.TerminalToolWindowFactory
+import org.jetbrains.plugins.terminal.TerminalToolWindowManager
+import org.jetbrains.plugins.terminal.exp.TerminalDataContextUtils.editor
+
+object TerminalUtil {
+    fun sendMsg(project: Project, data: String, e: AnActionEvent) {
+        val editor = e.editor
+        if (editor == null) {
+            trySendMsgInOld(project, data)
+            return
+        }
+
+        suggestCommand(data, project) { string ->
+            editor.document.insertString(editor.caretModel.offset, string)
+        }
+    }
+
+    private fun trySendMsgInOld(project: Project, data: String): Boolean {
+        val widget = getCurrentTerminalWidget(project) ?: return true
+        suggestCommand(data, project) { string ->
+            widget.terminalStarter?.sendString(string, true)
+        }
+
+        return false
+    }
+
+    fun getCurrentTerminalWidget(project: Project): JBTerminalWidget? {
+        val content = getContent(project) ?: return null
+        val widget = TerminalToolWindowManager.getWidgetByContent(content) ?: return null
+        return widget
+    }
+
+    private fun getContent(project: Project): Content? {
+        val toolWindow = ToolWindowManager.getInstance(project)
+            .getToolWindow(TerminalToolWindowFactory.TOOL_WINDOW_ID)
+        val content = toolWindow?.contentManager?.selectedContent
+        return content
+    }
+}
diff --git a/exts/ext-terminal/src/main/kotlin/cc/unitmesh/terminal/ShellCommandSuggestAction.kt b/exts/ext-terminal/src/main/kotlin/cc/unitmesh/terminal/ShellCommandSuggestAction.kt
@@ -45,44 +45,9 @@ class ShellCommandSuggestAction : AnAction() {
         val project = e.project ?: return
         val contextComponent = e.getData(PlatformCoreDataKeys.CONTEXT_COMPONENT) ?: return
 
-        showContentRenamePopup(contextComponent, getPreferredPopupPoint(e)) { data ->
-            val widget = TerminalUtil.getCurrentTerminalWidget(project) ?: return@showContentRenamePopup
-            suggestCommand(data, project) { string ->
-                widget.terminalStarter?.sendString(string, true)
-            }
-        }
-    }
-
-    open fun suggestCommand(data: String, project: Project, function: (str: String) -> Unit?) {
-        val templateRender = TemplateRender(GENIUS_PRACTISES)
-        val template = templateRender.getTemplate("shell-suggest.vm")
-
-        val options = TerminalProjectOptionsProvider.getInstance(project)
-
-        templateRender.context = ShellSuggestContext(
-            data, options.shellPath,
-            options.startingDirectory
-                ?: project.guessProjectDir()?.path ?: System.getProperty("user.home")
-        )
-        val promptText = templateRender.renderTemplate(template)
-
-        val llm = LlmFactory.instance.create(project)
-        val stringFlow: Flow<String> = llm.stream(promptText, "", false)
-
-        LLMCoroutineScope.scope(project).launch {
-            AutoDevStatusService.notifyApplication(AutoDevStatus.InProgress)
-
-            try {
-                stringFlow.collect {
-                    if (it.contains("\n")) {
-                        throw Exception("Shell command suggestion failed")
-                    }
-
-                    function(it)
-                }
-            } finally {
-                AutoDevStatusService.notifyApplication(AutoDevStatus.Ready)
-            }
+        showContentRenamePopup(contextComponent, getPreferredPopupPoint(e)) { string ->
+            TerminalUtil.sendMsg(project, string, e)
+            return@showContentRenamePopup
         }
     }
 
@@ -159,5 +124,40 @@ class ShellCommandSuggestAction : AnAction() {
             }
         })
     }
+
+    companion object {
+        fun suggestCommand(data: String, project: Project, function: (str: String) -> Unit?) {
+            val templateRender = TemplateRender(GENIUS_PRACTISES)
+            val template = templateRender.getTemplate("shell-suggest.vm")
+
+            val options = TerminalProjectOptionsProvider.getInstance(project)
+
+            templateRender.context = ShellSuggestContext(
+                data, options.shellPath,
+                options.startingDirectory
+                    ?: project.guessProjectDir()?.path ?: System.getProperty("user.home")
+            )
+            val promptText = templateRender.renderTemplate(template)
+
+            val llm = LlmFactory.instance.create(project)
+            val stringFlow: Flow<String> = llm.stream(promptText, "", false)
+
+            LLMCoroutineScope.scope(project).launch {
+                AutoDevStatusService.notifyApplication(AutoDevStatus.InProgress)
+
+                try {
+                    stringFlow.collect {
+                        if (it.contains("\n")) {
+                            throw Exception("Shell command suggestion failed")
+                        }
+
+                        function(it)
+                    }
+                } finally {
+                    AutoDevStatusService.notifyApplication(AutoDevStatus.Ready)
+                }
+            }
+        }
+    }
 }
 
