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

K1: report ABSTRACT_SUPER_CALL(_WARNING) also for 2+ steps to intersection

Browse Source 
#KT-53953 Fixed
This commit is contained in:
Mikhail Glukhikh
2022-09-15 09:42:22 +02:00
committed by Space
parent 3e5d5bcaa7
commit c4a48927d2
4 changed files with 50 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/components/ResolutionParts.kt
+23 -9
View File
@@ -804,15 +804,7 @@ internal object CheckSuperExpressionCallPart : ResolutionPart() {
if (callComponents.statelessCallbacks.isSuperExpression(resolvedCall.dispatchReceiverArgument)) {
if (candidateDescriptor is CallableMemberDescriptor) {
if (candidateDescriptor.modality == Modality.ABSTRACT) {
addDiagnostic(AbstractSuperCall(resolvedCall.dispatchReceiverArgument!!))
} else if (candidateDescriptor.kind == CallableMemberDescriptor.Kind.FAKE_OVERRIDE &&
candidateDescriptor.overriddenDescriptors.size > 1
) {
if (candidateDescriptor.overriddenDescriptors.firstOrNull { !it.isInsideInterface }?.modality == Modality.ABSTRACT) {
addDiagnostic(AbstractFakeOverrideSuperCall)
}
}
checkSuperCandidateDescriptor(candidateDescriptor)
}
}
@@ -821,6 +813,28 @@ internal object CheckSuperExpressionCallPart : ResolutionPart() {
addDiagnostic(SuperAsExtensionReceiver(extensionReceiver))
}
}
private fun ResolutionCandidate.checkSuperCandidateDescriptor(candidateDescriptor: CallableMemberDescriptor) {
if (candidateDescriptor.modality == Modality.ABSTRACT) {
addDiagnostic(AbstractSuperCall(resolvedCall.dispatchReceiverArgument!!))
} else if (candidateDescriptor.kind == CallableMemberDescriptor.Kind.FAKE_OVERRIDE) {
var intersectionFakeOverrideDescriptor = candidateDescriptor
while (intersectionFakeOverrideDescriptor.overriddenDescriptors.size == 1) {
intersectionFakeOverrideDescriptor = intersectionFakeOverrideDescriptor.overriddenDescriptors.first()
if (intersectionFakeOverrideDescriptor.kind != CallableMemberDescriptor.Kind.FAKE_OVERRIDE) {
return
}
}
if (intersectionFakeOverrideDescriptor.overriddenDescriptors.size > 1) {
if (intersectionFakeOverrideDescriptor.overriddenDescriptors.firstOrNull {
!it.isInsideInterface
}?.modality == Modality.ABSTRACT
) {
addDiagnostic(AbstractFakeOverrideSuperCall)
}
}
}
}
}
internal object ErrorDescriptorResolutionPart : ResolutionPart() {