From 5aa75ba3e119aa87827ccb3b1a1a7b32003ad9a6 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Thu, 20 Mar 2014 15:34:04 +0400 Subject: [PATCH] Move top-level declarations to separate file: Refactoring processor and tests --- .../KotlinMoveTarget.kt | 58 +++++++++++++++ ...MoveKotlinTopLevelDeclarationsProcessor.kt | 74 ++++++++++--------- .../moveClassToFile/after/_a/noImports.kt | 7 ++ .../after/_a/specificImportsWithAliases.kt | 7 ++ .../moveClassToFile/after/a/dependency.kt | 7 ++ .../moveClassToFile/after/a/main.kt | 7 ++ .../moveClassToFile/after/a/noImports.java | 9 +++ .../moveClassToFile/after/a/noImports.kt | 7 ++ .../after/a/specificImportsWithAliases.kt | 7 ++ .../moveClassToFile/after/b/dependency.kt | 16 ++++ .../moveClassToFile/after/b/noImports.java | 7 ++ .../moveClassToFile/after/b/noImports.kt | 5 ++ .../after/b/onDemandImport.java | 7 ++ .../moveClassToFile/after/b/onDemandImport.kt | 7 ++ .../after/b/specificImports.java | 7 ++ .../after/b/specificImports.kt | 7 ++ .../after/b/specificImportsWithAliases.kt | 7 ++ .../moveClassToFile/after/c/dependency.kt | 7 ++ .../moveClassToFile/after/c/noImports.java | 9 +++ .../moveClassToFile/after/c/noImports.kt | 7 ++ .../after/c/onDemandImport.java | 9 +++ .../moveClassToFile/after/c/onDemandImport.kt | 8 ++ .../after/c/specificImports.java | 9 +++ .../after/c/specificImports.kt | 7 ++ .../after/c/specificImportsWithAliases.kt | 7 ++ .../moveClassToFile/before/_a/noImports.kt | 5 ++ .../before/_a/specificImportsWithAliases.kt | 7 ++ .../moveClassToFile/before/a/dependency.kt | 7 ++ .../moveClassToFile/before/a/main.kt | 14 ++++ .../moveClassToFile/before/a/noImports.java | 7 ++ .../moveClassToFile/before/a/noImports.kt | 5 ++ .../before/a/specificImportsWithAliases.kt | 7 ++ .../moveClassToFile/before/b/dependency.kt | 8 ++ .../moveClassToFile/before/b/noImports.java | 7 ++ .../moveClassToFile/before/b/noImports.kt | 5 ++ .../before/b/onDemandImport.java | 9 +++ .../before/b/onDemandImport.kt | 7 ++ .../before/b/specificImports.java | 9 +++ .../before/b/specificImports.kt | 7 ++ .../before/b/specificImportsWithAliases.kt | 7 ++ .../moveClassToFile/before/c/dependency.kt | 7 ++ .../moveClassToFile/before/c/noImports.java | 7 ++ .../moveClassToFile/before/c/noImports.kt | 5 ++ .../before/c/onDemandImport.java | 9 +++ .../before/c/onDemandImport.kt | 7 ++ .../before/c/specificImports.java | 9 +++ .../before/c/specificImports.kt | 7 ++ .../before/c/specificImportsWithAliases.kt | 7 ++ .../moveClassToFile/moveClassToFile.test | 5 ++ .../moveFunctionToFile/after/_a/noImports.kt | 5 ++ .../after/_a/specificImportsWithAliases.kt | 7 ++ .../moveFunctionToFile/after/a/dependency.kt | 7 ++ .../moveFunctionToFile/after/a/main.kt | 7 ++ .../moveFunctionToFile/after/a/noImports.java | 7 ++ .../moveFunctionToFile/after/a/noImports.kt | 5 ++ .../after/a/onDemandStaticImport.java | 7 ++ .../after/a/specificImportsWithAliases.kt | 7 ++ .../after/a/specificStaticImports.java | 9 +++ .../moveFunctionToFile/after/b/dependency.kt | 16 ++++ .../moveFunctionToFile/after/b/noImports.java | 7 ++ .../moveFunctionToFile/after/b/noImports.kt | 5 ++ .../after/b/onDemandImport.java | 7 ++ .../after/b/onDemandImport.kt | 7 ++ .../after/b/onDemandStaticImport.java | 7 ++ .../after/b/specificImports.java | 7 ++ .../after/b/specificImports.kt | 7 ++ .../after/b/specificImportsWithAliases.kt | 7 ++ .../after/b/specificStaticImports.java | 9 +++ .../moveFunctionToFile/after/c/dependency.kt | 7 ++ .../moveFunctionToFile/after/c/noImports.java | 7 ++ .../moveFunctionToFile/after/c/noImports.kt | 5 ++ .../after/c/onDemandImport.java | 7 ++ .../after/c/onDemandImport.kt | 7 ++ .../after/c/onDemandStaticImport.java | 7 ++ .../after/c/specificImports.java | 7 ++ .../after/c/specificImports.kt | 7 ++ .../after/c/specificImportsWithAliases.kt | 7 ++ .../after/c/specificStaticImports.java | 9 +++ .../moveFunctionToFile/before/_a/noImports.kt | 5 ++ .../before/_a/specificImportsWithAliases.kt | 7 ++ .../moveFunctionToFile/before/a/dependency.kt | 7 ++ .../moveFunctionToFile/before/a/main.kt | 16 ++++ .../before/a/noImports.java | 7 ++ .../moveFunctionToFile/before/a/noImports.kt | 5 ++ .../before/a/onDemandStaticImport.java | 9 +++ .../before/a/specificImportsWithAliases.kt | 7 ++ .../before/a/specificStaticImports.java | 9 +++ .../moveFunctionToFile/before/b/dependency.kt | 8 ++ .../before/b/noImports.java | 7 ++ .../moveFunctionToFile/before/b/noImports.kt | 5 ++ .../before/b/onDemandImport.java | 9 +++ .../before/b/onDemandImport.kt | 7 ++ .../before/b/onDemandStaticImport.java | 9 +++ .../before/b/specificImports.java | 9 +++ .../before/b/specificImports.kt | 7 ++ .../before/b/specificImportsWithAliases.kt | 7 ++ .../before/b/specificStaticImports.java | 9 +++ .../moveFunctionToFile/before/c/dependency.kt | 7 ++ .../before/c/noImports.java | 7 ++ .../moveFunctionToFile/before/c/noImports.kt | 5 ++ .../before/c/onDemandImport.java | 9 +++ .../before/c/onDemandImport.kt | 7 ++ .../before/c/onDemandStaticImport.java | 9 +++ .../before/c/specificImports.java | 9 +++ .../before/c/specificImports.kt | 7 ++ .../before/c/specificImportsWithAliases.kt | 7 ++ .../before/c/specificStaticImports.java | 9 +++ .../moveFunctionToFile.test | 5 ++ .../moveObjectToFile/after/_a/noImports.kt | 7 ++ .../after/_a/specificImportsWithAliases.kt | 7 ++ .../moveObjectToFile/after/a/dependency.kt | 7 ++ .../moveObjectToFile/after/a/main.kt | 7 ++ .../moveObjectToFile/after/a/noImports.java | 9 +++ .../moveObjectToFile/after/a/noImports.kt | 7 ++ .../after/a/specificImportsWithAliases.kt | 7 ++ .../moveObjectToFile/after/b/dependency.kt | 16 ++++ .../moveObjectToFile/after/b/noImports.java | 7 ++ .../moveObjectToFile/after/b/noImports.kt | 5 ++ .../after/b/onDemandImport.java | 7 ++ .../after/b/onDemandImport.kt | 7 ++ .../after/b/specificImports.java | 7 ++ .../after/b/specificImports.kt | 7 ++ .../after/b/specificImportsWithAliases.kt | 7 ++ .../moveObjectToFile/after/c/dependency.kt | 7 ++ .../moveObjectToFile/after/c/noImports.java | 9 +++ .../moveObjectToFile/after/c/noImports.kt | 7 ++ .../after/c/onDemandImport.java | 9 +++ .../after/c/onDemandImport.kt | 8 ++ .../after/c/specificImports.java | 9 +++ .../after/c/specificImports.kt | 7 ++ .../after/c/specificImportsWithAliases.kt | 7 ++ .../moveObjectToFile/before/_a/noImports.kt | 5 ++ .../before/_a/specificImportsWithAliases.kt | 7 ++ .../moveObjectToFile/before/a/dependency.kt | 7 ++ .../moveObjectToFile/before/a/main.kt | 14 ++++ .../moveObjectToFile/before/a/noImports.java | 7 ++ .../moveObjectToFile/before/a/noImports.kt | 5 ++ .../before/a/specificImportsWithAliases.kt | 7 ++ .../moveObjectToFile/before/b/dependency.kt | 8 ++ .../moveObjectToFile/before/b/noImports.java | 7 ++ .../moveObjectToFile/before/b/noImports.kt | 5 ++ .../before/b/onDemandImport.java | 9 +++ .../before/b/onDemandImport.kt | 7 ++ .../before/b/specificImports.java | 9 +++ .../before/b/specificImports.kt | 7 ++ .../before/b/specificImportsWithAliases.kt | 7 ++ .../moveObjectToFile/before/c/dependency.kt | 7 ++ .../moveObjectToFile/before/c/noImports.java | 7 ++ .../moveObjectToFile/before/c/noImports.kt | 5 ++ .../before/c/onDemandImport.java | 9 +++ .../before/c/onDemandImport.kt | 7 ++ .../before/c/specificImports.java | 9 +++ .../before/c/specificImports.kt | 7 ++ .../before/c/specificImportsWithAliases.kt | 7 ++ .../moveObjectToFile/moveObjectToFile.test | 5 ++ .../movePropertyToFile/after/_a/noImports.kt | 6 ++ .../after/_a/specificImportsWithAliases.kt | 8 ++ .../movePropertyToFile/after/a/dependency.kt | 7 ++ .../movePropertyToFile/after/a/main.kt | 7 ++ .../movePropertyToFile/after/a/noImports.java | 8 ++ .../movePropertyToFile/after/a/noImports.kt | 6 ++ .../after/a/onDemandStaticImport.java | 8 ++ .../after/a/specificImportsWithAliases.kt | 8 ++ .../after/a/specificStaticImports.java | 11 +++ .../movePropertyToFile/after/b/dependency.kt | 18 +++++ .../movePropertyToFile/after/b/noImports.java | 8 ++ .../movePropertyToFile/after/b/noImports.kt | 6 ++ .../after/b/onDemandImport.java | 8 ++ .../after/b/onDemandImport.kt | 8 ++ .../after/b/onDemandStaticImport.java | 8 ++ .../after/b/specificImports.java | 8 ++ .../after/b/specificImports.kt | 8 ++ .../after/b/specificImportsWithAliases.kt | 8 ++ .../after/b/specificStaticImports.java | 11 +++ .../movePropertyToFile/after/c/dependency.kt | 7 ++ .../movePropertyToFile/after/c/noImports.java | 8 ++ .../movePropertyToFile/after/c/noImports.kt | 6 ++ .../after/c/onDemandImport.java | 8 ++ .../after/c/onDemandImport.kt | 8 ++ .../after/c/onDemandStaticImport.java | 8 ++ .../after/c/specificImports.java | 8 ++ .../after/c/specificImports.kt | 8 ++ .../after/c/specificImportsWithAliases.kt | 8 ++ .../after/c/specificStaticImports.java | 11 +++ .../movePropertyToFile/before/_a/noImports.kt | 6 ++ .../before/_a/specificImportsWithAliases.kt | 8 ++ .../movePropertyToFile/before/a/dependency.kt | 7 ++ .../movePropertyToFile/before/a/main.kt | 18 +++++ .../before/a/noImports.java | 8 ++ .../movePropertyToFile/before/a/noImports.kt | 6 ++ .../before/a/onDemandStaticImport.java | 10 +++ .../before/a/specificImportsWithAliases.kt | 8 ++ .../before/a/specificStaticImports.java | 11 +++ .../movePropertyToFile/before/b/dependency.kt | 8 ++ .../before/b/noImports.java | 8 ++ .../movePropertyToFile/before/b/noImports.kt | 6 ++ .../before/b/onDemandImport.java | 10 +++ .../before/b/onDemandImport.kt | 8 ++ .../before/b/onDemandStaticImport.java | 10 +++ .../before/b/specificImports.java | 10 +++ .../before/b/specificImports.kt | 8 ++ .../before/b/specificImportsWithAliases.kt | 8 ++ .../before/b/specificStaticImports.java | 11 +++ .../movePropertyToFile/before/c/dependency.kt | 7 ++ .../before/c/noImports.java | 8 ++ .../movePropertyToFile/before/c/noImports.kt | 6 ++ .../before/c/onDemandImport.java | 10 +++ .../before/c/onDemandImport.kt | 8 ++ .../before/c/onDemandStaticImport.java | 10 +++ .../before/c/specificImports.java | 10 +++ .../before/c/specificImports.kt | 8 ++ .../before/c/specificImportsWithAliases.kt | 8 ++ .../before/c/specificStaticImports.java | 11 +++ .../movePropertyToFile.test | 5 ++ .../refactoring/move/AbstractJetMoveTest.kt | 18 +++-- .../move/JetMoveTestGenerated.java | 20 +++++ 216 files changed, 1770 insertions(+), 42 deletions(-) create mode 100644 idea/src/org/jetbrains/jet/plugin/refactoring/move/moveTopLevelDeclarations/KotlinMoveTarget.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/_a/noImports.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/_a/specificImportsWithAliases.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/a/dependency.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/a/main.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/a/noImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/a/noImports.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/a/specificImportsWithAliases.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/b/dependency.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/b/noImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/b/noImports.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/b/onDemandImport.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/b/onDemandImport.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/b/specificImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/b/specificImports.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/b/specificImportsWithAliases.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/c/dependency.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/c/noImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/c/noImports.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/c/onDemandImport.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/c/onDemandImport.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/c/specificImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/c/specificImports.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/c/specificImportsWithAliases.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/_a/noImports.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/_a/specificImportsWithAliases.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/a/dependency.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/a/main.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/a/noImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/a/noImports.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/a/specificImportsWithAliases.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/b/dependency.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/b/noImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/b/noImports.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/b/onDemandImport.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/b/onDemandImport.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/b/specificImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/b/specificImports.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/b/specificImportsWithAliases.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/c/dependency.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/c/noImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/c/noImports.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/c/onDemandImport.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/c/onDemandImport.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/c/specificImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/c/specificImports.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/c/specificImportsWithAliases.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/moveClassToFile.test create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/_a/noImports.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/_a/specificImportsWithAliases.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/a/dependency.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/a/main.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/a/noImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/a/noImports.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/a/onDemandStaticImport.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/a/specificImportsWithAliases.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/a/specificStaticImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/dependency.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/noImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/noImports.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/onDemandImport.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/onDemandImport.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/onDemandStaticImport.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/specificImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/specificImports.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/specificImportsWithAliases.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/specificStaticImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/c/dependency.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/c/noImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/c/noImports.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/c/onDemandImport.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/c/onDemandImport.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/c/onDemandStaticImport.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/c/specificImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/c/specificImports.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/c/specificImportsWithAliases.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/c/specificStaticImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/_a/noImports.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/_a/specificImportsWithAliases.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/a/dependency.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/a/main.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/a/noImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/a/noImports.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/a/onDemandStaticImport.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/a/specificImportsWithAliases.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/a/specificStaticImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/b/dependency.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/b/noImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/b/noImports.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/b/onDemandImport.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/b/onDemandImport.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/b/onDemandStaticImport.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/b/specificImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/b/specificImports.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/b/specificImportsWithAliases.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/b/specificStaticImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/c/dependency.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/c/noImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/c/noImports.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/c/onDemandImport.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/c/onDemandImport.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/c/onDemandStaticImport.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/c/specificImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/c/specificImports.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/c/specificImportsWithAliases.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/c/specificStaticImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/moveFunctionToFile.test create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/_a/noImports.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/_a/specificImportsWithAliases.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/a/dependency.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/a/main.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/a/noImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/a/noImports.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/a/specificImportsWithAliases.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/b/dependency.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/b/noImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/b/noImports.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/b/onDemandImport.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/b/onDemandImport.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/b/specificImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/b/specificImports.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/b/specificImportsWithAliases.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/c/dependency.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/c/noImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/c/noImports.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/c/onDemandImport.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/c/onDemandImport.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/c/specificImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/c/specificImports.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/c/specificImportsWithAliases.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/_a/noImports.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/_a/specificImportsWithAliases.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/a/dependency.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/a/main.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/a/noImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/a/noImports.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/a/specificImportsWithAliases.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/b/dependency.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/b/noImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/b/noImports.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/b/onDemandImport.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/b/onDemandImport.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/b/specificImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/b/specificImports.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/b/specificImportsWithAliases.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/c/dependency.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/c/noImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/c/noImports.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/c/onDemandImport.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/c/onDemandImport.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/c/specificImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/c/specificImports.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/c/specificImportsWithAliases.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/moveObjectToFile.test create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/_a/noImports.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/_a/specificImportsWithAliases.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/a/dependency.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/a/main.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/a/noImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/a/noImports.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/a/onDemandStaticImport.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/a/specificImportsWithAliases.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/a/specificStaticImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/dependency.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/noImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/noImports.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/onDemandImport.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/onDemandImport.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/onDemandStaticImport.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/specificImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/specificImports.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/specificImportsWithAliases.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/specificStaticImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/c/dependency.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/c/noImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/c/noImports.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/c/onDemandImport.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/c/onDemandImport.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/c/onDemandStaticImport.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/c/specificImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/c/specificImports.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/c/specificImportsWithAliases.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/c/specificStaticImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/_a/noImports.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/_a/specificImportsWithAliases.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/a/dependency.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/a/main.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/a/noImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/a/noImports.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/a/onDemandStaticImport.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/a/specificImportsWithAliases.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/a/specificStaticImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/b/dependency.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/b/noImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/b/noImports.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/b/onDemandImport.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/b/onDemandImport.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/b/onDemandStaticImport.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/b/specificImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/b/specificImports.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/b/specificImportsWithAliases.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/b/specificStaticImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/c/dependency.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/c/noImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/c/noImports.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/c/onDemandImport.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/c/onDemandImport.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/c/onDemandStaticImport.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/c/specificImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/c/specificImports.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/c/specificImportsWithAliases.kt create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/c/specificStaticImports.java create mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/movePropertyToFile.test diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveTopLevelDeclarations/KotlinMoveTarget.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveTopLevelDeclarations/KotlinMoveTarget.kt new file mode 100644 index 00000000000..33f8309e52f --- /dev/null +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveTopLevelDeclarations/KotlinMoveTarget.kt @@ -0,0 +1,58 @@ +/* + * Copyright 2010-2014 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jetbrains.jet.plugin.refactoring.move.moveTopLevelDeclarations + +import com.intellij.refactoring.PackageWrapper +import com.intellij.refactoring.MoveDestination +import org.jetbrains.jet.lang.psi.JetFile +import com.intellij.psi.PsiElement +import com.intellij.psi.PsiFile +import com.intellij.psi.PsiManager + +public trait KotlinMoveTarget { + val packageWrapper: PackageWrapper? + fun getOrCreateTargetPsi(originalPsi: PsiElement): PsiElement? + fun getTargetPsiIfExists(originalPsi: PsiElement): PsiElement? + + // Check possible errors and return corresponding message, or null if no errors are detected + fun verify(file: PsiFile): String? +} + +public class MoveDestinationKotlinMoveTarget(val moveDestination: MoveDestination): KotlinMoveTarget { + override val packageWrapper: PackageWrapper? = moveDestination.getTargetPackage() + + override fun getOrCreateTargetPsi(originalPsi: PsiElement): PsiElement? = + moveDestination.getTargetDirectory(originalPsi.getContainingFile()) + + override fun getTargetPsiIfExists(originalPsi: PsiElement): PsiElement? = + moveDestination.getTargetIfExists(originalPsi.getContainingFile()) + + override fun verify(file: PsiFile): String? = moveDestination.verify(file) +} + +public class JetFileKotlinMoveTarget(val targetFile: JetFile): KotlinMoveTarget { + override val packageWrapper: PackageWrapper? = targetFile.getPackageName()?.let { packageName -> + PackageWrapper(PsiManager.getInstance(targetFile.getProject()), packageName) + } + + override fun getOrCreateTargetPsi(originalPsi: PsiElement): PsiElement? = targetFile + + override fun getTargetPsiIfExists(originalPsi: PsiElement): PsiElement? = targetFile + + // No additional verification is needed + override fun verify(file: PsiFile): String? = null +} \ No newline at end of file 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 b6047ded37d..4478e27acb8 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 @@ -20,7 +20,6 @@ import com.intellij.refactoring.BaseRefactoringProcessor import com.intellij.openapi.project.Project import com.intellij.usageView.UsageInfo import com.intellij.usageView.UsageViewDescriptor -import com.intellij.refactoring.MoveDestination import com.intellij.refactoring.move.MoveCallback import com.intellij.refactoring.move.MoveMultipleElementsViewDescriptor import com.intellij.refactoring.move.moveClassesOrPackages.MoveClassesOrPackagesUtil @@ -33,7 +32,6 @@ import com.intellij.util.IncorrectOperationException import com.intellij.refactoring.util.RefactoringUIUtil import org.jetbrains.jet.utils.keysToMap import com.intellij.refactoring.rename.RenameUtil -import com.intellij.refactoring.move.MoveClassesOrPackagesCallback import org.jetbrains.jet.plugin.refactoring.JetRefactoringBundle import com.intellij.openapi.util.text.StringUtil import com.intellij.psi.PsiDirectory @@ -56,14 +54,12 @@ 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.psi.PsiClass import com.intellij.refactoring.util.TextOccurrencesUtil import com.intellij.refactoring.move.moveClassesOrPackages.MoveClassHandler import com.intellij.util.containers.MultiMap import org.jetbrains.jet.asJava.namedUnwrappedElement import org.jetbrains.jet.lang.psi.psiUtil.isPrivate import org.jetbrains.jet.plugin.refactoring.getUsageContext -import com.intellij.refactoring.util.CommonRefactoringUtil import org.jetbrains.jet.lang.psi.psiUtil.isInsideOf import org.jetbrains.jet.plugin.codeInsight.JetFileReferencesResolver import org.jetbrains.jet.lang.resolve.BindingContext @@ -78,7 +74,7 @@ import org.jetbrains.jet.plugin.references.JetSimpleNameReference.ShorteningMode public class MoveKotlinTopLevelDeclarationsOptions( val elementsToMove: Collection, - val moveDestination: MoveDestination, + val moveTarget: KotlinMoveTarget, val searchInCommentsAndStrings: Boolean = true, val searchInNonCode: Boolean = true, val moveCallback: MoveCallback? = null @@ -92,18 +88,19 @@ public class MoveKotlinTopLevelDeclarationsProcessor(project: Project, val optio } private var nonCodeUsages: Array? = null - private val kotlinToLightElements = options.elementsToMove.keysToMap { it.toLightElements() } + private val elementsToMove = options.elementsToMove.filter { e -> e.getContainingFile() != options.moveTarget.getTargetPsiIfExists(e) } + private val kotlinToLightElements = elementsToMove.keysToMap { it.toLightElements() } private val conflicts = MultiMap() override fun createUsageViewDescriptor(usages: Array?): UsageViewDescriptor { return MoveMultipleElementsViewDescriptor( - options.elementsToMove.copyToArray(), - MoveClassesOrPackagesUtil.getPackageName(options.moveDestination.getTargetPackage()) + elementsToMove.copyToArray(), + MoveClassesOrPackagesUtil.getPackageName(options.moveTarget.packageWrapper) ) } override fun findUsages(): Array { - val newPackageName = options.moveDestination.getTargetPackage()?.getQualifiedName() ?: "" + val newPackageName = options.moveTarget.packageWrapper?.getQualifiedName() ?: "" fun collectUsages(): List { return kotlinToLightElements.values().flatten().flatMap { lightElement -> @@ -156,7 +153,7 @@ public class MoveKotlinTopLevelDeclarationsProcessor(project: Project, val optio val declaration = usage.getReferencedElement()?.namedUnwrappedElement as? JetNamedDeclaration if (declaration == null || !declaration.isPrivate()) continue - if (element.isInsideOf(options.elementsToMove)) continue + if (element.isInsideOf(elementsToMove)) continue val container = element.getUsageContext() if (!declarationToContainers.getOrPut(declaration) { HashSet() }.add(container)) continue @@ -177,13 +174,13 @@ public class MoveKotlinTopLevelDeclarationsProcessor(project: Project, val optio fun collectConflictsInDeclarations() { val declarationToReferenceTargets = HashMap>() - for (declaration in options.elementsToMove) { + for (declaration in elementsToMove) { val referenceToContext = JetFileReferencesResolver.resolve(element = declaration, visitReceivers = false) for ((refExpr, bindingContext) in referenceToContext) { val refTarget = bindingContext[BindingContext.REFERENCE_TARGET, refExpr]?.let { descriptor -> DescriptorToDeclarationUtil.getDeclaration(declaration.getProject(), descriptor, bindingContext) } - if (refTarget == null || refTarget.isInsideOf(options.elementsToMove)) continue + if (refTarget == null || refTarget.isInsideOf(elementsToMove)) continue val packagePrivate = when(refTarget) { is JetModifierListOwner -> @@ -223,23 +220,32 @@ public class MoveKotlinTopLevelDeclarationsProcessor(project: Project, val optio } override fun performRefactoring(usages: Array?) { - fun moveDeclaration(declaration: JetNamedDeclaration, moveDestination: PsiDirectory): JetNamedDeclaration? { - val newPackage = moveDestination.getPackage() - if (newPackage == null) return null - + fun moveDeclaration(declaration: JetNamedDeclaration, moveTarget: KotlinMoveTarget): JetNamedDeclaration? { val file = declaration.getContainingFile() as? JetFile - if (file == null) return null + assert (file != null, "${declaration.getClass()}: ${declaration.getText()}") - val packageNameInfo = PackageNameInfo(JetPsiUtil.getFQName(file), FqName(newPackage.getQualifiedName())) + val targetPsi = moveTarget.getOrCreateTargetPsi(declaration) + val targetFile = + if (targetPsi is PsiDirectory) { + val existingFile = if (targetPsi != file!!.getContainingDirectory()) targetPsi.findFile(file.getName()) else null + val newFile = existingFile ?: declaration.getFileNameAfterMove()?.let { + fileName -> + createKotlinFile(fileName, targetPsi) + } - val existingFile = if (moveDestination != file.getContainingDirectory()) moveDestination.findFile(file.getName()) else null - val newFile = existingFile ?: declaration.getFileNameAfterMove()?.let { - fileName -> createKotlinFile(fileName, moveDestination) - } - assert(newFile != null, "Couldn't create Koltin file for: ${declaration.getClass()}: ${declaration.getText()}") + newFile + } + else targetPsi + assert(targetFile is JetFile, "Couldn't create Koltin file for: ${declaration.getClass()}: ${declaration.getText()}") + + val newPackage = (targetFile as JetFile).getPackageName() + assert (newPackage != null, "${targetFile.getClass()}: ${targetFile.getText()}") + + val packageNameInfo = PackageNameInfo(JetPsiUtil.getFQName(file!!), FqName(newPackage!!)) declaration.updateInternalReferencesOnPackageNameChange(packageNameInfo, ShorteningMode.NO_SHORTENING) - val newElement = newFile!!.add(declaration) as JetNamedDeclaration + + val newElement = targetFile.add(declaration) as JetNamedDeclaration declaration.delete() newElement.addToShorteningWaitSet() @@ -250,11 +256,13 @@ public class MoveKotlinTopLevelDeclarationsProcessor(project: Project, val optio try { val oldToNewElementsMapping = HashMap() for ((oldDeclaration, oldLightElements) in kotlinToLightElements) { - val targetDirectory = options.moveDestination.getTargetDirectory(oldDeclaration.getContainingFile()) - if (targetDirectory == null) continue - - val newDeclaration = moveDeclaration(oldDeclaration, targetDirectory) - if (newDeclaration == null) continue + val newDeclaration = moveDeclaration(oldDeclaration, options.moveTarget) + if (newDeclaration == null) { + for (oldElement in oldLightElements) { + oldToNewElementsMapping[oldElement] = oldElement + } + continue + } getTransaction()!!.getElementListener(oldDeclaration).elementMoved(newDeclaration) for ((oldElement, newElement) in oldLightElements.iterator() zip newDeclaration.toLightElements().iterator()) { @@ -272,13 +280,7 @@ public class MoveKotlinTopLevelDeclarationsProcessor(project: Project, val optio override fun performPsiSpoilingRefactoring() { nonCodeUsages?.let { nonCodeUsages -> RenameUtil.renameNonCodeUsages(myProject, nonCodeUsages) } - - options.moveCallback?.let { moveCallback -> - if (moveCallback is MoveClassesOrPackagesCallback) { - moveCallback.classesOrPackagesMoved(options.moveDestination) - } - moveCallback.refactoringCompleted() - } + options.moveCallback?.refactoringCompleted() } override fun getCommandName(): String = REFACTORING_NAME diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/_a/noImports.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/_a/noImports.kt new file mode 100644 index 00000000000..acbf910e155 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/_a/noImports.kt @@ -0,0 +1,7 @@ +package a + +import b.Test + +fun bar() { + val t: Test = Test() +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/_a/specificImportsWithAliases.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/_a/specificImportsWithAliases.kt new file mode 100644 index 00000000000..8c0461e0e74 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/_a/specificImportsWithAliases.kt @@ -0,0 +1,7 @@ +package a + +import b.Test as _Test + +fun bar() { + val t: _Test = _Test() +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/a/dependency.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/a/dependency.kt new file mode 100644 index 00000000000..19e1c2c2fdd --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/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/moveClassToFile/after/a/main.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/a/main.kt new file mode 100644 index 00000000000..fb2fc43b29e --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/a/main.kt @@ -0,0 +1,7 @@ +package a + +import b.Test + +fun test(): Test { + return Test() +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/a/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/a/noImports.java new file mode 100644 index 00000000000..c5fa6db1721 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/a/noImports.java @@ -0,0 +1,9 @@ +package a; + +import b.Test; + +class J { + void bar() { + Test t = new Test(); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/a/noImports.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/a/noImports.kt new file mode 100644 index 00000000000..acbf910e155 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/a/noImports.kt @@ -0,0 +1,7 @@ +package a + +import b.Test + +fun bar() { + val t: Test = Test() +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/a/specificImportsWithAliases.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/a/specificImportsWithAliases.kt new file mode 100644 index 00000000000..8c0461e0e74 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/a/specificImportsWithAliases.kt @@ -0,0 +1,7 @@ +package a + +import b.Test as _Test + +fun bar() { + val t: _Test = _Test() +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/b/dependency.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/b/dependency.kt new file mode 100644 index 00000000000..fa509866370 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/b/dependency.kt @@ -0,0 +1,16 @@ +package b + +open class Foo { + open class Bar { + + } +} + +class 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() +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/b/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/b/noImports.java new file mode 100644 index 00000000000..2d783a78dc0 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/b/noImports.java @@ -0,0 +1,7 @@ +package b; + +class J { + void bar() { + Test t = new Test(); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/b/noImports.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/b/noImports.kt new file mode 100644 index 00000000000..5996754ebd8 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/b/noImports.kt @@ -0,0 +1,5 @@ +package b + +fun bar() { + val t: Test = Test() +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/b/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/b/onDemandImport.java new file mode 100644 index 00000000000..2d783a78dc0 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/b/onDemandImport.java @@ -0,0 +1,7 @@ +package b; + +class J { + void bar() { + Test t = new Test(); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/b/onDemandImport.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/b/onDemandImport.kt new file mode 100644 index 00000000000..5916652a84f --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/b/onDemandImport.kt @@ -0,0 +1,7 @@ +package b + +import a.* + +fun bar() { + val t: Test = Test() +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/b/specificImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/b/specificImports.java new file mode 100644 index 00000000000..2d783a78dc0 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/b/specificImports.java @@ -0,0 +1,7 @@ +package b; + +class J { + void bar() { + Test t = new Test(); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/b/specificImports.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/b/specificImports.kt new file mode 100644 index 00000000000..912cbbdb0d1 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/b/specificImports.kt @@ -0,0 +1,7 @@ +package b + +import b.Test + +fun bar() { + val t: Test = Test() +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/b/specificImportsWithAliases.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/b/specificImportsWithAliases.kt new file mode 100644 index 00000000000..431f5eda5e5 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/b/specificImportsWithAliases.kt @@ -0,0 +1,7 @@ +package b + +import b.Test as _Test + +fun bar() { + val t: _Test = _Test() +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/c/dependency.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/c/dependency.kt new file mode 100644 index 00000000000..bde1387bee5 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/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/moveClassToFile/after/c/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/c/noImports.java new file mode 100644 index 00000000000..30b8802d5ed --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/c/noImports.java @@ -0,0 +1,9 @@ +package c; + +import b.Test; + +class J { + void bar() { + Test t = new Test(); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/c/noImports.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/c/noImports.kt new file mode 100644 index 00000000000..5aee576bfa6 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/c/noImports.kt @@ -0,0 +1,7 @@ +package c + +import b.Test + +fun bar() { + val t: Test = Test() +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/c/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/c/onDemandImport.java new file mode 100644 index 00000000000..30b8802d5ed --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/c/onDemandImport.java @@ -0,0 +1,9 @@ +package c; + +import b.Test; + +class J { + void bar() { + Test t = new Test(); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/c/onDemandImport.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/c/onDemandImport.kt new file mode 100644 index 00000000000..7d3b78c3a61 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/c/onDemandImport.kt @@ -0,0 +1,8 @@ +package c + +import a.* +import b.Test + +fun bar() { + val t: Test = Test() +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/c/specificImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/c/specificImports.java new file mode 100644 index 00000000000..30b8802d5ed --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/c/specificImports.java @@ -0,0 +1,9 @@ +package c; + +import b.Test; + +class J { + void bar() { + Test t = new Test(); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/c/specificImports.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/c/specificImports.kt new file mode 100644 index 00000000000..5aee576bfa6 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/c/specificImports.kt @@ -0,0 +1,7 @@ +package c + +import b.Test + +fun bar() { + val t: Test = Test() +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/c/specificImportsWithAliases.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/c/specificImportsWithAliases.kt new file mode 100644 index 00000000000..7be875a249c --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/c/specificImportsWithAliases.kt @@ -0,0 +1,7 @@ +package c + +import b.Test as _Test + +fun bar() { + val t: _Test = _Test() +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/_a/noImports.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/_a/noImports.kt new file mode 100644 index 00000000000..92ae90f968f --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/_a/noImports.kt @@ -0,0 +1,5 @@ +package a + +fun bar() { + val t: Test = Test() +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/_a/specificImportsWithAliases.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/_a/specificImportsWithAliases.kt new file mode 100644 index 00000000000..14f0a1be487 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/_a/specificImportsWithAliases.kt @@ -0,0 +1,7 @@ +package a + +import a.Test as _Test + +fun bar() { + val t: _Test = _Test() +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/a/dependency.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/a/dependency.kt new file mode 100644 index 00000000000..19e1c2c2fdd --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/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/moveClassToFile/before/a/main.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/a/main.kt new file mode 100644 index 00000000000..d406a46a313 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/a/main.kt @@ -0,0 +1,14 @@ +package a + +class 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 test(): Test { + return Test() +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/a/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/a/noImports.java new file mode 100644 index 00000000000..315818ca8fd --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/a/noImports.java @@ -0,0 +1,7 @@ +package a; + +class J { + void bar() { + Test t = new Test(); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/a/noImports.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/a/noImports.kt new file mode 100644 index 00000000000..92ae90f968f --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/a/noImports.kt @@ -0,0 +1,5 @@ +package a + +fun bar() { + val t: Test = Test() +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/a/specificImportsWithAliases.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/a/specificImportsWithAliases.kt new file mode 100644 index 00000000000..14f0a1be487 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/a/specificImportsWithAliases.kt @@ -0,0 +1,7 @@ +package a + +import a.Test as _Test + +fun bar() { + val t: _Test = _Test() +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/b/dependency.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/b/dependency.kt new file mode 100644 index 00000000000..cb8b5157938 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/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/moveClassToFile/before/b/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/b/noImports.java new file mode 100644 index 00000000000..5e89bacd569 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/b/noImports.java @@ -0,0 +1,7 @@ +package b; + +class J { + void bar() { + a.Test t = new a.Test(); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/b/noImports.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/b/noImports.kt new file mode 100644 index 00000000000..09d63022357 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/b/noImports.kt @@ -0,0 +1,5 @@ +package b + +fun bar() { + val t: a.Test = a.Test() +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/b/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/b/onDemandImport.java new file mode 100644 index 00000000000..6db8ed79f30 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/b/onDemandImport.java @@ -0,0 +1,9 @@ +package b; + +import a.*; + +class J { + void bar() { + Test t = new Test(); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/b/onDemandImport.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/b/onDemandImport.kt new file mode 100644 index 00000000000..5916652a84f --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/b/onDemandImport.kt @@ -0,0 +1,7 @@ +package b + +import a.* + +fun bar() { + val t: Test = Test() +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/b/specificImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/b/specificImports.java new file mode 100644 index 00000000000..12260b929e7 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/b/specificImports.java @@ -0,0 +1,9 @@ +package b; + +import a.Test; + +class J { + void bar() { + Test t = new Test(); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/b/specificImports.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/b/specificImports.kt new file mode 100644 index 00000000000..0f26408b9a3 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/b/specificImports.kt @@ -0,0 +1,7 @@ +package b + +import a.Test + +fun bar() { + val t: Test = Test() +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/b/specificImportsWithAliases.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/b/specificImportsWithAliases.kt new file mode 100644 index 00000000000..4146574cb60 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/b/specificImportsWithAliases.kt @@ -0,0 +1,7 @@ +package b + +import a.Test as _Test + +fun bar() { + val t: _Test = _Test() +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/c/dependency.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/c/dependency.kt new file mode 100644 index 00000000000..bde1387bee5 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/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/moveClassToFile/before/c/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/c/noImports.java new file mode 100644 index 00000000000..46bc1c1af69 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/c/noImports.java @@ -0,0 +1,7 @@ +package c; + +class J { + void bar() { + a.Test t = new a.Test(); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/c/noImports.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/c/noImports.kt new file mode 100644 index 00000000000..9a193d0ddf1 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/c/noImports.kt @@ -0,0 +1,5 @@ +package c + +fun bar() { + val t: a.Test = a.Test() +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/c/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/c/onDemandImport.java new file mode 100644 index 00000000000..b2fcb81f6ca --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/c/onDemandImport.java @@ -0,0 +1,9 @@ +package c; + +import a.*; + +class J { + void bar() { + Test t = new Test(); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/c/onDemandImport.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/c/onDemandImport.kt new file mode 100644 index 00000000000..1f13e627a2d --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/c/onDemandImport.kt @@ -0,0 +1,7 @@ +package c + +import a.* + +fun bar() { + val t: Test = Test() +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/c/specificImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/c/specificImports.java new file mode 100644 index 00000000000..b205abdd409 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/c/specificImports.java @@ -0,0 +1,9 @@ +package c; + +import a.Test; + +class J { + void bar() { + Test t = new Test(); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/c/specificImports.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/c/specificImports.kt new file mode 100644 index 00000000000..8cafb82d04c --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/c/specificImports.kt @@ -0,0 +1,7 @@ +package c + +import a.Test + +fun bar() { + val t: Test = Test() +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/c/specificImportsWithAliases.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/c/specificImportsWithAliases.kt new file mode 100644 index 00000000000..4c707cf47e9 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/before/c/specificImportsWithAliases.kt @@ -0,0 +1,7 @@ +package c + +import a.Test as _Test + +fun bar() { + val t: _Test = _Test() +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/moveClassToFile.test b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/moveClassToFile.test new file mode 100644 index 00000000000..351facb56ee --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/moveClassToFile.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/moveFunctionToFile/after/_a/noImports.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/_a/noImports.kt new file mode 100644 index 00000000000..93d5d1f09de --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/_a/noImports.kt @@ -0,0 +1,5 @@ +package a + +fun bar() { + b.test() +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/_a/specificImportsWithAliases.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/_a/specificImportsWithAliases.kt new file mode 100644 index 00000000000..a15828ba0aa --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/_a/specificImportsWithAliases.kt @@ -0,0 +1,7 @@ +package a + +import b.test as _test + +fun bar() { + _test() +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/a/dependency.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/a/dependency.kt new file mode 100644 index 00000000000..19e1c2c2fdd --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/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/moveFunctionToFile/after/a/main.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/a/main.kt new file mode 100644 index 00000000000..f90b20c77b1 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/a/main.kt @@ -0,0 +1,7 @@ +package a + +class Test { + fun foo() { + b.test() + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/a/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/a/noImports.java new file mode 100644 index 00000000000..d43fc44523a --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/a/noImports.java @@ -0,0 +1,7 @@ +package a; + +class J { + void bar() { + b.BPackage.test(); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/a/noImports.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/a/noImports.kt new file mode 100644 index 00000000000..93d5d1f09de --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/a/noImports.kt @@ -0,0 +1,5 @@ +package a + +fun bar() { + b.test() +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/a/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/a/onDemandStaticImport.java new file mode 100644 index 00000000000..d43fc44523a --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/a/onDemandStaticImport.java @@ -0,0 +1,7 @@ +package a; + +class J { + void bar() { + b.BPackage.test(); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/a/specificImportsWithAliases.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/a/specificImportsWithAliases.kt new file mode 100644 index 00000000000..a15828ba0aa --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/a/specificImportsWithAliases.kt @@ -0,0 +1,7 @@ +package a + +import b.test as _test + +fun bar() { + _test() +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/a/specificStaticImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/a/specificStaticImports.java new file mode 100644 index 00000000000..31f7d50216a --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/a/specificStaticImports.java @@ -0,0 +1,9 @@ +package a; + +import static b.BPackage.test; + +class J { + void bar() { + test(); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/dependency.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/dependency.kt new file mode 100644 index 00000000000..499f51466ec --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/dependency.kt @@ -0,0 +1,16 @@ +package b + +open class Foo { + open class Bar { + + } +} + +fun 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() +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/noImports.java new file mode 100644 index 00000000000..377df2c11af --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/noImports.java @@ -0,0 +1,7 @@ +package b; + +class J { + void bar() { + b.BPackage.test(); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/noImports.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/noImports.kt new file mode 100644 index 00000000000..1222643879a --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/noImports.kt @@ -0,0 +1,5 @@ +package b + +fun bar() { + test() +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/onDemandImport.java new file mode 100644 index 00000000000..377df2c11af --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/onDemandImport.java @@ -0,0 +1,7 @@ +package b; + +class J { + void bar() { + b.BPackage.test(); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/onDemandImport.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/onDemandImport.kt new file mode 100644 index 00000000000..b3a977adfe6 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/onDemandImport.kt @@ -0,0 +1,7 @@ +package b + +import a.* + +fun bar() { + test() +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/onDemandStaticImport.java new file mode 100644 index 00000000000..377df2c11af --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/onDemandStaticImport.java @@ -0,0 +1,7 @@ +package b; + +class J { + void bar() { + b.BPackage.test(); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/specificImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/specificImports.java new file mode 100644 index 00000000000..377df2c11af --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/specificImports.java @@ -0,0 +1,7 @@ +package b; + +class J { + void bar() { + b.BPackage.test(); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/specificImports.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/specificImports.kt new file mode 100644 index 00000000000..3b8a5e8ae20 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/specificImports.kt @@ -0,0 +1,7 @@ +package b + +import b.test + +fun bar() { + test() +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/specificImportsWithAliases.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/specificImportsWithAliases.kt new file mode 100644 index 00000000000..80885a58c31 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/specificImportsWithAliases.kt @@ -0,0 +1,7 @@ +package b + +import b.test as _test + +fun bar() { + _test() +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/specificStaticImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/specificStaticImports.java new file mode 100644 index 00000000000..9becc62a457 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/specificStaticImports.java @@ -0,0 +1,9 @@ +package b; + +import static b.BPackage.test; + +class J { + void bar() { + test(); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/c/dependency.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/c/dependency.kt new file mode 100644 index 00000000000..bde1387bee5 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/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/moveFunctionToFile/after/c/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/c/noImports.java new file mode 100644 index 00000000000..fef0d1afe56 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/c/noImports.java @@ -0,0 +1,7 @@ +package c; + +class J { + void bar() { + b.BPackage.test(); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/c/noImports.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/c/noImports.kt new file mode 100644 index 00000000000..a62f1daa823 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/c/noImports.kt @@ -0,0 +1,5 @@ +package c + +fun bar() { + b.test() +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/c/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/c/onDemandImport.java new file mode 100644 index 00000000000..fef0d1afe56 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/c/onDemandImport.java @@ -0,0 +1,7 @@ +package c; + +class J { + void bar() { + b.BPackage.test(); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/c/onDemandImport.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/c/onDemandImport.kt new file mode 100644 index 00000000000..132915b6a94 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/c/onDemandImport.kt @@ -0,0 +1,7 @@ +package c + +import a.* + +fun bar() { + b.test() +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/c/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/c/onDemandStaticImport.java new file mode 100644 index 00000000000..fef0d1afe56 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/c/onDemandStaticImport.java @@ -0,0 +1,7 @@ +package c; + +class J { + void bar() { + b.BPackage.test(); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/c/specificImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/c/specificImports.java new file mode 100644 index 00000000000..fef0d1afe56 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/c/specificImports.java @@ -0,0 +1,7 @@ +package c; + +class J { + void bar() { + b.BPackage.test(); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/c/specificImports.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/c/specificImports.kt new file mode 100644 index 00000000000..658ae63ed1a --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/c/specificImports.kt @@ -0,0 +1,7 @@ +package c + +import b.test + +fun bar() { + test() +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/c/specificImportsWithAliases.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/c/specificImportsWithAliases.kt new file mode 100644 index 00000000000..bd75960d0e0 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/c/specificImportsWithAliases.kt @@ -0,0 +1,7 @@ +package c + +import b.test as _test + +fun bar() { + _test() +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/c/specificStaticImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/c/specificStaticImports.java new file mode 100644 index 00000000000..559a10fedb1 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/c/specificStaticImports.java @@ -0,0 +1,9 @@ +package c; + +import static b.BPackage.test; + +class J { + void bar() { + test(); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/_a/noImports.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/_a/noImports.kt new file mode 100644 index 00000000000..4c10813ba46 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/_a/noImports.kt @@ -0,0 +1,5 @@ +package a + +fun bar() { + test() +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/_a/specificImportsWithAliases.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/_a/specificImportsWithAliases.kt new file mode 100644 index 00000000000..b212a44ff7f --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/_a/specificImportsWithAliases.kt @@ -0,0 +1,7 @@ +package a + +import a.test as _test + +fun bar() { + _test() +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/a/dependency.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/a/dependency.kt new file mode 100644 index 00000000000..19e1c2c2fdd --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/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/moveFunctionToFile/before/a/main.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/a/main.kt new file mode 100644 index 00000000000..867d2f3d996 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/a/main.kt @@ -0,0 +1,16 @@ +package a + +fun 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() +} + +class Test { + fun foo() { + test() + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/a/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/a/noImports.java new file mode 100644 index 00000000000..2f22a169eb5 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/a/noImports.java @@ -0,0 +1,7 @@ +package a; + +class J { + void bar() { + APackage.test(); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/a/noImports.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/a/noImports.kt new file mode 100644 index 00000000000..4c10813ba46 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/a/noImports.kt @@ -0,0 +1,5 @@ +package a + +fun bar() { + test() +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/a/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/a/onDemandStaticImport.java new file mode 100644 index 00000000000..baff27c159c --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/a/onDemandStaticImport.java @@ -0,0 +1,9 @@ +package a; + +import static a.APackage.*; + +class J { + void bar() { + test(); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/a/specificImportsWithAliases.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/a/specificImportsWithAliases.kt new file mode 100644 index 00000000000..b212a44ff7f --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/a/specificImportsWithAliases.kt @@ -0,0 +1,7 @@ +package a + +import a.test as _test + +fun bar() { + _test() +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/a/specificStaticImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/a/specificStaticImports.java new file mode 100644 index 00000000000..b57b7dd7f37 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/a/specificStaticImports.java @@ -0,0 +1,9 @@ +package a; + +import static a.APackage.test; + +class J { + void bar() { + test(); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/b/dependency.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/b/dependency.kt new file mode 100644 index 00000000000..cb8b5157938 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/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/moveFunctionToFile/before/b/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/b/noImports.java new file mode 100644 index 00000000000..6be3c9da729 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/b/noImports.java @@ -0,0 +1,7 @@ +package b; + +class J { + void bar() { + a.APackage.test(); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/b/noImports.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/b/noImports.kt new file mode 100644 index 00000000000..62870e79d91 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/b/noImports.kt @@ -0,0 +1,5 @@ +package b + +fun bar() { + a.test() +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/b/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/b/onDemandImport.java new file mode 100644 index 00000000000..9e1ffdd6c43 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/b/onDemandImport.java @@ -0,0 +1,9 @@ +package b; + +import a.*; + +class J { + void bar() { + APackage.test(); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/b/onDemandImport.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/b/onDemandImport.kt new file mode 100644 index 00000000000..b3a977adfe6 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/b/onDemandImport.kt @@ -0,0 +1,7 @@ +package b + +import a.* + +fun bar() { + test() +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/b/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/b/onDemandStaticImport.java new file mode 100644 index 00000000000..8de3725979d --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/b/onDemandStaticImport.java @@ -0,0 +1,9 @@ +package b; + +import static a.APackage.*; + +class J { + void bar() { + test(); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/b/specificImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/b/specificImports.java new file mode 100644 index 00000000000..61c6adf877d --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/b/specificImports.java @@ -0,0 +1,9 @@ +package b; + +import a.APackage; + +class J { + void bar() { + APackage.test(); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/b/specificImports.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/b/specificImports.kt new file mode 100644 index 00000000000..819c1edee97 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/b/specificImports.kt @@ -0,0 +1,7 @@ +package b + +import a.test + +fun bar() { + test() +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/b/specificImportsWithAliases.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/b/specificImportsWithAliases.kt new file mode 100644 index 00000000000..18f543a5664 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/b/specificImportsWithAliases.kt @@ -0,0 +1,7 @@ +package b + +import a.test as _test + +fun bar() { + _test() +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/b/specificStaticImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/b/specificStaticImports.java new file mode 100644 index 00000000000..14e299706dd --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/b/specificStaticImports.java @@ -0,0 +1,9 @@ +package b; + +import static a.APackage.test; + +class J { + void bar() { + test(); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/c/dependency.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/c/dependency.kt new file mode 100644 index 00000000000..bde1387bee5 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/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/moveFunctionToFile/before/c/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/c/noImports.java new file mode 100644 index 00000000000..39488b60ac6 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/c/noImports.java @@ -0,0 +1,7 @@ +package c; + +class J { + void bar() { + a.APackage.test(); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/c/noImports.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/c/noImports.kt new file mode 100644 index 00000000000..71ac08d8e5f --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/c/noImports.kt @@ -0,0 +1,5 @@ +package c + +fun bar() { + a.test() +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/c/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/c/onDemandImport.java new file mode 100644 index 00000000000..c60b20ab683 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/c/onDemandImport.java @@ -0,0 +1,9 @@ +package c; + +import a.*; + +class J { + void bar() { + APackage.test(); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/c/onDemandImport.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/c/onDemandImport.kt new file mode 100644 index 00000000000..805610b6cd4 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/c/onDemandImport.kt @@ -0,0 +1,7 @@ +package c + +import a.* + +fun bar() { + test() +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/c/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/c/onDemandStaticImport.java new file mode 100644 index 00000000000..d207bf9688c --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/c/onDemandStaticImport.java @@ -0,0 +1,9 @@ +package c; + +import static a.APackage.*; + +class J { + void bar() { + test(); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/c/specificImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/c/specificImports.java new file mode 100644 index 00000000000..0ff087f37cf --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/c/specificImports.java @@ -0,0 +1,9 @@ +package c; + +import a.APackage; + +class J { + void bar() { + APackage.test(); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/c/specificImports.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/c/specificImports.kt new file mode 100644 index 00000000000..ea2f3807c53 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/c/specificImports.kt @@ -0,0 +1,7 @@ +package c + +import a.test + +fun bar() { + test() +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/c/specificImportsWithAliases.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/c/specificImportsWithAliases.kt new file mode 100644 index 00000000000..d9afd8865d1 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/c/specificImportsWithAliases.kt @@ -0,0 +1,7 @@ +package c + +import a.test as _test + +fun bar() { + _test() +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/c/specificStaticImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/c/specificStaticImports.java new file mode 100644 index 00000000000..1fb44fda749 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/before/c/specificStaticImports.java @@ -0,0 +1,9 @@ +package c; + +import static a.APackage.test; + +class J { + void bar() { + test(); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/moveFunctionToFile.test b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/moveFunctionToFile.test new file mode 100644 index 00000000000..351facb56ee --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/moveFunctionToFile.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/moveObjectToFile/after/_a/noImports.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/_a/noImports.kt new file mode 100644 index 00000000000..33627bd785b --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/_a/noImports.kt @@ -0,0 +1,7 @@ +package a + +import b.Test + +fun bar() { + val t: Test = Test +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/_a/specificImportsWithAliases.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/_a/specificImportsWithAliases.kt new file mode 100644 index 00000000000..267ec7bd67d --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/_a/specificImportsWithAliases.kt @@ -0,0 +1,7 @@ +package a + +import b.Test as _Test + +fun bar() { + val t: _Test = _Test +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/a/dependency.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/a/dependency.kt new file mode 100644 index 00000000000..19e1c2c2fdd --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/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/moveObjectToFile/after/a/main.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/a/main.kt new file mode 100644 index 00000000000..fb2fc43b29e --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/a/main.kt @@ -0,0 +1,7 @@ +package a + +import b.Test + +fun test(): Test { + return Test() +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/a/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/a/noImports.java new file mode 100644 index 00000000000..0f8ae714797 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/a/noImports.java @@ -0,0 +1,9 @@ +package a; + +import b.Test; + +class J { + void bar() { + Test t = Test.instance$; + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/a/noImports.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/a/noImports.kt new file mode 100644 index 00000000000..33627bd785b --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/a/noImports.kt @@ -0,0 +1,7 @@ +package a + +import b.Test + +fun bar() { + val t: Test = Test +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/a/specificImportsWithAliases.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/a/specificImportsWithAliases.kt new file mode 100644 index 00000000000..267ec7bd67d --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/a/specificImportsWithAliases.kt @@ -0,0 +1,7 @@ +package a + +import b.Test as _Test + +fun bar() { + val t: _Test = _Test +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/b/dependency.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/b/dependency.kt new file mode 100644 index 00000000000..96ce8b09a23 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/b/dependency.kt @@ -0,0 +1,16 @@ +package b + +open class Foo { + open class Bar { + + } +} + +object 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() +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/b/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/b/noImports.java new file mode 100644 index 00000000000..3816fb0abda --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/b/noImports.java @@ -0,0 +1,7 @@ +package b; + +class J { + void bar() { + Test t = Test.instance$; + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/b/noImports.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/b/noImports.kt new file mode 100644 index 00000000000..32e72da8b89 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/b/noImports.kt @@ -0,0 +1,5 @@ +package b + +fun bar() { + val t: Test = Test +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/b/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/b/onDemandImport.java new file mode 100644 index 00000000000..3816fb0abda --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/b/onDemandImport.java @@ -0,0 +1,7 @@ +package b; + +class J { + void bar() { + Test t = Test.instance$; + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/b/onDemandImport.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/b/onDemandImport.kt new file mode 100644 index 00000000000..0367e6e35a3 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/b/onDemandImport.kt @@ -0,0 +1,7 @@ +package b + +import a.* + +fun bar() { + val t: Test = Test +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/b/specificImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/b/specificImports.java new file mode 100644 index 00000000000..3816fb0abda --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/b/specificImports.java @@ -0,0 +1,7 @@ +package b; + +class J { + void bar() { + Test t = Test.instance$; + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/b/specificImports.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/b/specificImports.kt new file mode 100644 index 00000000000..b7f379045a9 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/b/specificImports.kt @@ -0,0 +1,7 @@ +package b + +import b.Test + +fun bar() { + val t: Test = Test +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/b/specificImportsWithAliases.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/b/specificImportsWithAliases.kt new file mode 100644 index 00000000000..38cc0b27ff3 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/b/specificImportsWithAliases.kt @@ -0,0 +1,7 @@ +package b + +import b.Test as _Test + +fun bar() { + val t: _Test = _Test +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/c/dependency.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/c/dependency.kt new file mode 100644 index 00000000000..bde1387bee5 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/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/moveObjectToFile/after/c/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/c/noImports.java new file mode 100644 index 00000000000..c43110bdc42 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/c/noImports.java @@ -0,0 +1,9 @@ +package c; + +import b.Test; + +class J { + void bar() { + Test t = Test.instance$; + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/c/noImports.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/c/noImports.kt new file mode 100644 index 00000000000..b0866ddf9da --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/c/noImports.kt @@ -0,0 +1,7 @@ +package c + +import b.Test + +fun bar() { + val t: Test = Test +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/c/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/c/onDemandImport.java new file mode 100644 index 00000000000..c43110bdc42 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/c/onDemandImport.java @@ -0,0 +1,9 @@ +package c; + +import b.Test; + +class J { + void bar() { + Test t = Test.instance$; + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/c/onDemandImport.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/c/onDemandImport.kt new file mode 100644 index 00000000000..23c30dc6b57 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/c/onDemandImport.kt @@ -0,0 +1,8 @@ +package c + +import a.* +import b.Test + +fun bar() { + val t: Test = Test +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/c/specificImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/c/specificImports.java new file mode 100644 index 00000000000..c43110bdc42 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/c/specificImports.java @@ -0,0 +1,9 @@ +package c; + +import b.Test; + +class J { + void bar() { + Test t = Test.instance$; + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/c/specificImports.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/c/specificImports.kt new file mode 100644 index 00000000000..b0866ddf9da --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/c/specificImports.kt @@ -0,0 +1,7 @@ +package c + +import b.Test + +fun bar() { + val t: Test = Test +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/c/specificImportsWithAliases.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/c/specificImportsWithAliases.kt new file mode 100644 index 00000000000..900d54f05fd --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/c/specificImportsWithAliases.kt @@ -0,0 +1,7 @@ +package c + +import b.Test as _Test + +fun bar() { + val t: _Test = _Test +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/_a/noImports.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/_a/noImports.kt new file mode 100644 index 00000000000..2fd128dfb13 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/_a/noImports.kt @@ -0,0 +1,5 @@ +package a + +fun bar() { + val t: Test = Test +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/_a/specificImportsWithAliases.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/_a/specificImportsWithAliases.kt new file mode 100644 index 00000000000..c90e8622130 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/_a/specificImportsWithAliases.kt @@ -0,0 +1,7 @@ +package a + +import a.Test as _Test + +fun bar() { + val t: _Test = _Test +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/a/dependency.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/a/dependency.kt new file mode 100644 index 00000000000..19e1c2c2fdd --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/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/moveObjectToFile/before/a/main.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/a/main.kt new file mode 100644 index 00000000000..aba81f03b4f --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/a/main.kt @@ -0,0 +1,14 @@ +package a + +object 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 test(): Test { + return Test() +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/a/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/a/noImports.java new file mode 100644 index 00000000000..c4f7954ce65 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/a/noImports.java @@ -0,0 +1,7 @@ +package a; + +class J { + void bar() { + Test t = Test.instance$; + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/a/noImports.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/a/noImports.kt new file mode 100644 index 00000000000..2fd128dfb13 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/a/noImports.kt @@ -0,0 +1,5 @@ +package a + +fun bar() { + val t: Test = Test +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/a/specificImportsWithAliases.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/a/specificImportsWithAliases.kt new file mode 100644 index 00000000000..c90e8622130 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/a/specificImportsWithAliases.kt @@ -0,0 +1,7 @@ +package a + +import a.Test as _Test + +fun bar() { + val t: _Test = _Test +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/b/dependency.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/b/dependency.kt new file mode 100644 index 00000000000..cb8b5157938 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/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/moveObjectToFile/before/b/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/b/noImports.java new file mode 100644 index 00000000000..62dcb8f569a --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/b/noImports.java @@ -0,0 +1,7 @@ +package b; + +class J { + void bar() { + a.Test t = a.Test.instance$; + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/b/noImports.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/b/noImports.kt new file mode 100644 index 00000000000..59e747f53bd --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/b/noImports.kt @@ -0,0 +1,5 @@ +package b + +fun bar() { + val t: a.Test = a.Test +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/b/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/b/onDemandImport.java new file mode 100644 index 00000000000..8df3f06fe1e --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/b/onDemandImport.java @@ -0,0 +1,9 @@ +package b; + +import a.*; + +class J { + void bar() { + Test t = Test.instance$; + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/b/onDemandImport.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/b/onDemandImport.kt new file mode 100644 index 00000000000..0367e6e35a3 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/b/onDemandImport.kt @@ -0,0 +1,7 @@ +package b + +import a.* + +fun bar() { + val t: Test = Test +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/b/specificImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/b/specificImports.java new file mode 100644 index 00000000000..34f22f3c1f3 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/b/specificImports.java @@ -0,0 +1,9 @@ +package b; + +import a.Test; + +class J { + void bar() { + Test t = Test.instance$; + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/b/specificImports.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/b/specificImports.kt new file mode 100644 index 00000000000..9aa92bda259 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/b/specificImports.kt @@ -0,0 +1,7 @@ +package b + +import a.Test + +fun bar() { + val t: Test = Test +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/b/specificImportsWithAliases.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/b/specificImportsWithAliases.kt new file mode 100644 index 00000000000..36c0e744590 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/b/specificImportsWithAliases.kt @@ -0,0 +1,7 @@ +package b + +import a.Test as _Test + +fun bar() { + val t: _Test = _Test +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/c/dependency.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/c/dependency.kt new file mode 100644 index 00000000000..bde1387bee5 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/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/moveObjectToFile/before/c/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/c/noImports.java new file mode 100644 index 00000000000..14242cda197 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/c/noImports.java @@ -0,0 +1,7 @@ +package c; + +class J { + void bar() { + a.Test t = a.Test.instance$; + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/c/noImports.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/c/noImports.kt new file mode 100644 index 00000000000..24a89b5d280 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/c/noImports.kt @@ -0,0 +1,5 @@ +package c + +fun bar() { + val t: a.Test = a.Test +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/c/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/c/onDemandImport.java new file mode 100644 index 00000000000..7cd99b52387 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/c/onDemandImport.java @@ -0,0 +1,9 @@ +package c; + +import a.*; + +class J { + void bar() { + Test t = Test.instance$; + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/c/onDemandImport.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/c/onDemandImport.kt new file mode 100644 index 00000000000..0d6845f83d9 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/c/onDemandImport.kt @@ -0,0 +1,7 @@ +package c + +import a.* + +fun bar() { + val t: Test = Test +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/c/specificImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/c/specificImports.java new file mode 100644 index 00000000000..57185c2d145 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/c/specificImports.java @@ -0,0 +1,9 @@ +package c; + +import a.Test; + +class J { + void bar() { + Test t = Test.instance$; + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/c/specificImports.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/c/specificImports.kt new file mode 100644 index 00000000000..92c1ec2050f --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/c/specificImports.kt @@ -0,0 +1,7 @@ +package c + +import a.Test + +fun bar() { + val t: Test = Test +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/c/specificImportsWithAliases.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/c/specificImportsWithAliases.kt new file mode 100644 index 00000000000..297ee3a16af --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/c/specificImportsWithAliases.kt @@ -0,0 +1,7 @@ +package c + +import a.Test as _Test + +fun bar() { + val t: _Test = _Test +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/moveObjectToFile.test b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/moveObjectToFile.test new file mode 100644 index 00000000000..351facb56ee --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/moveObjectToFile.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/movePropertyToFile/after/_a/noImports.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/_a/noImports.kt new file mode 100644 index 00000000000..1159d9abfef --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/_a/noImports.kt @@ -0,0 +1,6 @@ +package a + +fun bar() { + b.test = "" + println(b.test) +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/_a/specificImportsWithAliases.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/_a/specificImportsWithAliases.kt new file mode 100644 index 00000000000..88c7bb98b5e --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/_a/specificImportsWithAliases.kt @@ -0,0 +1,8 @@ +package a + +import b.test as _test + +fun bar() { + _test = "" + println(_test) +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/a/dependency.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/a/dependency.kt new file mode 100644 index 00000000000..19e1c2c2fdd --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/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/movePropertyToFile/after/a/main.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/a/main.kt new file mode 100644 index 00000000000..f90b20c77b1 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/a/main.kt @@ -0,0 +1,7 @@ +package a + +class Test { + fun foo() { + b.test() + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/a/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/a/noImports.java new file mode 100644 index 00000000000..b973de71c0c --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/a/noImports.java @@ -0,0 +1,8 @@ +package a; + +class J { + void bar() { + b.BPackage.setTest(""); + System.out.println(b.BPackage.getTest()); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/a/noImports.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/a/noImports.kt new file mode 100644 index 00000000000..1159d9abfef --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/a/noImports.kt @@ -0,0 +1,6 @@ +package a + +fun bar() { + b.test = "" + println(b.test) +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/a/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/a/onDemandStaticImport.java new file mode 100644 index 00000000000..b973de71c0c --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/a/onDemandStaticImport.java @@ -0,0 +1,8 @@ +package a; + +class J { + void bar() { + b.BPackage.setTest(""); + System.out.println(b.BPackage.getTest()); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/a/specificImportsWithAliases.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/a/specificImportsWithAliases.kt new file mode 100644 index 00000000000..88c7bb98b5e --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/a/specificImportsWithAliases.kt @@ -0,0 +1,8 @@ +package a + +import b.test as _test + +fun bar() { + _test = "" + println(_test) +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/a/specificStaticImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/a/specificStaticImports.java new file mode 100644 index 00000000000..0d131511d74 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/a/specificStaticImports.java @@ -0,0 +1,11 @@ +package a; + +import static b.BPackage.getTest; +import static b.BPackage.setTest; + +class J { + void bar() { + setTest(""); + System.out.println(getTest()); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/dependency.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/dependency.kt new file mode 100644 index 00000000000..30d8040a4ac --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/dependency.kt @@ -0,0 +1,18 @@ +package b + +open class Foo { + open class Bar { + + } +} + +var test: String + get() = "" + set(value: String) { + 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() + } \ No newline at end of file diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/noImports.java new file mode 100644 index 00000000000..8648539c9f7 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/noImports.java @@ -0,0 +1,8 @@ +package b; + +class J { + void bar() { + b.BPackage.setTest(""); + System.out.println(b.BPackage.getTest()); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/noImports.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/noImports.kt new file mode 100644 index 00000000000..8d8f59100de --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/noImports.kt @@ -0,0 +1,6 @@ +package b + +fun bar() { + test = "" + println(test) +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/onDemandImport.java new file mode 100644 index 00000000000..8648539c9f7 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/onDemandImport.java @@ -0,0 +1,8 @@ +package b; + +class J { + void bar() { + b.BPackage.setTest(""); + System.out.println(b.BPackage.getTest()); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/onDemandImport.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/onDemandImport.kt new file mode 100644 index 00000000000..7f05a5ae342 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/onDemandImport.kt @@ -0,0 +1,8 @@ +package b + +import a.* + +fun bar() { + test = "" + println(test) +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/onDemandStaticImport.java new file mode 100644 index 00000000000..8648539c9f7 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/onDemandStaticImport.java @@ -0,0 +1,8 @@ +package b; + +class J { + void bar() { + b.BPackage.setTest(""); + System.out.println(b.BPackage.getTest()); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/specificImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/specificImports.java new file mode 100644 index 00000000000..8648539c9f7 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/specificImports.java @@ -0,0 +1,8 @@ +package b; + +class J { + void bar() { + b.BPackage.setTest(""); + System.out.println(b.BPackage.getTest()); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/specificImports.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/specificImports.kt new file mode 100644 index 00000000000..6a531687734 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/specificImports.kt @@ -0,0 +1,8 @@ +package b + +import b.test + +fun bar() { + test = "" + println(test) +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/specificImportsWithAliases.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/specificImportsWithAliases.kt new file mode 100644 index 00000000000..e93f254e11c --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/specificImportsWithAliases.kt @@ -0,0 +1,8 @@ +package b + +import b.test as _test + +fun bar() { + _test = "" + println(_test) +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/specificStaticImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/specificStaticImports.java new file mode 100644 index 00000000000..59ec9aa301f --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/specificStaticImports.java @@ -0,0 +1,11 @@ +package b; + +import static b.BPackage.getTest; +import static b.BPackage.setTest; + +class J { + void bar() { + setTest(""); + System.out.println(getTest()); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/c/dependency.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/c/dependency.kt new file mode 100644 index 00000000000..bde1387bee5 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/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/movePropertyToFile/after/c/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/c/noImports.java new file mode 100644 index 00000000000..1309a310809 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/c/noImports.java @@ -0,0 +1,8 @@ +package c; + +class J { + void bar() { + b.BPackage.setTest(""); + System.out.println(b.BPackage.getTest()); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/c/noImports.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/c/noImports.kt new file mode 100644 index 00000000000..5bfeeb1f712 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/c/noImports.kt @@ -0,0 +1,6 @@ +package c + +fun bar() { + b.test = "" + println(b.test) +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/c/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/c/onDemandImport.java new file mode 100644 index 00000000000..1309a310809 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/c/onDemandImport.java @@ -0,0 +1,8 @@ +package c; + +class J { + void bar() { + b.BPackage.setTest(""); + System.out.println(b.BPackage.getTest()); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/c/onDemandImport.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/c/onDemandImport.kt new file mode 100644 index 00000000000..c1072a9db4b --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/c/onDemandImport.kt @@ -0,0 +1,8 @@ +package c + +import a.* + +fun bar() { + b.test = "" + println(b.test) +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/c/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/c/onDemandStaticImport.java new file mode 100644 index 00000000000..1309a310809 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/c/onDemandStaticImport.java @@ -0,0 +1,8 @@ +package c; + +class J { + void bar() { + b.BPackage.setTest(""); + System.out.println(b.BPackage.getTest()); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/c/specificImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/c/specificImports.java new file mode 100644 index 00000000000..1309a310809 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/c/specificImports.java @@ -0,0 +1,8 @@ +package c; + +class J { + void bar() { + b.BPackage.setTest(""); + System.out.println(b.BPackage.getTest()); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/c/specificImports.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/c/specificImports.kt new file mode 100644 index 00000000000..90955bfba8b --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/c/specificImports.kt @@ -0,0 +1,8 @@ +package c + +import b.test + +fun bar() { + test = "" + println(test) +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/c/specificImportsWithAliases.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/c/specificImportsWithAliases.kt new file mode 100644 index 00000000000..73e3d31d27c --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/c/specificImportsWithAliases.kt @@ -0,0 +1,8 @@ +package c + +import b.test as _test + +fun bar() { + _test = "" + println(_test) +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/c/specificStaticImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/c/specificStaticImports.java new file mode 100644 index 00000000000..8916d698cec --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/c/specificStaticImports.java @@ -0,0 +1,11 @@ +package c; + +import static b.BPackage.getTest; +import static b.BPackage.setTest; + +class J { + void bar() { + setTest(""); + System.out.println(getTest()); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/_a/noImports.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/_a/noImports.kt new file mode 100644 index 00000000000..f319c15486f --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/_a/noImports.kt @@ -0,0 +1,6 @@ +package a + +fun bar() { + test = "" + println(test) +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/_a/specificImportsWithAliases.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/_a/specificImportsWithAliases.kt new file mode 100644 index 00000000000..9632e12d312 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/_a/specificImportsWithAliases.kt @@ -0,0 +1,8 @@ +package a + +import a.test as _test + +fun bar() { + _test = "" + println(_test) +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/a/dependency.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/a/dependency.kt new file mode 100644 index 00000000000..19e1c2c2fdd --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/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/movePropertyToFile/before/a/main.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/a/main.kt new file mode 100644 index 00000000000..ab655b8d5a5 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/a/main.kt @@ -0,0 +1,18 @@ +package a + +var test: String + get() = "" + set(value: String) { + 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() + } + +class Test { + fun foo() { + test() + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/a/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/a/noImports.java new file mode 100644 index 00000000000..b42807193c7 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/a/noImports.java @@ -0,0 +1,8 @@ +package a; + +class J { + void bar() { + APackage.setTest(""); + System.out.println(APackage.getTest()); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/a/noImports.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/a/noImports.kt new file mode 100644 index 00000000000..f319c15486f --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/a/noImports.kt @@ -0,0 +1,6 @@ +package a + +fun bar() { + test = "" + println(test) +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/a/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/a/onDemandStaticImport.java new file mode 100644 index 00000000000..4c7d2b3a428 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/a/onDemandStaticImport.java @@ -0,0 +1,10 @@ +package a; + +import static a.APackage.*; + +class J { + void bar() { + setTest(""); + System.out.println(getTest()); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/a/specificImportsWithAliases.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/a/specificImportsWithAliases.kt new file mode 100644 index 00000000000..9632e12d312 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/a/specificImportsWithAliases.kt @@ -0,0 +1,8 @@ +package a + +import a.test as _test + +fun bar() { + _test = "" + println(_test) +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/a/specificStaticImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/a/specificStaticImports.java new file mode 100644 index 00000000000..5cb271f6685 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/a/specificStaticImports.java @@ -0,0 +1,11 @@ +package a; + +import static a.APackage.getTest; +import static a.APackage.setTest; + +class J { + void bar() { + setTest(""); + System.out.println(getTest()); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/b/dependency.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/b/dependency.kt new file mode 100644 index 00000000000..cb8b5157938 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/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/movePropertyToFile/before/b/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/b/noImports.java new file mode 100644 index 00000000000..a2840dbb624 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/b/noImports.java @@ -0,0 +1,8 @@ +package b; + +class J { + void bar() { + a.APackage.setTest(""); + System.out.println(a.APackage.getTest()); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/b/noImports.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/b/noImports.kt new file mode 100644 index 00000000000..8ebfba88869 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/b/noImports.kt @@ -0,0 +1,6 @@ +package b + +fun bar() { + a.test = "" + println(a.test) +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/b/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/b/onDemandImport.java new file mode 100644 index 00000000000..10af19e0cf0 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/b/onDemandImport.java @@ -0,0 +1,10 @@ +package b; + +import a.*; + +class J { + void bar() { + APackage.setTest(""); + System.out.println(APackage.getTest()); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/b/onDemandImport.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/b/onDemandImport.kt new file mode 100644 index 00000000000..7f05a5ae342 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/b/onDemandImport.kt @@ -0,0 +1,8 @@ +package b + +import a.* + +fun bar() { + test = "" + println(test) +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/b/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/b/onDemandStaticImport.java new file mode 100644 index 00000000000..0f8a1f6ee75 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/b/onDemandStaticImport.java @@ -0,0 +1,10 @@ +package b; + +import static a.APackage.*; + +class J { + void bar() { + setTest(""); + System.out.println(getTest()); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/b/specificImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/b/specificImports.java new file mode 100644 index 00000000000..72363a4bea3 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/b/specificImports.java @@ -0,0 +1,10 @@ +package b; + +import a.APackage; + +class J { + void bar() { + APackage.setTest(""); + System.out.println(APackage.getTest()); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/b/specificImports.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/b/specificImports.kt new file mode 100644 index 00000000000..4d935f61996 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/b/specificImports.kt @@ -0,0 +1,8 @@ +package b + +import a.test + +fun bar() { + test = "" + println(test) +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/b/specificImportsWithAliases.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/b/specificImportsWithAliases.kt new file mode 100644 index 00000000000..f54a1a27817 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/b/specificImportsWithAliases.kt @@ -0,0 +1,8 @@ +package b + +import a.test as _test + +fun bar() { + _test = "" + println(_test) +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/b/specificStaticImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/b/specificStaticImports.java new file mode 100644 index 00000000000..b896c640b4b --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/b/specificStaticImports.java @@ -0,0 +1,11 @@ +package b; + +import static a.APackage.getTest; +import static a.APackage.setTest; + +class J { + void bar() { + setTest(""); + System.out.println(getTest()); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/c/dependency.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/c/dependency.kt new file mode 100644 index 00000000000..bde1387bee5 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/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/movePropertyToFile/before/c/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/c/noImports.java new file mode 100644 index 00000000000..14722d77fe6 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/c/noImports.java @@ -0,0 +1,8 @@ +package c; + +class J { + void bar() { + a.APackage.setTest(""); + System.out.println(a.APackage.getTest()); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/c/noImports.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/c/noImports.kt new file mode 100644 index 00000000000..0c524b872bb --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/c/noImports.kt @@ -0,0 +1,6 @@ +package c + +fun bar() { + a.test = "" + println(a.test) +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/c/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/c/onDemandImport.java new file mode 100644 index 00000000000..a1342503097 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/c/onDemandImport.java @@ -0,0 +1,10 @@ +package c; + +import a.*; + +class J { + void bar() { + APackage.setTest(""); + System.out.println(APackage.getTest()); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/c/onDemandImport.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/c/onDemandImport.kt new file mode 100644 index 00000000000..145340ad9e1 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/c/onDemandImport.kt @@ -0,0 +1,8 @@ +package c + +import a.* + +fun bar() { + test = "" + println(test) +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/c/onDemandStaticImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/c/onDemandStaticImport.java new file mode 100644 index 00000000000..99f9096d76f --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/c/onDemandStaticImport.java @@ -0,0 +1,10 @@ +package c; + +import static a.APackage.*; + +class J { + void bar() { + setTest(""); + System.out.println(getTest()); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/c/specificImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/c/specificImports.java new file mode 100644 index 00000000000..c294f14dcaf --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/c/specificImports.java @@ -0,0 +1,10 @@ +package c; + +import a.APackage; + +class J { + void bar() { + APackage.setTest(""); + System.out.println(APackage.getTest()); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/c/specificImports.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/c/specificImports.kt new file mode 100644 index 00000000000..66a22ff6388 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/c/specificImports.kt @@ -0,0 +1,8 @@ +package c + +import a.test + +fun bar() { + test = "" + println(test) +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/c/specificImportsWithAliases.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/c/specificImportsWithAliases.kt new file mode 100644 index 00000000000..7ae37527ca8 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/c/specificImportsWithAliases.kt @@ -0,0 +1,8 @@ +package c + +import a.test as _test + +fun bar() { + _test = "" + println(_test) +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/c/specificStaticImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/c/specificStaticImports.java new file mode 100644 index 00000000000..29ebd4c3b45 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/before/c/specificStaticImports.java @@ -0,0 +1,11 @@ +package c; + +import static a.APackage.getTest; +import static a.APackage.setTest; + +class J { + void bar() { + setTest(""); + System.out.println(getTest()); + } +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/movePropertyToFile.test b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/movePropertyToFile.test new file mode 100644 index 00000000000..351facb56ee --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/movePropertyToFile.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/AbstractJetMoveTest.kt b/idea/tests/org/jetbrains/jet/plugin/refactoring/move/AbstractJetMoveTest.kt index 900dac62eed..8881cabaa96 100644 --- a/idea/tests/org/jetbrains/jet/plugin/refactoring/move/AbstractJetMoveTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/refactoring/move/AbstractJetMoveTest.kt @@ -52,8 +52,11 @@ import com.intellij.refactoring.move.MoveHandler import org.jetbrains.jet.getString import org.jetbrains.jet.getNullableString import org.jetbrains.jet.plugin.refactoring.move.moveTopLevelDeclarations.MoveKotlinTopLevelDeclarationsProcessor -import org.jetbrains.jet.plugin.refactoring.move.moveTopLevelDeclarations.MoveKotlinTopLevelDeclarationsOptions import org.jetbrains.jet.lang.psi.JetNamedDeclaration +import org.jetbrains.jet.plugin.refactoring.move.moveTopLevelDeclarations.MoveDestinationKotlinMoveTarget +import org.jetbrains.jet.plugin.refactoring.move.moveTopLevelDeclarations.MoveKotlinTopLevelDeclarationsOptions +import org.jetbrains.jet.plugin.refactoring.move.moveTopLevelDeclarations.JetFileKotlinMoveTarget +import org.jetbrains.jet.lang.psi.JetFile public abstract class AbstractJetMoveTest : MultiFileTestCase() { protected fun doTest(path: String) { @@ -251,13 +254,16 @@ enum class MoveAction { MOVE_KOTLIN_TOP_LEVEL_DECLARATIONS { override fun runRefactoring(rootDir: VirtualFile, mainFile: PsiFile, elementAtCaret: PsiElement?, config: JsonObject) { + val project = mainFile.getProject() val elementToMove = elementAtCaret!!.getParentByType(javaClass())!! - val targetPackage = config.getString("targetPackage") - val options = MoveKotlinTopLevelDeclarationsOptions( - elementsToMove = listOf(elementToMove), - moveDestination = MultipleRootsMoveDestination(PackageWrapper(mainFile.getManager(), targetPackage)) - ) + val moveTarget = config.getNullableString("targetPackage")?.let { packageName -> + MoveDestinationKotlinMoveTarget(MultipleRootsMoveDestination(PackageWrapper(mainFile.getManager(), packageName))) + } ?: config.getString("targetFile").let { filePath -> + JetFileKotlinMoveTarget(PsiManager.getInstance(project).findFile(rootDir.findFileByRelativePath(filePath)!!) as JetFile) + } + + val options = MoveKotlinTopLevelDeclarationsOptions(listOf(elementToMove), moveTarget) MoveKotlinTopLevelDeclarationsProcessor(mainFile.getProject(), options).run() } } 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 d9965dd8a9d..5f489b5c0f5 100644 --- a/idea/tests/org/jetbrains/jet/plugin/refactoring/move/JetMoveTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/refactoring/move/JetMoveTestGenerated.java @@ -185,6 +185,11 @@ public class JetMoveTestGenerated extends AbstractJetMoveTest { doTest("idea/testData/refactoring/move/kotlin/movePackage/movePackage/movePackage.test"); } + @TestMetadata("kotlin/moveTopLevelDeclarations/moveClassToFile/moveClassToFile.test") + public void testKotlin_moveTopLevelDeclarations_moveClassToFile_MoveClassToFile() throws Exception { + doTest("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/moveClassToFile.test"); + } + @TestMetadata("kotlin/moveTopLevelDeclarations/moveClassToPackage/moveClassToPackage.test") public void testKotlin_moveTopLevelDeclarations_moveClassToPackage_MoveClassToPackage() throws Exception { doTest("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToPackage/moveClassToPackage.test"); @@ -195,6 +200,11 @@ public class JetMoveTestGenerated extends AbstractJetMoveTest { doTest("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToPackageWithConflicts/moveClassToPackageWithConflicts.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"); + } + @TestMetadata("kotlin/moveTopLevelDeclarations/moveFunctionToPackage/moveFunctionToPackage.test") public void testKotlin_moveTopLevelDeclarations_moveFunctionToPackage_MoveFunctionToPackage() throws Exception { doTest("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/moveFunctionToPackage.test"); @@ -205,6 +215,11 @@ public class JetMoveTestGenerated extends AbstractJetMoveTest { doTest("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackageWithConflicts/moveFunctionToPackageWithConflicts.test"); } + @TestMetadata("kotlin/moveTopLevelDeclarations/moveObjectToFile/moveObjectToFile.test") + public void testKotlin_moveTopLevelDeclarations_moveObjectToFile_MoveObjectToFile() throws Exception { + doTest("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/moveObjectToFile.test"); + } + @TestMetadata("kotlin/moveTopLevelDeclarations/moveObjectToPackage/moveObjectToPackage.test") public void testKotlin_moveTopLevelDeclarations_moveObjectToPackage_MoveObjectToPackage() throws Exception { doTest("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/moveObjectToPackage.test"); @@ -215,6 +230,11 @@ public class JetMoveTestGenerated extends AbstractJetMoveTest { doTest("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackageWithConflicts/moveObjectToPackageWithConflicts.test"); } + @TestMetadata("kotlin/moveTopLevelDeclarations/movePropertyToFile/movePropertyToFile.test") + public void testKotlin_moveTopLevelDeclarations_movePropertyToFile_MovePropertyToFile() throws Exception { + doTest("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/movePropertyToFile.test"); + } + @TestMetadata("kotlin/moveTopLevelDeclarations/movePropertyToPackage/movePropertyToPackage.test") public void testKotlin_moveTopLevelDeclarations_movePropertyToPackage_MovePropertyToPackage() throws Exception { doTest("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/movePropertyToPackage.test");