Make CgVariableConstructor generate more base names

Author: IlyaMuravjov

utbot-framework/src/main/kotlin/org/utbot/framework/codegen/tree/CgVariableConstructor.kt

@@ -49,6 +49,7 @@ import org.utbot.framework.plugin.api.util.booleanClassId
 import org.utbot.framework.plugin.api.util.booleanWrapperClassId
 import org.utbot.framework.plugin.api.util.classClassId
 import org.utbot.framework.plugin.api.util.defaultValueModel
+import org.utbot.framework.plugin.api.util.executable
 import org.utbot.framework.plugin.api.util.jField
 import org.utbot.framework.plugin.api.util.findFieldByIdOrNull
 import org.utbot.framework.plugin.api.util.id
@@ -188,7 +189,7 @@ open class CgVariableConstructor(val context: CgContext) :
         }
 
         for ((fieldId, fieldModel) in model.fields) {
-            val variableForField = getOrCreateVariable(fieldModel)
+            val variableForField = getOrCreateVariable(fieldModel, name = fieldId.name)
             if (!variableForField.hasDefaultValue())
                 setFieldValue(obj, fieldId, variableForField)
         }
@@ -261,7 +262,10 @@ open class CgVariableConstructor(val context: CgContext) :
                 is UtDirectSetFieldModel -> {
                     val instance = declareOrGet(statementModel.instance)
                     // fields here are supposed to be accessible, so we assign them directly without any checks
-                    instance[statementModel.fieldId] `=` declareOrGet(statementModel.fieldModel)
+                    instance[statementModel.fieldId] `=` declareOrGet(
+                        model = statementModel.fieldModel,
+                        name = statementModel.fieldId.name,
+                    )
                 }
                 is UtStatementCallModel -> {
                     val call = createCgExecutableCallFromUtExecutableCall(statementModel)
@@ -284,19 +288,18 @@ open class CgVariableConstructor(val context: CgContext) :
         when (statementModel) {
             is UtExecutableCallModel -> {
                 val executable = statementModel.executable
+                val paramNames = runCatching {
+                    executable.executable.parameters.map { if (it.isNamePresent) it.name else null }
+                }.getOrNull()
                 val params = statementModel.params
+                val caller = statementModel.instance?.let { declareOrGet(it) }
+                val args = params.mapIndexed { i, param ->
+                    declareOrGet(param, name = paramNames?.getOrNull(i))
+                }
 
                 when (executable) {
-                    is MethodId -> {
-                        val caller = statementModel.instance?.let { declareOrGet(it) }
-                        val args = params.map { declareOrGet(it) }
-                        caller[executable](*args.toTypedArray())
-                    }
-
-                    is ConstructorId -> {
-                        val args = params.map { declareOrGet(it) }
-                        executable(*args.toTypedArray())
-                    }
+                    is MethodId -> caller[executable](*args.toTypedArray())
+                    is ConstructorId -> executable(*args.toTypedArray())
                 }
             }
             is UtDirectGetFieldModel -> {
@@ -512,8 +515,8 @@ open class CgVariableConstructor(val context: CgContext) :
      * Either declares a new variable or gets it from context's cache
      * Returns the obtained variable
      */
-    private fun declareOrGet(model: UtModel): CgValue =
-        valueByUtModelWrapper[model.wrap()] ?: getOrCreateVariable(model)
+    private fun declareOrGet(model: UtModel, name: String? = null): CgValue =
+        valueByUtModelWrapper[model.wrap()] ?: getOrCreateVariable(model, name)
 
     private fun basicForLoop(start: Any, until: Any, body: (i: CgExpression) -> Unit) {
         forLoop {