feat(devins): introduce ActionLocationEditor and ShireActionLocation enums for enhanced action location handling #379

phodal · phodal · commit 9c098195b35c · 2025-04-24T16:29:57.000+08:00
diff --git a/core/src/223/main/resources/META-INF/autodev-core.xml b/core/src/223/main/resources/META-INF/autodev-core.xml
@@ -230,6 +230,10 @@
                         interface="cc.unitmesh.devti.indexer.provider.LangDictProvider"
                         dynamic="true"
         />
+
+        <extensionPoint qualifiedName="cc.unitmesh.shireActionLocationEditor"
+                        interface="cc.unitmesh.devti.devins.ActionLocationEditor"
+                        dynamic="true"/>
     </extensionPoints>
 
 <!--    <projectListeners>-->
diff --git a/core/src/233/main/resources/META-INF/autodev-core.xml b/core/src/233/main/resources/META-INF/autodev-core.xml
@@ -239,6 +239,10 @@
                         interface="cc.unitmesh.devti.indexer.provider.LangDictProvider"
                         dynamic="true"
         />
+
+        <extensionPoint qualifiedName="cc.unitmesh.shireActionLocationEditor"
+                        interface="cc.unitmesh.devti.devins.ActionLocationEditor"
+                        dynamic="true"/>
     </extensionPoints>
 
     <projectListeners>
diff --git a/core/src/main/kotlin/cc/unitmesh/devti/AutoDevIcons.kt b/core/src/main/kotlin/cc/unitmesh/devti/AutoDevIcons.kt
@@ -109,4 +109,7 @@ object AutoDevIcons {
 
     @JvmField
     val LOCAL_AGENT: Icon = IconLoader.getIcon("/icons/local-agent.svg", AutoDevIcons::class.java)
+
+    @JvmField
+    val VARIABLE: Icon = IconLoader.getIcon("/icons/variable.svg", AutoDevIcons::class.java)
 }
diff --git a/core/src/main/kotlin/cc/unitmesh/devti/devins/ActionLocationEditor.kt b/core/src/main/kotlin/cc/unitmesh/devti/devins/ActionLocationEditor.kt
@@ -1,7 +1,5 @@
-package cc.unitmesh.devti.language.provider
+package cc.unitmesh.devti.devins
 
-import cc.unitmesh.devti.language.ast.config.ShireActionLocation
-import cc.unitmesh.devti.language.provider.action.VariableActionEventDataHolder
 import com.intellij.ide.DataManager
 import com.intellij.openapi.actionSystem.CommonDataKeys
 import com.intellij.openapi.editor.Editor
