feat(custom-variable): improve variable list component and add custom variable support #51

Author: phodal

src/main/kotlin/cc/unitmesh/devti/custom/team/TeamPromptTemplateCompiler.kt

@@ -1,5 +1,6 @@
 package cc.unitmesh.devti.custom.team
 
+import cc.unitmesh.devti.custom.variable.CustomVariable
 import cc.unitmesh.devti.gui.chat.ChatActionType
 import cc.unitmesh.devti.provider.context.ChatContextProvider
 import cc.unitmesh.devti.provider.context.ChatCreationContext
@@ -22,23 +23,24 @@ class TeamPromptTemplateCompiler(
     val editor: Editor,
     val selectedText: String = "",
 ) {
+    private val log = logger<TeamPromptTemplateCompiler>()
     private val velocityContext = VelocityContext()
 
     init {
-        this.set("selection", selectedText)
-        this.set("beforeCursor", file.text.substring(0, editor.caretModel.offset))
-        this.set("afterCursor", file.text.substring(editor.caretModel.offset))
+        this.set(CustomVariable.SELECTION.variable, selectedText)
+        this.set(CustomVariable.BEFORE_CURSOR.variable, file.text.substring(0, editor.caretModel.offset))
+        this.set(CustomVariable.AFTER_CURSOR.variable, file.text.substring(editor.caretModel.offset))
     }
 
     fun set(key: String, value: String) {
         velocityContext.put(key, value)
     }
 
     fun compile(template: String): String {
-        velocityContext.put("fileName", file.name)
-        velocityContext.put("filePath", file.virtualFile?.path ?: "")
+        velocityContext.put(CustomVariable.FILE_NAME.variable, file.name)
+        velocityContext.put(CustomVariable.FILE_PATH.variable, file.virtualFile?.path ?: "")
         velocityContext.put(
-            "methodName", when (element) {
+            CustomVariable.METHOD_NAME.variable, when (element) {
                 is PsiNameIdentifierOwner -> element.nameIdentifier?.text ?: ""
                 else -> ""
             }
@@ -74,16 +76,16 @@ class TeamPromptTemplateCompiler(
             )
 
             val collectChatContextList = ChatContextProvider.collectChatContextList(file.project, context)
-            velocityContext.put("frameworkContext", collectChatContextList.joinToString("\n") {
+            velocityContext.put(CustomVariable.FRAMEWORK_CONTEXT.variable, collectChatContextList.joinToString("\n") {
                 it.text
             })
         }
     }
 
     private fun configForLanguage() {
-        velocityContext.put("language", language.displayName)
+        velocityContext.put(CustomVariable.LANGUAGE.variable, language.displayName)
         velocityContext.put(
-            "commentSymbol", when (language.displayName.lowercase()) {
+            CustomVariable.COMMENT_SYMBOL.variable, when (language.displayName.lowercase()) {
                 "java", "kotlin" -> "//"
                 "python" -> "#"
                 "javascript" -> "//"
@@ -93,8 +95,4 @@ class TeamPromptTemplateCompiler(
             }
         )
     }
-
-    companion object {
-        val log = logger<TeamPromptTemplateCompiler>()
-    }
 }

src/main/kotlin/cc/unitmesh/devti/custom/variable/CustomVariable.kt

@@ -0,0 +1,19 @@
+package cc.unitmesh.devti.custom.variable
+
+enum class CustomVariable(val variable: String, val description: String) {
+    SELECTION("selection", "The selected text"),
+    BEFORE_CURSOR("beforeCursor", "The text before the cursor"),
+    AFTER_CURSOR("afterCursor", "The text after the cursor"),
+    FILE_NAME("fileName", "The name of the file"),
+    FILE_PATH("filePath", "The path of the file"),
+    METHOD_NAME("methodName", "The name of the method"),
+    LANGUAGE("language", "The language of the file"),
+    COMMENT_SYMBOL("commentSymbol", "The comment symbol of the language"),
+    FRAMEWORK_CONTEXT("frameworkContext", "The context of the framework"),
+
+    ;
+
+    companion object {
+        fun all(): List<CustomVariable> = values().toList()
+    }
+}

src/main/kotlin/cc/unitmesh/devti/custom/variable/CustomVariableType.kt

@@ -6,4 +6,4 @@ enum class CustomVariableType(@JvmField val description: String) {
     SPEC_VARIABLE("Load from spec config, and config to items"),
     SIMILAR_CHUNK("Similar code chunk with element's code and recently open code"),
     ;
-}
+}

src/main/kotlin/cc/unitmesh/devti/gui/chat/AutoDevVariableList.kt

@@ -3,6 +3,7 @@ package cc.unitmesh.devti.gui.chat
 import com.intellij.ui.Gray
 import com.intellij.ui.JBColor
 import com.intellij.ui.components.JBList
+import java.awt.BorderLayout
 import java.awt.Component
 import java.awt.event.MouseEvent
 import java.awt.event.MouseListener
@@ -15,14 +16,14 @@ class AutoDevVariableList(
     val callback: ((AutoDevVariableListComponent) -> Unit?)?,
 ) : JBList<AutoDevVariableListComponent>() {
     init {
-        border = BorderFactory.createEmptyBorder(0, 5, 0, 5)
+        border = BorderFactory.createEmptyBorder(0, 4, 0, 4)
         setCellRenderer(VariableListCellRenderer())
         addMouseListener(object : MouseInputAdapter() {
             override fun mouseClicked(event: MouseEvent?) {
                 val item = selectedValue ?: return
                 callback?.invoke(item)
             }
-        } as MouseListener)
+        })
     }
 }
 
@@ -66,9 +67,10 @@ class VariableListCellRenderer : ListCellRenderer<AutoDevVariableListComponent>
 
 class AutoDevVariableListComponent : JPanel() {
     init {
-        val label = JLabel("doing something")
+        add(JLabel("$" + "selection"), BorderLayout.WEST)
+        val label = JLabel("Used to get the currently selected text")
         label.border = BorderFactory.createEmptyBorder(0, 8, 0, 0)
         label.foreground = JBColor.namedColor("Component.infoForeground", JBColor(Gray.x99, Gray.x78))
-        add(label, "East")
+        add(label, BorderLayout.EAST)
     }
 }