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

[FIR] Report friendly errors for type aliases from stdlib if -no-jdk option is set

Browse Source 
^KT-54531 Fixed
This commit is contained in:
Ivan Kochurkin
2022-11-22 23:20:50 +01:00
committed by Space Team
parent 8eeb7e2631
commit 879deb90fc
5 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/tower/FirInvokeResolveTowerExtension.kt
+3 -3
View File
@@ -174,7 +174,7 @@ internal class FirInvokeResolveTowerExtension(
val invokeReceiverExpression =
components.createExplicitReceiverForInvoke(
invokeReceiverCandidate, info, invokeBuiltinExtensionMode, extensionReceiverExpression
)
) ?: continue
val invokeFunctionInfo =
info.copy(
@@ -283,7 +283,7 @@ private fun BodyResolveComponents.createExplicitReceiverForInvoke(
info: CallInfo,
invokeBuiltinExtensionMode: Boolean,
extensionReceiverExpression: FirExpression
): FirExpression {
): FirExpression? {
return when (val symbol = candidate.symbol) {
is FirCallableSymbol<*> -> createExplicitReceiverForInvokeByCallable(
candidate, info, invokeBuiltinExtensionMode, extensionReceiverExpression, symbol
@@ -294,7 +294,7 @@ private fun BodyResolveComponents.createExplicitReceiverForInvoke(
)
is FirTypeAliasSymbol -> {
val type = symbol.fir.expandedTypeRef.coneTypeUnsafe<ConeClassLikeType>().fullyExpandedType(session)
val expansionRegularClassSymbol = type.lookupTag.toSymbolOrError(session)
val expansionRegularClassSymbol = type.lookupTag.toSymbol(session) ?: return null
buildResolvedQualifierForClass(expansionRegularClassSymbol, sourceElement = symbol.fir.source)
}
else -> throw AssertionError()