azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIR IDE] Small refactoring of KtSymbol's value parameters

Browse Source
This commit is contained in:
Roman Golyshev
2022-04-21 23:20:13 +04:00
committed by teamcity
parent 1d5cb8ab75
commit ea8a05ec02
3 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirCallResolver.kt
+1 -5
View File
@@ -689,10 +689,6 @@ internal class KtFirCallResolver(
private fun FirVariableSymbol<*>.toKtSignature(): KtVariableLikeSignature<KtVariableLikeSymbol> = private fun FirVariableSymbol<*>.toKtSignature(): KtVariableLikeSignature<KtVariableLikeSymbol> =
firSymbolBuilder.variableLikeBuilder.buildVariableLikeSignature(this) firSymbolBuilder.variableLikeBuilder.buildVariableLikeSignature(this)
@OptIn(SymbolInternals::class)
private fun FirValueParameterSymbol.toKtSymbol(): KtValueParameterSymbol =
firSymbolBuilder.variableLikeBuilder.buildValueParameterSymbol(this)
override fun collectCallCandidates(psi: KtElement): List<KtCallCandidateInfo> = withValidityAssertion { override fun collectCallCandidates(psi: KtElement): List<KtCallCandidateInfo> = withValidityAssertion {
getCallInfo(psi) { psiToResolve, resolveCalleeExpressionOfFunctionCall, resolveFragmentOfCall -> getCallInfo(psi) { psiToResolve, resolveCalleeExpressionOfFunctionCall, resolveFragmentOfCall ->
collectCallCandidates( collectCallCandidates(
@@ -977,7 +973,7 @@ internal class KtFirCallResolver(
substitutor: KtSubstitutor, substitutor: KtSubstitutor,
): LinkedHashMap<KtExpression, KtVariableLikeSignature<KtValueParameterSymbol>> { ): LinkedHashMap<KtExpression, KtVariableLikeSignature<KtValueParameterSymbol>> {
val ktArgumentMapping = LinkedHashMap<KtExpression, KtVariableLikeSignature<KtValueParameterSymbol>>() val ktArgumentMapping = LinkedHashMap<KtExpression, KtVariableLikeSignature<KtValueParameterSymbol>>()
val parameterSymbol = arrayOfCallSymbol.firSymbol.fir.valueParameters.single().symbol.toKtSymbol() val parameterSymbol = arrayOfCallSymbol.valueParameters.single()
for (firExpression in argumentList.arguments) { for (firExpression in argumentList.arguments) {
mapArgumentExpressionToParameter(firExpression, parameterSymbol.toSignature(substitutor), ktArgumentMapping) mapArgumentExpressionToParameter(firExpression, parameterSymbol.toSignature(substitutor), ktArgumentMapping)
analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirPropertySetterSymbol.kt
+1 -1
View File
@@ -65,7 +65,7 @@ internal class KtFirPropertySetterSymbol(
} }
override val parameter: KtValueParameterSymbol by cached { override val parameter: KtValueParameterSymbol by cached {
builder.variableLikeBuilder.buildValueParameterSymbol(firSymbol.fir.valueParameters.single().symbol) firSymbol.createKtValueParameters(builder).single()
} }
override val valueParameters: List<KtValueParameterSymbol> by cached { listOf(parameter) } override val valueParameters: List<KtValueParameterSymbol> by cached { listOf(parameter) }
analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirSamConstructorSymbol.kt
+1 -3
View File
@@ -37,9 +37,7 @@ internal class KtFirSamConstructorSymbol(
override val valueParameters: List<KtValueParameterSymbol> override val valueParameters: List<KtValueParameterSymbol>
get() = withValidityAssertion { get() = withValidityAssertion {
firSymbol.fir.valueParameters.map { valueParameter -> firSymbol.createKtValueParameters(builder)
builder.variableLikeBuilder.buildValueParameterSymbol(valueParameter.symbol)
}
} }
override val hasStableParameterNames: Boolean override val hasStableParameterNames: Boolean