From ee377688089dab050d6e9274b78e53aebc8b1585 Mon Sep 17 00:00:00 2001 From: Ivan Kochurkin Date: Tue, 7 Sep 2021 18:28:19 +0300 Subject: [PATCH] [FIR] Rename getClassLikeSymbolFqName to getClassLikeSymbolByClassId --- .../kotlin/fir/AbstractFirLoadBinariesTest.kt | 2 +- .../kotlin/fir/java/AbstractFirTypeEnhancementTest.kt | 2 +- .../expression/FirInterfaceDefaultMethodCallChecker.kt | 2 +- .../fir/analysis/checkers/FirAnnotationHelpers.kt | 2 +- .../kotlin/fir/analysis/checkers/FirHelpers.kt | 2 +- .../fir/analysis/checkers/FirSinceKotlinHelpers.kt | 2 +- .../checkers/declaration/FirExpectActualResolver.kt | 6 +++--- .../analysis/checkers/declaration/FirImportsChecker.kt | 2 +- .../checkers/declaration/FirSealedSupertypeChecker.kt | 4 ++-- .../AbstractFirDeserializedSymbolsProvider.kt | 2 +- .../resolve/providers/impl/FirBuiltinSymbolProvider.kt | 6 +++--- .../kotlin/fir/serialization/FirElementSerializer.kt | 2 +- .../kotlin/fir/serialization/constant/ConstantValue.kt | 2 +- .../fir/backend/jvm/FirJvmBackendClassResolver.kt | 2 +- .../kotlin/fir/backend/jvm/FirJvmMangleComputer.kt | 2 +- .../kotlin/fir/backend/jvm/FirJvmTypeMapper.kt | 6 +++--- .../org/jetbrains/kotlin/fir/backend/Fir2IrBuiltIns.kt | 2 +- .../kotlin/fir/backend/Fir2IrClassifierStorage.kt | 2 +- .../jetbrains/kotlin/fir/backend/IrBuiltInsOverFir.kt | 2 +- .../jetbrains/kotlin/fir/java/JavaSymbolProvider.kt | 4 ++-- .../src/org/jetbrains/kotlin/fir/java/JavaUtils.kt | 2 +- .../enhancement/FirAnnotationTypeQualifierResolver.kt | 2 +- .../jetbrains/kotlin/fir/resolve/FirJavaClassMapper.kt | 2 +- .../kotlin/fir/resolve/scopes/JvmMappedScopes.kt | 2 +- .../kotlin/fir/resolve/FirOuterClassManager.kt | 2 +- .../org/jetbrains/kotlin/fir/resolve/LookupTagUtils.kt | 2 +- .../org/jetbrains/kotlin/fir/resolve/ResolveUtils.kt | 4 ++-- .../kotlin/fir/resolve/calls/tower/TowerLevels.kt | 2 +- .../kotlin/fir/resolve/providers/FirSymbolProvider.kt | 4 ++-- .../providers/impl/FirCloneableSymbolProvider.kt | 2 +- .../providers/impl/FirCompositeSymbolProvider.kt | 4 ++-- .../impl/FirDependenciesSymbolProviderImpl.kt | 4 ++-- .../providers/impl/FirLibrarySessionProvider.kt | 2 +- .../fir/resolve/providers/impl/FirProviderImpl.kt | 2 +- .../resolve/providers/impl/FirQualifierResolverImpl.kt | 4 ++-- .../fir/resolve/providers/impl/FirTypeResolverImpl.kt | 2 +- .../transformers/FirImportResolveTransformer.kt | 2 +- .../resolve/transformers/FirSupertypesResolution.kt | 2 +- .../transformers/FirWhenExhaustivenessTransformer.kt | 2 +- .../transformers/body/resolve/BodyResolveUtils.kt | 2 +- .../fir/scopes/impl/FirAbstractImportingScope.kt | 4 ++-- .../fir/scopes/impl/FirLazyNestedClassifierScope.kt | 2 +- .../kotlin/fir/scopes/impl/FirPackageMemberScope.kt | 2 +- .../jetbrains/kotlin/fir/types/ConeInferenceContext.kt | 4 ++-- .../test/frontend/fir/handlers/FirScopeDumpHandler.kt | 2 +- .../FirIdeBuiltinsAndCloneableSessionProvider.kt | 2 +- .../api/providers/FirIdeLibrariesSessionProvider.kt | 2 +- .../idea/fir/low/level/api/providers/FirIdeProvider.kt | 2 +- .../FirModuleWithDependenciesSymbolProvider.kt | 10 +++++----- .../util/FirDeclarationForCompiledElementSearcher.kt | 2 +- .../idea/fir/low/level/api/util/declarationUtils.kt | 2 +- .../idea/frontend/api/fir/KtSymbolByFirBuilder.kt | 2 +- .../api/fir/components/KtFirReferenceShortener.kt | 2 +- .../frontend/api/fir/components/KtFirTypeCreator.kt | 2 +- .../frontend/api/fir/symbols/KtFirSymbolProvider.kt | 2 +- .../symbols/pointers/KtFirEnumEntrySymbolPointer.kt | 2 +- .../frontend/api/fir/symbols/pointers/pointerUtils.kt | 2 +- 57 files changed, 76 insertions(+), 76 deletions(-) diff --git a/compiler/fir/analysis-tests/legacy-fir-tests/tests/org/jetbrains/kotlin/fir/AbstractFirLoadBinariesTest.kt b/compiler/fir/analysis-tests/legacy-fir-tests/tests/org/jetbrains/kotlin/fir/AbstractFirLoadBinariesTest.kt index 329f4691b83..6d5fa28d74a 100644 --- a/compiler/fir/analysis-tests/legacy-fir-tests/tests/org/jetbrains/kotlin/fir/AbstractFirLoadBinariesTest.kt +++ b/compiler/fir/analysis-tests/legacy-fir-tests/tests/org/jetbrains/kotlin/fir/AbstractFirLoadBinariesTest.kt @@ -42,7 +42,7 @@ abstract class AbstractFirLoadBinariesTest : AbstractFirResolveWithSessionTestCa } for (name in declarationNames) { - val classLikeSymbol = provider.getClassLikeSymbolByFqName(ClassId.topLevel(packageFqName.child(name))) ?: continue + val classLikeSymbol = provider.getClassLikeSymbolByClassId(ClassId.topLevel(packageFqName.child(name))) ?: continue classLikeSymbol.fir.accept(firRenderer) builder.appendLine() } diff --git a/compiler/fir/analysis-tests/legacy-fir-tests/tests/org/jetbrains/kotlin/fir/java/AbstractFirTypeEnhancementTest.kt b/compiler/fir/analysis-tests/legacy-fir-tests/tests/org/jetbrains/kotlin/fir/java/AbstractFirTypeEnhancementTest.kt index 1a537c3ec79..34b322bba4a 100644 --- a/compiler/fir/analysis-tests/legacy-fir-tests/tests/org/jetbrains/kotlin/fir/java/AbstractFirTypeEnhancementTest.kt +++ b/compiler/fir/analysis-tests/legacy-fir-tests/tests/org/jetbrains/kotlin/fir/java/AbstractFirTypeEnhancementTest.kt @@ -148,7 +148,7 @@ abstract class AbstractFirTypeEnhancementTest : KtUsefulTestCase() { val processedJavaClasses = mutableSetOf() fun processClassWithChildren(psiClass: PsiClass, parentFqName: FqName) { val classId = psiClass.classId(parentFqName) - val javaClass = javaProvider.getClassLikeSymbolByFqName(classId)?.fir + val javaClass = javaProvider.getClassLikeSymbolByClassId(classId)?.fir ?: throw AssertionError(classId.asString()) if (javaClass !is FirJavaClass || javaClass in processedJavaClasses) { return diff --git a/compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/checkers/expression/FirInterfaceDefaultMethodCallChecker.kt b/compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/checkers/expression/FirInterfaceDefaultMethodCallChecker.kt index 5a305382cc1..124da8784f7 100644 --- a/compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/checkers/expression/FirInterfaceDefaultMethodCallChecker.kt +++ b/compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/checkers/expression/FirInterfaceDefaultMethodCallChecker.kt @@ -32,7 +32,7 @@ object FirInterfaceDefaultMethodCallChecker : FirQualifiedAccessExpressionChecke val symbol = expression.calleeReference.toResolvedCallableSymbol() val classId = symbol?.callableId?.classId ?: return if (classId.isLocal) return - val typeSymbol = context.session.symbolProvider.getClassLikeSymbolByFqName(classId) as? FirRegularClassSymbol ?: return + val typeSymbol = context.session.symbolProvider.getClassLikeSymbolByClassId(classId) as? FirRegularClassSymbol ?: return if (!supportsDefaults && symbol.isStatic && diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirAnnotationHelpers.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirAnnotationHelpers.kt index 30d35dc7cb2..e87fb4f3423 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirAnnotationHelpers.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirAnnotationHelpers.kt @@ -117,7 +117,7 @@ fun checkRepeatedAnnotation( fun FirAnnotationCall.isRepeatable(session: FirSession): Boolean { val annotationClassId = this.toAnnotationClassId() ?: return false if (annotationClassId.isLocal) return false - val annotationClass = session.symbolProvider.getClassLikeSymbolByFqName(annotationClassId) ?: return false + val annotationClass = session.symbolProvider.getClassLikeSymbolByClassId(annotationClassId) ?: return false return annotationClass.containsRepeatableAnnotation(session) } diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirHelpers.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirHelpers.kt index e3c582a4f0d..b04008b6522 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirHelpers.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirHelpers.kt @@ -132,7 +132,7 @@ fun FirBasedSymbol<*>.getContainingClassSymbol(session: FirSession): FirClassLik fun FirClassLikeSymbol<*>.outerClassSymbol(context: CheckerContext): FirClassLikeSymbol<*>? { if (this !is FirClassSymbol<*>) return null val outerClassId = classId.outerClassId ?: return null - return context.session.symbolProvider.getClassLikeSymbolByFqName(outerClassId) + return context.session.symbolProvider.getClassLikeSymbolByClassId(outerClassId) } /** diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirSinceKotlinHelpers.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirSinceKotlinHelpers.kt index f7fcb29f27b..34370004274 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirSinceKotlinHelpers.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirSinceKotlinHelpers.kt @@ -85,7 +85,7 @@ private fun FirAnnotatedDeclaration.getOwnSinceKotlinVersion(session: FirSession if (this is FirConstructor) { val classId = symbol.callableId.classId if (classId != null) { - val classSymbol = session.symbolProvider.getClassLikeSymbolByFqName(classId) + val classSymbol = session.symbolProvider.getClassLikeSymbolByClassId(classId) classSymbol?.consider() } } diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirExpectActualResolver.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirExpectActualResolver.kt index 5b7301ccf85..ce53ebb89f5 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirExpectActualResolver.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirExpectActualResolver.kt @@ -47,10 +47,10 @@ object FirExpectActualResolver { var actualContainingClass: FirRegularClassSymbol? = null val candidates = when { classId != null -> { - expectContainingClass = useSiteSession.dependenciesSymbolProvider.getClassLikeSymbolByFqName(classId)?.let { + expectContainingClass = useSiteSession.dependenciesSymbolProvider.getClassLikeSymbolByClassId(classId)?.let { it.fullyExpandedClass(it.moduleData.session) } - actualContainingClass = useSiteSession.symbolProvider.getClassLikeSymbolByFqName(classId) + actualContainingClass = useSiteSession.symbolProvider.getClassLikeSymbolByClassId(classId) ?.fullyExpandedClass(useSiteSession) val expectTypeParameters = expectContainingClass?.typeParameterSymbols.orEmpty() @@ -87,7 +87,7 @@ object FirExpectActualResolver { } is FirClassLikeSymbol<*> -> { val expectClassSymbol = useSiteSession.dependenciesSymbolProvider - .getClassLikeSymbolByFqName(actualSymbol.classId) as? FirRegularClassSymbol ?: return null + .getClassLikeSymbolByClassId(actualSymbol.classId) as? FirRegularClassSymbol ?: return null val compatibility = areCompatibleClassifiers(expectClassSymbol, actualSymbol, useSiteSession, scopeSession) mapOf(compatibility to listOf(expectClassSymbol)) } diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirImportsChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirImportsChecker.kt index 26bf314a1ce..d19e06fa340 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirImportsChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirImportsChecker.kt @@ -134,7 +134,7 @@ object FirImportsChecker : FirFileChecker() { } private fun ClassId.resolveToClass(context: CheckerContext): FirRegularClassSymbol? { - val classSymbol = context.session.symbolProvider.getClassLikeSymbolByFqName(this) ?: return null + val classSymbol = context.session.symbolProvider.getClassLikeSymbolByClassId(this) ?: return null return when (classSymbol) { is FirRegularClassSymbol -> classSymbol is FirTypeAliasSymbol -> classSymbol.fullyExpandedClass(context.session) diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirSealedSupertypeChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirSealedSupertypeChecker.kt index 5a7e9872de0..f7a4582fc66 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirSealedSupertypeChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirSealedSupertypeChecker.kt @@ -39,7 +39,7 @@ object FirSealedSupertypeChecker : FirClassChecker() { continue } - val superClass = context.session.symbolProvider.getClassLikeSymbolByFqName(superClassId) as? FirRegularClassSymbol ?: continue + val superClass = context.session.symbolProvider.getClassLikeSymbolByClassId(superClassId) as? FirRegularClassSymbol ?: continue if (!superClass.isSealed) continue if (superClass.origin == FirDeclarationOrigin.Java) { @@ -65,7 +65,7 @@ object FirSealedSupertypeChecker : FirClassChecker() { continue } - val classSymbol = context.session.symbolProvider.getClassLikeSymbolByFqName(classId) as? FirRegularClassSymbol ?: continue + val classSymbol = context.session.symbolProvider.getClassLikeSymbolByClassId(classId) as? FirRegularClassSymbol ?: continue if (classSymbol.modality == Modality.SEALED) { reporter.reportOn(it.source, FirErrors.SEALED_SUPERTYPE_IN_LOCAL_CLASS, context) diff --git a/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/AbstractFirDeserializedSymbolsProvider.kt b/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/AbstractFirDeserializedSymbolsProvider.kt index 179481412f1..93d7c8d4fff 100644 --- a/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/AbstractFirDeserializedSymbolsProvider.kt +++ b/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/AbstractFirDeserializedSymbolsProvider.kt @@ -213,7 +213,7 @@ abstract class AbstractFirDeserializedSymbolsProvider( destination += propertyCache.getValue(CallableId(packageFqName, name)) } - override fun getClassLikeSymbolByFqName(classId: ClassId): FirClassLikeSymbol<*>? { + override fun getClassLikeSymbolByClassId(classId: ClassId): FirClassLikeSymbol<*>? { return getClass(classId) ?: getTypeAlias(classId) } diff --git a/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirBuiltinSymbolProvider.kt b/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirBuiltinSymbolProvider.kt index b6502633811..e5d2489654f 100644 --- a/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirBuiltinSymbolProvider.kt +++ b/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirBuiltinSymbolProvider.kt @@ -72,9 +72,9 @@ open class FirBuiltinSymbolProvider( return null } - override fun getClassLikeSymbolByFqName(classId: ClassId): FirRegularClassSymbol? { + override fun getClassLikeSymbolByClassId(classId: ClassId): FirRegularClassSymbol? { return allPackageFragments[classId.packageFqName]?.firstNotNullOfOrNull { - it.getClassLikeSymbolByFqName(classId) + it.getClassLikeSymbolByClassId(classId) } ?: syntheticFunctionalInterfaceCache.tryGetSyntheticFunctionalInterface(classId) } @@ -139,7 +139,7 @@ open class FirBuiltinSymbolProvider( ) } - fun getClassLikeSymbolByFqName(classId: ClassId): FirRegularClassSymbol? = + fun getClassLikeSymbolByClassId(classId: ClassId): FirRegularClassSymbol? = findAndDeserializeClass(classId) private fun findAndDeserializeClass( diff --git a/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/FirElementSerializer.kt b/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/FirElementSerializer.kt index 48b55450dbf..4b202a7b806 100644 --- a/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/FirElementSerializer.kt +++ b/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/FirElementSerializer.kt @@ -964,7 +964,7 @@ class FirElementSerializer private constructor( ): FirElementSerializer { val parentClassId = klass.symbol.classId.outerClassId val parent = if (parentClassId != null && !parentClassId.isLocal) { - val parentClass = session.symbolProvider.getClassLikeSymbolByFqName(parentClassId)!!.fir as FirRegularClass + val parentClass = session.symbolProvider.getClassLikeSymbolByClassId(parentClassId)!!.fir as FirRegularClass parentSerializer ?: create(session, scopeSession, parentClass, extension, null, typeApproximator) } else { createTopLevel(session, scopeSession, extension, typeApproximator) diff --git a/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/constant/ConstantValue.kt b/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/constant/ConstantValue.kt index 6964a9946f0..b5f72b123c2 100644 --- a/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/constant/ConstantValue.kt +++ b/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/constant/ConstantValue.kt @@ -138,7 +138,7 @@ internal class KClassValue(value: Value) : ConstantValue(valu is Value.LocalClass -> return value.type is Value.NormalClass -> { val (classId, arrayDimensions) = value.value - val klass = session.symbolProvider.getClassLikeSymbolByFqName(classId)?.fir as? FirRegularClass ?: return null + val klass = session.symbolProvider.getClassLikeSymbolByClassId(classId)?.fir as? FirRegularClass ?: return null var type: ConeKotlinType = klass.defaultType().replaceArgumentsWithStarProjections() repeat(arrayDimensions) { type = type.createArrayType() diff --git a/compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirJvmBackendClassResolver.kt b/compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirJvmBackendClassResolver.kt index 5a8eaf95cca..189876782f9 100644 --- a/compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirJvmBackendClassResolver.kt +++ b/compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirJvmBackendClassResolver.kt @@ -19,7 +19,7 @@ class FirJvmBackendClassResolver(val components: Fir2IrComponents) : JvmBackendC override fun resolveToClassDescriptors(type: Type): List { if (type.sort != Type.OBJECT) return emptyList() - val symbol = components.session.symbolProvider.getClassLikeSymbolByFqName(type.classId) ?: return emptyList() + val symbol = components.session.symbolProvider.getClassLikeSymbolByClassId(type.classId) ?: return emptyList() require(symbol is FirClassSymbol<*>) return listOf(components.classifierStorage.getIrClassSymbol(symbol).descriptor) } diff --git a/compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirJvmMangleComputer.kt b/compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirJvmMangleComputer.kt index d158b53ae51..483c77421a2 100644 --- a/compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirJvmMangleComputer.kt +++ b/compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirJvmMangleComputer.kt @@ -88,7 +88,7 @@ open class FirJvmMangleComputer( else -> return } if (parentClassId != null && !parentClassId.isLocal) { - val parentClassLike = this@FirJvmMangleComputer.session.symbolProvider.getClassLikeSymbolByFqName(parentClassId)?.fir + val parentClassLike = this@FirJvmMangleComputer.session.symbolProvider.getClassLikeSymbolByClassId(parentClassId)?.fir ?: error("Attempt to find parent ($parentClassId) for probably-local declaration!") if (parentClassLike is FirRegularClass || parentClassLike is FirTypeAlias) { parentClassLike.accept(this@FirJvmMangleComputer, false) diff --git a/compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirJvmTypeMapper.kt b/compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirJvmTypeMapper.kt index dee83e4dd31..b6280e2bdfb 100644 --- a/compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirJvmTypeMapper.kt +++ b/compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirJvmTypeMapper.kt @@ -108,7 +108,7 @@ class FirJvmTypeMapper(val session: FirSession) : TypeMappingContext diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/IrBuiltInsOverFir.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/IrBuiltInsOverFir.kt index 210bb9b376c..24dfcd286d6 100644 --- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/IrBuiltInsOverFir.kt +++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/IrBuiltInsOverFir.kt @@ -675,7 +675,7 @@ class IrBuiltInsOverFir( referenceClassByClassId(ClassId(packageName, Name.identifier(identifier))) private fun referenceClassByClassId(classId: ClassId): IrClassSymbol? { - val firSymbol = components.session.symbolProvider.getClassLikeSymbolByFqName(classId) ?: return null + val firSymbol = components.session.symbolProvider.getClassLikeSymbolByClassId(classId) ?: return null val firClassSymbol = firSymbol as? FirClassSymbol ?: return null return components.classifierStorage.getIrClassSymbol(firClassSymbol) } diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaSymbolProvider.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaSymbolProvider.kt index 32b93208920..49aa4f7feb5 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaSymbolProvider.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaSymbolProvider.kt @@ -131,7 +131,7 @@ class JavaSymbolProvider( private fun List.convertTypeParameters(stack: JavaTypeParameterStack): List = map { it.toFirTypeParameter(stack) } - override fun getClassLikeSymbolByFqName(classId: ClassId): FirRegularClassSymbol? { + override fun getClassLikeSymbolByClassId(classId: ClassId): FirRegularClassSymbol? { return try { if (!hasTopLevelClassOf(classId)) return null getFirJavaClass(classId) @@ -167,7 +167,7 @@ class JavaSymbolProvider( val javaTypeParameterStack = JavaTypeParameterStack() val outerClassId = classId.outerClassId val parentClassSymbol = if (outerClassId != null) { - getClassLikeSymbolByFqName(outerClassId) + getClassLikeSymbolByClassId(outerClassId) } else null diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaUtils.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaUtils.kt index 71084209fd5..877808de160 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaUtils.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaUtils.kt @@ -134,7 +134,7 @@ private fun buildArgumentMapping( if (annotationArguments.none { it.name != null }) { return null } - val annotationClassSymbol = session.symbolProvider.getClassLikeSymbolByFqName(lookupTag.classId).also { + val annotationClassSymbol = session.symbolProvider.getClassLikeSymbolByClassId(lookupTag.classId).also { lookupTag.bindSymbolToLookupTag(session, it) } ?: return null val annotationConstructor = diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/enhancement/FirAnnotationTypeQualifierResolver.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/enhancement/FirAnnotationTypeQualifierResolver.kt index 9fa5b31a30f..3f48573665d 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/enhancement/FirAnnotationTypeQualifierResolver.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/enhancement/FirAnnotationTypeQualifierResolver.kt @@ -54,7 +54,7 @@ class FirAnnotationTypeQualifierResolver( val classId = firClass.symbol.classId val outerClassId = classId.outerClassId val parentQualifiers = if (outerClassId != null) { - (session.symbolProvider.getClassLikeSymbolByFqName(outerClassId)?.fir as? FirRegularClass) + (session.symbolProvider.getClassLikeSymbolByClassId(outerClassId)?.fir as? FirRegularClass) ?.let { extractDefaultQualifiers(it) } } else { val forModule = javaModuleAnnotationsProvider.getAnnotationsForModuleOwnerOfClass(classId) diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/resolve/FirJavaClassMapper.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/resolve/FirJavaClassMapper.kt index 8fcf04f2499..116dc51318b 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/resolve/FirJavaClassMapper.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/resolve/FirJavaClassMapper.kt @@ -15,6 +15,6 @@ import org.jetbrains.kotlin.fir.declarations.FirRegularClass class FirJavaClassMapper(private val session: FirSession) : FirPlatformClassMapper() { override fun getCorrespondingPlatformClass(declaration: FirClassLikeDeclaration): FirRegularClass? { val javaClassId = JavaToKotlinClassMap.mapKotlinToJava(declaration.symbol.classId.asSingleFqName().toUnsafe()) - return javaClassId?.let { session.symbolProvider.getClassLikeSymbolByFqName(it)?.fir } as? FirRegularClass + return javaClassId?.let { session.symbolProvider.getClassLikeSymbolByClassId(it)?.fir } as? FirRegularClass } } diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/resolve/scopes/JvmMappedScopes.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/resolve/scopes/JvmMappedScopes.kt index 7263bfd826b..74ddfc453b4 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/resolve/scopes/JvmMappedScopes.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/resolve/scopes/JvmMappedScopes.kt @@ -31,7 +31,7 @@ fun wrapScopeWithJvmMapped( val javaClassId = JavaToKotlinClassMap.mapKotlinToJava(kotlinUnsafeFqName) ?: return declaredMemberScope val symbolProvider = useSiteSession.symbolProvider - val javaClass = symbolProvider.getClassLikeSymbolByFqName(javaClassId)?.fir as? FirRegularClass + val javaClass = symbolProvider.getClassLikeSymbolByClassId(javaClassId)?.fir as? FirRegularClass ?: return declaredMemberScope val preparedSignatures = JvmMappedScope.prepareSignatures(javaClass, JavaToKotlinClassMap.isMutable(kotlinUnsafeFqName)) return if (preparedSignatures.isNotEmpty()) { diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/FirOuterClassManager.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/FirOuterClassManager.kt index 8fd525437fd..eb8d2758dcd 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/FirOuterClassManager.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/FirOuterClassManager.kt @@ -24,7 +24,7 @@ class FirOuterClassManager( val classId = classSymbol.classId if (classId.isLocal) return outerLocalClassForNested[classSymbol] val outerClassId = classId.outerClassId ?: return null - return symbolProvider.getClassLikeSymbolByFqName(outerClassId) + return symbolProvider.getClassLikeSymbolByClassId(outerClassId) } fun outerType(classLikeType: ConeClassLikeType): ConeClassLikeType? { diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/LookupTagUtils.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/LookupTagUtils.kt index d4314d9ebbe..afb32945b8d 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/LookupTagUtils.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/LookupTagUtils.kt @@ -29,7 +29,7 @@ fun ConeClassLikeLookupTag.toSymbol(useSiteSession: FirSession): FirClassLikeSym val firSymbolProvider = useSiteSession.symbolProvider (this as? ConeClassLikeLookupTagImpl)?.boundSymbol?.takeIf { it.first === useSiteSession }?.let { return it.second } - return firSymbolProvider.getClassLikeSymbolByFqName(classId).also { + return firSymbolProvider.getClassLikeSymbolByClassId(classId).also { (this as? ConeClassLikeLookupTagImpl)?.bindSymbolToLookupTag(useSiteSession, it) } } diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/ResolveUtils.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/ResolveUtils.kt index 4b9906c88f4..ff0db92f372 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/ResolveUtils.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/ResolveUtils.kt @@ -393,7 +393,7 @@ fun FirAnnotationCall.getCorrespondingClassSymbolOrNull(session: FirSession): Fi // TODO: How to retrieve local annotaiton's constructor? null } else { - (session.symbolProvider.getClassLikeSymbolByFqName(it) as? FirRegularClassSymbol) + (session.symbolProvider.getClassLikeSymbolByClassId(it) as? FirRegularClassSymbol) } } } @@ -511,7 +511,7 @@ fun FirClassLikeDeclaration.getContainingDeclaration(session: FirSession): FirCl val parentId = classId.relativeClassName.parent() if (!parentId.isRoot) { val containingDeclarationId = ClassId(classId.packageFqName, parentId, false) - return session.symbolProvider.getClassLikeSymbolByFqName(containingDeclarationId)?.fir + return session.symbolProvider.getClassLikeSymbolByClassId(containingDeclarationId)?.fir } } diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/tower/TowerLevels.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/tower/TowerLevels.kt index ad1827f173c..429e9e01066 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/tower/TowerLevels.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/tower/TowerLevels.kt @@ -223,7 +223,7 @@ class ScopeTowerLevel( private fun dispatchReceiverValue(candidate: FirCallableSymbol<*>): ReceiverValue? { candidate.fir.importedFromObjectData?.let { data -> val objectClassId = data.objectClassId - val symbol = session.symbolProvider.getClassLikeSymbolByFqName(objectClassId) + val symbol = session.symbolProvider.getClassLikeSymbolByClassId(objectClassId) if (symbol is FirRegularClassSymbol) { val resolvedQualifier = buildResolvedQualifier { packageFqName = objectClassId.packageFqName diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/FirSymbolProvider.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/FirSymbolProvider.kt index 89fe74e2a37..a49ff5d8973 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/FirSymbolProvider.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/FirSymbolProvider.kt @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.name.Name annotation class FirSymbolProviderInternals abstract class FirSymbolProvider(val session: FirSession) : FirSessionComponent { - abstract fun getClassLikeSymbolByFqName(classId: ClassId): FirClassLikeSymbol<*>? + abstract fun getClassLikeSymbolByClassId(classId: ClassId): FirClassLikeSymbol<*>? @OptIn(ExperimentalStdlibApi::class, FirSymbolProviderInternals::class) open fun getTopLevelCallableSymbols(packageFqName: FqName, name: Name): List> { @@ -58,7 +58,7 @@ abstract class FirSymbolProvider(val session: FirSession) : FirSessionComponent abstract class FirDependenciesSymbolProvider(session: FirSession) : FirSymbolProvider(session) private fun FirSymbolProvider.getClassDeclaredMemberScope(classId: ClassId): FirScope? { - val classSymbol = getClassLikeSymbolByFqName(classId) as? FirRegularClassSymbol ?: return null + val classSymbol = getClassLikeSymbolByClassId(classId) as? FirRegularClassSymbol ?: return null return session.declaredMemberScope(classSymbol.fir) } diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirCloneableSymbolProvider.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirCloneableSymbolProvider.kt index dfa64a8a7f8..6ce12896628 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirCloneableSymbolProvider.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirCloneableSymbolProvider.kt @@ -68,7 +68,7 @@ class FirCloneableSymbolProvider( } - override fun getClassLikeSymbolByFqName(classId: ClassId): FirClassLikeSymbol<*>? { + override fun getClassLikeSymbolByClassId(classId: ClassId): FirClassLikeSymbol<*>? { return if (classId == CLONEABLE_CLASS_ID) klass.symbol else null } diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirCompositeSymbolProvider.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirCompositeSymbolProvider.kt index 035f09bfe72..9fbd60ce534 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirCompositeSymbolProvider.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirCompositeSymbolProvider.kt @@ -46,7 +46,7 @@ class FirCompositeSymbolProvider(session: FirSession, val providers: List? { - return providers.firstNotNullOfOrNull { it.getClassLikeSymbolByFqName(classId) } + override fun getClassLikeSymbolByClassId(classId: ClassId): FirClassLikeSymbol<*>? { + return providers.firstNotNullOfOrNull { it.getClassLikeSymbolByClassId(classId) } } } diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirDependenciesSymbolProviderImpl.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirDependenciesSymbolProviderImpl.kt index 064a5a9ca25..1b9d8544f0f 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirDependenciesSymbolProviderImpl.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirDependenciesSymbolProviderImpl.kt @@ -54,7 +54,7 @@ open class FirDependenciesSymbolProviderImpl(session: FirSession) : FirDependenc dependencyProviders.firstNotNullOfOrNull { provider -> provider.getPackage(it) } private fun computeClass(classId: ClassId): FirClassLikeSymbol<*>? = - dependencyProviders.firstNotNullOfOrNull { provider -> provider.getClassLikeSymbolByFqName(classId) } + dependencyProviders.firstNotNullOfOrNull { provider -> provider.getClassLikeSymbolByClassId(classId) } @FirSymbolProviderInternals @@ -76,7 +76,7 @@ open class FirDependenciesSymbolProviderImpl(session: FirSession) : FirDependenc return topLevelCallableCache.getValue(CallableId(packageFqName, name)) } - override fun getClassLikeSymbolByFqName(classId: ClassId): FirClassLikeSymbol<*>? { + override fun getClassLikeSymbolByClassId(classId: ClassId): FirClassLikeSymbol<*>? { return classCache.getValue(classId) } diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirLibrarySessionProvider.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirLibrarySessionProvider.kt index f62a20be2d2..2a882aaf62c 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirLibrarySessionProvider.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirLibrarySessionProvider.kt @@ -18,7 +18,7 @@ class FirLibrarySessionProvider( override val symbolProvider: FirSymbolProvider ) : FirProvider() { override fun getFirClassifierByFqName(classId: ClassId): FirClassLikeDeclaration? = - symbolProvider.getClassLikeSymbolByFqName(classId)?.fir + symbolProvider.getClassLikeSymbolByClassId(classId)?.fir override fun getFirClassifierContainerFile(fqName: ClassId): FirFile = shouldNotBeCalled() diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirProviderImpl.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirProviderImpl.kt index 014bd0f8f83..61ed0808432 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirProviderImpl.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirProviderImpl.kt @@ -51,7 +51,7 @@ class FirProviderImpl(val session: FirSession, val kotlinScopeProvider: FirKotli } private inner class SymbolProvider : FirSymbolProvider(session) { - override fun getClassLikeSymbolByFqName(classId: ClassId): FirClassLikeSymbol<*>? { + override fun getClassLikeSymbolByClassId(classId: ClassId): FirClassLikeSymbol<*>? { return getFirClassifierByFqName(classId)?.symbol } diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirQualifierResolverImpl.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirQualifierResolverImpl.kt index 71dd06d09b7..efe0edcea49 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirQualifierResolverImpl.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirQualifierResolverImpl.kt @@ -26,7 +26,7 @@ class FirQualifierResolverImpl(val session: FirSession) : FirQualifierResolver() parts.drop(1).fold(prefix.relativeClassName) { result, suffix -> result.child(suffix.name) }, false ) - return symbolProvider.getClassLikeSymbolByFqName(fqName) + return symbolProvider.getClassLikeSymbolByClassId(fqName) } override fun resolveSymbol(parts: List): FirClassifierSymbol<*>? { @@ -45,7 +45,7 @@ class FirQualifierResolverImpl(val session: FirSession) : FirQualifierResolver() firstPart.removeAt(firstPart.lastIndex) val fqName = ClassId(firstPart.toFqName(), lastPart.toFqName(), false) - val foundSymbol = firProvider.getClassLikeSymbolByFqName(fqName) + val foundSymbol = firProvider.getClassLikeSymbolByClassId(fqName) if (foundSymbol != null) { return foundSymbol } diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirTypeResolverImpl.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirTypeResolverImpl.kt index de1fd0d8195..d3aa70c55d6 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirTypeResolverImpl.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirTypeResolverImpl.kt @@ -50,7 +50,7 @@ class FirTypeResolverImpl(private val session: FirSession) : FirTypeResolver() { private fun resolveBuiltInQualified(id: ClassId, session: FirSession): FirClassLikeSymbol<*> { val nameInSession = ClassIdInSession(session, id) return implicitBuiltinTypeSymbols.getOrPut(nameInSession) { - symbolProvider.getClassLikeSymbolByFqName(id)!! + symbolProvider.getClassLikeSymbolByClassId(id)!! } } diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirImportResolveTransformer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirImportResolveTransformer.kt index b8ca4d4a4c7..27ae8745f20 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirImportResolveTransformer.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirImportResolveTransformer.kt @@ -107,7 +107,7 @@ fun resolveToPackageOrClass(symbolProvider: FirSymbolProvider, fqName: FqName): FqName.fromSegments((prefixSize until pathSegments.size).map { pathSegments[it].asString() }) val classId = ClassId(currentPackage, relativeClassFqName, false) - val symbol = symbolProvider.getClassLikeSymbolByFqName(classId) ?: return null + val symbol = symbolProvider.getClassLikeSymbolByClassId(classId) ?: return null return PackageOrClass(currentPackage, relativeClassFqName, symbol) } diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirSupertypesResolution.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirSupertypesResolution.kt index b8070e8a237..48e044aaeb3 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirSupertypesResolution.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirSupertypesResolution.kt @@ -511,7 +511,7 @@ class SupertypeComputationSession { val parentId = classLikeDecl.symbol.classId.relativeClassName.parent() if (!parentId.isRoot) { - val parentSymbol = session.symbolProvider.getClassLikeSymbolByFqName(ClassId.fromString(parentId.asString())) + val parentSymbol = session.symbolProvider.getClassLikeSymbolByClassId(ClassId.fromString(parentId.asString())) if (parentSymbol is FirRegularClassSymbol) { checkIsInLoop(parentSymbol.fir) } diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirWhenExhaustivenessTransformer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirWhenExhaustivenessTransformer.kt index 7c15bf19f23..c329bcbe846 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirWhenExhaustivenessTransformer.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirWhenExhaustivenessTransformer.kt @@ -384,7 +384,7 @@ private object WhenOnSealedClassExhaustivenessChecker : WhenExhaustivenessChecke } when { fir.modality == Modality.SEALED -> fir.getSealedClassInheritors(session).forEach { - val symbol = session.symbolProvider.getClassLikeSymbolByFqName(it) as? FirRegularClassSymbol + val symbol = session.symbolProvider.getClassLikeSymbolByClassId(it) as? FirRegularClassSymbol symbol?.collectAllSubclassesTo(destination, session) } fir.classKind == ClassKind.ENUM_CLASS -> fir.collectEnumEntries().mapTo(destination) { it.symbol } diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/BodyResolveUtils.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/BodyResolveUtils.kt index d17132549b7..42b994ff1c5 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/BodyResolveUtils.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/BodyResolveUtils.kt @@ -108,7 +108,7 @@ fun FirBlock.writeResultType(session: FirSession) { fun ConstantValueKind<*>.expectedConeType(session: FirSession): ConeKotlinType { fun constructLiteralType(classId: ClassId, isNullable: Boolean = false): ConeKotlinType { - val symbol = session.symbolProvider.getClassLikeSymbolByFqName(classId) + val symbol = session.symbolProvider.getClassLikeSymbolByClassId(classId) ?: return ConeClassErrorType(ConeSimpleDiagnostic("Missing stdlib class: $classId", DiagnosticKind.MissingStdlibClass)) return symbol.toLookupTag().constructClassType(emptyArray(), isNullable) } diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirAbstractImportingScope.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirAbstractImportingScope.kt index c32a4ee037a..b27546fbbe0 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirAbstractImportingScope.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirAbstractImportingScope.kt @@ -70,7 +70,7 @@ abstract class FirAbstractImportingScope( } fun getStaticsScope(classId: ClassId): FirScope? = - provider.getClassLikeSymbolByFqName(classId)?.fullyExpandedSymbol?.getStaticsScope() + provider.getClassLikeSymbolByClassId(classId)?.fullyExpandedSymbol?.getStaticsScope() protected fun findSingleClassifierSymbolByName(name: Name?, imports: List): FirClassLikeSymbol<*>? { var result: FirClassLikeSymbol<*>? = null @@ -78,7 +78,7 @@ abstract class FirAbstractImportingScope( val importedName = name ?: import.importedName ?: continue val classId = import.resolvedClassId?.createNestedClassId(importedName) ?: ClassId.topLevel(import.packageFqName.child(importedName)) - val symbol = provider.getClassLikeSymbolByFqName(classId) ?: continue + val symbol = provider.getClassLikeSymbolByClassId(classId) ?: continue if (!filter.check(symbol, session)) continue result = when { result == null || result == symbol -> symbol diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirLazyNestedClassifierScope.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirLazyNestedClassifierScope.kt index 682de8ada59..84c439bb58e 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirLazyNestedClassifierScope.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirLazyNestedClassifierScope.kt @@ -29,7 +29,7 @@ class FirLazyNestedClassifierScope( return } val child = classId.createNestedClassId(name) - val symbol = symbolProvider.getClassLikeSymbolByFqName(child) ?: return + val symbol = symbolProvider.getClassLikeSymbolByClassId(child) ?: return processor(symbol, ConeSubstitutor.Empty) } diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirPackageMemberScope.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirPackageMemberScope.kt index 413026f96c4..1a00c217cb0 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirPackageMemberScope.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirPackageMemberScope.kt @@ -36,7 +36,7 @@ class FirPackageMemberScope( val symbol = classifierCache.getOrPut(name) { val unambiguousFqName = ClassId(fqName, name) - symbolProvider.getClassLikeSymbolByFqName(unambiguousFqName) + symbolProvider.getClassLikeSymbolByClassId(unambiguousFqName) } if (symbol != null) { diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/types/ConeInferenceContext.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/types/ConeInferenceContext.kt index 6081976e0d6..4b4084605d8 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/types/ConeInferenceContext.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/types/ConeInferenceContext.kt @@ -490,7 +490,7 @@ interface ConeInferenceContext : TypeSystemInferenceExtensionContext, ConeTypeCo val classId = if (isSuspend) StandardNames.getSuspendFunctionClassId(parametersNumber) else StandardNames.getFunctionClassId(parametersNumber) - return session.symbolProvider.getClassLikeSymbolByFqName(classId)?.toLookupTag() + return session.symbolProvider.getClassLikeSymbolByClassId(classId)?.toLookupTag() ?: error("Can't find Function type") } @@ -498,7 +498,7 @@ interface ConeInferenceContext : TypeSystemInferenceExtensionContext, ConeTypeCo val classId = if (isSuspend) StandardNames.getKSuspendFunctionClassId(parametersNumber) else StandardNames.getKFunctionClassId(parametersNumber) - return session.symbolProvider.getClassLikeSymbolByFqName(classId)?.toLookupTag() + return session.symbolProvider.getClassLikeSymbolByClassId(classId)?.toLookupTag() ?: error("Can't find KFunction type") } diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/handlers/FirScopeDumpHandler.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/handlers/FirScopeDumpHandler.kt index 3e616844313..52edffb39f2 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/handlers/FirScopeDumpHandler.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/handlers/FirScopeDumpHandler.kt @@ -50,7 +50,7 @@ class FirScopeDumpHandler(testServices: TestServices) : FirAnalysisHandler(testS private fun SmartPrinter.processClass(fqName: String, session: FirSession, scopeSession: ScopeSession, module: TestModule) { val classId = ClassId.topLevel(FqName.fromSegments(fqName.split("."))) - val symbol = session.symbolProvider.getClassLikeSymbolByFqName(classId) ?: assertions.fail { + val symbol = session.symbolProvider.getClassLikeSymbolByClassId(classId) ?: assertions.fail { "Class $fqName not found in module ${module.name}" } val firClass = symbol.fir as? FirRegularClass ?: assertions.fail { "$fqName is not a class but ${symbol.fir.render()}" } diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/providers/FirIdeBuiltinsAndCloneableSessionProvider.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/providers/FirIdeBuiltinsAndCloneableSessionProvider.kt index 3a385409176..f2247447f07 100644 --- a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/providers/FirIdeBuiltinsAndCloneableSessionProvider.kt +++ b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/providers/FirIdeBuiltinsAndCloneableSessionProvider.kt @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.name.Name internal class FirIdeBuiltinsAndCloneableSessionProvider(override val symbolProvider: FirSymbolProvider) : FirProvider() { override fun getFirClassifierByFqName(classId: ClassId): FirClassLikeDeclaration? = - symbolProvider.getClassLikeSymbolByFqName(classId)?.fir + symbolProvider.getClassLikeSymbolByClassId(classId)?.fir override fun getFirClassifierContainerFile(fqName: ClassId): FirFile = shouldNotBeCalled() diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/providers/FirIdeLibrariesSessionProvider.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/providers/FirIdeLibrariesSessionProvider.kt index 1d7fb027af4..9dd4e0acd9f 100644 --- a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/providers/FirIdeLibrariesSessionProvider.kt +++ b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/providers/FirIdeLibrariesSessionProvider.kt @@ -18,7 +18,7 @@ internal class FirIdeLibrariesSessionProvider( override val symbolProvider: FirSymbolProvider ) : FirProvider() { override fun getFirClassifierByFqName(classId: ClassId): FirClassLikeDeclaration? = - symbolProvider.getClassLikeSymbolByFqName(classId)?.fir + symbolProvider.getClassLikeSymbolByClassId(classId)?.fir override fun getFirClassifierContainerFile(fqName: ClassId): FirFile = shouldNotBeCalled() diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/providers/FirIdeProvider.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/providers/FirIdeProvider.kt index 64f52910796..10b20f50b67 100644 --- a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/providers/FirIdeProvider.kt +++ b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/providers/FirIdeProvider.kt @@ -129,7 +129,7 @@ internal class FirIdeProvider( override fun getPackage(fqName: FqName): FqName? = providerHelper.getPackage(fqName) - override fun getClassLikeSymbolByFqName(classId: ClassId): FirClassLikeSymbol<*>? { + override fun getClassLikeSymbolByClassId(classId: ClassId): FirClassLikeSymbol<*>? { return getFirClassifierByFqName(classId)?.symbol } } diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/providers/FirModuleWithDependenciesSymbolProvider.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/providers/FirModuleWithDependenciesSymbolProvider.kt index ec2b3dd9a62..a597d98703f 100644 --- a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/providers/FirModuleWithDependenciesSymbolProvider.kt +++ b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/providers/FirModuleWithDependenciesSymbolProvider.kt @@ -23,13 +23,13 @@ internal class FirModuleWithDependenciesSymbolProvider( val dependencyProvider: DependentModuleProviders ) : FirSymbolProvider(session) { - override fun getClassLikeSymbolByFqName(classId: ClassId): FirClassLikeSymbol<*>? = + override fun getClassLikeSymbolByClassId(classId: ClassId): FirClassLikeSymbol<*>? = getClassLikeSymbolByFqNameWithoutDependencies(classId) - ?: dependencyProvider.getClassLikeSymbolByFqName(classId) + ?: dependencyProvider.getClassLikeSymbolByClassId(classId) fun getClassLikeSymbolByFqNameWithoutDependencies(classId: ClassId): FirClassLikeSymbol<*>? = - providers.firstNotNullOfOrNull { it.getClassLikeSymbolByFqName(classId) } + providers.firstNotNullOfOrNull { it.getClassLikeSymbolByClassId(classId) } @FirSymbolProviderInternals override fun getTopLevelCallableSymbolsTo(destination: MutableList>, packageFqName: FqName, name: Name) { @@ -78,11 +78,11 @@ internal class FirModuleWithDependenciesSymbolProvider( } internal class DependentModuleProviders(session: FirSession, private val providers: List) : FirDependenciesSymbolProvider(session) { - override fun getClassLikeSymbolByFqName(classId: ClassId): FirClassLikeSymbol<*>? = + override fun getClassLikeSymbolByClassId(classId: ClassId): FirClassLikeSymbol<*>? = providers.firstNotNullOfOrNull { provider -> when (provider) { is FirModuleWithDependenciesSymbolProvider -> provider.getClassLikeSymbolByFqNameWithoutDependencies(classId) - else -> provider.getClassLikeSymbolByFqName(classId) + else -> provider.getClassLikeSymbolByClassId(classId) } } diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/util/FirDeclarationForCompiledElementSearcher.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/util/FirDeclarationForCompiledElementSearcher.kt index 35388c478dc..88a91dcb7a0 100644 --- a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/util/FirDeclarationForCompiledElementSearcher.kt +++ b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/util/FirDeclarationForCompiledElementSearcher.kt @@ -29,7 +29,7 @@ internal class FirDeclarationForCompiledElementSearcher(private val symbolProvid val classId = declaration.getClassId() ?: error("Non-local class should have classId. The class is ${declaration.getElementTextInContext()}") - val classCandidate = symbolProvider.getClassLikeSymbolByFqName(classId) + val classCandidate = symbolProvider.getClassLikeSymbolByClassId(classId) ?: error("We should be able to find a symbol for $classId") return classCandidate.fir diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/util/declarationUtils.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/util/declarationUtils.kt index aea2ddab669..c3f72149250 100644 --- a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/util/declarationUtils.kt +++ b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/util/declarationUtils.kt @@ -120,7 +120,7 @@ var KtFile.originalKtFile by UserDataProperty(ORIGINAL_KT_FILE_KEY) private fun KtClassLikeDeclaration.findFir(firSymbolProvider: FirSymbolProvider): FirClassLikeDeclaration? { val classId = getClassId() ?: return null return executeWithoutPCE { - firSymbolProvider.getClassLikeSymbolByFqName(classId)?.fir as? FirRegularClass + firSymbolProvider.getClassLikeSymbolByClassId(classId)?.fir as? FirRegularClass } } diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/KtSymbolByFirBuilder.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/KtSymbolByFirBuilder.kt index 7c2f5128b5d..c1adceda1be 100644 --- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/KtSymbolByFirBuilder.kt +++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/KtSymbolByFirBuilder.kt @@ -178,7 +178,7 @@ internal class KtSymbolByFirBuilder private constructor( } fun buildClassLikeSymbolByClassId(classId: ClassId): KtClassLikeSymbol? { - val firClassLikeSymbol = firProvider.getClassLikeSymbolByFqName(classId) ?: return null + val firClassLikeSymbol = firProvider.getClassLikeSymbolByClassId(classId) ?: return null return buildClassLikeSymbol(firClassLikeSymbol.fir) } diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/components/KtFirReferenceShortener.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/components/KtFirReferenceShortener.kt index 323c7db2df9..d76539c1c52 100644 --- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/components/KtFirReferenceShortener.kt +++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/components/KtFirReferenceShortener.kt @@ -249,7 +249,7 @@ private class FirShorteningContext(val firResolveState: FirModuleResolveState) { } fun toClassSymbol(classId: ClassId) = - firSession.symbolProvider.getClassLikeSymbolByFqName(classId) + firSession.symbolProvider.getClassLikeSymbolByClassId(classId) fun convertToImportableName(callableSymbol: FirCallableSymbol<*>): FqName? = callableSymbol.computeImportableName(firSession) diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/components/KtFirTypeCreator.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/components/KtFirTypeCreator.kt index 7d04c116aea..7a1a4853510 100644 --- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/components/KtFirTypeCreator.kt +++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/components/KtFirTypeCreator.kt @@ -27,7 +27,7 @@ internal class KtFirTypeCreator( override fun buildClassType(builder: KtClassTypeBuilder): KtClassType = withValidityAssertion { val lookupTag = when (builder) { is KtClassTypeBuilder.ByClassId -> { - val classSymbol = rootModuleSession.symbolProvider.getClassLikeSymbolByFqName(builder.classId) + val classSymbol = rootModuleSession.symbolProvider.getClassLikeSymbolByClassId(builder.classId) ?: return ConeClassErrorType(ConeUnresolvedSymbolError(builder.classId)).asKtType() as KtClassType classSymbol.toLookupTag() } diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirSymbolProvider.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirSymbolProvider.kt index d12107af7da..591495a6674 100644 --- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirSymbolProvider.kt +++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirSymbolProvider.kt @@ -131,7 +131,7 @@ internal class KtFirSymbolProvider( } override fun getClassOrObjectSymbolByClassId(classId: ClassId): KtClassOrObjectSymbol? = withValidityAssertion { - val symbol = firSymbolProvider.getClassLikeSymbolByFqName(classId) as? FirRegularClassSymbol ?: return null + val symbol = firSymbolProvider.getClassLikeSymbolByClassId(classId) as? FirRegularClassSymbol ?: return null firSymbolBuilder.classifierBuilder.buildNamedClassOrObjectSymbol(symbol.fir) } diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/pointers/KtFirEnumEntrySymbolPointer.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/pointers/KtFirEnumEntrySymbolPointer.kt index 8fadab1aaa5..cbedc1bd657 100644 --- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/pointers/KtFirEnumEntrySymbolPointer.kt +++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/pointers/KtFirEnumEntrySymbolPointer.kt @@ -30,7 +30,7 @@ internal class KtFirEnumEntrySymbolPointer( } private fun getEnumClass(analysisSession: KtFirAnalysisSession, classId: ClassId): FirRegularClass? { - val enumClass = analysisSession.firSymbolProvider.getClassLikeSymbolByFqName(classId)?.fir as? FirRegularClass + val enumClass = analysisSession.firSymbolProvider.getClassLikeSymbolByClassId(classId)?.fir as? FirRegularClass ?: return null if (enumClass.classKind != ClassKind.ENUM_CLASS) return null return enumClass diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/pointers/pointerUtils.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/pointers/pointerUtils.kt index 419b49a97ba..af6a9d530d9 100644 --- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/pointers/pointerUtils.kt +++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/pointers/pointerUtils.kt @@ -55,4 +55,4 @@ internal fun FirDeclaration.createSignature(): IdSignature { } internal fun KtFirAnalysisSession.getClassLikeSymbol(classId: ClassId) = - firResolveState.rootModuleSession.symbolProvider.getClassLikeSymbolByFqName(classId)?.fir + firResolveState.rootModuleSession.symbolProvider.getClassLikeSymbolByClassId(classId)?.fir