@@ -16,7 +14,7 @@ interface ActionLocationEditor {
 
     companion object {
         private val EP_NAME: ExtensionPointName<ActionLocationEditor> =
-            ExtensionPointName.create("cc.unitmesh.shireActionLocationEditor")
+            ExtensionPointName.Companion.create("cc.unitmesh.shireActionLocationEditor")
 
         fun provide(project: Project, location: ShireActionLocation? = null): Editor? {
             if (location == null) {
@@ -51,4 +49,4 @@ interface ActionLocationEditor {
         fun defaultEditor(project: Project) =
             FileEditorManager.getInstance(project).selectedTextEditor
     }
-}
+}
diff --git a/core/src/main/kotlin/cc/unitmesh/devti/devins/ShireActionLocation.kt b/core/src/main/kotlin/cc/unitmesh/devti/devins/ShireActionLocation.kt
@@ -1,4 +1,4 @@
-package cc.unitmesh.devti.language.ast.config
+package cc.unitmesh.devti.devins
 
 enum class ShireActionLocation(val location: String, val description: String) {
     CONTEXT_MENU("ContextMenu", "Show in Context Menu by Right Click"),
@@ -29,4 +29,4 @@ enum class ShireActionLocation(val location: String, val description: String) {
 
         fun default(): String = RUN_PANEL.location
     }
-}
+}
diff --git a/core/src/main/kotlin/cc/unitmesh/devti/devins/VariableActionEventDataHolder.kt b/core/src/main/kotlin/cc/unitmesh/devti/devins/VariableActionEventDataHolder.kt
@@ -1,4 +1,4 @@
-package cc.unitmesh.devti.language.provider.action
+package cc.unitmesh.devti.devins
 
 import com.intellij.openapi.actionSystem.DataContext
 import com.intellij.openapi.util.Key
diff --git a/core/src/main/kotlin/cc/unitmesh/devti/devins/shireql/JvmShireQLFuncType.kt b/core/src/main/kotlin/cc/unitmesh/devti/devins/shireql/JvmShireQLFuncType.kt
@@ -1,4 +1,4 @@
-package cc.unitmesh.devti.devins
+package cc.unitmesh.devti.devins.shireql
 
 enum class JvmShireQLFuncType(val methodName: String, val description: String) {
     GET_NAME("getName", "Get class name"),
diff --git a/core/src/main/resources/icons/variable.svg b/core/src/main/resources/icons/variable.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 19 19" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 62 (91390) - https://sketch.com -->
+    <title>Dollar</title>
+    <desc>Created with Sketch.</desc>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round">
+        <g id="dollar-minimalistic-svgrepo-com" transform="translate(1.666667, 1.666667)" stroke="#011C32" stroke-width="1">
+            <polyline id="Path" points="8 11.9927928 8 12.381982 8 12.7711712"></polyline>
+            <polyline id="Path" points="8 3.25765766 8 3.64684685 8 4.03603604"></polyline>
+            <path d="M10.4347826,6.02522523 C10.4347826,4.92662786 9.34473043,4.03603604 8,4.03603604 C6.65526957,4.03603604 5.56521739,4.92662786 5.56521739,6.02522523 C5.56521739,7.12381463 6.65526957,8.01441441 8,8.01441441 C9.34473043,8.01441441 10.4347826,8.9050142 10.4347826,10.0036036 C10.4347826,11.102193 9.34473043,11.9927928 8,11.9927928 C6.65526957,11.9927928 5.56521739,11.102193 5.56521739,10.0036036" id="Path"></path>
+            <path d="M4,1.12212849 C5.176696,0.445127841 6.54288,0.0576576577 8,0.0576576577 C12.41824,0.0576576577 16,3.62001701 16,8.01441441 C16,12.408772 12.41824,15.9711712 8,15.9711712 C3.58172,15.9711712 0,12.408772 0,8.01441441 C0,6.56517074 0.389576,5.20637152 1.070256,4.03603604" id="Path"></path>
+        </g>
+    </g>
+</svg>
diff --git a/exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/actions/console/AutoDevConsoleAction.kt b/exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/actions/console/AutoDevConsoleAction.kt
@@ -1,8 +1,8 @@
 package cc.unitmesh.devti.language.actions.console
 
 import cc.unitmesh.devti.language.actions.DevInsRunFileAction
-import cc.unitmesh.devti.language.ast.config.ShireActionLocation
-import cc.unitmesh.devti.language.provider.action.VariableActionEventDataHolder
+import cc.unitmesh.devti.devins.ShireActionLocation
+import cc.unitmesh.devti.devins.VariableActionEventDataHolder
 import cc.unitmesh.devti.language.startup.DynamicShireActionService
 import com.intellij.openapi.actionSystem.ActionUpdateThread
 import com.intellij.openapi.actionSystem.AnAction
diff --git a/exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/actions/context/AutoDevContextMenuActionGroup.kt b/exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/actions/context/AutoDevContextMenuActionGroup.kt
@@ -2,7 +2,7 @@ package cc.unitmesh.devti.language.actions.context
 
 import com.intellij.openapi.actionSystem.*
 import cc.unitmesh.devti.language.actions.base.validator.WhenConditionValidator
-import cc.unitmesh.devti.language.ast.config.ShireActionLocation
+import cc.unitmesh.devti.devins.ShireActionLocation
 import cc.unitmesh.devti.language.startup.DynamicShireActionService
 
 class AutoDevContextMenuActionGroup : ActionGroup() {
diff --git a/exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/actions/database/AutoDevDatabaseAction.kt b/exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/actions/database/AutoDevDatabaseAction.kt
@@ -1,8 +1,8 @@
 package cc.unitmesh.devti.language.actions.database
 
 import cc.unitmesh.devti.language.actions.DevInsRunFileAction
-import cc.unitmesh.devti.language.ast.config.ShireActionLocation
-import cc.unitmesh.devti.language.provider.action.VariableActionEventDataHolder
+import cc.unitmesh.devti.devins.ShireActionLocation
+import cc.unitmesh.devti.devins.VariableActionEventDataHolder
 import cc.unitmesh.devti.language.startup.DynamicShireActionService
 import com.intellij.openapi.actionSystem.ActionUpdateThread
 import com.intellij.openapi.actionSystem.AnAction
diff --git a/exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/actions/external/AutoDevSonarLintAction.kt b/exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/actions/external/AutoDevSonarLintAction.kt
@@ -1,8 +1,8 @@
 package cc.unitmesh.devti.language.actions.external
 
 import cc.unitmesh.devti.language.actions.DevInsRunFileAction
-import cc.unitmesh.devti.language.ast.config.ShireActionLocation
-import cc.unitmesh.devti.language.provider.action.VariableActionEventDataHolder
+import cc.unitmesh.devti.devins.ShireActionLocation
+import cc.unitmesh.devti.devins.VariableActionEventDataHolder
 import cc.unitmesh.devti.language.startup.DynamicShireActionService
 import com.intellij.openapi.actionSystem.ActionUpdateThread
 import com.intellij.openapi.actionSystem.AnAction
diff --git a/exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/actions/input/AutoDevInputBoxAction.kt b/exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/actions/input/AutoDevInputBoxAction.kt
@@ -14,7 +14,7 @@ import cc.unitmesh.devti.language.actions.input.inlay.CustomInputBox
 import cc.unitmesh.devti.language.actions.input.inlay.CustomInputBox.Companion.CUSTOM_INPUT_CANCEL_ACTION
 import cc.unitmesh.devti.language.actions.input.inlay.CustomInputBox.Companion.CUSTOM_INPUT_SUBMIT_ACTION
 import cc.unitmesh.devti.language.actions.input.inlay.InlayPanel
-import cc.unitmesh.devti.language.ast.config.ShireActionLocation
+import cc.unitmesh.devti.devins.ShireActionLocation
 import cc.unitmesh.devti.language.startup.DynamicDevInsActionConfig
 import cc.unitmesh.devti.language.startup.DynamicShireActionService
 import java.awt.event.ActionEvent
diff --git a/exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/actions/intention/AutoDevIntentionAction.kt b/exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/actions/intention/AutoDevIntentionAction.kt
@@ -9,7 +9,7 @@ import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiFile
 import cc.unitmesh.devti.language.actions.base.validator.WhenConditionValidator
 import cc.unitmesh.devti.language.ast.HobbitHole
-import cc.unitmesh.devti.language.ast.config.ShireActionLocation
+import cc.unitmesh.devti.devins.ShireActionLocation
 import cc.unitmesh.devti.language.startup.DynamicShireActionService
 import kotlin.collections.firstOrNull
 
diff --git a/exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/actions/intention/AutoDevIntentionHelper.kt b/exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/actions/intention/AutoDevIntentionHelper.kt
@@ -13,7 +13,7 @@ import com.intellij.openapi.util.Iconable
 import com.intellij.psi.PsiFile
 import javax.swing.Icon
 import cc.unitmesh.devti.language.actions.intention.ui.CustomPopupStep
-import cc.unitmesh.devti.language.ast.config.ShireActionLocation
+import cc.unitmesh.devti.devins.ShireActionLocation
 import cc.unitmesh.devti.language.startup.DynamicShireActionService
 
 class AutoDevIntentionHelper : IntentionAction, Iconable {
diff --git a/exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/actions/terminal/AutoDevTerminalAction.kt b/exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/actions/terminal/AutoDevTerminalAction.kt
@@ -2,7 +2,7 @@ package cc.unitmesh.devti.language.actions.terminal
 
 import cc.unitmesh.devti.AutoDevBundle
 import cc.unitmesh.devti.language.actions.DevInsRunFileAction
-import cc.unitmesh.devti.language.ast.config.ShireActionLocation
+import cc.unitmesh.devti.devins.ShireActionLocation
 import cc.unitmesh.devti.language.provider.TerminalLocationExecutor
 import cc.unitmesh.devti.language.startup.DynamicShireActionService
 import com.intellij.openapi.actionSystem.ActionUpdateThread
diff --git a/exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/actions/vcs/AutoDevVcsActionGroup.kt b/exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/actions/vcs/AutoDevVcsActionGroup.kt
@@ -2,8 +2,8 @@ package cc.unitmesh.devti.language.actions.vcs
 
 import cc.unitmesh.devti.AutoDevIcons
 import cc.unitmesh.devti.language.actions.DevInsRunFileAction
-import cc.unitmesh.devti.language.ast.config.ShireActionLocation
-import cc.unitmesh.devti.language.provider.action.VariableActionEventDataHolder
+import cc.unitmesh.devti.devins.ShireActionLocation
+import cc.unitmesh.devti.devins.VariableActionEventDataHolder
 import cc.unitmesh.devti.language.startup.DynamicDevInsActionConfig
 import cc.unitmesh.devti.language.startup.DynamicShireActionService
 import com.intellij.openapi.actionSystem.ActionGroup
diff --git a/exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/actions/vcs/AutoDevVcsLogAction.kt b/exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/actions/vcs/AutoDevVcsLogAction.kt
@@ -1,8 +1,8 @@
 package cc.unitmesh.devti.language.actions.vcs
 
 import cc.unitmesh.devti.language.actions.DevInsRunFileAction
-import cc.unitmesh.devti.language.ast.config.ShireActionLocation
-import cc.unitmesh.devti.language.provider.action.VariableActionEventDataHolder
+import cc.unitmesh.devti.devins.ShireActionLocation
+import cc.unitmesh.devti.devins.VariableActionEventDataHolder
 import cc.unitmesh.devti.language.startup.DynamicShireActionService
 import com.intellij.openapi.actionSystem.ActionUpdateThread
 import com.intellij.openapi.actionSystem.AnAction
diff --git a/exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/actions/vcs/AutoDevVcsSingleAction.kt b/exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/actions/vcs/AutoDevVcsSingleAction.kt
@@ -1,8 +1,8 @@
 package cc.unitmesh.devti.language.actions.vcs
 
 import cc.unitmesh.devti.language.actions.DevInsRunFileAction
-import cc.unitmesh.devti.language.ast.config.ShireActionLocation
-import cc.unitmesh.devti.language.provider.action.VariableActionEventDataHolder
+import cc.unitmesh.devti.devins.ShireActionLocation
+import cc.unitmesh.devti.devins.VariableActionEventDataHolder
 import cc.unitmesh.devti.language.startup.DynamicShireActionService
 import com.intellij.openapi.actionSystem.ActionUpdateThread
 import com.intellij.openapi.actionSystem.AnActionEvent
diff --git a/exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/ast/HobbitHole.kt b/exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/ast/HobbitHole.kt
@@ -2,7 +2,7 @@ package cc.unitmesh.devti.language.ast
 
 import cc.unitmesh.devti.custom.team.InteractionType
 import cc.unitmesh.devti.language.ast.action.DirectAction
-import cc.unitmesh.devti.language.ast.config.ShireActionLocation
+import cc.unitmesh.devti.devins.ShireActionLocation
 import cc.unitmesh.devti.language.compiler.HobbitHoleParser
 import cc.unitmesh.devti.language.console.isCanceled
 import cc.unitmesh.devti.language.middleware.post.LifecycleProcessorSignature
diff --git a/exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/ast/variable/CompositeVariableProvider.kt b/exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/ast/variable/CompositeVariableProvider.kt
@@ -1,7 +1,7 @@
 package cc.unitmesh.devti.language.ast.variable
 
-import cc.unitmesh.devti.language.ast.variable.toolchain.VcsToolchainVariable
 import cc.unitmesh.devti.language.ast.variable.toolchain.DatabaseToolchainVariable
+import cc.unitmesh.devti.language.ast.variable.toolchain.VcsToolchainVariable
 
 data class VariableDisplay(
     val name: String,
diff --git a/exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/ast/variable/ToolchainVariable.kt b/exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/ast/variable/ToolchainVariable.kt
@@ -9,7 +9,7 @@ import kotlin.reflect.full.functions
 interface ToolchainVariable : Variable {
     companion object {
         private val subclasses: Set<KClass<out ToolchainVariable>> by lazy {
-            val reflections = Reflections("cc.unitmesh.devti.language.provider.variable.model")
+            val reflections = Reflections("cc.unitmesh.devti.language.ast.variable")
             reflections.getSubTypesOf(ToolchainVariable::class.java)
                 .map { it.kotlin }
                 .toSet()
diff --git a/exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/ast/variable/Variable.kt b/exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/ast/variable/Variable.kt
@@ -5,6 +5,7 @@ import cc.unitmesh.devti.language.ast.variable.toolchain.DatabaseToolchainVariab
 import cc.unitmesh.devti.language.ast.variable.toolchain.SonarqubeVariable
 import cc.unitmesh.devti.language.ast.variable.toolchain.TerminalToolchainVariable
 import cc.unitmesh.devti.language.ast.variable.toolchain.VcsToolchainVariable
+import kotlin.collections.addAll
 
 interface Variable {
     val variableName: String
@@ -19,23 +20,23 @@ data class DebugValue(
 ) : Variable {
     companion object {
         fun description(key: String): String {
-            return PsiContextVariable.from(key)?.description
-                ?: ContextVariable.from(key)?.description
-                ?: SystemInfoVariable.from(key)?.description
+            return PsiContextVariable.Companion.from(key)?.description
+                ?: ContextVariable.Companion.from(key)?.description
+                ?: SystemInfoVariable.Companion.from(key)?.description
 //                ?: ConditionPsiVariable.from(key)?.description
                 /// ...
-                ?: DatabaseToolchainVariable.from(key)?.description
-                ?: TerminalToolchainVariable.from(key)?.description
-                ?: VcsToolchainVariable.from(key)?.description
-                ?: BuildToolchainVariable.from(key)?.description
-                ?: SonarqubeVariable.from(key)?.description
+                ?: DatabaseToolchainVariable.Companion.from(key)?.description
+                ?: TerminalToolchainVariable.Companion.from(key)?.description
+                ?: VcsToolchainVariable.Companion.from(key)?.description
+                ?: BuildToolchainVariable.Companion.from(key)?.description
+                ?: SonarqubeVariable.Companion.from(key)?.description
                 ?: "Unknown"
         }
 
         fun all(): List<Variable> {
             val allVariables = mutableListOf<Variable>()
             allVariables.addAll(ContextVariable.values())
-            allVariables.addAll(PsiContextVariable.all())
+            allVariables.addAll(PsiContextVariable.Companion.all())
             allVariables.addAll(SystemInfoVariable.values())
 //            allVariables.addAll(ConditionPsiVariable.values())
             /// ...
diff --git a/exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/ast/variable/resolver/CompositeVariableResolver.kt b/exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/ast/variable/resolver/CompositeVariableResolver.kt
@@ -5,10 +5,6 @@ import com.intellij.psi.PsiElement
 import cc.unitmesh.devti.language.ast.variable.resolver.base.VariableResolver
 import cc.unitmesh.devti.language.ast.variable.resolver.base.VariableResolverContext
 import cc.unitmesh.devti.language.middleware.select.SelectElementStrategy
-import cc.unitmesh.devti.language.ast.variable.resolver.PsiContextVariableResolver
-import cc.unitmesh.devti.language.ast.variable.resolver.SystemInfoVariableResolver
-import cc.unitmesh.devti.language.ast.variable.resolver.ToolchainVariableResolver
-import cc.unitmesh.devti.language.ast.variable.resolver.UserCustomVariableResolver
 
 class CompositeVariableResolver(private val context: VariableResolverContext) : VariableResolver {
     init {
diff --git a/exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/ast/variable/toolchain/SonarqubeVariable.kt b/exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/ast/variable/toolchain/SonarqubeVariable.kt
@@ -1,6 +1,7 @@
 package cc.unitmesh.devti.language.ast.variable.toolchain
 
 import cc.unitmesh.devti.language.ast.variable.ToolchainVariable
+
 /**
  * Enum representing variables used in the generation of code structures.
  */
diff --git a/exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/compiler/DevInsCompiler.kt b/exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/compiler/DevInsCompiler.kt
@@ -126,6 +126,7 @@ class DevInsCompiler(
         }
 
         result.output = output.toString()
+        result.variableTable = variableTable
 
         CACHED_COMPILE_RESULT[file.name] = result
         return@withContext result
diff --git a/exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/completion/VariableCompletionProvider.kt b/exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/completion/VariableCompletionProvider.kt
@@ -0,0 +1,29 @@
+package cc.unitmesh.devti.language.completion
+
+import cc.unitmesh.devti.AutoDevIcons
+import cc.unitmesh.devti.language.ast.variable.CompositeVariableProvider
+import com.intellij.codeInsight.completion.CompletionParameters
+import com.intellij.codeInsight.completion.CompletionProvider
+import com.intellij.codeInsight.completion.CompletionResultSet
+import com.intellij.codeInsight.completion.PrioritizedLookupElement
+import com.intellij.codeInsight.lookup.LookupElementBuilder
+import com.intellij.util.ProcessingContext
+
+class VariableCompletionProvider : CompletionProvider<CompletionParameters>() {
+    override fun addCompletions(
+        parameters: CompletionParameters,
+        context: ProcessingContext,
+        result: CompletionResultSet,
+    ) {
+        CompositeVariableProvider.all().forEach {
+            val withTypeText =
+                PrioritizedLookupElement.withPriority(
+                    LookupElementBuilder.create(it.name)
+                        .withIcon(AutoDevIcons.VARIABLE)
+                        .withTypeText(it.description, true),
+                    it.priority
+                )
+            result.addElement(withTypeText)
+        }
+    }
+}
diff --git a/exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/run/DevInsRunConfigurationProfileState.kt b/exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/run/DevInsRunConfigurationProfileState.kt
@@ -3,7 +3,7 @@ package cc.unitmesh.devti.language.run
 import cc.unitmesh.devti.agent.custom.CustomAgentExecutor
 import cc.unitmesh.devti.agent.custom.model.CustomAgentConfig
 import cc.unitmesh.devti.custom.team.InteractionType
-import cc.unitmesh.devti.language.ast.config.ShireActionLocation
+import cc.unitmesh.devti.devins.ShireActionLocation
 import cc.unitmesh.devti.language.compiler.DevInsCompiler
 import cc.unitmesh.devti.language.compiler.error.DEVINS_ERROR
 import cc.unitmesh.devti.language.compiler.streaming.OnStreamingService
diff --git a/exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/run/runner/LocationInteractionContext.kt b/exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/run/runner/LocationInteractionContext.kt
@@ -1,7 +1,7 @@
 package cc.unitmesh.devti.language.run.runner
 
 import cc.unitmesh.devti.custom.team.InteractionType
-import cc.unitmesh.devti.language.ast.config.ShireActionLocation
+import cc.unitmesh.devti.devins.ShireActionLocation
 import com.intellij.execution.ui.ConsoleView
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.project.Project
diff --git a/exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/run/runner/ShireDefaultLlmExecutor.kt b/exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/run/runner/ShireDefaultLlmExecutor.kt
@@ -2,7 +2,7 @@ package cc.unitmesh.devti.language.run.runner
 
 import cc.unitmesh.devti.AutoDevBundle
 import cc.unitmesh.devti.custom.team.InteractionType
-import cc.unitmesh.devti.language.ast.config.ShireActionLocation
+import cc.unitmesh.devti.devins.ShireActionLocation
 import cc.unitmesh.devti.language.provider.LocationInteractionProvider
 import cc.unitmesh.devti.language.run.flow.DevInsConversationService
 import cc.unitmesh.devti.llms.LlmFactory
diff --git a/exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/run/runner/ShireRunner.kt b/exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/run/runner/ShireRunner.kt
@@ -2,15 +2,15 @@ package cc.unitmesh.devti.language.run.runner
 
 import cc.unitmesh.devti.AutoDevBundle
 import cc.unitmesh.devti.language.ast.HobbitHole
-import cc.unitmesh.devti.language.ast.config.ShireActionLocation
+import cc.unitmesh.devti.devins.ShireActionLocation
 import cc.unitmesh.devti.language.ast.variable.ShireVariableTemplateCompiler
 import cc.unitmesh.devti.language.compiler.DevInsCompiledResult
 import cc.unitmesh.devti.language.compiler.DevInsCompiler
 import cc.unitmesh.devti.language.compiler.error.DEVINS_ERROR
 import cc.unitmesh.devti.language.compiler.streaming.OnStreamingService
 import cc.unitmesh.devti.language.console.addCancelCallback
 import cc.unitmesh.devti.language.middleware.post.PostProcessorContext
-import cc.unitmesh.devti.language.provider.ActionLocationEditor
+import cc.unitmesh.devti.devins.ActionLocationEditor
 import cc.unitmesh.devti.language.provider.TerminalLocationExecutor
 import cc.unitmesh.devti.language.psi.DevInFile
 import cc.unitmesh.devti.language.run.DevInsConfiguration
diff --git a/exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/startup/DynamicShireActionService.kt b/exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/startup/DynamicShireActionService.kt
@@ -1,6 +1,6 @@
 package cc.unitmesh.devti.language.startup
 
-import cc.unitmesh.devti.language.ast.config.ShireActionLocation
+import cc.unitmesh.devti.devins.ShireActionLocation
 import cc.unitmesh.devti.language.psi.DevInFile
 import com.intellij.openapi.actionSystem.ActionManager
 import com.intellij.openapi.actionSystem.AnAction
diff --git a/exts/devins-lang/src/main/resources/cc.unitmesh.devti.language.xml b/exts/devins-lang/src/main/resources/cc.unitmesh.devti.language.xml
@@ -147,10 +147,6 @@
                         interface="cc.unitmesh.devti.language.provider.LocationInteractionProvider"
                         dynamic="true"/>
 
-        <extensionPoint qualifiedName="cc.unitmesh.shireActionLocationEditor"
-                        interface="cc.unitmesh.devti.language.provider.ActionLocationEditor"
-                        dynamic="true"/>
-
         <extensionPoint qualifiedName="cc.unitmesh.shirePsiCapture"
                         beanClass="com.intellij.lang.LanguageExtensionPoint" dynamic="true">
             <with attribute="implementationClass" implements="cc.unitmesh.devti.language.provider.PsiCapture"/>
diff --git a/exts/ext-git/src/main/kotlin/cc/unitmesh/git/provider/GitActionLocationEditor.kt b/exts/ext-git/src/main/kotlin/cc/unitmesh/git/provider/GitActionLocationEditor.kt
diff --git a/exts/ext-git/src/main/kotlin/cc/unitmesh/git/provider/GitToolchainVariableProvider.kt b/exts/ext-git/src/main/kotlin/cc/unitmesh/git/provider/GitToolchainVariableProvider.kt
diff --git a/java/src/main/kotlin/cc/unitmesh/idea/provider/JavaShireQLInterpreter.kt b/java/src/main/kotlin/cc/unitmesh/idea/provider/JavaShireQLInterpreter.kt

Original file line number	Diff line number	Diff line change
`@@ -109,4 +109,7 @@ object AutoDevIcons {`
`109`	`109`
`110`	`110`	`@JvmField`
`111`	`111`	`val LOCAL_AGENT: Icon = IconLoader.getIcon("/icons/local-agent.svg", AutoDevIcons::class.java)`
	`112`	`+`
	`113`	`+ @JvmField`
	`114`	`+ val VARIABLE: Icon = IconLoader.getIcon("/icons/variable.svg", AutoDevIcons::class.java)`
`112`	`115`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package cc.unitmesh.devti.language.ast.config`
	`1`	`+package cc.unitmesh.devti.devins`
`2`	`2`
`3`	`3`	`enum class ShireActionLocation(val location: String, val description: String) {`
`4`	`4`	`CONTEXT_MENU("ContextMenu", "Show in Context Menu by Right Click"),`
`@@ -29,4 +29,4 @@ enum class ShireActionLocation(val location: String, val description: String) {`
`29`	`29`
`30`	`30`	`fun default(): String = RUN_PANEL.location`
`31`	`31`	`}`
`32`		`-}`
	`32`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package cc.unitmesh.devti.language.provider.action`
	`1`	`+package cc.unitmesh.devti.devins`
`2`	`2`
`3`	`3`	`import com.intellij.openapi.actionSystem.DataContext`
`4`	`4`	`import com.intellij.openapi.util.Key`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package cc.unitmesh.devti.devins`
	`1`	`+package cc.unitmesh.devti.devins.shireql`
`2`	`2`
`3`	`3`	`enum class JvmShireQLFuncType(val methodName: String, val description: String) {`
`4`	`4`	`GET_NAME("getName", "Get class name"),`
Original file line number	Diff line number	Diff line change
`@@ -126,6 +126,7 @@ class DevInsCompiler(`
`126`	`126`	`}`
`127`	`127`
`128`	`128`	`result.output = output.toString()`
	`129`	`+ result.variableTable = variableTable`
`129`	`130`
`130`	`131`	`CACHED_COMPILE_RESULT[file.name] = result`
`131`	`132`	`return@withContext result`