FIR IDE: rename some of constant values for consistency

analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/evaluate/KtFirConstantValueConverter.kt

@@ -39,11 +39,11 @@ internal object KtFirConstantValueConverter {
 
     fun <T> toConstantValue(
         firConstExpression: FirConstExpression<T>,
-    ): KtSimpleConstantValue<T> =
+    ): KtLiteralConstantValue<T> =
         firConstExpression.convertConstantExpression()
 
-    private fun <T> FirConstExpression<T>.convertConstantExpression(): KtSimpleConstantValue<T> =
-        KtSimpleConstantValue(kind, value, realPsi as? KtElement)
+    private fun <T> FirConstExpression<T>.convertConstantExpression(): KtLiteralConstantValue<T> =
+        KtLiteralConstantValue(kind, value, realPsi as? KtElement)
 
     private fun Collection<FirExpression>.convertConstantExpression(
         session: FirSession,
@@ -112,7 +112,10 @@ internal object KtFirConstantValueConverter {
                 val reference = calleeReference as? FirResolvedNamedReference ?: return null
                 when (val resolvedSymbol = reference.resolvedSymbol) {
                     is FirEnumEntrySymbol -> {
-                        KtEnumEntryValue(resolvedSymbol.fir.buildSymbol(firSymbolBuilder) as KtEnumEntrySymbol, realPsi as? KtElement)
+                        KtEnumEntryConstantValue(
+                            resolvedSymbol.fir.buildSymbol(firSymbolBuilder) as KtEnumEntrySymbol,
+                            realPsi as? KtElement
+                        )
                     }
                     else -> null
                 }

analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/AbstractCompileTimeConstantEvaluatorTest.kt

@@ -31,7 +31,7 @@ abstract class AbstractCompileTimeConstantEvaluatorTest : AbstractHLApiSingleFil
         val actual = buildString {
             appendLine("expression: ${expression.text}")
             appendLine("constant_value: ${analyse(ktFile) { constantValue?.stringRepresentation() }}")
-            appendLine("constant: ${(constantValue as? KtSimpleConstantValue<*>)?.toConst()}")
+            appendLine("constant: ${(constantValue as? KtLiteralConstantValue<*>)?.toConst()}")
         }
         testServices.assertions.assertEqualsToFile(testDataFileSibling(".txt"), actual)
     }
@@ -52,12 +52,17 @@ abstract class AbstractCompileTimeConstantEvaluatorTest : AbstractHLApiSingleFil
                 }
                 append(")")
             }
-            is KtEnumEntryValue -> buildString {
-                append("KtEnumEntryValue(")
+            is KtEnumEntryConstantValue -> buildString {
+                append("KtEnumEntryConstantValue(")
                 append(enumEntrySymbol.callableIdIfNonLocal ?: enumEntrySymbol.name)
                 append(")")
             }
-            is KtSimpleConstantValue<*> -> toString()
+            is KtLiteralConstantValue<*> -> buildString {
+                append("KtLiteralConstantValue(")
+                append("constantValueKind=${constantValueKind}")
+                append(", ")
+                append("value=${value})")
+            }
             is KtUnsupportedConstantValue -> "KtUnsupportedConstantValue"
         }
     }