Make DescriptorVisibility delegate to Visibility

Original commit: 696f089b3e80c6ecee67861c19fb2c7ba6cd6386

GitOrigin-RevId: 6ed85efbacfed011cc2287e64b0d1cc785e3336e
This commit is contained in:
Dmitriy Novozhilov
2020-11-28 01:03:30 +03:00
committed by intellij-monorepo-bot
parent 981d27937b
commit 243ee2ff7b
@@ -17,12 +17,9 @@
package org.jetbrains.kotlin.idea.quickfix
import com.intellij.codeInsight.intention.IntentionAction
import org.jetbrains.kotlin.descriptors.DeclarationDescriptorWithVisibility
import org.jetbrains.kotlin.descriptors.DescriptorWithRelation
import org.jetbrains.kotlin.descriptors.EffectiveVisibility
import org.jetbrains.kotlin.descriptors.*
import org.jetbrains.kotlin.descriptors.EffectiveVisibility.Permissiveness.LESS
import org.jetbrains.kotlin.descriptors.DescriptorVisibilities.*
import org.jetbrains.kotlin.descriptors.DescriptorVisibility
import org.jetbrains.kotlin.diagnostics.Diagnostic
import org.jetbrains.kotlin.diagnostics.DiagnosticFactory3
import org.jetbrains.kotlin.idea.core.toDescriptor
@@ -61,7 +58,7 @@ object ChangeVisibilityOnExposureFactory : KotlinIntentionActionsFactory() {
val exposedVisibility = exposedDiagnostic.c
val userVisibility = exposedDiagnostic.a
val (targetUserVisibility, targetExposedVisibility) = when (exposedVisibility.relation(userVisibility)) {
LESS -> Pair(exposedVisibility.toVisibility(), userVisibility.toVisibility())
LESS -> Pair(exposedVisibility.toDescriptorVisibility(), userVisibility.toDescriptorVisibility())
else -> Pair(PRIVATE, PUBLIC)
}
val result = ArrayList<IntentionAction>()