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

[FIR] Fix typo in FirCloneableSymbolProvider

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2020-06-26 13:49:33 +03:00
parent 57b9baac53
commit fd1de9b298
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/java/src/org/jetbrains/kotlin/fir/java/FirJavaModuleBasedSession.kt
+1 -1
View File
@@ -107,7 +107,7 @@ class FirLibrarySession private constructor(
kotlinScopeProvider kotlinScopeProvider
), ),
FirBuiltinSymbolProvider(this, kotlinScopeProvider), FirBuiltinSymbolProvider(this, kotlinScopeProvider),
FirClonableSymbolProvider(this, kotlinScopeProvider), FirCloneableSymbolProvider(this, kotlinScopeProvider),
javaSymbolProvider, javaSymbolProvider,
FirDependenciesSymbolProviderImpl(this) FirDependenciesSymbolProviderImpl(this)
) )
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/deserialization/ClassDeserialization.kt
+3 -3
View File
@@ -19,8 +19,8 @@ import org.jetbrains.kotlin.fir.declarations.impl.FirDeclarationStatusImpl
import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall
import org.jetbrains.kotlin.fir.generateValueOfFunction import org.jetbrains.kotlin.fir.generateValueOfFunction
import org.jetbrains.kotlin.fir.generateValuesFunction 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.FirCloneableSymbolProvider.Companion.CLONEABLE_CLASS_ID
import org.jetbrains.kotlin.fir.resolve.providers.impl.FirClonableSymbolProvider.Companion.CLONE import org.jetbrains.kotlin.fir.resolve.providers.impl.FirCloneableSymbolProvider.Companion.CLONE
import org.jetbrains.kotlin.fir.resolve.transformers.sealedInheritors import org.jetbrains.kotlin.fir.resolve.transformers.sealedInheritors
import org.jetbrains.kotlin.fir.scopes.KotlinScopeProvider import org.jetbrains.kotlin.fir.scopes.KotlinScopeProvider
import org.jetbrains.kotlin.fir.symbols.CallableId import org.jetbrains.kotlin.fir.symbols.CallableId
@@ -201,7 +201,7 @@ private fun FirRegularClassBuilder.addCloneForArrayIfNeeded(classId: ClassId) {
if (classId.shortClassName !in ARRAY_CLASSES) return if (classId.shortClassName !in ARRAY_CLASSES) return
superTypeRefs += buildResolvedTypeRef { superTypeRefs += buildResolvedTypeRef {
type = ConeClassLikeTypeImpl( type = ConeClassLikeTypeImpl(
ConeClassLikeLookupTagImpl(CLONABLE_CLASS_ID), ConeClassLikeLookupTagImpl(CLONEABLE_CLASS_ID),
typeArguments = emptyArray(), typeArguments = emptyArray(),
isNullable = false isNullable = false
) )
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirClonableSymbolProvider.kt → compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirCloneableSymbolProvider.kt
+7 -7
View File
@@ -28,10 +28,10 @@ import org.jetbrains.kotlin.name.ClassId
import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.name.Name
class FirClonableSymbolProvider(session: FirSession, scopeProvider: FirScopeProvider) : FirSymbolProvider() { class FirCloneableSymbolProvider(session: FirSession, scopeProvider: FirScopeProvider) : FirSymbolProvider() {
companion object { companion object {
val CLONABLE: Name = Name.identifier("Cloneable") val CLONEABLE: Name = Name.identifier("Cloneable")
val CLONABLE_CLASS_ID: ClassId = ClassId(KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME, CLONABLE) val CLONEABLE_CLASS_ID: ClassId = ClassId(KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME, CLONEABLE)
val CLONE: Name = Name.identifier("clone") val CLONE: Name = Name.identifier("clone")
} }
@@ -54,15 +54,15 @@ class FirClonableSymbolProvider(session: FirSession, scopeProvider: FirScopeProv
} }
status = FirDeclarationStatusImpl(Visibilities.PROTECTED, Modality.OPEN) status = FirDeclarationStatusImpl(Visibilities.PROTECTED, Modality.OPEN)
name = CLONE name = CLONE
symbol = FirNamedFunctionSymbol(CallableId(CLONABLE_CLASS_ID, CLONE)) symbol = FirNamedFunctionSymbol(CallableId(CLONEABLE_CLASS_ID, CLONE))
} }
this.scopeProvider = scopeProvider this.scopeProvider = scopeProvider
name = CLONABLE name = CLONEABLE
symbol = FirRegularClassSymbol(CLONABLE_CLASS_ID) symbol = FirRegularClassSymbol(CLONEABLE_CLASS_ID)
} }
override fun getClassLikeSymbolByFqName(classId: ClassId): FirClassLikeSymbol<*>? { 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<FirCallableSymbol<*>> { override fun getTopLevelCallableSymbols(packageFqName: FqName, name: Name): List<FirCallableSymbol<*>> {