From ac35f747d126c9fa508b0fd132de19c1d97d2e9d Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Wed, 16 Sep 2015 13:45:16 +0300 Subject: [PATCH] Pull Up: Fix UI for J2K case --- .../kotlin/idea/refactoring/pullUp/KotlinPullUpDialog.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/pullUp/KotlinPullUpDialog.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/pullUp/KotlinPullUpDialog.kt index ad60f48f4cd..5c45f171341 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/pullUp/KotlinPullUpDialog.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/pullUp/KotlinPullUpDialog.kt @@ -56,6 +56,7 @@ public class KotlinPullUpDialog( override fun isAbstractEnabled(memberInfo: KotlinMemberInfo): Boolean { val superClass = superClass ?: return false if (superClass is PsiClass) return false + if (superClass !is JetClass) return false if (!superClass.isInterface()) return true val member = memberInfo.member @@ -84,7 +85,7 @@ public class KotlinPullUpDialog( override fun getDimensionServiceKey() = "#" + javaClass.name - override fun getSuperClass() = super.getSuperClass() as? JetClass + override fun getSuperClass() = super.getSuperClass() override fun createMemberInfoModel() = MemberInfoModelImpl()