From 6c903a607c241537676ba0d361242d33dc6cb357 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Fri, 4 Sep 2015 18:16:31 +0300 Subject: [PATCH] Move Declarations: Filter out declarations which are not under source root (including libraries) #KT-8922 Fixed --- .../MoveKotlinTopLevelDeclarationsHandler.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/MoveKotlinTopLevelDeclarationsHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/MoveKotlinTopLevelDeclarationsHandler.kt index d558de76a95..0408219c0d6 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/MoveKotlinTopLevelDeclarationsHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/MoveKotlinTopLevelDeclarationsHandler.kt @@ -31,6 +31,7 @@ import com.intellij.refactoring.move.MoveHandlerDelegate import com.intellij.refactoring.move.moveClassesOrPackages.MoveClassesOrPackagesImpl import com.intellij.refactoring.util.CommonRefactoringUtil import org.jetbrains.kotlin.idea.core.getPackage +import org.jetbrains.kotlin.idea.core.refactoring.canRefactor import org.jetbrains.kotlin.idea.core.refactoring.isInJavaSourceRoot import org.jetbrains.kotlin.idea.refactoring.move.moveTopLevelDeclarations.ui.MoveKotlinTopLevelDeclarationsDialog import org.jetbrains.kotlin.psi.* @@ -78,8 +79,7 @@ public class MoveKotlinTopLevelDeclarationsHandler : MoveHandlerDelegate() { return elements.all { e -> if (e is JetClass || (e is JetObjectDeclaration && !e.isObjectLiteral()) || e is JetNamedFunction || e is JetProperty) { - val parent = e.parent - (editorMode || parent is JetFile) && parent.isInJavaSourceRoot() + (editorMode || e.parent is JetFile) && e.canRefactor() } else false }