refactor(variable): rename toolchain variable packages and update imports for consistency #379

Author: phodal

build.gradle.kts

@@ -428,6 +428,10 @@ project(":core") {
             excludeKotlinDeps()
         }
 
+        implementation("org.reflections:reflections:0.10.2") {
+            exclude(group = "org.slf4j", module = "slf4j-api")
+        }
+
         implementation("com.squareup.retrofit2:converter-jackson:2.11.0")
         implementation("com.squareup.retrofit2:converter-gson:2.11.0")
         implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.18.1")
@@ -797,10 +801,6 @@ project(":exts:devins-lang") {
         }
 
         implementation("com.jayway.jsonpath:json-path:2.9.0")
-        implementation("org.reflections:reflections:0.10.2") {
-            exclude(group = "org.slf4j", module = "slf4j-api")
-        }
-
         implementation(project(":core"))
     }
 

exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/ast/variable/ConditionPsiVariable.kt renamed to core/src/main/kotlin/cc/unitmesh/devti/devins/variable/ConditionPsiVariable.kt

@@ -1,4 +1,4 @@
-package cc.unitmesh.devti.language.ast.variable
+package cc.unitmesh.devti.devins.variable
 
 enum class ConditionPsiVariable(
     override val variableName: String,

exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/ast/variable/ContextVariable.kt renamed to core/src/main/kotlin/cc/unitmesh/devti/devins/variable/ContextVariable.kt

@@ -1,4 +1,4 @@
-package cc.unitmesh.devti.language.ast.variable
+package cc.unitmesh.devti.devins.variable
 
 enum class ContextVariable(
     override val variableName: String,

exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/ast/variable/PsiContextVariable.kt renamed to core/src/main/kotlin/cc/unitmesh/devti/devins/variable/PsiContextVariable.kt

@@ -1,4 +1,4 @@
-package cc.unitmesh.devti.language.ast.variable
+package cc.unitmesh.devti.devins.variable
 
 /**
  * Represents the context variables that can be used in the code structure generation process.

exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/ast/variable/SystemInfoVariable.kt renamed to core/src/main/kotlin/cc/unitmesh/devti/devins/variable/SystemInfoVariable.kt

@@ -1,4 +1,4 @@
-package cc.unitmesh.devti.language.ast.variable
+package cc.unitmesh.devti.devins.variable
 
 import com.intellij.openapi.application.ApplicationInfo
 import java.util.*

exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/ast/variable/ToolchainVariable.kt renamed to core/src/main/kotlin/cc/unitmesh/devti/devins/variable/ToolchainVariable.kt

@@ -1,6 +1,7 @@
-package cc.unitmesh.devti.language.ast.variable
+package cc.unitmesh.devti.devins.variable
 
 import org.reflections.Reflections
+import kotlin.jvm.kotlin
 import kotlin.reflect.KClass
 import kotlin.reflect.full.companionObjectInstance
 import kotlin.reflect.full.declaredFunctions
@@ -9,7 +10,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.ast.variable")
+            val reflections = Reflections("cc.unitmesh.devti.devins.variable")
             reflections.getSubTypesOf(ToolchainVariable::class.java)
                 .map { it.kotlin }
                 .toSet()

exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/ast/variable/Variable.kt renamed to core/src/main/kotlin/cc/unitmesh/devti/devins/variable/Variable.kt

@@ -1,4 +1,4 @@
-package cc.unitmesh.devti.language.ast.variable
+package cc.unitmesh.devti.devins.variable
 
 interface Variable {
     val variableName: String

exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/ast/variable/VariableProvider.kt renamed to core/src/main/kotlin/cc/unitmesh/devti/devins/variable/VariableProvider.kt

@@ -1,4 +1,4 @@
-package cc.unitmesh.devti.language.ast.variable
+package cc.unitmesh.devti.devins.variable
 
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.project.Project

exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/ast/variable/toolchain/BuildToolchainVariable.kt renamed to core/src/main/kotlin/cc/unitmesh/devti/devins/variable/toolchain/BuildToolchainVariable.kt

@@ -1,6 +1,6 @@
-package cc.unitmesh.devti.language.ast.variable.toolchain
+package cc.unitmesh.devti.devins.variable.toolchain
 
-import cc.unitmesh.devti.language.ast.variable.ToolchainVariable
+import cc.unitmesh.devti.devins.variable.ToolchainVariable
 
 /**
  * Enum representing variables used in the generation of code structures.

exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/ast/variable/toolchain/DatabaseToolchainVariable.kt renamed to core/src/main/kotlin/cc/unitmesh/devti/devins/variable/toolchain/DatabaseToolchainVariable.kt

@@ -1,6 +1,6 @@
-package cc.unitmesh.devti.language.ast.variable.toolchain
+package cc.unitmesh.devti.devins.variable.toolchain
 
-import cc.unitmesh.devti.language.ast.variable.ToolchainVariable
+import cc.unitmesh.devti.devins.variable.ToolchainVariable
 
 enum class DatabaseToolchainVariable(
     override val variableName: String,

exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/ast/variable/toolchain/SonarqubeVariable.kt renamed to core/src/main/kotlin/cc/unitmesh/devti/devins/variable/toolchain/SonarqubeVariable.kt

@@ -1,6 +1,6 @@
-package cc.unitmesh.devti.language.ast.variable.toolchain
+package cc.unitmesh.devti.devins.variable.toolchain
 
-import cc.unitmesh.devti.language.ast.variable.ToolchainVariable
+import cc.unitmesh.devti.devins.variable.ToolchainVariable
 
 /**
  * Enum representing variables used in the generation of code structures.

exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/ast/variable/toolchain/TerminalToolchainVariable.kt renamed to core/src/main/kotlin/cc/unitmesh/devti/devins/variable/toolchain/TerminalToolchainVariable.kt

@@ -1,6 +1,6 @@
-package cc.unitmesh.devti.language.ast.variable.toolchain
+package cc.unitmesh.devti.devins.variable.toolchain
 
-import cc.unitmesh.devti.language.ast.variable.ToolchainVariable
+import cc.unitmesh.devti.devins.variable.ToolchainVariable
 
 /**
  * Enum representing variables used in the generation of code structures.

exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/ast/variable/toolchain/VcsToolchainVariable.kt renamed to core/src/main/kotlin/cc/unitmesh/devti/devins/variable/toolchain/VcsToolchainVariable.kt

@@ -1,6 +1,6 @@
-package cc.unitmesh.devti.language.ast.variable.toolchain
+package cc.unitmesh.devti.devins.variable.toolchain
 
-import cc.unitmesh.devti.language.ast.variable.ToolchainVariable
+import cc.unitmesh.devti.devins.variable.ToolchainVariable
 
 /**
  * Enum representing variables used in the generation of code structures.

exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/actions/base/validator/WhenConditionValidator.kt

@@ -2,7 +2,7 @@ package cc.unitmesh.devti.language.actions.base.validator
 
 import cc.unitmesh.devti.language.ast.FrontMatterType
 import cc.unitmesh.devti.language.ast.Statement
-import cc.unitmesh.devti.language.ast.variable.ConditionPsiVariable
+import cc.unitmesh.devti.devins.variable.ConditionPsiVariable
 import com.intellij.psi.PsiFile
 
 

exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/ast/variable/CompositeVariableProvider.kt

@@ -1,7 +1,11 @@
 package cc.unitmesh.devti.language.ast.variable
 
-import cc.unitmesh.devti.language.ast.variable.toolchain.DatabaseToolchainVariable
-import cc.unitmesh.devti.language.ast.variable.toolchain.VcsToolchainVariable
+import cc.unitmesh.devti.devins.variable.ContextVariable
+import cc.unitmesh.devti.devins.variable.PsiContextVariable
+import cc.unitmesh.devti.devins.variable.SystemInfoVariable
+import cc.unitmesh.devti.devins.variable.ToolchainVariable
+import cc.unitmesh.devti.devins.variable.toolchain.DatabaseToolchainVariable
+import cc.unitmesh.devti.devins.variable.toolchain.VcsToolchainVariable
 
 data class VariableDisplay(
     val name: String,

exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/ast/variable/DefaultPsiContextVariableProvider.kt

@@ -1,5 +1,6 @@
 package cc.unitmesh.devti.language.ast.variable
 
+import cc.unitmesh.devti.devins.variable.PsiContextVariable
 import cc.unitmesh.devti.language.ast.variable.psi.CodeSmellCollector
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.project.Project

exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/ast/variable/PsiContextVariableProvider.kt

@@ -1,5 +1,7 @@
 package cc.unitmesh.devti.language.ast.variable
 
+import cc.unitmesh.devti.devins.variable.PsiContextVariable
+import cc.unitmesh.devti.devins.variable.VariableProvider
 import cc.unitmesh.devti.language.provider.ComplexityProvider
 import cc.unitmesh.devti.language.provider.LanguageToolchainProvider
 import cc.unitmesh.devti.language.provider.ToolchainPrepareContext

exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/ast/variable/resolver/ContextVariableResolver.kt

@@ -6,8 +6,8 @@ import com.intellij.openapi.editor.CaretModel
 import com.intellij.psi.PsiNameIdentifierOwner
 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.ast.variable.ContextVariable
-import cc.unitmesh.devti.language.ast.variable.ContextVariable.*
+import cc.unitmesh.devti.devins.variable.ContextVariable
+import cc.unitmesh.devti.devins.variable.ContextVariable.*
 
 class ContextVariableResolver(
     private val context: VariableResolverContext,

exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/ast/variable/resolver/PsiContextVariableResolver.kt

@@ -1,7 +1,7 @@
 package cc.unitmesh.devti.language.ast.variable.resolver
 
 import cc.unitmesh.devti.language.ast.variable.DefaultPsiContextVariableProvider
-import cc.unitmesh.devti.language.ast.variable.PsiContextVariable
+import cc.unitmesh.devti.devins.variable.PsiContextVariable
 import cc.unitmesh.devti.language.ast.variable.PsiContextVariableProvider
 import com.intellij.openapi.application.runReadAction
 import com.intellij.openapi.diagnostic.logger

exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/ast/variable/resolver/SystemInfoVariableResolver.kt

@@ -1,6 +1,6 @@
 package cc.unitmesh.devti.language.ast.variable.resolver
 
-import cc.unitmesh.devti.language.ast.variable.SystemInfoVariable
+import cc.unitmesh.devti.devins.variable.SystemInfoVariable
 import cc.unitmesh.devti.language.ast.variable.resolver.base.VariableResolver
 import cc.unitmesh.devti.language.ast.variable.resolver.base.VariableResolverContext
 

exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/ast/variable/resolver/ToolchainVariableResolver.kt

@@ -1,6 +1,6 @@
 package cc.unitmesh.devti.language.ast.variable.resolver
 
-import cc.unitmesh.devti.language.ast.variable.ToolchainVariable
+import cc.unitmesh.devti.devins.variable.ToolchainVariable
 import com.intellij.openapi.diagnostic.logger
 import cc.unitmesh.devti.language.ast.variable.resolver.base.VariableResolver
 import cc.unitmesh.devti.language.ast.variable.resolver.base.VariableResolverContext

exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/ast/variable/DebugValueVariable.kt renamed to exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/debugger/DebugValueVariable.kt

@@ -1,10 +1,14 @@
-package cc.unitmesh.devti.language.ast.variable
+package cc.unitmesh.devti.language.debugger
 
-import cc.unitmesh.devti.language.ast.variable.toolchain.BuildToolchainVariable
-import cc.unitmesh.devti.language.ast.variable.toolchain.DatabaseToolchainVariable
-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 cc.unitmesh.devti.devins.variable.ContextVariable
+import cc.unitmesh.devti.devins.variable.PsiContextVariable
+import cc.unitmesh.devti.devins.variable.SystemInfoVariable
+import cc.unitmesh.devti.devins.variable.Variable
+import cc.unitmesh.devti.devins.variable.toolchain.BuildToolchainVariable
+import cc.unitmesh.devti.devins.variable.toolchain.DatabaseToolchainVariable
+import cc.unitmesh.devti.devins.variable.toolchain.SonarqubeVariable
+import cc.unitmesh.devti.devins.variable.toolchain.TerminalToolchainVariable
+import cc.unitmesh.devti.devins.variable.toolchain.VcsToolchainVariable
 import kotlin.collections.addAll
 
 data class DebugValueVariable(

exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/debugger/editor/ShireVariableViewPanel.kt

@@ -1,7 +1,7 @@
 package cc.unitmesh.devti.language.debugger.editor
 
-import cc.unitmesh.devti.language.ast.variable.DebugValueVariable
-import cc.unitmesh.devti.language.ast.variable.Variable
+import cc.unitmesh.devti.language.debugger.DebugValueVariable
+import cc.unitmesh.devti.devins.variable.Variable
 import cc.unitmesh.devti.language.debugger.snapshot.VariableSnapshotRecorder
 import com.intellij.openapi.project.Project
 import com.intellij.ui.JBColor

exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/provider/ToolchainVariableProvider.kt

@@ -1,7 +1,7 @@
 package cc.unitmesh.devti.language.provider
 
-import cc.unitmesh.devti.language.ast.variable.ToolchainVariable
-import cc.unitmesh.devti.language.ast.variable.VariableProvider
+import cc.unitmesh.devti.devins.variable.ToolchainVariable
+import cc.unitmesh.devti.devins.variable.VariableProvider
 import com.intellij.openapi.extensions.ExtensionPointName
 import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiElement

exts/ext-database/src/main/kotlin/cc/unitmesh/database/provider/DatabaseVariableProvider.kt

@@ -2,8 +2,8 @@ package cc.unitmesh.database.provider
 
 import cc.unitmesh.database.util.DatabaseSchemaAssistant
 import cc.unitmesh.database.util.SqlContextBuilder
-import cc.unitmesh.devti.language.ast.variable.ToolchainVariable
-import cc.unitmesh.devti.language.ast.variable.toolchain.DatabaseToolchainVariable
+import cc.unitmesh.devti.devins.variable.ToolchainVariable
+import cc.unitmesh.devti.devins.variable.toolchain.DatabaseToolchainVariable
 import cc.unitmesh.devti.language.provider.ToolchainVariableProvider
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.project.Project

exts/ext-git/src/main/kotlin/cc/unitmesh/git/provider/GitToolchainVariableProvider.kt

@@ -1,9 +1,9 @@
 package cc.unitmesh.git.provider
 
-import cc.unitmesh.devti.language.ast.variable.ToolchainVariable
+import cc.unitmesh.devti.devins.variable.ToolchainVariable
 import cc.unitmesh.devti.language.provider.ToolchainVariableProvider
 import cc.unitmesh.devti.devins.VariableActionEventDataHolder
-import cc.unitmesh.devti.language.ast.variable.toolchain.VcsToolchainVariable
+import cc.unitmesh.devti.devins.variable.toolchain.VcsToolchainVariable
 import cc.unitmesh.devti.vcs.VcsPrompting
 import com.intellij.ide.DataManager
 import com.intellij.openapi.actionSystem.DataContext