From 222dfd265b2120ea5f1ea7db9af361ef51d440ef Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Wed, 27 Jan 2016 15:00:42 +0300 Subject: [PATCH] Move: Forbid target annotation classes in class chooser --- .../moveDeclarations/ui/MoveKotlinNestedClassesDialog.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/ui/MoveKotlinNestedClassesDialog.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/ui/MoveKotlinNestedClassesDialog.java index 59397bdf84f..7e9c925f509 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/ui/MoveKotlinNestedClassesDialog.java +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/ui/MoveKotlinNestedClassesDialog.java @@ -40,7 +40,6 @@ import kotlin.jvm.functions.Function1; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.asJava.KtLightClassForExplicitDeclaration; -import org.jetbrains.kotlin.asJava.LightClassUtil; import org.jetbrains.kotlin.asJava.LightClassUtilsKt; import org.jetbrains.kotlin.idea.projectView.KtClassOrObjectTreeNode; import org.jetbrains.kotlin.idea.refactoring.memberInfo.KotlinMemberInfo; @@ -118,14 +117,13 @@ public class MoveKotlinNestedClassesDialog extends RefactoringDialog { if (!(aClass instanceof KtLightClassForExplicitDeclaration)) return false; KtClassOrObject classOrObject = ((KtLightClassForExplicitDeclaration) aClass).getOrigin(); - if (classOrObject.isTopLevel()) return true; - if (classOrObject instanceof KtObjectDeclaration) { return !((KtObjectDeclaration) classOrObject).isObjectLiteral(); } if (classOrObject instanceof KtClass) { - return !((KtClass) classOrObject).isInner(); + KtClass ktClass = (KtClass) classOrObject; + return !(ktClass.isInner() || ktClass.isAnnotation()); } return false;