Rename Visibility to DescriptorVisibility
This commit is contained in:
+2
-2
@@ -153,7 +153,7 @@ fun ConstraintSystemOperation.checkCallableReference(
|
||||
addSubtypeConstraint(toFreshSubstitutor.safeSubstitute(reflectionCandidateType), expectedType, position)
|
||||
}
|
||||
|
||||
val invisibleMember = Visibilities.findInvisibleMember(
|
||||
val invisibleMember = DescriptorVisibilities.findInvisibleMember(
|
||||
dispatchReceiver?.asReceiverValueForVisibilityChecks,
|
||||
candidateDescriptor, ownerDescriptor
|
||||
)
|
||||
@@ -495,7 +495,7 @@ class CallableReferencesCandidateFactory(
|
||||
is PropertyDescriptor -> {
|
||||
val mutable = descriptor.isVar && run {
|
||||
val setter = descriptor.setter
|
||||
setter == null || Visibilities.isVisible(
|
||||
setter == null || DescriptorVisibilities.isVisible(
|
||||
dispatchReceiver?.asReceiverValueForVisibilityChecks, setter,
|
||||
scopeTower.lexicalScope.ownerDescriptor
|
||||
)
|
||||
|
||||
+3
-3
@@ -37,13 +37,13 @@ internal object CheckVisibility : ResolutionPart() {
|
||||
val containingDescriptor = scopeTower.lexicalScope.ownerDescriptor
|
||||
val dispatchReceiverArgument = resolvedCall.dispatchReceiverArgument
|
||||
|
||||
val receiverValue = dispatchReceiverArgument?.receiver?.receiverValue ?: Visibilities.ALWAYS_SUITABLE_RECEIVER
|
||||
val receiverValue = dispatchReceiverArgument?.receiver?.receiverValue ?: DescriptorVisibilities.ALWAYS_SUITABLE_RECEIVER
|
||||
val invisibleMember =
|
||||
Visibilities.findInvisibleMember(receiverValue, resolvedCall.candidateDescriptor, containingDescriptor) ?: return
|
||||
DescriptorVisibilities.findInvisibleMember(receiverValue, resolvedCall.candidateDescriptor, containingDescriptor) ?: return
|
||||
|
||||
if (dispatchReceiverArgument is ExpressionKotlinCallArgument) {
|
||||
val smartCastReceiver = getReceiverValueWithSmartCast(receiverValue, dispatchReceiverArgument.receiver.stableType)
|
||||
if (Visibilities.findInvisibleMember(smartCastReceiver, candidateDescriptor, containingDescriptor) == null) {
|
||||
if (DescriptorVisibilities.findInvisibleMember(smartCastReceiver, candidateDescriptor, containingDescriptor) == null) {
|
||||
addDiagnostic(
|
||||
SmartCastDiagnostic(
|
||||
dispatchReceiverArgument,
|
||||
|
||||
@@ -64,7 +64,7 @@ internal abstract class AbstractScopeTowerLevel(
|
||||
|
||||
val shouldSkipVisibilityCheck = scopeTower.isNewInferenceEnabled
|
||||
if (!shouldSkipVisibilityCheck) {
|
||||
Visibilities.findInvisibleMember(
|
||||
DescriptorVisibilities.findInvisibleMember(
|
||||
getReceiverValueWithSmartCast(dispatchReceiver?.receiverValue, dispatchReceiverSmartCastType),
|
||||
descriptor,
|
||||
scopeTower.lexicalScope.ownerDescriptor
|
||||
|
||||
+1
-1
@@ -455,7 +455,7 @@ object ExpectedActualResolver {
|
||||
a: CallableMemberDescriptor,
|
||||
b: CallableMemberDescriptor
|
||||
): Boolean {
|
||||
val compare = Visibilities.compare(a.visibility, b.visibility)
|
||||
val compare = DescriptorVisibilities.compare(a.visibility, b.visibility)
|
||||
return if (a.isOverridable) {
|
||||
// For overridable declarations visibility should match precisely, see KT-19664
|
||||
compare == 0
|
||||
|
||||
Reference in New Issue
Block a user