From 33cbc099ab9e5411bf6074ad22062b2093030df8 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Wed, 19 Feb 2014 15:14:12 +0400 Subject: [PATCH] Add tests for Java "Move Inner Class/To Inner Class" refactoring --- .../after/a/main.java | 4 ++ .../after/a/noImports.kt | 7 ++++ .../after/a/onDemandImport.kt | 7 ++++ .../after/a/specificImport.kt | 7 ++++ .../after/b/X.java | 5 +++ .../after/b/noImports.kt | 5 +++ .../after/b/onDemandImport.kt | 7 ++++ .../after/b/specificImport.kt | 7 ++++ .../before/a/main.java | 7 ++++ .../before/a/noImports.kt | 5 +++ .../before/a/onDemandImport.kt | 7 ++++ .../before/a/specificImport.kt | 7 ++++ .../before/b/noImports.kt | 5 +++ .../before/b/onDemandImport.kt | 7 ++++ .../before/b/specificImport.kt | 7 ++++ ...NestedClassToTopLevelInAnotherPackage.test | 5 +++ .../after/a/X.java | 5 +++ .../after/a/main.java | 4 ++ .../after/a/noImports.kt | 5 +++ .../after/a/onDemandImport.kt | 7 ++++ .../after/a/specificImport.kt | 7 ++++ .../before/a/main.java | 7 ++++ .../before/a/noImports.kt | 5 +++ .../before/a/onDemandImport.kt | 7 ++++ .../before/a/specificImport.kt | 7 ++++ ...NestedClassToTopLevelInTheSamePackage.test | 5 +++ .../after/a/X.java | 10 +++++ .../after/a/main.java | 4 ++ .../after/a/noImports.kt | 5 +++ .../after/a/onDemandImport.kt | 7 ++++ .../after/a/specificImport.kt | 7 ++++ .../before/a/main.java | 9 ++++ .../before/a/noImports.kt | 5 +++ .../before/a/onDemandImport.kt | 7 ++++ .../before/a/specificImport.kt | 7 ++++ ...heSamePackageAndAddOuterInstance.test_todo | 6 +++ .../after/a/Y.java | 5 +++ .../after/a/main.java | 4 ++ .../after/a/noImports.kt | 5 +++ .../after/a/onDemandImport.kt | 7 ++++ .../after/a/specificImport.kt | 7 ++++ .../before/a/main.java | 7 ++++ .../before/a/noImports.kt | 5 +++ .../before/a/onDemandImport.kt | 7 ++++ .../before/a/specificImport.kt | 7 ++++ ...ssToTopLevelInTheSamePackageAndRename.test | 6 +++ .../after/main2.java | 8 ++++ .../after/noImports.kt | 3 ++ .../after/onDemandImport.kt | 5 +++ .../after/specificImport.kt | 5 +++ .../before/main.java | 3 ++ .../before/main2.java | 5 +++ .../before/noImports.kt | 3 ++ .../before/onDemandImport.kt | 5 +++ .../before/specificImport.kt | 5 +++ .../moveTopLevelClassToTopLevelClass.test | 5 +++ .../after/main2.java | 5 +++ .../after/noImports.kt | 3 ++ .../after/onDemandImport.kt | 5 +++ .../after/specificImport.kt | 5 +++ .../before/main.java | 3 ++ .../before/main2.java | 2 + .../before/noImports.kt | 3 ++ .../before/onDemandImport.kt | 5 +++ .../before/specificImport.kt | 5 +++ .../moveTopLevelClassToTopLevelClass.test | 5 +++ .../after/a/noImports.kt | 7 ++++ .../after/a/onDemandImport.kt | 7 ++++ .../after/a/specificImport.kt | 7 ++++ .../after/b/main2.java | 7 ++++ .../after/b/noImports.kt | 5 +++ .../after/b/onDemandImport.kt | 7 ++++ .../after/b/specificImport.kt | 7 ++++ .../before/a/main.java | 5 +++ .../before/a/noImports.kt | 5 +++ .../before/a/onDemandImport.kt | 7 ++++ .../before/a/specificImport.kt | 7 ++++ .../before/b/main2.java | 4 ++ .../before/b/noImports.kt | 5 +++ .../before/b/onDemandImport.kt | 7 ++++ .../before/b/specificImport.kt | 7 ++++ ...lClassToTopLevelClassOfAnotherPackage.test | 5 +++ .../refactoring/move/AbstractJetMoveTest.kt | 41 +++++++++++++++++++ .../move/JetMoveTestGenerated.java | 30 ++++++++++++++ 84 files changed, 543 insertions(+) create mode 100644 idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInAnotherPackage/after/a/main.java create mode 100644 idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInAnotherPackage/after/a/noImports.kt create mode 100644 idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInAnotherPackage/after/a/onDemandImport.kt create mode 100644 idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInAnotherPackage/after/a/specificImport.kt create mode 100644 idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInAnotherPackage/after/b/X.java create mode 100644 idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInAnotherPackage/after/b/noImports.kt create mode 100644 idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInAnotherPackage/after/b/onDemandImport.kt create mode 100644 idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInAnotherPackage/after/b/specificImport.kt create mode 100644 idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInAnotherPackage/before/a/main.java create mode 100644 idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInAnotherPackage/before/a/noImports.kt create mode 100644 idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInAnotherPackage/before/a/onDemandImport.kt create mode 100644 idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInAnotherPackage/before/a/specificImport.kt create mode 100644 idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInAnotherPackage/before/b/noImports.kt create mode 100644 idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInAnotherPackage/before/b/onDemandImport.kt create mode 100644 idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInAnotherPackage/before/b/specificImport.kt create mode 100644 idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInAnotherPackage/moveNestedClassToTopLevelInAnotherPackage.test create mode 100644 idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackage/after/a/X.java create mode 100644 idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackage/after/a/main.java create mode 100644 idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackage/after/a/noImports.kt create mode 100644 idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackage/after/a/onDemandImport.kt create mode 100644 idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackage/after/a/specificImport.kt create mode 100644 idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackage/before/a/main.java create mode 100644 idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackage/before/a/noImports.kt create mode 100644 idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackage/before/a/onDemandImport.kt create mode 100644 idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackage/before/a/specificImport.kt create mode 100644 idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackage/moveNestedClassToTopLevelInTheSamePackage.test create mode 100644 idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstance/after/a/X.java create mode 100644 idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstance/after/a/main.java create mode 100644 idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstance/after/a/noImports.kt create mode 100644 idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstance/after/a/onDemandImport.kt create mode 100644 idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstance/after/a/specificImport.kt create mode 100644 idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstance/before/a/main.java create mode 100644 idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstance/before/a/noImports.kt create mode 100644 idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstance/before/a/onDemandImport.kt create mode 100644 idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstance/before/a/specificImport.kt create mode 100644 idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstance/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstance.test_todo create mode 100644 idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndRename/after/a/Y.java create mode 100644 idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndRename/after/a/main.java create mode 100644 idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndRename/after/a/noImports.kt create mode 100644 idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndRename/after/a/onDemandImport.kt create mode 100644 idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndRename/after/a/specificImport.kt create mode 100644 idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndRename/before/a/main.java create mode 100644 idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndRename/before/a/noImports.kt create mode 100644 idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndRename/before/a/onDemandImport.kt create mode 100644 idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndRename/before/a/specificImport.kt create mode 100644 idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndRename/moveNestedClassToTopLevelInTheSamePackageAndRename.test create mode 100644 idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToNestedClass/after/main2.java create mode 100644 idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToNestedClass/after/noImports.kt create mode 100644 idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToNestedClass/after/onDemandImport.kt create mode 100644 idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToNestedClass/after/specificImport.kt create mode 100644 idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToNestedClass/before/main.java create mode 100644 idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToNestedClass/before/main2.java create mode 100644 idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToNestedClass/before/noImports.kt create mode 100644 idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToNestedClass/before/onDemandImport.kt create mode 100644 idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToNestedClass/before/specificImport.kt create mode 100644 idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToNestedClass/moveTopLevelClassToTopLevelClass.test create mode 100644 idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClass/after/main2.java create mode 100644 idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClass/after/noImports.kt create mode 100644 idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClass/after/onDemandImport.kt create mode 100644 idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClass/after/specificImport.kt create mode 100644 idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClass/before/main.java create mode 100644 idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClass/before/main2.java create mode 100644 idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClass/before/noImports.kt create mode 100644 idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClass/before/onDemandImport.kt create mode 100644 idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClass/before/specificImport.kt create mode 100644 idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClass/moveTopLevelClassToTopLevelClass.test create mode 100644 idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClassOfAnotherPackage/after/a/noImports.kt create mode 100644 idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClassOfAnotherPackage/after/a/onDemandImport.kt create mode 100644 idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClassOfAnotherPackage/after/a/specificImport.kt create mode 100644 idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClassOfAnotherPackage/after/b/main2.java create mode 100644 idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClassOfAnotherPackage/after/b/noImports.kt create mode 100644 idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClassOfAnotherPackage/after/b/onDemandImport.kt create mode 100644 idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClassOfAnotherPackage/after/b/specificImport.kt create mode 100644 idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClassOfAnotherPackage/before/a/main.java create mode 100644 idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClassOfAnotherPackage/before/a/noImports.kt create mode 100644 idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClassOfAnotherPackage/before/a/onDemandImport.kt create mode 100644 idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClassOfAnotherPackage/before/a/specificImport.kt create mode 100644 idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClassOfAnotherPackage/before/b/main2.java create mode 100644 idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClassOfAnotherPackage/before/b/noImports.kt create mode 100644 idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClassOfAnotherPackage/before/b/onDemandImport.kt create mode 100644 idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClassOfAnotherPackage/before/b/specificImport.kt create mode 100644 idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClassOfAnotherPackage/moveTopLevelClassToTopLevelClassOfAnotherPackage.test diff --git a/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInAnotherPackage/after/a/main.java b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInAnotherPackage/after/a/main.java new file mode 100644 index 00000000000..7f3b1ac019d --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInAnotherPackage/after/a/main.java @@ -0,0 +1,4 @@ +package a; + +public class A { +} diff --git a/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInAnotherPackage/after/a/noImports.kt b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInAnotherPackage/after/a/noImports.kt new file mode 100644 index 00000000000..a64f3357e14 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInAnotherPackage/after/a/noImports.kt @@ -0,0 +1,7 @@ +package a + +import b.X + +fun bar() { + val t: X = X() +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInAnotherPackage/after/a/onDemandImport.kt b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInAnotherPackage/after/a/onDemandImport.kt new file mode 100644 index 00000000000..0b4c1f399cb --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInAnotherPackage/after/a/onDemandImport.kt @@ -0,0 +1,7 @@ +package a + +import b.* + +fun bar() { + val t: X = X() +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInAnotherPackage/after/a/specificImport.kt b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInAnotherPackage/after/a/specificImport.kt new file mode 100644 index 00000000000..de4724e28fb --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInAnotherPackage/after/a/specificImport.kt @@ -0,0 +1,7 @@ +package a + +import b.X as XX + +fun bar() { + val t: XX = XX() +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInAnotherPackage/after/b/X.java b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInAnotherPackage/after/b/X.java new file mode 100644 index 00000000000..ebc16c54769 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInAnotherPackage/after/b/X.java @@ -0,0 +1,5 @@ +package b; + +public class X { + +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInAnotherPackage/after/b/noImports.kt b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInAnotherPackage/after/b/noImports.kt new file mode 100644 index 00000000000..153afd08647 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInAnotherPackage/after/b/noImports.kt @@ -0,0 +1,5 @@ +package b + +fun bar() { + val t: X = X() +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInAnotherPackage/after/b/onDemandImport.kt b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInAnotherPackage/after/b/onDemandImport.kt new file mode 100644 index 00000000000..40fc2c20dd9 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInAnotherPackage/after/b/onDemandImport.kt @@ -0,0 +1,7 @@ +package b + +import b.* + +fun bar() { + val t: X = X() +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInAnotherPackage/after/b/specificImport.kt b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInAnotherPackage/after/b/specificImport.kt new file mode 100644 index 00000000000..c7894ca9438 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInAnotherPackage/after/b/specificImport.kt @@ -0,0 +1,7 @@ +package b + +import b.X as XX + +fun bar() { + val t: XX = XX() +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInAnotherPackage/before/a/main.java b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInAnotherPackage/before/a/main.java new file mode 100644 index 00000000000..fa07eebc21f --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInAnotherPackage/before/a/main.java @@ -0,0 +1,7 @@ +package a; + +public class A { + public static class X { + + } +} diff --git a/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInAnotherPackage/before/a/noImports.kt b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInAnotherPackage/before/a/noImports.kt new file mode 100644 index 00000000000..6b07322f6f3 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInAnotherPackage/before/a/noImports.kt @@ -0,0 +1,5 @@ +package a + +fun bar() { + val t: A.X = A.X() +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInAnotherPackage/before/a/onDemandImport.kt b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInAnotherPackage/before/a/onDemandImport.kt new file mode 100644 index 00000000000..4debdf5407f --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInAnotherPackage/before/a/onDemandImport.kt @@ -0,0 +1,7 @@ +package a + +import b.* + +fun bar() { + val t: A.X = A.X() +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInAnotherPackage/before/a/specificImport.kt b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInAnotherPackage/before/a/specificImport.kt new file mode 100644 index 00000000000..663bacd35b8 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInAnotherPackage/before/a/specificImport.kt @@ -0,0 +1,7 @@ +package a + +import a.A.X as XX + +fun bar() { + val t: XX = XX() +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInAnotherPackage/before/b/noImports.kt b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInAnotherPackage/before/b/noImports.kt new file mode 100644 index 00000000000..76946ec35c8 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInAnotherPackage/before/b/noImports.kt @@ -0,0 +1,5 @@ +package b + +fun bar() { + val t: a.A.X = a.A.X() +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInAnotherPackage/before/b/onDemandImport.kt b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInAnotherPackage/before/b/onDemandImport.kt new file mode 100644 index 00000000000..8cb2e51309c --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInAnotherPackage/before/b/onDemandImport.kt @@ -0,0 +1,7 @@ +package b + +import b.* + +fun bar() { + val t: a.A.X = a.A.X() +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInAnotherPackage/before/b/specificImport.kt b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInAnotherPackage/before/b/specificImport.kt new file mode 100644 index 00000000000..df83e4d14e8 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInAnotherPackage/before/b/specificImport.kt @@ -0,0 +1,7 @@ +package b + +import a.A.X as XX + +fun bar() { + val t: XX = XX() +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInAnotherPackage/moveNestedClassToTopLevelInAnotherPackage.test b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInAnotherPackage/moveNestedClassToTopLevelInAnotherPackage.test new file mode 100644 index 00000000000..6ad021cc1b0 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInAnotherPackage/moveNestedClassToTopLevelInAnotherPackage.test @@ -0,0 +1,5 @@ +{ + "mainFile": "a/main.java", + "type": "MOVE_INNER_CLASS", + "targetPackage": "b" +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackage/after/a/X.java b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackage/after/a/X.java new file mode 100644 index 00000000000..76a017d26d4 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackage/after/a/X.java @@ -0,0 +1,5 @@ +package a; + +public class X { + +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackage/after/a/main.java b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackage/after/a/main.java new file mode 100644 index 00000000000..c9e70fd4826 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackage/after/a/main.java @@ -0,0 +1,4 @@ +package a; + +public class A { +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackage/after/a/noImports.kt b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackage/after/a/noImports.kt new file mode 100644 index 00000000000..03041662aba --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackage/after/a/noImports.kt @@ -0,0 +1,5 @@ +package a + +fun bar(s: String) { + val t: X = X() +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackage/after/a/onDemandImport.kt b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackage/after/a/onDemandImport.kt new file mode 100644 index 00000000000..ce8631747b3 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackage/after/a/onDemandImport.kt @@ -0,0 +1,7 @@ +package a + +import a.A.* + +fun bar(s: String) { + val t: X = X() +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackage/after/a/specificImport.kt b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackage/after/a/specificImport.kt new file mode 100644 index 00000000000..a1a29b37e5c --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackage/after/a/specificImport.kt @@ -0,0 +1,7 @@ +package a + +import a.X as XX + +fun bar(s: String) { + val t: XX = XX() +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackage/before/a/main.java b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackage/before/a/main.java new file mode 100644 index 00000000000..d794509dd62 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackage/before/a/main.java @@ -0,0 +1,7 @@ +package a; + +public class A { + public static class X { + + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackage/before/a/noImports.kt b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackage/before/a/noImports.kt new file mode 100644 index 00000000000..3d1b90dc533 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackage/before/a/noImports.kt @@ -0,0 +1,5 @@ +package a + +fun bar(s: String) { + val t: A.X = A.X() +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackage/before/a/onDemandImport.kt b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackage/before/a/onDemandImport.kt new file mode 100644 index 00000000000..ce8631747b3 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackage/before/a/onDemandImport.kt @@ -0,0 +1,7 @@ +package a + +import a.A.* + +fun bar(s: String) { + val t: X = X() +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackage/before/a/specificImport.kt b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackage/before/a/specificImport.kt new file mode 100644 index 00000000000..ab47bdddb83 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackage/before/a/specificImport.kt @@ -0,0 +1,7 @@ +package a + +import a.A.X as XX + +fun bar(s: String) { + val t: XX = XX() +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackage/moveNestedClassToTopLevelInTheSamePackage.test b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackage/moveNestedClassToTopLevelInTheSamePackage.test new file mode 100644 index 00000000000..bf877944f0e --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackage/moveNestedClassToTopLevelInTheSamePackage.test @@ -0,0 +1,5 @@ +{ + "mainFile": "a/main.java", + "type": "MOVE_INNER_CLASS", + "targetPackage": "a" +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstance/after/a/X.java b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstance/after/a/X.java new file mode 100644 index 00000000000..81517efca14 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstance/after/a/X.java @@ -0,0 +1,10 @@ +package a; + +public class X { + private A outer; + + public X(A outer, String s) { + this.outer = outer; + System.out.println(s); + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstance/after/a/main.java b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstance/after/a/main.java new file mode 100644 index 00000000000..c9e70fd4826 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstance/after/a/main.java @@ -0,0 +1,4 @@ +package a; + +public class A { +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstance/after/a/noImports.kt b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstance/after/a/noImports.kt new file mode 100644 index 00000000000..8e4e4077ba1 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstance/after/a/noImports.kt @@ -0,0 +1,5 @@ +package a + +fun bar(s: String) { + val t: X = X(A(), "test") +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstance/after/a/onDemandImport.kt b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstance/after/a/onDemandImport.kt new file mode 100644 index 00000000000..1ed0891d2c2 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstance/after/a/onDemandImport.kt @@ -0,0 +1,7 @@ +package a + +import a.A.* + +fun bar(s: String) { + val t: X = X(A(), "test") +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstance/after/a/specificImport.kt b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstance/after/a/specificImport.kt new file mode 100644 index 00000000000..30c6ec5d031 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstance/after/a/specificImport.kt @@ -0,0 +1,7 @@ +package a + +import a.X + +fun bar(s: String) { + val t: X = X(A(), "test") +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstance/before/a/main.java b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstance/before/a/main.java new file mode 100644 index 00000000000..b7239193a36 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstance/before/a/main.java @@ -0,0 +1,9 @@ +package a; + +public class A { + public class X { + public X(String s) { + System.out.println(s); + } + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstance/before/a/noImports.kt b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstance/before/a/noImports.kt new file mode 100644 index 00000000000..a4df4a3718a --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstance/before/a/noImports.kt @@ -0,0 +1,5 @@ +package a + +fun bar(s: String) { + val t: A.X = A().X("test") +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstance/before/a/onDemandImport.kt b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstance/before/a/onDemandImport.kt new file mode 100644 index 00000000000..1e7716d7f4d --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstance/before/a/onDemandImport.kt @@ -0,0 +1,7 @@ +package a + +import a.A.* + +fun bar(s: String) { + val t: X = A().X("test") +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstance/before/a/specificImport.kt b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstance/before/a/specificImport.kt new file mode 100644 index 00000000000..45a535ee54b --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstance/before/a/specificImport.kt @@ -0,0 +1,7 @@ +package a + +import a.A.X + +fun bar(s: String) { + val t: X = A().X("test") +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstance/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstance.test_todo b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstance/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstance.test_todo new file mode 100644 index 00000000000..ad9af03dbc9 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstance/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstance.test_todo @@ -0,0 +1,6 @@ +{ + "mainFile": "a/main.java", + "type": "MOVE_INNER_CLASS", + "targetPackage": "a", + "outerInstanceParameterName": "outer" +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndRename/after/a/Y.java b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndRename/after/a/Y.java new file mode 100644 index 00000000000..9e6d828af80 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndRename/after/a/Y.java @@ -0,0 +1,5 @@ +package a; + +public class Y { + +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndRename/after/a/main.java b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndRename/after/a/main.java new file mode 100644 index 00000000000..c9e70fd4826 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndRename/after/a/main.java @@ -0,0 +1,4 @@ +package a; + +public class A { +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndRename/after/a/noImports.kt b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndRename/after/a/noImports.kt new file mode 100644 index 00000000000..06cc224bba3 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndRename/after/a/noImports.kt @@ -0,0 +1,5 @@ +package a + +fun bar(s: String) { + val t: Y = Y() +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndRename/after/a/onDemandImport.kt b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndRename/after/a/onDemandImport.kt new file mode 100644 index 00000000000..8fd87b89ade --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndRename/after/a/onDemandImport.kt @@ -0,0 +1,7 @@ +package a + +import a.A.* + +fun bar(s: String) { + val t: Y = Y() +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndRename/after/a/specificImport.kt b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndRename/after/a/specificImport.kt new file mode 100644 index 00000000000..970ea3c44b1 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndRename/after/a/specificImport.kt @@ -0,0 +1,7 @@ +package a + +import a.Y as XX + +fun bar(s: String) { + val t: XX = XX() +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndRename/before/a/main.java b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndRename/before/a/main.java new file mode 100644 index 00000000000..d794509dd62 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndRename/before/a/main.java @@ -0,0 +1,7 @@ +package a; + +public class A { + public static class X { + + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndRename/before/a/noImports.kt b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndRename/before/a/noImports.kt new file mode 100644 index 00000000000..3d1b90dc533 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndRename/before/a/noImports.kt @@ -0,0 +1,5 @@ +package a + +fun bar(s: String) { + val t: A.X = A.X() +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndRename/before/a/onDemandImport.kt b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndRename/before/a/onDemandImport.kt new file mode 100644 index 00000000000..ce8631747b3 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndRename/before/a/onDemandImport.kt @@ -0,0 +1,7 @@ +package a + +import a.A.* + +fun bar(s: String) { + val t: X = X() +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndRename/before/a/specificImport.kt b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndRename/before/a/specificImport.kt new file mode 100644 index 00000000000..ab47bdddb83 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndRename/before/a/specificImport.kt @@ -0,0 +1,7 @@ +package a + +import a.A.X as XX + +fun bar(s: String) { + val t: XX = XX() +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndRename/moveNestedClassToTopLevelInTheSamePackageAndRename.test b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndRename/moveNestedClassToTopLevelInTheSamePackageAndRename.test new file mode 100644 index 00000000000..07ce7d1e8c7 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndRename/moveNestedClassToTopLevelInTheSamePackageAndRename.test @@ -0,0 +1,6 @@ +{ + "mainFile": "a/main.java", + "type": "MOVE_INNER_CLASS", + "targetPackage": "a", + "newClassName": "Y" +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToNestedClass/after/main2.java b/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToNestedClass/after/main2.java new file mode 100644 index 00000000000..5c24664e308 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToNestedClass/after/main2.java @@ -0,0 +1,8 @@ +public class B { + public class C { + + public static class A { + + } + } +} diff --git a/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToNestedClass/after/noImports.kt b/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToNestedClass/after/noImports.kt new file mode 100644 index 00000000000..22af36d44db --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToNestedClass/after/noImports.kt @@ -0,0 +1,3 @@ +fun bar() { + val t: B.C.A = B.C.A() +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToNestedClass/after/onDemandImport.kt b/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToNestedClass/after/onDemandImport.kt new file mode 100644 index 00000000000..fe437111e87 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToNestedClass/after/onDemandImport.kt @@ -0,0 +1,5 @@ +import B.* + +fun bar() { + val t: C.A = B.C.A() +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToNestedClass/after/specificImport.kt b/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToNestedClass/after/specificImport.kt new file mode 100644 index 00000000000..bbc2dca37fe --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToNestedClass/after/specificImport.kt @@ -0,0 +1,5 @@ +import B.C.A as X + +fun bar() { + val t: X = X() +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToNestedClass/before/main.java b/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToNestedClass/before/main.java new file mode 100644 index 00000000000..35d04be50ec --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToNestedClass/before/main.java @@ -0,0 +1,3 @@ +public class A { + +} diff --git a/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToNestedClass/before/main2.java b/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToNestedClass/before/main2.java new file mode 100644 index 00000000000..f192a21567a --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToNestedClass/before/main2.java @@ -0,0 +1,5 @@ +public class B { + public class C { + + } +} diff --git a/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToNestedClass/before/noImports.kt b/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToNestedClass/before/noImports.kt new file mode 100644 index 00000000000..43241c50fc1 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToNestedClass/before/noImports.kt @@ -0,0 +1,3 @@ +fun bar() { + val t: A = A() +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToNestedClass/before/onDemandImport.kt b/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToNestedClass/before/onDemandImport.kt new file mode 100644 index 00000000000..393288261a9 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToNestedClass/before/onDemandImport.kt @@ -0,0 +1,5 @@ +import B.* + +fun bar() { + val t: A = A() +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToNestedClass/before/specificImport.kt b/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToNestedClass/before/specificImport.kt new file mode 100644 index 00000000000..155939eccd8 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToNestedClass/before/specificImport.kt @@ -0,0 +1,5 @@ +import A as X + +fun bar() { + val t: X = X() +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToNestedClass/moveTopLevelClassToTopLevelClass.test b/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToNestedClass/moveTopLevelClassToTopLevelClass.test new file mode 100644 index 00000000000..61e0c741c73 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToNestedClass/moveTopLevelClassToTopLevelClass.test @@ -0,0 +1,5 @@ +{ + "mainFile": "main.java", + "type": "MOVE_TOP_LEVEL_CLASSES_TO_INNER", + "targetClass": "B.C" +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClass/after/main2.java b/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClass/after/main2.java new file mode 100644 index 00000000000..848d4a5eabf --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClass/after/main2.java @@ -0,0 +1,5 @@ +public class B { + public static class A { + + } +} diff --git a/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClass/after/noImports.kt b/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClass/after/noImports.kt new file mode 100644 index 00000000000..bca84ba26c8 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClass/after/noImports.kt @@ -0,0 +1,3 @@ +fun bar() { + val t: B.A = B.A() +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClass/after/onDemandImport.kt b/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClass/after/onDemandImport.kt new file mode 100644 index 00000000000..393288261a9 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClass/after/onDemandImport.kt @@ -0,0 +1,5 @@ +import B.* + +fun bar() { + val t: A = A() +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClass/after/specificImport.kt b/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClass/after/specificImport.kt new file mode 100644 index 00000000000..858c511527a --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClass/after/specificImport.kt @@ -0,0 +1,5 @@ +import B.A as X + +fun bar() { + val t: X = X() +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClass/before/main.java b/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClass/before/main.java new file mode 100644 index 00000000000..35d04be50ec --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClass/before/main.java @@ -0,0 +1,3 @@ +public class A { + +} diff --git a/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClass/before/main2.java b/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClass/before/main2.java new file mode 100644 index 00000000000..66dd24ce675 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClass/before/main2.java @@ -0,0 +1,2 @@ +public class B { +} diff --git a/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClass/before/noImports.kt b/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClass/before/noImports.kt new file mode 100644 index 00000000000..43241c50fc1 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClass/before/noImports.kt @@ -0,0 +1,3 @@ +fun bar() { + val t: A = A() +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClass/before/onDemandImport.kt b/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClass/before/onDemandImport.kt new file mode 100644 index 00000000000..393288261a9 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClass/before/onDemandImport.kt @@ -0,0 +1,5 @@ +import B.* + +fun bar() { + val t: A = A() +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClass/before/specificImport.kt b/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClass/before/specificImport.kt new file mode 100644 index 00000000000..155939eccd8 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClass/before/specificImport.kt @@ -0,0 +1,5 @@ +import A as X + +fun bar() { + val t: X = X() +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClass/moveTopLevelClassToTopLevelClass.test b/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClass/moveTopLevelClassToTopLevelClass.test new file mode 100644 index 00000000000..6078c91e1d2 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClass/moveTopLevelClassToTopLevelClass.test @@ -0,0 +1,5 @@ +{ + "mainFile": "main.java", + "type": "MOVE_TOP_LEVEL_CLASSES_TO_INNER", + "targetClass": "B" +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClassOfAnotherPackage/after/a/noImports.kt b/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClassOfAnotherPackage/after/a/noImports.kt new file mode 100644 index 00000000000..d4bf3fda792 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClassOfAnotherPackage/after/a/noImports.kt @@ -0,0 +1,7 @@ +package a + +import b.B + +fun bar() { + val t: B.A = B.A() +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClassOfAnotherPackage/after/a/onDemandImport.kt b/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClassOfAnotherPackage/after/a/onDemandImport.kt new file mode 100644 index 00000000000..313ef33ae31 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClassOfAnotherPackage/after/a/onDemandImport.kt @@ -0,0 +1,7 @@ +package a + +import b.B.* + +fun bar() { + val t: A = A() +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClassOfAnotherPackage/after/a/specificImport.kt b/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClassOfAnotherPackage/after/a/specificImport.kt new file mode 100644 index 00000000000..cadde485edc --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClassOfAnotherPackage/after/a/specificImport.kt @@ -0,0 +1,7 @@ +package a + +import b.B.A as X + +fun bar() { + val t: X = X() +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClassOfAnotherPackage/after/b/main2.java b/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClassOfAnotherPackage/after/b/main2.java new file mode 100644 index 00000000000..06fee67b4d9 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClassOfAnotherPackage/after/b/main2.java @@ -0,0 +1,7 @@ +package b; + +public class B { + public static class A { + + } +} diff --git a/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClassOfAnotherPackage/after/b/noImports.kt b/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClassOfAnotherPackage/after/b/noImports.kt new file mode 100644 index 00000000000..d292370cce2 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClassOfAnotherPackage/after/b/noImports.kt @@ -0,0 +1,5 @@ +package b + +fun bar() { + val t: B.A = B.A() +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClassOfAnotherPackage/after/b/onDemandImport.kt b/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClassOfAnotherPackage/after/b/onDemandImport.kt new file mode 100644 index 00000000000..0b6f091454d --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClassOfAnotherPackage/after/b/onDemandImport.kt @@ -0,0 +1,7 @@ +package b + +import b.B.* + +fun bar() { + val t: A = A() +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClassOfAnotherPackage/after/b/specificImport.kt b/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClassOfAnotherPackage/after/b/specificImport.kt new file mode 100644 index 00000000000..d0d6a62413c --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClassOfAnotherPackage/after/b/specificImport.kt @@ -0,0 +1,7 @@ +package b + +import b.B.A as X + +fun bar() { + val t: X = X() +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClassOfAnotherPackage/before/a/main.java b/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClassOfAnotherPackage/before/a/main.java new file mode 100644 index 00000000000..6c0a4148c85 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClassOfAnotherPackage/before/a/main.java @@ -0,0 +1,5 @@ +package a; + +public class A { + +} diff --git a/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClassOfAnotherPackage/before/a/noImports.kt b/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClassOfAnotherPackage/before/a/noImports.kt new file mode 100644 index 00000000000..e879a7194b7 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClassOfAnotherPackage/before/a/noImports.kt @@ -0,0 +1,5 @@ +package a + +fun bar() { + val t: A = A() +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClassOfAnotherPackage/before/a/onDemandImport.kt b/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClassOfAnotherPackage/before/a/onDemandImport.kt new file mode 100644 index 00000000000..313ef33ae31 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClassOfAnotherPackage/before/a/onDemandImport.kt @@ -0,0 +1,7 @@ +package a + +import b.B.* + +fun bar() { + val t: A = A() +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClassOfAnotherPackage/before/a/specificImport.kt b/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClassOfAnotherPackage/before/a/specificImport.kt new file mode 100644 index 00000000000..88970e2cedc --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClassOfAnotherPackage/before/a/specificImport.kt @@ -0,0 +1,7 @@ +package a + +import a.A as X + +fun bar() { + val t: X = X() +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClassOfAnotherPackage/before/b/main2.java b/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClassOfAnotherPackage/before/b/main2.java new file mode 100644 index 00000000000..15b711c6515 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClassOfAnotherPackage/before/b/main2.java @@ -0,0 +1,4 @@ +package b; + +public class B { +} diff --git a/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClassOfAnotherPackage/before/b/noImports.kt b/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClassOfAnotherPackage/before/b/noImports.kt new file mode 100644 index 00000000000..7b86dd85a0a --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClassOfAnotherPackage/before/b/noImports.kt @@ -0,0 +1,5 @@ +package b + +fun bar() { + val t: a.A = a.A() +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClassOfAnotherPackage/before/b/onDemandImport.kt b/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClassOfAnotherPackage/before/b/onDemandImport.kt new file mode 100644 index 00000000000..3727a350e1e --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClassOfAnotherPackage/before/b/onDemandImport.kt @@ -0,0 +1,7 @@ +package b + +import b.B.* + +fun bar() { + val t: a.A = a.A() +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClassOfAnotherPackage/before/b/specificImport.kt b/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClassOfAnotherPackage/before/b/specificImport.kt new file mode 100644 index 00000000000..29b95b10227 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClassOfAnotherPackage/before/b/specificImport.kt @@ -0,0 +1,7 @@ +package b + +import a.A as X + +fun bar() { + val t: X = X() +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClassOfAnotherPackage/moveTopLevelClassToTopLevelClassOfAnotherPackage.test b/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClassOfAnotherPackage/moveTopLevelClassToTopLevelClassOfAnotherPackage.test new file mode 100644 index 00000000000..66375ce0513 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClassOfAnotherPackage/moveTopLevelClassToTopLevelClassOfAnotherPackage.test @@ -0,0 +1,5 @@ +{ + "mainFile": "a/main.java", + "type": "MOVE_TOP_LEVEL_CLASSES_TO_INNER", + "targetClass": "b.B" +} \ No newline at end of file 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 d019eac7ef8..a3067efe136 100644 --- a/idea/tests/org/jetbrains/jet/plugin/refactoring/move/AbstractJetMoveTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/refactoring/move/AbstractJetMoveTest.kt @@ -42,6 +42,9 @@ import com.intellij.refactoring.move.moveClassesOrPackages.MultipleRootsMoveDest import com.intellij.refactoring.PackageWrapper import com.intellij.psi.JavaPsiFacade import com.intellij.psi.PsiClass +import com.intellij.refactoring.move.moveInner.MoveInnerProcessor +import com.intellij.psi.search.GlobalSearchScope +import com.intellij.refactoring.move.moveClassesOrPackages.MoveClassToInnerProcessor import com.intellij.psi.PsiFile import com.intellij.psi.PsiManager @@ -182,5 +185,43 @@ enum class MoveAction { } } + MOVE_TOP_LEVEL_CLASSES_TO_INNER { + override fun runRefactoring(mainFile: PsiFile, elementAtCaret: PsiElement?, config: JsonObject) { + val project = mainFile.getProject() + + val classToMove = elementAtCaret!!.getParentByType(javaClass())!! + val targetClass = config.getString("targetClass") + + MoveClassToInnerProcessor( + project = project, + classesToMove = array(classToMove), + targetClass = JavaPsiFacade.getInstance(project).findClass(targetClass, GlobalSearchScope.allScope(project))!!, + searchInComments = false, + searchInNonJavaFiles = true, + moveCallback = null + ).run() + } + } + + MOVE_INNER_CLASS { + override fun runRefactoring(mainFile: PsiFile, elementAtCaret: PsiElement?, config: JsonObject) { + val project = mainFile.getProject() + + val classToMove = elementAtCaret!!.getParentByType(javaClass())!! + val newClassName = config.getNullableString("newClassName") ?: classToMove.getName()!! + val outerInstanceParameterName = config.getNullableString("outerInstanceParameterName") + val targetPackage = config.getString("targetPackage") + + MoveInnerProcessor( + project = project, + innerClass = classToMove, + name = newClassName, + passOuterClass = outerInstanceParameterName != null, + parameterName = outerInstanceParameterName, + targetContainer = JavaPsiFacade.getInstance(project).findPackage(targetPackage)!!.getDirectories()[0] + ).run() + } + } + abstract fun runRefactoring(mainFile: PsiFile, elementAtCaret: PsiElement?, config: JsonObject) } 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 01b859a22fa..cdda936f30f 100644 --- a/idea/tests/org/jetbrains/jet/plugin/refactoring/move/JetMoveTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/refactoring/move/JetMoveTestGenerated.java @@ -66,11 +66,41 @@ public class JetMoveTestGenerated extends AbstractJetMoveTest { doTest("idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassOfAnotherPackage/moveClassToTopLevelClassOfAnotherPackage.test"); } + @TestMetadata("java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInAnotherPackage/moveNestedClassToTopLevelInAnotherPackage.test") + public void testJava_moveClass_moveInnerToTop_moveNestedClassToTopLevelInAnotherPackage_MoveNestedClassToTopLevelInAnotherPackage() throws Exception { + doTest("idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInAnotherPackage/moveNestedClassToTopLevelInAnotherPackage.test"); + } + + @TestMetadata("java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackage/moveNestedClassToTopLevelInTheSamePackage.test") + public void testJava_moveClass_moveInnerToTop_moveNestedClassToTopLevelInTheSamePackage_MoveNestedClassToTopLevelInTheSamePackage() throws Exception { + doTest("idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackage/moveNestedClassToTopLevelInTheSamePackage.test"); + } + + @TestMetadata("java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndRename/moveNestedClassToTopLevelInTheSamePackageAndRename.test") + public void testJava_moveClass_moveInnerToTop_moveNestedClassToTopLevelInTheSamePackageAndRename_MoveNestedClassToTopLevelInTheSamePackageAndRename() throws Exception { + doTest("idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndRename/moveNestedClassToTopLevelInTheSamePackageAndRename.test"); + } + @TestMetadata("java/moveClass/moveTop/moveTopLevelClassToAnotherPackage/moveTopLevelClassToAnotherPackage.test") public void testJava_moveClass_moveTop_moveTopLevelClassToAnotherPackage_MoveTopLevelClassToAnotherPackage() throws Exception { doTest("idea/testData/refactoring/move/java/moveClass/moveTop/moveTopLevelClassToAnotherPackage/moveTopLevelClassToAnotherPackage.test"); } + @TestMetadata("java/moveClass/moveTopToInner/moveTopLevelClassToNestedClass/moveTopLevelClassToTopLevelClass.test") + public void testJava_moveClass_moveTopToInner_moveTopLevelClassToNestedClass_MoveTopLevelClassToTopLevelClass() throws Exception { + doTest("idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToNestedClass/moveTopLevelClassToTopLevelClass.test"); + } + + @TestMetadata("java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClass/moveTopLevelClassToTopLevelClass.test") + public void testJava_moveClass_moveTopToInner_moveTopLevelClassToTopLevelClass_MoveTopLevelClassToTopLevelClass() throws Exception { + doTest("idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClass/moveTopLevelClassToTopLevelClass.test"); + } + + @TestMetadata("java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClassOfAnotherPackage/moveTopLevelClassToTopLevelClassOfAnotherPackage.test") + public void testJava_moveClass_moveTopToInner_moveTopLevelClassToTopLevelClassOfAnotherPackage_MoveTopLevelClassToTopLevelClassOfAnotherPackage() throws Exception { + doTest("idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClassOfAnotherPackage/moveTopLevelClassToTopLevelClassOfAnotherPackage.test"); + } + @TestMetadata("java/moveField/moveFieldToExternalNestedClass/moveFieldToExternalNestedClass.test") public void testJava_moveField_moveFieldToExternalNestedClass_MoveFieldToExternalNestedClass() throws Exception { doTest("idea/testData/refactoring/move/java/moveField/moveFieldToExternalNestedClass/moveFieldToExternalNestedClass.test");