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

[FIR] Remove incorrect FirClassSymbol<*>.superConeTypes utility

Browse Source 
Replace all usages with member `FirClassSymbol.resolvedSuperTypes`
This commit is contained in:
Dmitriy Novozhilov
2022-08-24 10:59:02 +03:00
committed by teamcity
parent 6ef3d1e573
commit 194741b96b
7 changed files with 12 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirExpressionTypeProvider.kt
+1 -1
View File
@@ -48,7 +48,7 @@ internal class KtFirExpressionTypeProvider(
val containingClass =
(fir.dispatchReceiver as? FirThisReceiverExpression)?.calleeReference?.boundSymbol as? FirClassSymbol<*>
if (fir.calleeReference is FirSuperReference && fir.typeRef is FirErrorTypeRef && containingClass != null) {
val superTypes = containingClass.superConeTypes
val superTypes = containingClass.resolvedSuperTypes
when (superTypes.size) {
0 -> analysisSession.builtinTypes.ANY
1 -> superTypes.single().asKtType()
analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirTypeProvider.kt
+3 -4
View File
@@ -26,7 +26,6 @@ import org.jetbrains.kotlin.fir.analysis.checkers.ConeTypeCompatibilityChecker.i
import org.jetbrains.kotlin.fir.analysis.checkers.typeParameterSymbols
import org.jetbrains.kotlin.fir.declarations.FirResolvePhase
import org.jetbrains.kotlin.fir.declarations.fullyExpandedClass
import org.jetbrains.kotlin.fir.declarations.utils.superConeTypes
import org.jetbrains.kotlin.fir.expressions.FirCallableReferenceAccess
import org.jetbrains.kotlin.fir.expressions.FirDelegatedConstructorCall
import org.jetbrains.kotlin.fir.expressions.FirGetClassCall
@@ -147,9 +146,9 @@ internal class KtFirTypeProvider(
val session = analysisSession.firResolveSession.useSiteFirSession
val symbol = lookupTag.toSymbol(session)
val superTypes = when (symbol) {
is FirAnonymousObjectSymbol -> symbol.superConeTypes
is FirRegularClassSymbol -> symbol.superConeTypes
is FirTypeAliasSymbol -> symbol.fullyExpandedClass(session)?.superConeTypes ?: return emptySequence()
is FirAnonymousObjectSymbol -> symbol.resolvedSuperTypes
is FirRegularClassSymbol -> symbol.resolvedSuperTypes
is FirTypeAliasSymbol -> symbol.fullyExpandedClass(session)?.resolvedSuperTypes ?: return emptySequence()
is FirTypeParameterSymbol -> symbol.resolvedBounds.map { it.type }
else -> return emptySequence()
}