From 693b6f04e4ea005ea0da0fae0ac01b4d06542bf8 Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Fri, 24 Jun 2022 06:43:11 +0200 Subject: [PATCH] [Analysis API] cleanup, remove repetitive logic --- .../kotlin/analysis/api/fir/scopes/firScopeUtils.kt | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/scopes/firScopeUtils.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/scopes/firScopeUtils.kt index e0164ecac73..b12e8f3d260 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/scopes/firScopeUtils.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/scopes/firScopeUtils.kt @@ -10,10 +10,8 @@ import org.jetbrains.kotlin.analysis.api.signatures.KtCallableSignature import org.jetbrains.kotlin.analysis.api.symbols.KtCallableSymbol import org.jetbrains.kotlin.analysis.api.symbols.KtClassifierSymbol import org.jetbrains.kotlin.analysis.api.symbols.KtConstructorSymbol -import org.jetbrains.kotlin.fir.isSubstitutionOverride import org.jetbrains.kotlin.fir.scopes.FirScope import org.jetbrains.kotlin.fir.scopes.processClassifiersByName -import org.jetbrains.kotlin.fir.symbols.impl.FirPropertySymbol import org.jetbrains.kotlin.name.Name @@ -27,13 +25,7 @@ internal fun FirScope.getCallableSymbols( callables.add(builder.functionLikeBuilder.buildFunctionSymbol(firSymbol)) } processPropertiesByName(name) { firSymbol -> - val symbol = when { - firSymbol is FirPropertySymbol && firSymbol.fir.isSubstitutionOverride -> { - builder.variableLikeBuilder.buildVariableSymbol(firSymbol) - } - else -> builder.callableBuilder.buildCallableSymbol(firSymbol) - } - callables.add(symbol) + callables.add(builder.callableBuilder.buildCallableSymbol(firSymbol)) } yieldAll(callables) }