From f49a42895f29d7b50a673bb694588dc252c6d773 Mon Sep 17 00:00:00 2001 From: Jinseong Jeon Date: Fri, 11 Feb 2022 12:07:54 -0800 Subject: [PATCH] FIR LC: use StandardNames (instead of hardcoded constants) --- .../light/classes/symbol/classes/FirLightClassForSymbol.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/FirLightClassForSymbol.kt b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/FirLightClassForSymbol.kt index 9f028d0ce87..ab5e626c5d4 100644 --- a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/FirLightClassForSymbol.kt +++ b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/FirLightClassForSymbol.kt @@ -17,6 +17,8 @@ import org.jetbrains.kotlin.asJava.classes.METHOD_INDEX_FOR_NON_ORIGIN_METHOD import org.jetbrains.kotlin.asJava.classes.lazyPub import org.jetbrains.kotlin.asJava.elements.KtLightField import org.jetbrains.kotlin.asJava.elements.KtLightMethod +import org.jetbrains.kotlin.builtins.StandardNames.ENUM_VALUES +import org.jetbrains.kotlin.builtins.StandardNames.ENUM_VALUE_OF import org.jetbrains.kotlin.builtins.StandardNames.HASHCODE_NAME import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.descriptors.Visibility @@ -95,7 +97,8 @@ internal open class FirLightClassForSymbol( val visibleDeclarations = declaredMemberScope.getCallableSymbols().applyIf(isEnum) { filterNot { function -> - function is KtFunctionSymbol && function.name.asString().let { it == "values" || it == "valueOf" } + function is KtFunctionSymbol && + (function.name == ENUM_VALUES || function.name == ENUM_VALUE_OF) } }.applyIf(classOrObjectSymbol.isObject) { filterNot {