diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinMutableMethodDescriptor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinMutableMethodDescriptor.kt index c0e71361c72..903769e65e0 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinMutableMethodDescriptor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinMutableMethodDescriptor.kt @@ -42,7 +42,7 @@ class KotlinMutableMethodDescriptor(override val original: KotlinMethodDescripto receiver?.let { parameters.add(it) } } - override fun getVisibility(): DescriptorVisibility? { + override fun getVisibility(): DescriptorVisibility { return original.visibility } } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinMutableMethodDescriptor.kt.202 b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinMutableMethodDescriptor.kt.202 index 1cfcb1d4d77..903769e65e0 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinMutableMethodDescriptor.kt.202 +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinMutableMethodDescriptor.kt.202 @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.idea.refactoring.changeSignature -import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibility class KotlinMutableMethodDescriptor(override val original: KotlinMethodDescriptor) : KotlinMethodDescriptor by original { private val parameters: MutableList = original.parameters @@ -42,7 +42,7 @@ class KotlinMutableMethodDescriptor(override val original: KotlinMethodDescripto receiver?.let { parameters.add(it) } } - override fun getVisibility(): Visibility { + override fun getVisibility(): DescriptorVisibility { return original.visibility } -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureCompat.kt.193 b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureCompat.kt.193 index f39465db594..726d23b3701 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureCompat.kt.193 +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureCompat.kt.193 @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.idea.refactoring.changeSignature.ui import com.intellij.openapi.project.Project import com.intellij.openapi.ui.Messages import com.intellij.openapi.ui.Messages.OkCancelResult -import org.jetbrains.kotlin.descriptors.Visibility +import org.jetbrains.kotlin.descriptors.DescriptorVisibility import javax.swing.Icon // FIX ME WHEN BUNCH 193 REMOVED @@ -28,4 +28,4 @@ fun showOkCancelDialog( ) } -typealias ComboBox = javax.swing.JComboBox +typealias ComboBox = javax.swing.JComboBox