refactor(runner): change return types to Any for variable resolution #14

Update return types to Any for variable resolution methods to allow flexibility in handling different data types. This commit modifies the return types of variable resolution methods in the runner package to Any, enabling the handling of various data types.
phodal · Jun 16, 2024 · 69f1d61 · 69f1d61
1 parent fb8ad5f
commit 69f1d61
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 15 deletions.
diff --git a/core/src/main/kotlin/com/phodal/shirecore/provider/PsiContextVariableProvider.kt b/core/src/main/kotlin/com/phodal/shirecore/provider/PsiContextVariableProvider.kt
@@ -16,8 +16,8 @@ interface PsiContextVariableProvider {
      * @param psiElement the PsiElement for which to calculate variable values
      * @return a map containing the resolved values for each PsiVariable based on the provided PsiElement
      */
-    fun resolveAll(psiElement: PsiElement): Map<PsiVariable, String> {
-        val result = mutableMapOf<PsiVariable, String>()
+    fun resolveAll(psiElement: PsiElement): Map<PsiVariable, Any> {
+        val result = mutableMapOf<PsiVariable, Any>()
         for (variable in PsiVariable.values()) {
             result[variable] = resolveVariableValue(psiElement, variable)
         }
@@ -31,7 +31,7 @@ interface PsiContextVariableProvider {
      * @param variable the PsiVariable for which to calculate the value
      * @return the calculated value for the variable as a String
      */
-    fun resolveVariableValue(psiElement: PsiElement?, variable: PsiVariable): String
+    fun resolveVariableValue(psiElement: PsiElement?, variable: PsiVariable): Any
 
     companion object {
         private val languageExtension: LanguageExtension<PsiContextVariableProvider> =

diff --git a/...ges/java/src/main/kotlin/com/phodal/shirelang/java/impl/JavaPsiContextVariableProvider.kt b/...ges/java/src/main/kotlin/com/phodal/shirelang/java/impl/JavaPsiContextVariableProvider.kt
@@ -13,7 +13,7 @@ import com.phodal.shirelang.java.toolchain.getContainingClass
 import kotlinx.coroutines.runBlocking
 
 class JavaPsiContextVariableProvider : PsiContextVariableProvider {
-    override fun resolveVariableValue(psiElement: PsiElement?, variable: PsiVariable): String {
+    override fun resolveVariableValue(psiElement: PsiElement?, variable: PsiVariable): Any {
         val project = psiElement?.project ?: return ""
         if (psiElement.language.id != "JAVA") {
             return ""
@@ -45,11 +45,7 @@ class JavaPsiContextVariableProvider : PsiContextVariableProvider {
 
             PsiVariable.IS_NEW_FILE -> {
                 val sourceElement = TestFinderHelper.findClassesForTest(psiElement)
-                return if (sourceElement.isEmpty()) {
-                    "true"
-                } else {
-                    "false"
-                }
+                return sourceElement.isEmpty()
             }
 
             PsiVariable.TARGET_TEST_FILE_NAME -> {

diff --git a/shirelang/src/main/kotlin/com/phodal/shirelang/compile/VariableTemplateCompiler.kt b/shirelang/src/main/kotlin/com/phodal/shirelang/compile/VariableTemplateCompiler.kt
@@ -17,13 +17,13 @@ class VariableTemplateCompiler(
     val file: PsiFile,
 ) {
     private val log = logger<VariableTemplateCompiler>()
-    private val variableMap: MutableMap<String, String> = mutableMapOf()
+    private val variableMap: MutableMap<String, Any> = mutableMapOf()
 
     fun set(key: String, value: String) {
         variableMap[key] = value
     }
 
-    fun set(map: Map<String, String>) {
+    fun set(map: Map<String, Any>) {
         variableMap.putAll(map)
     }
 

diff --git a/shirelang/src/main/kotlin/com/phodal/shirelang/run/ShireRunConfigurationProfileState.kt b/shirelang/src/main/kotlin/com/phodal/shirelang/run/ShireRunConfigurationProfileState.kt
@@ -147,7 +147,7 @@ fun compileShireTemplate(myProject: Project, hole: HobbitHole, symbolTable: Symb
     val currentElement = VariableTemplateCompiler.defaultElement(myProject, currentEditor)
 
     if (currentElement != null && currentEditor != null) {
-        val additionalMap: Map<String, String> = SymbolResolver(myProject, currentEditor, hole).resolve(symbolTable)
+        val additionalMap: Map<String, Any> = SymbolResolver(myProject, currentEditor, hole).resolve(symbolTable)
 
         val file = currentElement.containingFile
         val templateCompiler = VariableTemplateCompiler(file.language, file)

diff --git a/shirelang/src/main/kotlin/com/phodal/shirelang/run/runner/SymbolResolver.kt b/shirelang/src/main/kotlin/com/phodal/shirelang/run/runner/SymbolResolver.kt
@@ -27,7 +27,7 @@ class SymbolResolver(val myProject: Project, val editor: Editor, val hole: Hobbi
         }
     }
 
-    fun resolve(symbolTable: SymbolTable): Map<String, String> {
+    fun resolve(symbolTable: SymbolTable): Map<String, Any> {
         val element: PsiElement? = try {
             editor.caretModel.currentCaret.offset.let {
                 val psiFile = PsiUtilBase.getPsiFileInEditor(editor, myProject) ?: return@let null
@@ -49,8 +49,8 @@ class SymbolResolver(val myProject: Project, val editor: Editor, val hole: Hobbi
         return results
     }
 
-    private fun resolveBuiltInVariable(symbolTable: SymbolTable, element: PsiElement?): MutableMap<String, String> {
-        val result = mutableMapOf<String, String>()
+    private fun resolveBuiltInVariable(symbolTable: SymbolTable, element: PsiElement?): MutableMap<String, Any> {
+        val result = mutableMapOf<String, Any>()
         symbolTable.getAllVariables().forEach {
             val psiVariable = PsiVariable.fromVariableName(it.key)
             if (psiVariable != null) {