azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move: Forbid moving of enum entries

Browse Source 
#KT-13215 Fixed
This commit is contained in:
Alexey Sedunov
2016-08-23 14:23:32 +03:00
parent c50f38aa52
commit 64f0532934
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog.md
+1
View File
@@ -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-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: 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 ## 1.0.4
idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/ui/KotlinSelectNestedClassRefactoringDialog.kt
+2
View File
@@ -24,6 +24,7 @@ import com.intellij.refactoring.RefactoringBundle
import com.intellij.refactoring.util.RadioUpDownListener import com.intellij.refactoring.util.RadioUpDownListener
import org.jetbrains.kotlin.psi.KtClass import org.jetbrains.kotlin.psi.KtClass
import org.jetbrains.kotlin.psi.KtClassOrObject import org.jetbrains.kotlin.psi.KtClassOrObject
import org.jetbrains.kotlin.psi.KtEnumEntry
import org.jetbrains.kotlin.psi.psiUtil.containingClassOrObject import org.jetbrains.kotlin.psi.psiUtil.containingClassOrObject
import java.awt.BorderLayout import java.awt.BorderLayout
import javax.swing.* import javax.swing.*
@@ -110,6 +111,7 @@ internal class KotlinSelectNestedClassRefactoringDialog private constructor (
nestedClass is KtClass && nestedClass.isInner() -> { nestedClass is KtClass && nestedClass.isInner() -> {
MoveKotlinNestedClassesToUpperLevelDialog(nestedClass, targetContainer) MoveKotlinNestedClassesToUpperLevelDialog(nestedClass, targetContainer)
} }
nestedClass is KtEnumEntry -> return
else -> { else -> {
val selectionDialog = KotlinSelectNestedClassRefactoringDialog(project, nestedClass, targetContainer) val selectionDialog = KotlinSelectNestedClassRefactoringDialog(project, nestedClass, targetContainer)
selectionDialog.show() selectionDialog.show()