From 8fc787d6df8b612692361eefa50d1bb273bec81d Mon Sep 17 00:00:00 2001 From: Dmitrii Gridin Date: Thu, 24 Nov 2022 17:44:39 +0100 Subject: [PATCH] [AA FIR] FirCallableSignature: rename 'sameSignature' to 'hasTheSameSignature' ^KT-54826 --- .../api/fir/symbols/pointers/FirCallableSignature.kt | 4 ++-- .../kotlin/analysis/api/fir/symbols/pointers/pointerUtils.kt | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/pointers/FirCallableSignature.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/pointers/FirCallableSignature.kt index fdc0b862138..526e6a3e671 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/pointers/FirCallableSignature.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/pointers/FirCallableSignature.kt @@ -25,9 +25,9 @@ internal class FirCallableSignature private constructor( private val typeParametersCount: Int, private val returnType: String, ) { - fun sameSignature(declaration: FirCallableSymbol<*>): Boolean = sameSignature(declaration.fir) + fun hasTheSameSignature(declaration: FirCallableSymbol<*>): Boolean = hasTheSameSignature(declaration.fir) - fun sameSignature(declaration: FirCallableDeclaration): Boolean { + fun hasTheSameSignature(declaration: FirCallableDeclaration): Boolean { if ((receiverType == null) != (declaration.receiverParameter == null)) return false if (contextReceiverTypes.size != declaration.contextReceivers.size) return false if (typeParametersCount != declaration.typeParameters.size) return false diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/pointers/pointerUtils.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/pointers/pointerUtils.kt index a9ae77c5a4b..4f4acb3f7a9 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/pointers/pointerUtils.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/pointers/pointerUtils.kt @@ -7,7 +7,6 @@ package org.jetbrains.kotlin.analysis.api.fir.symbols.pointers import org.jetbrains.kotlin.analysis.api.fir.KtFirAnalysisSession import org.jetbrains.kotlin.fir.declarations.FirCallableDeclaration -import org.jetbrains.kotlin.fir.declarations.FirDeclaration import org.jetbrains.kotlin.fir.resolve.providers.symbolProvider import org.jetbrains.kotlin.fir.scopes.FirScope import org.jetbrains.kotlin.fir.scopes.processClassifiersByName @@ -24,7 +23,7 @@ internal inline fun FirScope.findDeclaratio var foundSymbol: D? = null processor { symbol -> val declaration = symbol.fir - if (declaration is D && signature.sameSignature(declaration)) { + if (declaration is D && signature.hasTheSameSignature(declaration)) { foundSymbol = declaration } } @@ -48,7 +47,7 @@ internal inline fun Collection