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

Rename Visibility to DescriptorVisibility

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2020-09-01 16:06:06 +03:00
parent 2bcd8ee07f
commit d1fd1da56f
379 changed files with 2240 additions and 2250 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-core/src/org/jetbrains/kotlin/idea/core/Utils.kt
+2 -2
View File
@@ -142,7 +142,7 @@ fun Call.resolveCandidates(
if (filterOutByVisibility) {
candidates = candidates.filter {
Visibilities.isVisible(it.getDispatchReceiverWithSmartCast(), it.resultingDescriptor, inDescriptor)
DescriptorVisibilities.isVisible(it.getDispatchReceiverWithSmartCast(), it.resultingDescriptor, inDescriptor)
}
}
@@ -193,4 +193,4 @@ fun isEnumCompanionPropertyWithEntryConflict(element: PsiElement, expectedName:
if (!outerClass.isEnum()) return false
return outerClass.declarations.any { it is KtEnumEntry && it.name == expectedName }
}
}
idea/idea-core/src/org/jetbrains/kotlin/idea/core/descriptorUtils.kt
+9 -9
View File
@@ -48,7 +48,7 @@ private fun DeclarationDescriptorWithVisibility.isVisible(
bindingContext: BindingContext? = null,
resolutionScope: LexicalScope? = null
): Boolean {
if (Visibilities.isVisibleWithAnyReceiver(this, from)) return true
if (DescriptorVisibilities.isVisibleWithAnyReceiver(this, from)) return true
if (bindingContext == null || resolutionScope == null) return false
@@ -56,10 +56,10 @@ private fun DeclarationDescriptorWithVisibility.isVisible(
if (receiverExpression != null && !isExtension) {
val receiverType = bindingContext.getType(receiverExpression) ?: return false
val explicitReceiver = ExpressionReceiver.create(receiverExpression, receiverType, bindingContext)
return Visibilities.isVisible(explicitReceiver, this, from)
return DescriptorVisibilities.isVisible(explicitReceiver, this, from)
} else {
return resolutionScope.getImplicitReceiversHierarchy().any {
Visibilities.isVisible(it.value, this, from)
DescriptorVisibilities.isVisible(it.value, this, from)
}
}
}
@@ -104,12 +104,12 @@ fun compareDescriptors(project: Project, currentDescriptor: DeclarationDescripto
return false
}
fun Visibility.toKeywordToken(): KtModifierKeywordToken = when (val normalized = normalize()) {
Visibilities.PUBLIC -> KtTokens.PUBLIC_KEYWORD
Visibilities.PROTECTED -> KtTokens.PROTECTED_KEYWORD
Visibilities.INTERNAL -> KtTokens.INTERNAL_KEYWORD
fun DescriptorVisibility.toKeywordToken(): KtModifierKeywordToken = when (val normalized = normalize()) {
DescriptorVisibilities.PUBLIC -> KtTokens.PUBLIC_KEYWORD
DescriptorVisibilities.PROTECTED -> KtTokens.PROTECTED_KEYWORD
DescriptorVisibilities.INTERNAL -> KtTokens.INTERNAL_KEYWORD
else -> {
if (Visibilities.isPrivate(normalized)) {
if (DescriptorVisibilities.isPrivate(normalized)) {
KtTokens.PRIVATE_KEYWORD
} else {
error("Unexpected visibility '$normalized'")
@@ -144,4 +144,4 @@ fun <D : CallableMemberDescriptor> D.getDeepestSuperDeclarations(withThis: Boole
fun <T : DeclarationDescriptor> T.unwrapIfFakeOverride(): T {
return if (this is CallableMemberDescriptor) DescriptorUtils.unwrapFakeOverride(this) else this
}
}
idea/idea-core/src/org/jetbrains/kotlin/idea/core/overrideImplement/OverrideMembersHandler.kt
+1 -1
View File
@@ -19,7 +19,7 @@ class OverrideMembersHandler(private val preferConstructorParameters: Boolean =
for (member in descriptor.unsubstitutedMemberScope.getContributedDescriptors()) {
if (member is CallableMemberDescriptor && (member.kind != CallableMemberDescriptor.Kind.DECLARATION)) {
val overridden = member.overriddenDescriptors
if (overridden.any { it.modality == Modality.FINAL || Visibilities.isPrivate(it.visibility.normalize()) }) continue
if (overridden.any { it.modality == Modality.FINAL || DescriptorVisibilities.isPrivate(it.visibility.normalize()) }) continue
if (DescriptorUtils.isInterface(descriptor) && overridden.any { descriptor.builtIns.isMemberOfAny(it) }) continue