From 64f053293459e15f6c3d7a01ec75bfc24b54cc5d Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Tue, 23 Aug 2016 14:23:32 +0300 Subject: [PATCH] Move: Forbid moving of enum entries #KT-13215 Fixed --- ChangeLog.md | 1 + .../ui/KotlinSelectNestedClassRefactoringDialog.kt | 2 ++ 2 files changed, 3 insertions(+) diff --git a/ChangeLog.md b/ChangeLog.md index 77985b7e256..9c4c605270b 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -104,6 +104,7 @@ These artifacts include extensions for the types available in the latter JDKs, s - [`KT-13535`](https://youtrack.jetbrains.com/issue/KT-13535) Pull Up: Remove visibility modifiers on adding 'override' - [`KT-13216`](https://youtrack.jetbrains.com/issue/KT-13216) Move: Report separate conflicts for each property accessor +- [`KT-13216`](https://youtrack.jetbrains.com/issue/KT-13216) Move: Forbid moving of enum entries ## 1.0.4 diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/ui/KotlinSelectNestedClassRefactoringDialog.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/ui/KotlinSelectNestedClassRefactoringDialog.kt index 62664ac85f9..a252f0daecd 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/ui/KotlinSelectNestedClassRefactoringDialog.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/ui/KotlinSelectNestedClassRefactoringDialog.kt @@ -24,6 +24,7 @@ import com.intellij.refactoring.RefactoringBundle import com.intellij.refactoring.util.RadioUpDownListener import org.jetbrains.kotlin.psi.KtClass import org.jetbrains.kotlin.psi.KtClassOrObject +import org.jetbrains.kotlin.psi.KtEnumEntry import org.jetbrains.kotlin.psi.psiUtil.containingClassOrObject import java.awt.BorderLayout import javax.swing.* @@ -110,6 +111,7 @@ internal class KotlinSelectNestedClassRefactoringDialog private constructor ( nestedClass is KtClass && nestedClass.isInner() -> { MoveKotlinNestedClassesToUpperLevelDialog(nestedClass, targetContainer) } + nestedClass is KtEnumEntry -> return else -> { val selectionDialog = KotlinSelectNestedClassRefactoringDialog(project, nestedClass, targetContainer) selectionDialog.show()