[FIR] Drop makeNullable parameter from typeFromSymbol function
We always pass `false` argument to this function.
This commit is contained in:
@@ -303,14 +303,14 @@ fun BodyResolveComponents.typeFromCallee(access: FirElement, calleeReference: Fi
|
|||||||
diagnostic = ConeStubDiagnostic(calleeReference.diagnostic)
|
diagnostic = ConeStubDiagnostic(calleeReference.diagnostic)
|
||||||
}
|
}
|
||||||
is FirNamedReferenceWithCandidate -> {
|
is FirNamedReferenceWithCandidate -> {
|
||||||
typeFromSymbol(calleeReference.candidateSymbol, false)
|
typeFromSymbol(calleeReference.candidateSymbol)
|
||||||
}
|
}
|
||||||
is FirPropertyWithExplicitBackingFieldResolvedNamedReference -> {
|
is FirPropertyWithExplicitBackingFieldResolvedNamedReference -> {
|
||||||
val symbol = calleeReference.getNarrowedDownSymbol(session)
|
val symbol = calleeReference.getNarrowedDownSymbol(session)
|
||||||
typeFromSymbol(symbol, false)
|
typeFromSymbol(symbol)
|
||||||
}
|
}
|
||||||
is FirResolvedNamedReference -> {
|
is FirResolvedNamedReference -> {
|
||||||
typeFromSymbol(calleeReference.resolvedSymbol, false)
|
typeFromSymbol(calleeReference.resolvedSymbol)
|
||||||
}
|
}
|
||||||
is FirThisReference -> {
|
is FirThisReference -> {
|
||||||
val labelName = calleeReference.labelName
|
val labelName = calleeReference.labelName
|
||||||
@@ -342,18 +342,11 @@ fun BodyResolveComponents.typeFromCallee(access: FirElement, calleeReference: Fi
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun BodyResolveComponents.typeFromSymbol(symbol: FirBasedSymbol<*>, makeNullable: Boolean): FirResolvedTypeRef {
|
private fun BodyResolveComponents.typeFromSymbol(symbol: FirBasedSymbol<*>): FirResolvedTypeRef {
|
||||||
return when (symbol) {
|
return when (symbol) {
|
||||||
is FirCallableSymbol<*> -> {
|
is FirCallableSymbol<*> -> {
|
||||||
val returnTypeRef = returnTypeCalculator.tryCalculateReturnType(symbol.fir)
|
val returnTypeRef = returnTypeCalculator.tryCalculateReturnType(symbol.fir)
|
||||||
if (makeNullable) {
|
returnTypeRef.copyWithNewSourceKind(KtFakeSourceElementKind.ImplicitTypeRef)
|
||||||
returnTypeRef.withReplacedConeType(
|
|
||||||
returnTypeRef.type.withNullability(ConeNullability.NULLABLE, session.typeContext),
|
|
||||||
KtFakeSourceElementKind.ImplicitTypeRef
|
|
||||||
)
|
|
||||||
} else {
|
|
||||||
returnTypeRef.copyWithNewSourceKind(KtFakeSourceElementKind.ImplicitTypeRef)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
is FirClassifierSymbol<*> -> {
|
is FirClassifierSymbol<*> -> {
|
||||||
// TODO: unhack
|
// TODO: unhack
|
||||||
@@ -362,7 +355,7 @@ private fun BodyResolveComponents.typeFromSymbol(symbol: FirBasedSymbol<*>, make
|
|||||||
type = symbol.constructType(emptyArray(), isNullable = false)
|
type = symbol.constructType(emptyArray(), isNullable = false)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else -> error("WTF ! $symbol")
|
else -> error("Failed to extract type from symbol: $symbol")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -533,7 +526,7 @@ fun FirAnnotation.getCorrespondingClassSymbolOrNull(session: FirSession): FirReg
|
|||||||
}
|
}
|
||||||
|
|
||||||
fun BodyResolveComponents.initialTypeOfCandidate(candidate: Candidate): ConeKotlinType {
|
fun BodyResolveComponents.initialTypeOfCandidate(candidate: Candidate): ConeKotlinType {
|
||||||
val typeRef = typeFromSymbol(candidate.symbol, makeNullable = false)
|
val typeRef = typeFromSymbol(candidate.symbol)
|
||||||
return typeRef.initialTypeOfCandidate(candidate)
|
return typeRef.initialTypeOfCandidate(candidate)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user