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-analysis/src/org/jetbrains/kotlin/idea/KotlinDescriptorIconProvider.java
+5 -5
View File
@@ -56,20 +56,20 @@ public final class KotlinDescriptorIconProvider {
private static Icon getVisibilityIcon(@NotNull DeclarationDescriptor descriptor) {
if (descriptor instanceof DeclarationDescriptorWithVisibility) {
DeclarationDescriptorWithVisibility descriptorWithVisibility = (DeclarationDescriptorWithVisibility) descriptor;
Visibility visibility = descriptorWithVisibility.getVisibility().normalize();
if (visibility == Visibilities.PUBLIC) {
DescriptorVisibility visibility = descriptorWithVisibility.getVisibility().normalize();
if (visibility == DescriptorVisibilities.PUBLIC) {
return PlatformIcons.PUBLIC_ICON;
}
if (visibility == Visibilities.PROTECTED) {
if (visibility == DescriptorVisibilities.PROTECTED) {
return PlatformIcons.PROTECTED_ICON;
}
if (Visibilities.isPrivate(visibility)) {
if (DescriptorVisibilities.isPrivate(visibility)) {
return PlatformIcons.PRIVATE_ICON;
}
if (visibility == Visibilities.INTERNAL) {
if (visibility == DescriptorVisibilities.INTERNAL) {
return PlatformIcons.PACKAGE_LOCAL_ICON;
}
}
idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/KotlinStructureViewElement.kt
+7 -7
View File
@@ -26,7 +26,7 @@ import com.intellij.psi.PsiElement
import org.jetbrains.annotations.TestOnly
import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
import org.jetbrains.kotlin.descriptors.DeclarationDescriptorWithVisibility
import org.jetbrains.kotlin.descriptors.Visibilities
import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptorIfAny
import org.jetbrains.kotlin.idea.util.application.runReadAction
import org.jetbrains.kotlin.psi.*
@@ -111,7 +111,7 @@ class KotlinStructureViewElement(
}
private fun isPublic(descriptor: DeclarationDescriptor?) =
(descriptor as? DeclarationDescriptorWithVisibility)?.visibility == Visibilities.PUBLIC
(descriptor as? DeclarationDescriptorWithVisibility)?.visibility == DescriptorVisibilities.PUBLIC
private fun countDescriptor(): DeclarationDescriptor? {
val element = element
@@ -132,14 +132,14 @@ class KotlinStructureViewElement(
private val visibility = (descriptor as? DeclarationDescriptorWithVisibility)?.visibility
val isPublic: Boolean
get() = visibility == Visibilities.PUBLIC
get() = visibility == DescriptorVisibilities.PUBLIC
val accessLevel: Int?
get() = when {
visibility == Visibilities.PUBLIC -> 1
visibility == Visibilities.INTERNAL -> 2
visibility == Visibilities.PROTECTED -> 3
visibility?.let { Visibilities.isPrivate(it) } == true -> 4
visibility == DescriptorVisibilities.PUBLIC -> 1
visibility == DescriptorVisibilities.INTERNAL -> 2
visibility == DescriptorVisibilities.PROTECTED -> 3
visibility?.let { DescriptorVisibilities.isPrivate(it) } == true -> 4
else -> null
}
}