diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/FirJavaModuleBasedSession.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/FirJavaModuleBasedSession.kt index 676a63eeacf..09d177e59fa 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/FirJavaModuleBasedSession.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/FirJavaModuleBasedSession.kt @@ -107,7 +107,7 @@ class FirLibrarySession private constructor( kotlinScopeProvider ), FirBuiltinSymbolProvider(this, kotlinScopeProvider), - FirClonableSymbolProvider(this, kotlinScopeProvider), + FirCloneableSymbolProvider(this, kotlinScopeProvider), javaSymbolProvider, FirDependenciesSymbolProviderImpl(this) ) diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/deserialization/ClassDeserialization.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/deserialization/ClassDeserialization.kt index 455da189142..df346691960 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/deserialization/ClassDeserialization.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/deserialization/ClassDeserialization.kt @@ -19,8 +19,8 @@ import org.jetbrains.kotlin.fir.declarations.impl.FirDeclarationStatusImpl import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.generateValueOfFunction import org.jetbrains.kotlin.fir.generateValuesFunction -import org.jetbrains.kotlin.fir.resolve.providers.impl.FirClonableSymbolProvider.Companion.CLONABLE_CLASS_ID -import org.jetbrains.kotlin.fir.resolve.providers.impl.FirClonableSymbolProvider.Companion.CLONE +import org.jetbrains.kotlin.fir.resolve.providers.impl.FirCloneableSymbolProvider.Companion.CLONEABLE_CLASS_ID +import org.jetbrains.kotlin.fir.resolve.providers.impl.FirCloneableSymbolProvider.Companion.CLONE import org.jetbrains.kotlin.fir.resolve.transformers.sealedInheritors import org.jetbrains.kotlin.fir.scopes.KotlinScopeProvider import org.jetbrains.kotlin.fir.symbols.CallableId @@ -201,7 +201,7 @@ private fun FirRegularClassBuilder.addCloneForArrayIfNeeded(classId: ClassId) { if (classId.shortClassName !in ARRAY_CLASSES) return superTypeRefs += buildResolvedTypeRef { type = ConeClassLikeTypeImpl( - ConeClassLikeLookupTagImpl(CLONABLE_CLASS_ID), + ConeClassLikeLookupTagImpl(CLONEABLE_CLASS_ID), typeArguments = emptyArray(), isNullable = false ) diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirClonableSymbolProvider.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirCloneableSymbolProvider.kt similarity index 84% rename from compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirClonableSymbolProvider.kt rename to compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirCloneableSymbolProvider.kt index 80709fe8954..07a39348dc1 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirClonableSymbolProvider.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirCloneableSymbolProvider.kt @@ -28,10 +28,10 @@ import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name -class FirClonableSymbolProvider(session: FirSession, scopeProvider: FirScopeProvider) : FirSymbolProvider() { +class FirCloneableSymbolProvider(session: FirSession, scopeProvider: FirScopeProvider) : FirSymbolProvider() { companion object { - val CLONABLE: Name = Name.identifier("Cloneable") - val CLONABLE_CLASS_ID: ClassId = ClassId(KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME, CLONABLE) + val CLONEABLE: Name = Name.identifier("Cloneable") + val CLONEABLE_CLASS_ID: ClassId = ClassId(KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME, CLONEABLE) val CLONE: Name = Name.identifier("clone") } @@ -54,15 +54,15 @@ class FirClonableSymbolProvider(session: FirSession, scopeProvider: FirScopeProv } status = FirDeclarationStatusImpl(Visibilities.PROTECTED, Modality.OPEN) name = CLONE - symbol = FirNamedFunctionSymbol(CallableId(CLONABLE_CLASS_ID, CLONE)) + symbol = FirNamedFunctionSymbol(CallableId(CLONEABLE_CLASS_ID, CLONE)) } this.scopeProvider = scopeProvider - name = CLONABLE - symbol = FirRegularClassSymbol(CLONABLE_CLASS_ID) + name = CLONEABLE + symbol = FirRegularClassSymbol(CLONEABLE_CLASS_ID) } override fun getClassLikeSymbolByFqName(classId: ClassId): FirClassLikeSymbol<*>? { - return if (classId == CLONABLE_CLASS_ID) klass.symbol else null + return if (classId == CLONEABLE_CLASS_ID) klass.symbol else null } override fun getTopLevelCallableSymbols(packageFqName: FqName, name: Name): List> {