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

Optimize/simplify FirSealedClassConstructorCallChecker

Browse Source
This commit is contained in:
Mikhail Glukhikh
2020-12-07 11:30:54 +03:00
parent c94c71cc50
commit 42b590d07c
1 changed files with 4 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirSealedClassConstructorCallChecker.kt
+4 -18
View File
@@ -13,13 +13,11 @@ import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticReporter
import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors
import org.jetbrains.kotlin.fir.declarations.FirConstructor import org.jetbrains.kotlin.fir.declarations.FirConstructor
import org.jetbrains.kotlin.fir.declarations.FirRegularClass import org.jetbrains.kotlin.fir.declarations.FirRegularClass
import org.jetbrains.kotlin.fir.declarations.classId
import org.jetbrains.kotlin.fir.expressions.FirQualifiedAccessExpression import org.jetbrains.kotlin.fir.expressions.FirQualifiedAccessExpression
import org.jetbrains.kotlin.fir.references.FirResolvedNamedReference import org.jetbrains.kotlin.fir.references.FirResolvedNamedReference
import org.jetbrains.kotlin.fir.resolve.firSymbolProvider import org.jetbrains.kotlin.fir.resolve.toSymbol
import org.jetbrains.kotlin.fir.types.ConeClassLikeType import org.jetbrains.kotlin.fir.types.ConeClassLikeType
import org.jetbrains.kotlin.fir.types.FirResolvedTypeRef import org.jetbrains.kotlin.fir.types.FirResolvedTypeRef
import org.jetbrains.kotlin.name.ClassId
import org.jetbrains.kotlin.utils.addToStdlib.safeAs import org.jetbrains.kotlin.utils.addToStdlib.safeAs
object FirSealedClassConstructorCallChecker : FirQualifiedAccessChecker() { object FirSealedClassConstructorCallChecker : FirQualifiedAccessChecker() {
@@ -29,13 +27,10 @@ object FirSealedClassConstructorCallChecker : FirQualifiedAccessChecker() {
?.fir.safeAs<FirConstructor>() ?.fir.safeAs<FirConstructor>()
?: return ?: return
val typeClassId = constructorFir.returnTypeRef.safeAs<FirResolvedTypeRef>() val typeFir = constructorFir.returnTypeRef.safeAs<FirResolvedTypeRef>()
?.type.safeAs<ConeClassLikeType>() ?.type.safeAs<ConeClassLikeType>()
?.lookupTag ?.lookupTag?.toSymbol(context.session)
?.classId ?.fir as? FirRegularClass
?: return
val typeFir = typeClassId.toRegularClass(context)
?: return ?: return
if (typeFir.status.modality == Modality.SEALED) { if (typeFir.status.modality == Modality.SEALED) {
@@ -43,15 +38,6 @@ object FirSealedClassConstructorCallChecker : FirQualifiedAccessChecker() {
} }
} }
private fun ClassId.toRegularClass(context: CheckerContext): FirRegularClass? = if (!isLocal) {
context.session.firSymbolProvider.getClassLikeSymbolByFqName(this)
?.fir.safeAs()
} else {
context.containingDeclarations
.lastOrNull { it.safeAs<FirRegularClass>()?.classId == this }
.safeAs()
}
private fun DiagnosticReporter.report(source: FirSourceElement?) { private fun DiagnosticReporter.report(source: FirSourceElement?) {
source?.let { report(FirErrors.SEALED_CLASS_CONSTRUCTOR_CALL.on(it)) } source?.let { report(FirErrors.SEALED_CLASS_CONSTRUCTOR_CALL.on(it)) }
} }