feat(ext-terminal): introduce NewTerminalUiUtil class and refactor su…

…ggestCommand method to support new UI context #135
unit-mesh · Apr 4, 2024 · 3533b1d · 3533b1d
1 parent 34ca497
commit 3533b1d
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
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
@@ -0,0 +1,11 @@
+package cc.unitmesh.terminal
+
+import com.intellij.openapi.util.registry.Registry
+import com.intellij.ui.NewUI
+import org.jetbrains.plugins.terminal.LocalBlockTerminalRunner.Companion.BLOCK_TERMINAL_REGISTRY
+
+class NewTerminalUiUtil {
+    fun isNewTerminal(): Boolean {
+        return NewUI.isEnabled() && !Registry.`is`(BLOCK_TERMINAL_REGISTRY, false)
+    }
+}
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
@@ -19,7 +19,6 @@ import com.intellij.openapi.ui.popup.JBPopupFactory
 import com.intellij.openapi.ui.popup.JBPopupListener
 import com.intellij.openapi.ui.popup.LightweightWindowEvent
 import com.intellij.openapi.wm.IdeFocusManager
-import com.intellij.terminal.JBTerminalWidget
 import com.intellij.ui.DocumentAdapter
 import com.intellij.ui.awt.RelativePoint
 import com.intellij.ui.components.JBLabel
@@ -48,11 +47,13 @@ class ShellCommandSuggestAction : AnAction() {
 
         showContentRenamePopup(contextComponent, getPreferredPopupPoint(e)) { data ->
             val widget = TerminalUtil.getCurrentTerminalWidget(project) ?: return@showContentRenamePopup
-            suggestCommand(widget, data, project)
+            suggestCommand(data, project) { string ->
+                widget.terminalStarter?.sendString(string, true)
+            }
         }
     }
 
-    private fun suggestCommand(widget: JBTerminalWidget, data: String, project: Project) {
+    open fun suggestCommand(data: String, project: Project, function: (str: String) -> Unit?) {
         val templateRender = TemplateRender(GENIUS_PRACTISES)
         val template = templateRender.getTemplate("shell-suggest.vm")
 
@@ -77,7 +78,7 @@ class ShellCommandSuggestAction : AnAction() {
                         throw Exception("Shell command suggestion failed")
                     }
 
-                    widget.terminalStarter?.sendString(it, true)
+                    function(it)
                 }
             } finally {
                 AutoDevStatusService.notifyApplication(AutoDevStatus.Ready)