From 17dd5b9d058f22905676582f176b92e1fb4af2c8 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Thu, 10 Jul 2014 21:11:28 +0400 Subject: [PATCH] Move: Do not update Kotlin usages of extension members, add imports instead #KT-5378 Fixed --- ...MoveKotlinTopLevelDeclarationsProcessor.kt | 48 +++++++++++++++++-- .../after/_a/noImports.kt | 7 +++ .../after/_a/specificImportsWithAliases.kt | 8 ++++ .../after/a/dependency.kt | 7 +++ .../after/a/main.kt | 9 ++++ .../after/a/noImports.java | 7 +++ .../after/a/noImports.kt | 7 +++ .../after/a/onDemandStaticImport.java | 7 +++ .../after/a/specificImportsWithAliases.kt | 8 ++++ .../after/a/specificStaticImports.java | 9 ++++ .../after/b/dependency.kt | 30 ++++++++++++ .../after/b/noImports.java | 7 +++ .../after/b/onDemandImport.java | 9 ++++ .../after/b/onDemandImport.kt | 7 +++ .../after/b/onDemandStaticImport.java | 7 +++ .../after/b/specificImports.java | 9 ++++ .../after/b/specificImports.kt | 8 ++++ .../after/b/specificImportsWithAliases.kt | 8 ++++ .../after/b/specificStaticImports.java | 9 ++++ .../after/c/dependency.kt | 7 +++ .../after/c/noImports.java | 7 +++ .../after/c/onDemandImport.java | 9 ++++ .../after/c/onDemandImport.kt | 8 ++++ .../after/c/onDemandStaticImport.java | 7 +++ .../after/c/specificImports.java | 9 ++++ .../after/c/specificImports.kt | 8 ++++ .../after/c/specificImportsWithAliases.kt | 8 ++++ .../after/c/specificStaticImports.java | 9 ++++ .../before/_a/noImports.kt | 5 ++ .../before/_a/specificImportsWithAliases.kt | 8 ++++ .../before/a/dependency.kt | 7 +++ .../before/a/main.kt | 28 +++++++++++ .../before/a/noImports.java | 7 +++ .../before/a/noImports.kt | 5 ++ .../before/a/onDemandStaticImport.java | 9 ++++ .../before/a/specificImportsWithAliases.kt | 8 ++++ .../before/a/specificStaticImports.java | 9 ++++ .../before/b/dependency.kt | 8 ++++ .../before/b/noImports.java | 7 +++ .../before/b/onDemandImport.java | 9 ++++ .../before/b/onDemandImport.kt | 7 +++ .../before/b/onDemandStaticImport.java | 9 ++++ .../before/b/specificImports.java | 10 ++++ .../before/b/specificImports.kt | 8 ++++ .../before/b/specificImportsWithAliases.kt | 8 ++++ .../before/b/specificStaticImports.java | 9 ++++ .../before/c/dependency.kt | 7 +++ .../before/c/noImports.java | 7 +++ .../before/c/onDemandImport.java | 9 ++++ .../before/c/onDemandImport.kt | 7 +++ .../before/c/onDemandStaticImport.java | 9 ++++ .../before/c/specificImports.java | 10 ++++ .../before/c/specificImports.kt | 8 ++++ .../before/c/specificImportsWithAliases.kt | 8 ++++ .../before/c/specificStaticImports.java | 9 ++++ .../moveExtensionFunctionToFile.test | 5 ++ .../after/_a/noImports.kt | 8 ++++ .../after/_a/specificImportsWithAliases.kt | 9 ++++ .../after/a/dependency.kt | 7 +++ .../after/a/main.kt | 10 ++++ .../after/a/noImports.java | 8 ++++ .../after/a/noImports.kt | 8 ++++ .../after/a/onDemandStaticImport.java | 8 ++++ .../after/a/specificImportsWithAliases.kt | 9 ++++ .../after/a/specificStaticImports.java | 11 +++++ .../after/b/dependency.kt | 32 +++++++++++++ .../after/b/noImports.java | 8 ++++ .../after/b/onDemandImport.java | 10 ++++ .../after/b/onDemandImport.kt | 8 ++++ .../after/b/onDemandStaticImport.java | 8 ++++ .../after/b/specificImports.java | 10 ++++ .../after/b/specificImports.kt | 9 ++++ .../after/b/specificImportsWithAliases.kt | 9 ++++ .../after/b/specificStaticImports.java | 11 +++++ .../after/c/dependency.kt | 7 +++ .../after/c/noImports.java | 8 ++++ .../after/c/onDemandImport.java | 10 ++++ .../after/c/onDemandImport.kt | 9 ++++ .../after/c/onDemandStaticImport.java | 8 ++++ .../after/c/specificImports.java | 10 ++++ .../after/c/specificImports.kt | 9 ++++ .../after/c/specificImportsWithAliases.kt | 9 ++++ .../after/c/specificStaticImports.java | 11 +++++ .../before/_a/noImports.kt | 6 +++ .../before/_a/specificImportsWithAliases.kt | 9 ++++ .../before/a/dependency.kt | 7 +++ .../before/a/main.kt | 31 ++++++++++++ .../before/a/noImports.java | 8 ++++ .../before/a/noImports.kt | 6 +++ .../before/a/onDemandStaticImport.java | 10 ++++ .../before/a/specificImportsWithAliases.kt | 9 ++++ .../before/a/specificStaticImports.java | 11 +++++ .../before/b/dependency.kt | 8 ++++ .../before/b/noImports.java | 8 ++++ .../before/b/onDemandImport.java | 10 ++++ .../before/b/onDemandImport.kt | 8 ++++ .../before/b/onDemandStaticImport.java | 10 ++++ .../before/b/specificImports.java | 11 +++++ .../before/b/specificImports.kt | 9 ++++ .../before/b/specificImportsWithAliases.kt | 9 ++++ .../before/b/specificStaticImports.java | 11 +++++ .../before/c/dependency.kt | 7 +++ .../before/c/noImports.java | 8 ++++ .../before/c/onDemandImport.java | 10 ++++ .../before/c/onDemandImport.kt | 8 ++++ .../before/c/onDemandStaticImport.java | 10 ++++ .../before/c/specificImports.java | 11 +++++ .../before/c/specificImports.kt | 9 ++++ .../before/c/specificImportsWithAliases.kt | 9 ++++ .../before/c/specificStaticImports.java | 11 +++++ .../moveExtensionPropertyToFile.test | 5 ++ .../move/JetMoveTestGenerated.java | 10 ++++ 112 files changed, 1061 insertions(+), 5 deletions(-) create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/_a/noImports.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/_a/specificImportsWithAliases.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/a/dependency.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/a/main.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/a/noImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/a/noImports.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/a/onDemandStaticImport.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/a/specificImportsWithAliases.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/a/specificStaticImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/b/dependency.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/b/noImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/b/onDemandImport.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/b/onDemandImport.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/b/onDemandStaticImport.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/b/specificImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/b/specificImports.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/b/specificImportsWithAliases.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/b/specificStaticImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/c/dependency.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/c/noImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/c/onDemandImport.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/c/onDemandImport.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/c/onDemandStaticImport.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/c/specificImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/c/specificImports.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/c/specificImportsWithAliases.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/c/specificStaticImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/_a/noImports.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/_a/specificImportsWithAliases.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/a/dependency.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/a/main.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/a/noImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/a/noImports.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/a/onDemandStaticImport.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/a/specificImportsWithAliases.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/a/specificStaticImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/b/dependency.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/b/noImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/b/onDemandImport.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/b/onDemandImport.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/b/onDemandStaticImport.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/b/specificImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/b/specificImports.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/b/specificImportsWithAliases.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/b/specificStaticImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/c/dependency.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/c/noImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/c/onDemandImport.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/c/onDemandImport.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/c/onDemandStaticImport.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/c/specificImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/c/specificImports.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/c/specificImportsWithAliases.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/c/specificStaticImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/moveExtensionFunctionToFile.test create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/_a/noImports.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/_a/specificImportsWithAliases.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/a/dependency.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/a/main.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/a/noImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/a/noImports.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/a/onDemandStaticImport.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/a/specificImportsWithAliases.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/a/specificStaticImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/b/dependency.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/b/noImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/b/onDemandImport.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/b/onDemandImport.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/b/onDemandStaticImport.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/b/specificImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/b/specificImports.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/b/specificImportsWithAliases.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/b/specificStaticImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/c/dependency.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/c/noImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/c/onDemandImport.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/c/onDemandImport.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/c/onDemandStaticImport.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/c/specificImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/c/specificImports.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/c/specificImportsWithAliases.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/c/specificStaticImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/_a/noImports.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/_a/specificImportsWithAliases.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/a/dependency.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/a/main.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/a/noImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/a/noImports.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/a/onDemandStaticImport.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/a/specificImportsWithAliases.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/a/specificStaticImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/b/dependency.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/b/noImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/b/onDemandImport.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/b/onDemandImport.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/b/onDemandStaticImport.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/b/specificImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/b/specificImports.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/b/specificImportsWithAliases.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/b/specificStaticImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/c/dependency.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/c/noImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/c/onDemandImport.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/c/onDemandImport.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/c/onDemandStaticImport.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/c/specificImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/c/specificImports.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/c/specificImportsWithAliases.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/c/specificStaticImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/moveExtensionPropertyToFile.test diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveTopLevelDeclarations/MoveKotlinTopLevelDeclarationsProcessor.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveTopLevelDeclarations/MoveKotlinTopLevelDeclarationsProcessor.kt index 4bf6cbd9c6e..0e7bbce687b 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveTopLevelDeclarations/MoveKotlinTopLevelDeclarationsProcessor.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveTopLevelDeclarations/MoveKotlinTopLevelDeclarationsProcessor.kt @@ -38,8 +38,6 @@ import com.intellij.psi.PsiDirectory import org.jetbrains.jet.lang.psi.psiUtil.getPackage import org.jetbrains.jet.lang.psi.JetFile import org.jetbrains.jet.plugin.refactoring.move.PackageNameInfo -import org.jetbrains.jet.lang.psi.JetPsiUtil -import org.jetbrains.jet.lang.resolve.name.FqName import org.jetbrains.jet.plugin.refactoring.createKotlinFile import org.jetbrains.jet.plugin.refactoring.move.updateInternalReferencesOnPackageNameChange import org.jetbrains.jet.plugin.codeInsight.addToShorteningWaitSet @@ -52,7 +50,6 @@ import java.util.ArrayList import java.util.HashSet import com.intellij.psi.PsiReference import com.intellij.psi.search.searches.ReferencesSearch -import com.intellij.psi.search.GlobalSearchScope import com.intellij.refactoring.util.MoveRenameUsageInfo import com.intellij.refactoring.util.TextOccurrencesUtil import com.intellij.refactoring.move.moveClassesOrPackages.MoveClassHandler @@ -72,6 +69,11 @@ import com.intellij.openapi.util.Ref import org.jetbrains.jet.plugin.refactoring.getKotlinFqName import org.jetbrains.jet.plugin.references.JetSimpleNameReference.ShorteningMode import org.jetbrains.jet.plugin.search.projectScope +import org.jetbrains.jet.lang.psi.psiUtil.isExtensionDeclaration +import org.jetbrains.jet.plugin.references.JetReference +import org.jetbrains.jet.plugin.quickfix.ImportInsertHelper +import org.jetbrains.jet.lang.psi.psiUtil.getParentByType +import org.jetbrains.jet.lang.psi.JetImportDirective public class MoveKotlinTopLevelDeclarationsOptions( val elementsToMove: Collection, @@ -81,6 +83,14 @@ public class MoveKotlinTopLevelDeclarationsOptions( val moveCallback: MoveCallback? = null ) +class MoveRenameUsageInfoForExtension( + element: PsiElement, + reference: PsiReference, + startOffset: Int, + endOffset: Int, + referencedElement: PsiElement +): MoveRenameUsageInfo(element, reference, startOffset, endOffset, referencedElement, false) + public class MoveKotlinTopLevelDeclarationsProcessor(project: Project, val options: MoveKotlinTopLevelDeclarationsOptions) : BaseRefactoringProcessor(project) { class object { private val LOG: Logger = Logger.getInstance(javaClass()) @@ -101,6 +111,21 @@ public class MoveKotlinTopLevelDeclarationsProcessor(project: Project, val optio } override fun findUsages(): Array { + fun createUsageInfo( + element: PsiElement, + reference: PsiReference, + startOffset: Int, + endOffset: Int, + referencedElement: PsiElement + ): UsageInfo { + if (reference is JetReference + && referencedElement.namedUnwrappedElement!!.isExtensionDeclaration() + && element.getParentByType(javaClass()) == null) { + return MoveRenameUsageInfoForExtension(element, reference, startOffset, endOffset, referencedElement) + } + return MoveRenameUsageInfo(element, reference, startOffset, endOffset, referencedElement, false) + } + val newPackageName = options.moveTarget.packageWrapper?.getQualifiedName() ?: "" fun collectUsages(): List { @@ -114,7 +139,7 @@ public class MoveKotlinTopLevelDeclarationsProcessor(project: Project, val optio .mapTo(ArrayList()) { ref -> if (foundReferences.add(ref)) { val range = ref.getRangeInElement()!! - MoveRenameUsageInfo(ref.getElement(), ref, range.getStartOffset(), range.getEndOffset(), lightElement, false) + createUsageInfo(ref.getElement(), ref, range.getStartOffset(), range.getEndOffset(), lightElement) } else null } @@ -274,7 +299,20 @@ public class MoveKotlinTopLevelDeclarationsProcessor(project: Project, val optio } } - nonCodeUsages = CommonMoveUtil.retargetUsages(usages, oldToNewElementsMapping) + if (usages == null) return + + nonCodeUsages = CommonMoveUtil.retargetUsages( + usages.filter { it !is MoveRenameUsageInfoForExtension }.copyToArray(), + oldToNewElementsMapping + ) + for (usage in usages.filterIsInstance(javaClass())) { + val newElement = oldToNewElementsMapping[usage.getReferencedElement()] + + ImportInsertHelper.addImportDirectiveIfNeeded( + newElement!!.getKotlinFqName()!!, + usage.getElement()!!.getContainingFile() as JetFile + ) + } } catch (e: IncorrectOperationException) { nonCodeUsages = null diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/_a/noImports.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/_a/noImports.kt new file mode 100644 index 00000000000..c122a22a49d --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/_a/noImports.kt @@ -0,0 +1,7 @@ +package a + +import b.test + +fun bar() { + Test().test() +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/_a/specificImportsWithAliases.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/_a/specificImportsWithAliases.kt new file mode 100644 index 00000000000..890ae46af44 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/_a/specificImportsWithAliases.kt @@ -0,0 +1,8 @@ +package a + +import b.test as _test +import a.Test as _Test + +fun bar() { + _Test()._test() +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/a/dependency.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/a/dependency.kt new file mode 100644 index 00000000000..19e1c2c2fdd --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/a/dependency.kt @@ -0,0 +1,7 @@ +package a + +open class Foo { + open class Bar { + + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/a/main.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/a/main.kt new file mode 100644 index 00000000000..38f0bec9dde --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/a/main.kt @@ -0,0 +1,9 @@ +package a + +import b.test + +class Test { + fun foo() { + test() + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/a/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/a/noImports.java new file mode 100644 index 00000000000..f555342e625 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/a/noImports.java @@ -0,0 +1,7 @@ +package a; + +class J { + void bar() { + b.BPackage.test(new Test()); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/a/noImports.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/a/noImports.kt new file mode 100644 index 00000000000..c122a22a49d --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/a/noImports.kt @@ -0,0 +1,7 @@ +package a + +import b.test + +fun bar() { + Test().test() +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/a/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/a/onDemandStaticImport.java new file mode 100644 index 00000000000..f555342e625 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/a/onDemandStaticImport.java @@ -0,0 +1,7 @@ +package a; + +class J { + void bar() { + b.BPackage.test(new Test()); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/a/specificImportsWithAliases.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/a/specificImportsWithAliases.kt new file mode 100644 index 00000000000..890ae46af44 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/a/specificImportsWithAliases.kt @@ -0,0 +1,8 @@ +package a + +import b.test as _test +import a.Test as _Test + +fun bar() { + _Test()._test() +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/a/specificStaticImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/a/specificStaticImports.java new file mode 100644 index 00000000000..e8e4faca23a --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/a/specificStaticImports.java @@ -0,0 +1,9 @@ +package a; + +import static b.BPackage.test; + +class J { + void bar() { + test(new Test()); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/b/dependency.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/b/dependency.kt new file mode 100644 index 00000000000..75d9af91d43 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/b/dependency.kt @@ -0,0 +1,30 @@ +package b + +import a.Test + +open class Foo { + open class Bar { + + } +} + +fun Test.test() { + val aFoo: a.Foo = a.Foo() + val bFoo: Foo = Foo() + val cFoo: c.Foo = c.Foo() + val aBar: a.Foo.Bar = a.Foo.Bar() + val bBar: Foo.Bar = Foo.Bar() + val cBar: c.Foo.Bar = c.Foo.Bar() + + fun foo(u: Int) { + class T(val t: Int) + object O { + val t: Int = 1 + } + + val v = T(u).t + O.t + println(v) + } + + foo(1) +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/b/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/b/noImports.java new file mode 100644 index 00000000000..97cb94a716e --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/b/noImports.java @@ -0,0 +1,7 @@ +package b; + +class J { + void bar() { + b.BPackage.test(new a.Test()); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/b/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/b/onDemandImport.java new file mode 100644 index 00000000000..d6af08036ea --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/b/onDemandImport.java @@ -0,0 +1,9 @@ +package b; + +import a.*; + +class J { + void bar() { + b.BPackage.test(new Test()); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/b/onDemandImport.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/b/onDemandImport.kt new file mode 100644 index 00000000000..1df84659e89 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/b/onDemandImport.kt @@ -0,0 +1,7 @@ +package b + +import a.* + +fun bar() { + Test().test() +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/b/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/b/onDemandStaticImport.java new file mode 100644 index 00000000000..97cb94a716e --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/b/onDemandStaticImport.java @@ -0,0 +1,7 @@ +package b; + +class J { + void bar() { + b.BPackage.test(new a.Test()); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/b/specificImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/b/specificImports.java new file mode 100644 index 00000000000..6ed04772f5f --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/b/specificImports.java @@ -0,0 +1,9 @@ +package b; + +import a.Test; + +class J { + void bar() { + b.BPackage.test(new Test()); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/b/specificImports.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/b/specificImports.kt new file mode 100644 index 00000000000..8fde694e977 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/b/specificImports.kt @@ -0,0 +1,8 @@ +package b + +import b.test +import a.Test + +fun bar() { + Test().test() +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/b/specificImportsWithAliases.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/b/specificImportsWithAliases.kt new file mode 100644 index 00000000000..e3a4e4bb954 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/b/specificImportsWithAliases.kt @@ -0,0 +1,8 @@ +package b + +import b.test as _test +import a.Test as _Test + +fun bar() { + _Test()._test() +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/b/specificStaticImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/b/specificStaticImports.java new file mode 100644 index 00000000000..61fad841950 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/b/specificStaticImports.java @@ -0,0 +1,9 @@ +package b; + +import static b.BPackage.test; + +class J { + void bar() { + test(new a.Test()); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/c/dependency.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/c/dependency.kt new file mode 100644 index 00000000000..bde1387bee5 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/c/dependency.kt @@ -0,0 +1,7 @@ +package c + +open class Foo { + open class Bar { + + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/c/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/c/noImports.java new file mode 100644 index 00000000000..4f0834f00e3 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/c/noImports.java @@ -0,0 +1,7 @@ +package c; + +class J { + void bar() { + b.BPackage.test(new a.Test()); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/c/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/c/onDemandImport.java new file mode 100644 index 00000000000..a061026f9e3 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/c/onDemandImport.java @@ -0,0 +1,9 @@ +package c; + +import a.*; + +class J { + void bar() { + b.BPackage.test(new Test()); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/c/onDemandImport.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/c/onDemandImport.kt new file mode 100644 index 00000000000..e67200f9240 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/c/onDemandImport.kt @@ -0,0 +1,8 @@ +package c + +import a.* +import b.test + +fun bar() { + Test().test() +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/c/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/c/onDemandStaticImport.java new file mode 100644 index 00000000000..4f0834f00e3 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/c/onDemandStaticImport.java @@ -0,0 +1,7 @@ +package c; + +class J { + void bar() { + b.BPackage.test(new a.Test()); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/c/specificImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/c/specificImports.java new file mode 100644 index 00000000000..ee64c7621bb --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/c/specificImports.java @@ -0,0 +1,9 @@ +package c; + +import a.Test; + +class J { + void bar() { + b.BPackage.test(new Test()); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/c/specificImports.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/c/specificImports.kt new file mode 100644 index 00000000000..a2e29a21407 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/c/specificImports.kt @@ -0,0 +1,8 @@ +package c + +import b.test +import a.Test + +fun bar() { + Test().test() +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/c/specificImportsWithAliases.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/c/specificImportsWithAliases.kt new file mode 100644 index 00000000000..a09233f973d --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/c/specificImportsWithAliases.kt @@ -0,0 +1,8 @@ +package c + +import b.test as _test +import a.Test as _Test + +fun bar() { + _Test()._test() +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/c/specificStaticImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/c/specificStaticImports.java new file mode 100644 index 00000000000..753ab9f5bff --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/c/specificStaticImports.java @@ -0,0 +1,9 @@ +package c; + +import static b.BPackage.test; + +class J { + void bar() { + test(new a.Test()); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/_a/noImports.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/_a/noImports.kt new file mode 100644 index 00000000000..cc420e83157 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/_a/noImports.kt @@ -0,0 +1,5 @@ +package a + +fun bar() { + Test().test() +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/_a/specificImportsWithAliases.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/_a/specificImportsWithAliases.kt new file mode 100644 index 00000000000..cffd6d54c20 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/_a/specificImportsWithAliases.kt @@ -0,0 +1,8 @@ +package a + +import a.test as _test +import a.Test as _Test + +fun bar() { + _Test()._test() +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/a/dependency.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/a/dependency.kt new file mode 100644 index 00000000000..19e1c2c2fdd --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/a/dependency.kt @@ -0,0 +1,7 @@ +package a + +open class Foo { + open class Bar { + + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/a/main.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/a/main.kt new file mode 100644 index 00000000000..ab9de3bcbb6 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/a/main.kt @@ -0,0 +1,28 @@ +package a + +fun Test.test() { + val aFoo: Foo = Foo() + val bFoo: b.Foo = b.Foo() + val cFoo: c.Foo = c.Foo() + val aBar: Foo.Bar = Foo.Bar() + val bBar: b.Foo.Bar = b.Foo.Bar() + val cBar: c.Foo.Bar = c.Foo.Bar() + + fun foo(u: Int) { + class T(val t: Int) + object O { + val t: Int = 1 + } + + val v = T(u).t + O.t + println(v) + } + + foo(1) +} + +class Test { + fun foo() { + test() + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/a/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/a/noImports.java new file mode 100644 index 00000000000..406cd477c66 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/a/noImports.java @@ -0,0 +1,7 @@ +package a; + +class J { + void bar() { + APackage.test(new Test()); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/a/noImports.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/a/noImports.kt new file mode 100644 index 00000000000..cc420e83157 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/a/noImports.kt @@ -0,0 +1,5 @@ +package a + +fun bar() { + Test().test() +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/a/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/a/onDemandStaticImport.java new file mode 100644 index 00000000000..e6de2a349a1 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/a/onDemandStaticImport.java @@ -0,0 +1,9 @@ +package a; + +import static a.APackage.*; + +class J { + void bar() { + test(new Test()); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/a/specificImportsWithAliases.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/a/specificImportsWithAliases.kt new file mode 100644 index 00000000000..cffd6d54c20 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/a/specificImportsWithAliases.kt @@ -0,0 +1,8 @@ +package a + +import a.test as _test +import a.Test as _Test + +fun bar() { + _Test()._test() +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/a/specificStaticImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/a/specificStaticImports.java new file mode 100644 index 00000000000..bb3a452779f --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/a/specificStaticImports.java @@ -0,0 +1,9 @@ +package a; + +import static a.APackage.test; + +class J { + void bar() { + test(new Test()); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/b/dependency.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/b/dependency.kt new file mode 100644 index 00000000000..cb8b5157938 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/b/dependency.kt @@ -0,0 +1,8 @@ +package b + +open class Foo { + open class Bar { + + } +} + diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/b/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/b/noImports.java new file mode 100644 index 00000000000..302d20b962f --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/b/noImports.java @@ -0,0 +1,7 @@ +package b; + +class J { + void bar() { + a.APackage.test(new a.Test()); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/b/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/b/onDemandImport.java new file mode 100644 index 00000000000..19dfeee6aec --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/b/onDemandImport.java @@ -0,0 +1,9 @@ +package b; + +import a.*; + +class J { + void bar() { + APackage.test(new Test()); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/b/onDemandImport.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/b/onDemandImport.kt new file mode 100644 index 00000000000..1df84659e89 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/b/onDemandImport.kt @@ -0,0 +1,7 @@ +package b + +import a.* + +fun bar() { + Test().test() +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/b/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/b/onDemandStaticImport.java new file mode 100644 index 00000000000..8359630a7c3 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/b/onDemandStaticImport.java @@ -0,0 +1,9 @@ +package b; + +import static a.APackage.*; + +class J { + void bar() { + test(new a.Test()); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/b/specificImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/b/specificImports.java new file mode 100644 index 00000000000..f5e4f7cd9df --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/b/specificImports.java @@ -0,0 +1,10 @@ +package b; + +import a.APackage; +import a.Test; + +class J { + void bar() { + APackage.test(new Test()); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/b/specificImports.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/b/specificImports.kt new file mode 100644 index 00000000000..c10a0dcdbf3 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/b/specificImports.kt @@ -0,0 +1,8 @@ +package b + +import a.test +import a.Test + +fun bar() { + Test().test() +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/b/specificImportsWithAliases.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/b/specificImportsWithAliases.kt new file mode 100644 index 00000000000..00ede0a7e7a --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/b/specificImportsWithAliases.kt @@ -0,0 +1,8 @@ +package b + +import a.test as _test +import a.Test as _Test + +fun bar() { + _Test()._test() +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/b/specificStaticImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/b/specificStaticImports.java new file mode 100644 index 00000000000..886c6446018 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/b/specificStaticImports.java @@ -0,0 +1,9 @@ +package b; + +import static a.APackage.test; + +class J { + void bar() { + test(new a.Test()); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/c/dependency.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/c/dependency.kt new file mode 100644 index 00000000000..bde1387bee5 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/c/dependency.kt @@ -0,0 +1,7 @@ +package c + +open class Foo { + open class Bar { + + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/c/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/c/noImports.java new file mode 100644 index 00000000000..2ec4120b108 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/c/noImports.java @@ -0,0 +1,7 @@ +package c; + +class J { + void bar() { + a.APackage.test(new a.Test()); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/c/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/c/onDemandImport.java new file mode 100644 index 00000000000..4840be4c1a2 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/c/onDemandImport.java @@ -0,0 +1,9 @@ +package c; + +import a.*; + +class J { + void bar() { + APackage.test(new Test()); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/c/onDemandImport.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/c/onDemandImport.kt new file mode 100644 index 00000000000..5f94198335f --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/c/onDemandImport.kt @@ -0,0 +1,7 @@ +package c + +import a.* + +fun bar() { + Test().test() +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/c/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/c/onDemandStaticImport.java new file mode 100644 index 00000000000..2412510e6ef --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/c/onDemandStaticImport.java @@ -0,0 +1,9 @@ +package c; + +import static a.APackage.*; + +class J { + void bar() { + test(new a.Test()); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/c/specificImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/c/specificImports.java new file mode 100644 index 00000000000..175bc729366 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/c/specificImports.java @@ -0,0 +1,10 @@ +package c; + +import a.APackage; +import a.Test; + +class J { + void bar() { + APackage.test(new Test()); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/c/specificImports.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/c/specificImports.kt new file mode 100644 index 00000000000..e063f23fdb5 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/c/specificImports.kt @@ -0,0 +1,8 @@ +package c + +import a.test +import a.Test + +fun bar() { + Test().test() +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/c/specificImportsWithAliases.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/c/specificImportsWithAliases.kt new file mode 100644 index 00000000000..0dffc7dea13 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/c/specificImportsWithAliases.kt @@ -0,0 +1,8 @@ +package c + +import a.test as _test +import a.Test as _Test + +fun bar() { + _Test()._test() +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/c/specificStaticImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/c/specificStaticImports.java new file mode 100644 index 00000000000..6cce377c8a1 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/before/c/specificStaticImports.java @@ -0,0 +1,9 @@ +package c; + +import static a.APackage.test; + +class J { + void bar() { + test(new a.Test()); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/moveExtensionFunctionToFile.test b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/moveExtensionFunctionToFile.test new file mode 100644 index 00000000000..351facb56ee --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/moveExtensionFunctionToFile.test @@ -0,0 +1,5 @@ +{ + "mainFile": "a/main.kt", + "type": "MOVE_KOTLIN_TOP_LEVEL_DECLARATIONS", + "targetFile": "b/dependency.kt" +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/_a/noImports.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/_a/noImports.kt new file mode 100644 index 00000000000..c159763585d --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/_a/noImports.kt @@ -0,0 +1,8 @@ +package a + +import b.test + +fun bar() { + Test().test + Test().test = 0 +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/_a/specificImportsWithAliases.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/_a/specificImportsWithAliases.kt new file mode 100644 index 00000000000..b09232d6b8c --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/_a/specificImportsWithAliases.kt @@ -0,0 +1,9 @@ +package a + +import b.test as _test +import a.Test as _Test + +fun bar() { + _Test()._test + _Test()._test = 0 +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/a/dependency.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/a/dependency.kt new file mode 100644 index 00000000000..19e1c2c2fdd --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/a/dependency.kt @@ -0,0 +1,7 @@ +package a + +open class Foo { + open class Bar { + + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/a/main.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/a/main.kt new file mode 100644 index 00000000000..4f80a8f208b --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/a/main.kt @@ -0,0 +1,10 @@ +package a + +import b.test + +class Test { + fun foo() { + test + test = 0 + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/a/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/a/noImports.java new file mode 100644 index 00000000000..1f03744b539 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/a/noImports.java @@ -0,0 +1,8 @@ +package a; + +class J { + void bar() { + b.BPackage.getTest(new Test()); + b.BPackage.setTest(new Test(), 0); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/a/noImports.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/a/noImports.kt new file mode 100644 index 00000000000..c159763585d --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/a/noImports.kt @@ -0,0 +1,8 @@ +package a + +import b.test + +fun bar() { + Test().test + Test().test = 0 +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/a/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/a/onDemandStaticImport.java new file mode 100644 index 00000000000..1f03744b539 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/a/onDemandStaticImport.java @@ -0,0 +1,8 @@ +package a; + +class J { + void bar() { + b.BPackage.getTest(new Test()); + b.BPackage.setTest(new Test(), 0); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/a/specificImportsWithAliases.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/a/specificImportsWithAliases.kt new file mode 100644 index 00000000000..b09232d6b8c --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/a/specificImportsWithAliases.kt @@ -0,0 +1,9 @@ +package a + +import b.test as _test +import a.Test as _Test + +fun bar() { + _Test()._test + _Test()._test = 0 +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/a/specificStaticImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/a/specificStaticImports.java new file mode 100644 index 00000000000..fca7378ba9c --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/a/specificStaticImports.java @@ -0,0 +1,11 @@ +package a; + +import static b.BPackage.getTest; +import static b.BPackage.setTest; + +class J { + void bar() { + getTest(new Test()); + setTest(new Test(), 0); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/b/dependency.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/b/dependency.kt new file mode 100644 index 00000000000..93e88fe3af0 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/b/dependency.kt @@ -0,0 +1,32 @@ +package b + +import a.Test + +open class Foo { + open class Bar { + + } +} + +var Test.test: Int + get() = 0 + set(value: Int) { + val aFoo: a.Foo = a.Foo() + val bFoo: Foo = Foo() + val cFoo: c.Foo = c.Foo() + val aBar: a.Foo.Bar = a.Foo.Bar() + val bBar: Foo.Bar = Foo.Bar() + val cBar: c.Foo.Bar = c.Foo.Bar() + + fun foo(u: Int) { + class T(val t: Int) + object O { + val t: Int = 1 + } + + val v = T(u).t + O.t + println(v) + } + + foo(1) + } \ No newline at end of file diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/b/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/b/noImports.java new file mode 100644 index 00000000000..4659899092a --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/b/noImports.java @@ -0,0 +1,8 @@ +package b; + +class J { + void bar() { + b.BPackage.getTest(new a.Test()); + b.BPackage.setTest(new a.Test(), 0); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/b/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/b/onDemandImport.java new file mode 100644 index 00000000000..b65e8c40cb1 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/b/onDemandImport.java @@ -0,0 +1,10 @@ +package b; + +import a.*; + +class J { + void bar() { + b.BPackage.getTest(new Test()); + b.BPackage.setTest(new Test(), 0); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/b/onDemandImport.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/b/onDemandImport.kt new file mode 100644 index 00000000000..d602b6d87c9 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/b/onDemandImport.kt @@ -0,0 +1,8 @@ +package b + +import a.* + +fun bar() { + Test().test + Test().test = 0 +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/b/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/b/onDemandStaticImport.java new file mode 100644 index 00000000000..4659899092a --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/b/onDemandStaticImport.java @@ -0,0 +1,8 @@ +package b; + +class J { + void bar() { + b.BPackage.getTest(new a.Test()); + b.BPackage.setTest(new a.Test(), 0); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/b/specificImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/b/specificImports.java new file mode 100644 index 00000000000..986f71f398a --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/b/specificImports.java @@ -0,0 +1,10 @@ +package b; + +import a.Test; + +class J { + void bar() { + b.BPackage.getTest(new Test()); + b.BPackage.setTest(new Test(), 0); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/b/specificImports.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/b/specificImports.kt new file mode 100644 index 00000000000..da1a2034e55 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/b/specificImports.kt @@ -0,0 +1,9 @@ +package b + +import b.test +import a.Test + +fun bar() { + Test().test + Test().test = 0 +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/b/specificImportsWithAliases.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/b/specificImportsWithAliases.kt new file mode 100644 index 00000000000..976b03aee95 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/b/specificImportsWithAliases.kt @@ -0,0 +1,9 @@ +package b + +import b.test as _test +import a.Test as _Test + +fun bar() { + _Test()._test + _Test()._test = 0 +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/b/specificStaticImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/b/specificStaticImports.java new file mode 100644 index 00000000000..5a8c0175fdc --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/b/specificStaticImports.java @@ -0,0 +1,11 @@ +package b; + +import static b.BPackage.getTest; +import static b.BPackage.setTest; + +class J { + void bar() { + getTest(new a.Test()); + setTest(new a.Test(), 0); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/c/dependency.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/c/dependency.kt new file mode 100644 index 00000000000..bde1387bee5 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/c/dependency.kt @@ -0,0 +1,7 @@ +package c + +open class Foo { + open class Bar { + + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/c/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/c/noImports.java new file mode 100644 index 00000000000..e011168da1f --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/c/noImports.java @@ -0,0 +1,8 @@ +package c; + +class J { + void bar() { + b.BPackage.getTest(new a.Test()); + b.BPackage.setTest(new a.Test(), 0); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/c/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/c/onDemandImport.java new file mode 100644 index 00000000000..f6ad760538b --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/c/onDemandImport.java @@ -0,0 +1,10 @@ +package c; + +import a.*; + +class J { + void bar() { + b.BPackage.getTest(new Test()); + b.BPackage.setTest(new Test(), 0); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/c/onDemandImport.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/c/onDemandImport.kt new file mode 100644 index 00000000000..2f94f69d03f --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/c/onDemandImport.kt @@ -0,0 +1,9 @@ +package c + +import a.* +import b.test + +fun bar() { + Test().test + Test().test = 0 +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/c/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/c/onDemandStaticImport.java new file mode 100644 index 00000000000..e011168da1f --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/c/onDemandStaticImport.java @@ -0,0 +1,8 @@ +package c; + +class J { + void bar() { + b.BPackage.getTest(new a.Test()); + b.BPackage.setTest(new a.Test(), 0); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/c/specificImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/c/specificImports.java new file mode 100644 index 00000000000..55e7914de74 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/c/specificImports.java @@ -0,0 +1,10 @@ +package c; + +import a.Test; + +class J { + void bar() { + b.BPackage.getTest(new Test()); + b.BPackage.setTest(new Test(), 0); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/c/specificImports.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/c/specificImports.kt new file mode 100644 index 00000000000..a7699864e6b --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/c/specificImports.kt @@ -0,0 +1,9 @@ +package c + +import b.test +import a.Test + +fun bar() { + Test().test + Test().test = 0 +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/c/specificImportsWithAliases.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/c/specificImportsWithAliases.kt new file mode 100644 index 00000000000..3f06a978c79 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/c/specificImportsWithAliases.kt @@ -0,0 +1,9 @@ +package c + +import b.test as _test +import a.Test as _Test + +fun bar() { + _Test()._test + _Test()._test = 0 +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/c/specificStaticImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/c/specificStaticImports.java new file mode 100644 index 00000000000..5a7a9da0eee --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/c/specificStaticImports.java @@ -0,0 +1,11 @@ +package c; + +import static b.BPackage.getTest; +import static b.BPackage.setTest; + +class J { + void bar() { + getTest(new a.Test()); + setTest(new a.Test(), 0); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/_a/noImports.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/_a/noImports.kt new file mode 100644 index 00000000000..e1d5e25f148 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/_a/noImports.kt @@ -0,0 +1,6 @@ +package a + +fun bar() { + Test().test + Test().test = 0 +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/_a/specificImportsWithAliases.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/_a/specificImportsWithAliases.kt new file mode 100644 index 00000000000..47c3bcf04d3 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/_a/specificImportsWithAliases.kt @@ -0,0 +1,9 @@ +package a + +import a.test as _test +import a.Test as _Test + +fun bar() { + _Test()._test + _Test()._test = 0 +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/a/dependency.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/a/dependency.kt new file mode 100644 index 00000000000..19e1c2c2fdd --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/a/dependency.kt @@ -0,0 +1,7 @@ +package a + +open class Foo { + open class Bar { + + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/a/main.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/a/main.kt new file mode 100644 index 00000000000..9f9e6f0427b --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/a/main.kt @@ -0,0 +1,31 @@ +package a + +var Test.test: Int + get() = 0 + set(value: Int) { + val aFoo: Foo = Foo() + val bFoo: b.Foo = b.Foo() + val cFoo: c.Foo = c.Foo() + val aBar: Foo.Bar = Foo.Bar() + val bBar: b.Foo.Bar = b.Foo.Bar() + val cBar: c.Foo.Bar = c.Foo.Bar() + + fun foo(u: Int) { + class T(val t: Int) + object O { + val t: Int = 1 + } + + val v = T(u).t + O.t + println(v) + } + + foo(1) + } + +class Test { + fun foo() { + test + test = 0 + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/a/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/a/noImports.java new file mode 100644 index 00000000000..a44745ede2c --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/a/noImports.java @@ -0,0 +1,8 @@ +package a; + +class J { + void bar() { + APackage.getTest(new Test()); + APackage.setTest(new Test(), 0); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/a/noImports.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/a/noImports.kt new file mode 100644 index 00000000000..e1d5e25f148 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/a/noImports.kt @@ -0,0 +1,6 @@ +package a + +fun bar() { + Test().test + Test().test = 0 +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/a/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/a/onDemandStaticImport.java new file mode 100644 index 00000000000..59cabe5df2e --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/a/onDemandStaticImport.java @@ -0,0 +1,10 @@ +package a; + +import static a.APackage.*; + +class J { + void bar() { + getTest(new Test()); + setTest(new Test(), 0); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/a/specificImportsWithAliases.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/a/specificImportsWithAliases.kt new file mode 100644 index 00000000000..47c3bcf04d3 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/a/specificImportsWithAliases.kt @@ -0,0 +1,9 @@ +package a + +import a.test as _test +import a.Test as _Test + +fun bar() { + _Test()._test + _Test()._test = 0 +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/a/specificStaticImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/a/specificStaticImports.java new file mode 100644 index 00000000000..75d607c6951 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/a/specificStaticImports.java @@ -0,0 +1,11 @@ +package a; + +import static a.APackage.getTest; +import static a.APackage.setTest; + +class J { + void bar() { + getTest(new Test()); + setTest(new Test(), 0); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/b/dependency.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/b/dependency.kt new file mode 100644 index 00000000000..cb8b5157938 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/b/dependency.kt @@ -0,0 +1,8 @@ +package b + +open class Foo { + open class Bar { + + } +} + diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/b/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/b/noImports.java new file mode 100644 index 00000000000..65595805153 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/b/noImports.java @@ -0,0 +1,8 @@ +package b; + +class J { + void bar() { + a.APackage.getTest(new a.Test()); + a.APackage.setTest(new a.Test(), 0); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/b/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/b/onDemandImport.java new file mode 100644 index 00000000000..37e46f41a35 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/b/onDemandImport.java @@ -0,0 +1,10 @@ +package b; + +import a.*; + +class J { + void bar() { + APackage.getTest(new Test()); + APackage.setTest(new Test(), 0); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/b/onDemandImport.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/b/onDemandImport.kt new file mode 100644 index 00000000000..d602b6d87c9 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/b/onDemandImport.kt @@ -0,0 +1,8 @@ +package b + +import a.* + +fun bar() { + Test().test + Test().test = 0 +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/b/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/b/onDemandStaticImport.java new file mode 100644 index 00000000000..18d06a47182 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/b/onDemandStaticImport.java @@ -0,0 +1,10 @@ +package b; + +import static a.APackage.*; + +class J { + void bar() { + getTest(new a.Test()); + setTest(new a.Test(), 0); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/b/specificImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/b/specificImports.java new file mode 100644 index 00000000000..38b38c54795 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/b/specificImports.java @@ -0,0 +1,11 @@ +package b; + +import a.APackage; +import a.Test; + +class J { + void bar() { + APackage.getTest(new Test()); + APackage.setTest(new Test(), 0); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/b/specificImports.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/b/specificImports.kt new file mode 100644 index 00000000000..689b4d0a241 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/b/specificImports.kt @@ -0,0 +1,9 @@ +package b + +import a.test +import a.Test + +fun bar() { + Test().test + Test().test = 0 +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/b/specificImportsWithAliases.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/b/specificImportsWithAliases.kt new file mode 100644 index 00000000000..7177fa22911 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/b/specificImportsWithAliases.kt @@ -0,0 +1,9 @@ +package b + +import a.test as _test +import a.Test as _Test + +fun bar() { + _Test()._test + _Test()._test = 0 +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/b/specificStaticImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/b/specificStaticImports.java new file mode 100644 index 00000000000..02e79b9a244 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/b/specificStaticImports.java @@ -0,0 +1,11 @@ +package b; + +import static a.APackage.getTest; +import static a.APackage.setTest; + +class J { + void bar() { + getTest(new a.Test()); + setTest(new a.Test(), 0); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/c/dependency.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/c/dependency.kt new file mode 100644 index 00000000000..bde1387bee5 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/c/dependency.kt @@ -0,0 +1,7 @@ +package c + +open class Foo { + open class Bar { + + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/c/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/c/noImports.java new file mode 100644 index 00000000000..f23896101fa --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/c/noImports.java @@ -0,0 +1,8 @@ +package c; + +class J { + void bar() { + a.APackage.getTest(new a.Test()); + a.APackage.setTest(new a.Test(), 0); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/c/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/c/onDemandImport.java new file mode 100644 index 00000000000..22c0ee6e592 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/c/onDemandImport.java @@ -0,0 +1,10 @@ +package c; + +import a.*; + +class J { + void bar() { + APackage.getTest(new Test()); + APackage.setTest(new Test(), 0); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/c/onDemandImport.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/c/onDemandImport.kt new file mode 100644 index 00000000000..4ba88eda2b5 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/c/onDemandImport.kt @@ -0,0 +1,8 @@ +package c + +import a.* + +fun bar() { + Test().test + Test().test = 0 +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/c/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/c/onDemandStaticImport.java new file mode 100644 index 00000000000..b4e3b16f383 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/c/onDemandStaticImport.java @@ -0,0 +1,10 @@ +package c; + +import static a.APackage.*; + +class J { + void bar() { + getTest(new a.Test()); + setTest(new a.Test(), 0); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/c/specificImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/c/specificImports.java new file mode 100644 index 00000000000..0ee5dabc510 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/c/specificImports.java @@ -0,0 +1,11 @@ +package c; + +import a.APackage; +import a.Test; + +class J { + void bar() { + APackage.getTest(new Test()); + APackage.setTest(new Test(), 0); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/c/specificImports.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/c/specificImports.kt new file mode 100644 index 00000000000..dcd4f83441c --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/c/specificImports.kt @@ -0,0 +1,9 @@ +package c + +import a.test +import a.Test + +fun bar() { + Test().test + Test().test = 0 +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/c/specificImportsWithAliases.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/c/specificImportsWithAliases.kt new file mode 100644 index 00000000000..99bf654242c --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/c/specificImportsWithAliases.kt @@ -0,0 +1,9 @@ +package c + +import a.test as _test +import a.Test as _Test + +fun bar() { + _Test()._test + _Test()._test = 0 +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/c/specificStaticImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/c/specificStaticImports.java new file mode 100644 index 00000000000..da19665a048 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/before/c/specificStaticImports.java @@ -0,0 +1,11 @@ +package c; + +import static a.APackage.getTest; +import static a.APackage.setTest; + +class J { + void bar() { + getTest(new a.Test()); + setTest(new a.Test(), 0); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/moveExtensionPropertyToFile.test b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/moveExtensionPropertyToFile.test new file mode 100644 index 00000000000..351facb56ee --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/moveExtensionPropertyToFile.test @@ -0,0 +1,5 @@ +{ + "mainFile": "a/main.kt", + "type": "MOVE_KOTLIN_TOP_LEVEL_DECLARATIONS", + "targetFile": "b/dependency.kt" +} diff --git a/idea/tests/org/jetbrains/jet/plugin/refactoring/move/JetMoveTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/refactoring/move/JetMoveTestGenerated.java index 67408fc6570..acf3c0ef70a 100644 --- a/idea/tests/org/jetbrains/jet/plugin/refactoring/move/JetMoveTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/refactoring/move/JetMoveTestGenerated.java @@ -216,6 +216,16 @@ public class JetMoveTestGenerated extends AbstractJetMoveTest { doTest("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToPackageWithConflicts/moveClassToPackageWithConflicts.test"); } + @TestMetadata("kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/moveExtensionFunctionToFile.test") + public void testKotlin_moveTopLevelDeclarations_moveExtensionFunctionToFil_MoveExtensionFunctionToFile() throws Exception { + doTest("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/moveExtensionFunctionToFile.test"); + } + + @TestMetadata("kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/moveExtensionPropertyToFile.test") + public void testKotlin_moveTopLevelDeclarations_moveExtensionPropertyToFile_MoveExtensionPropertyToFile() throws Exception { + doTest("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/moveExtensionPropertyToFile.test"); + } + @TestMetadata("kotlin/moveTopLevelDeclarations/moveFunctionToFile/moveFunctionToFile.test") public void testKotlin_moveTopLevelDeclarations_moveFunctionToFile_MoveFunctionToFile() throws Exception { doTest("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/moveFunctionToFile.test");