diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetFile.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetFile.java index 073d4fb9df7..61b076205e9 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetFile.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetFile.java @@ -21,8 +21,11 @@ import com.intellij.lang.ASTNode; import com.intellij.lang.FileASTNode; import com.intellij.openapi.fileTypes.FileType; import com.intellij.psi.FileViewProvider; +import com.intellij.psi.PsiClass; +import com.intellij.psi.PsiClassOwner; import com.intellij.psi.PsiElementVisitor; import com.intellij.psi.util.PsiTreeUtil; +import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.JetNodeTypes; @@ -33,7 +36,7 @@ import org.jetbrains.jet.plugin.JetLanguage; import java.util.Collections; import java.util.List; -public class JetFile extends PsiFileBase implements JetDeclarationContainer, JetElement { +public class JetFile extends PsiFileBase implements JetDeclarationContainer, JetElement, PsiClassOwner { private final boolean isCompiled; @@ -96,6 +99,7 @@ public class JetFile extends PsiFileBase implements JetDeclarationContainer, Jet return ast != null ? (JetPackageDirective) ast.getPsi() : null; } + @Override @Nullable public String getPackageName() { PsiJetFileStub stub = (PsiJetFileStub) getStub(); @@ -107,6 +111,15 @@ public class JetFile extends PsiFileBase implements JetDeclarationContainer, Jet return directive != null ? directive.getQualifiedName() : null; } + @NotNull + @Override + public PsiClass[] getClasses() { + return PsiClass.EMPTY_ARRAY; + } + + @Override + public void setPackageName(String packageName) { } + @Nullable public JetScript getScript() { return PsiTreeUtil.getChildOfType(this, JetScript.class); diff --git a/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToExternalNestedClass/after/dependency.java b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToExternalNestedClass/after/dependency.java new file mode 100644 index 00000000000..ba42b375ab2 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToExternalNestedClass/after/dependency.java @@ -0,0 +1,8 @@ +public class B { + public static class C { + + public static class X { + + } + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToExternalNestedClass/after/main.java b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToExternalNestedClass/after/main.java new file mode 100644 index 00000000000..61ff2abcc95 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToExternalNestedClass/after/main.java @@ -0,0 +1,2 @@ +public class A { +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToExternalNestedClass/after/noImports.kt b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToExternalNestedClass/after/noImports.kt new file mode 100644 index 00000000000..6b412d83dab --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToExternalNestedClass/after/noImports.kt @@ -0,0 +1,3 @@ +fun bar(s: String) { + val t: B.C.X = B.C.X() +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToExternalNestedClass/after/onDemandImportOfSourceClassMembers.kt b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToExternalNestedClass/after/onDemandImportOfSourceClassMembers.kt new file mode 100644 index 00000000000..bd8e0e84326 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToExternalNestedClass/after/onDemandImportOfSourceClassMembers.kt @@ -0,0 +1,5 @@ +import A.* + +fun bar(s: String) { + val t: B.C.X = B.C.X() +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToExternalNestedClass/after/onDemandImportOfTargetClassMembers.kt b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToExternalNestedClass/after/onDemandImportOfTargetClassMembers.kt new file mode 100644 index 00000000000..70167dfc9f3 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToExternalNestedClass/after/onDemandImportOfTargetClassMembers.kt @@ -0,0 +1,5 @@ +import B.* + +fun bar(s: String) { + val t: C.X = C.X() +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToExternalNestedClass/after/specificImport.kt b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToExternalNestedClass/after/specificImport.kt new file mode 100644 index 00000000000..105b8f52a62 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToExternalNestedClass/after/specificImport.kt @@ -0,0 +1,5 @@ +import B.C.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/moveAsMember/moveClassToExternalNestedClass/before/dependency.java b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToExternalNestedClass/before/dependency.java new file mode 100644 index 00000000000..de2ad731fd6 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToExternalNestedClass/before/dependency.java @@ -0,0 +1,5 @@ +public class B { + public static class C { + + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToExternalNestedClass/before/main.java b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToExternalNestedClass/before/main.java new file mode 100644 index 00000000000..e9e29aaa251 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToExternalNestedClass/before/main.java @@ -0,0 +1,5 @@ +public class A { + public static class X { + + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToExternalNestedClass/before/noImports.kt b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToExternalNestedClass/before/noImports.kt new file mode 100644 index 00000000000..fd8f27738f6 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToExternalNestedClass/before/noImports.kt @@ -0,0 +1,3 @@ +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/moveAsMember/moveClassToExternalNestedClass/before/onDemandImportOfSourceClassMembers.kt b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToExternalNestedClass/before/onDemandImportOfSourceClassMembers.kt new file mode 100644 index 00000000000..69926dd5d39 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToExternalNestedClass/before/onDemandImportOfSourceClassMembers.kt @@ -0,0 +1,5 @@ +import A.* + +fun bar(s: String) { + val t: X = X() +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToExternalNestedClass/before/onDemandImportOfTargetClassMembers.kt b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToExternalNestedClass/before/onDemandImportOfTargetClassMembers.kt new file mode 100644 index 00000000000..63c22d97d4b --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToExternalNestedClass/before/onDemandImportOfTargetClassMembers.kt @@ -0,0 +1,5 @@ +import B.* + +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/moveAsMember/moveClassToExternalNestedClass/before/specificImport.kt b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToExternalNestedClass/before/specificImport.kt new file mode 100644 index 00000000000..cb131d7aca3 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToExternalNestedClass/before/specificImport.kt @@ -0,0 +1,5 @@ +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/moveAsMember/moveClassToExternalNestedClass/moveClassToExternalNestedClass.test b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToExternalNestedClass/moveClassToExternalNestedClass.test new file mode 100644 index 00000000000..0328b5e3206 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToExternalNestedClass/moveClassToExternalNestedClass.test @@ -0,0 +1,5 @@ +{ + "mainFile": "main.java", + "type": "MOVE_MEMBERS", + "targetClass": "B.C" +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToNestedSiblingClass/after/main.java b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToNestedSiblingClass/after/main.java new file mode 100644 index 00000000000..9940c5c0490 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToNestedSiblingClass/after/main.java @@ -0,0 +1,9 @@ +public class A { + + public static class B { + + public static class X { + + } + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToNestedSiblingClass/after/noImports.kt b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToNestedSiblingClass/after/noImports.kt new file mode 100644 index 00000000000..b371e9d7a90 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToNestedSiblingClass/after/noImports.kt @@ -0,0 +1,3 @@ +fun bar(s: String) { + val t: A.B.X = A.B.X() +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToNestedSiblingClass/after/onDemandImport.kt b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToNestedSiblingClass/after/onDemandImport.kt new file mode 100644 index 00000000000..7b1bf28b928 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToNestedSiblingClass/after/onDemandImport.kt @@ -0,0 +1,5 @@ +import A.* + +fun bar(s: String) { + val t: B.X = B.X() +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToNestedSiblingClass/after/specificImport.kt b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToNestedSiblingClass/after/specificImport.kt new file mode 100644 index 00000000000..6145a01541d --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToNestedSiblingClass/after/specificImport.kt @@ -0,0 +1,5 @@ +import A.B.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/moveAsMember/moveClassToNestedSiblingClass/before/main.java b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToNestedSiblingClass/before/main.java new file mode 100644 index 00000000000..0e33636da66 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToNestedSiblingClass/before/main.java @@ -0,0 +1,9 @@ +public class A { + public static class X { + + } + + public static class B { + + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToNestedSiblingClass/before/noImports.kt b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToNestedSiblingClass/before/noImports.kt new file mode 100644 index 00000000000..fd8f27738f6 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToNestedSiblingClass/before/noImports.kt @@ -0,0 +1,3 @@ +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/moveAsMember/moveClassToNestedSiblingClass/before/onDemandImport.kt b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToNestedSiblingClass/before/onDemandImport.kt new file mode 100644 index 00000000000..69926dd5d39 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToNestedSiblingClass/before/onDemandImport.kt @@ -0,0 +1,5 @@ +import A.* + +fun bar(s: String) { + val t: X = X() +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToNestedSiblingClass/before/specificImport.kt b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToNestedSiblingClass/before/specificImport.kt new file mode 100644 index 00000000000..cb131d7aca3 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToNestedSiblingClass/before/specificImport.kt @@ -0,0 +1,5 @@ +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/moveAsMember/moveClassToNestedSiblingClass/moveClassToNestedSiblingClass.test b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToNestedSiblingClass/moveClassToNestedSiblingClass.test new file mode 100644 index 00000000000..e677dd4192f --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToNestedSiblingClass/moveClassToNestedSiblingClass.test @@ -0,0 +1,5 @@ +{ + "mainFile": "main.java", + "type": "MOVE_MEMBERS", + "targetClass": "A.B" +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClass/after/main.java b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClass/after/main.java new file mode 100644 index 00000000000..1fcf64bf0a6 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClass/after/main.java @@ -0,0 +1,9 @@ +public class A { +} + +public class B { + + public static class X { + + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClass/after/noImports.kt b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClass/after/noImports.kt new file mode 100644 index 00000000000..8b616b22226 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClass/after/noImports.kt @@ -0,0 +1,3 @@ +fun bar(s: String) { + val t: B.X = B.X() +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClass/after/onDemandImport.kt b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClass/after/onDemandImport.kt new file mode 100644 index 00000000000..7b1bf28b928 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClass/after/onDemandImport.kt @@ -0,0 +1,5 @@ +import A.* + +fun bar(s: String) { + val t: B.X = B.X() +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClass/after/specificImport.kt b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClass/after/specificImport.kt new file mode 100644 index 00000000000..4050f1fe825 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClass/after/specificImport.kt @@ -0,0 +1,5 @@ +import B.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/moveAsMember/moveClassToTopLevelClass/before/main.java b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClass/before/main.java new file mode 100644 index 00000000000..7adba028b6f --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClass/before/main.java @@ -0,0 +1,9 @@ +public class A { + public static class X { + + } +} + +public class B { + +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClass/before/noImports.kt b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClass/before/noImports.kt new file mode 100644 index 00000000000..fd8f27738f6 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClass/before/noImports.kt @@ -0,0 +1,3 @@ +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/moveAsMember/moveClassToTopLevelClass/before/onDemandImport.kt b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClass/before/onDemandImport.kt new file mode 100644 index 00000000000..69926dd5d39 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClass/before/onDemandImport.kt @@ -0,0 +1,5 @@ +import A.* + +fun bar(s: String) { + val t: X = X() +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClass/before/specificImport.kt b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClass/before/specificImport.kt new file mode 100644 index 00000000000..cb131d7aca3 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClass/before/specificImport.kt @@ -0,0 +1,5 @@ +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/moveAsMember/moveClassToTopLevelClass/moveClassToTopLevelClass.test b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClass/moveClassToTopLevelClass.test new file mode 100644 index 00000000000..4f64ae3fb28 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClass/moveClassToTopLevelClass.test @@ -0,0 +1,5 @@ +{ + "mainFile": "main.java", + "type": "MOVE_MEMBERS", + "targetClass": "B" +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassAndMakePackageLocal/after/main.java b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassAndMakePackageLocal/after/main.java new file mode 100644 index 00000000000..366eb911c07 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassAndMakePackageLocal/after/main.java @@ -0,0 +1,9 @@ +public class A { +} + +public class B { + + static class X { + + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassAndMakePackageLocal/after/noImports.kt b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassAndMakePackageLocal/after/noImports.kt new file mode 100644 index 00000000000..8b616b22226 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassAndMakePackageLocal/after/noImports.kt @@ -0,0 +1,3 @@ +fun bar(s: String) { + val t: B.X = B.X() +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassAndMakePackageLocal/after/onDemandImport.kt b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassAndMakePackageLocal/after/onDemandImport.kt new file mode 100644 index 00000000000..7b1bf28b928 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassAndMakePackageLocal/after/onDemandImport.kt @@ -0,0 +1,5 @@ +import A.* + +fun bar(s: String) { + val t: B.X = B.X() +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassAndMakePackageLocal/after/specificImport.kt b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassAndMakePackageLocal/after/specificImport.kt new file mode 100644 index 00000000000..4050f1fe825 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassAndMakePackageLocal/after/specificImport.kt @@ -0,0 +1,5 @@ +import B.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/moveAsMember/moveClassToTopLevelClassAndMakePackageLocal/before/main.java b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassAndMakePackageLocal/before/main.java new file mode 100644 index 00000000000..7adba028b6f --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassAndMakePackageLocal/before/main.java @@ -0,0 +1,9 @@ +public class A { + public static class X { + + } +} + +public class B { + +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassAndMakePackageLocal/before/noImports.kt b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassAndMakePackageLocal/before/noImports.kt new file mode 100644 index 00000000000..fd8f27738f6 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassAndMakePackageLocal/before/noImports.kt @@ -0,0 +1,3 @@ +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/moveAsMember/moveClassToTopLevelClassAndMakePackageLocal/before/onDemandImport.kt b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassAndMakePackageLocal/before/onDemandImport.kt new file mode 100644 index 00000000000..69926dd5d39 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassAndMakePackageLocal/before/onDemandImport.kt @@ -0,0 +1,5 @@ +import A.* + +fun bar(s: String) { + val t: X = X() +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassAndMakePackageLocal/before/specificImport.kt b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassAndMakePackageLocal/before/specificImport.kt new file mode 100644 index 00000000000..cb131d7aca3 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassAndMakePackageLocal/before/specificImport.kt @@ -0,0 +1,5 @@ +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/moveAsMember/moveClassToTopLevelClassAndMakePackageLocal/moveClassToTopLevelClassAndMakePackageLocal.test b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassAndMakePackageLocal/moveClassToTopLevelClassAndMakePackageLocal.test new file mode 100644 index 00000000000..d99a43bfab8 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassAndMakePackageLocal/moveClassToTopLevelClassAndMakePackageLocal.test @@ -0,0 +1,6 @@ +{ + "mainFile": "main.java", + "type": "MOVE_MEMBERS", + "targetClass": "B", + "visibility": "packageLocal" +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassAndMakePrivate/after/main.java b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassAndMakePrivate/after/main.java new file mode 100644 index 00000000000..57edca5a657 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassAndMakePrivate/after/main.java @@ -0,0 +1,9 @@ +public class A { + public static class X { + + } +} + +public class B { + +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassAndMakePrivate/after/noImports.kt b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassAndMakePrivate/after/noImports.kt new file mode 100644 index 00000000000..fd8f27738f6 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassAndMakePrivate/after/noImports.kt @@ -0,0 +1,3 @@ +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/moveAsMember/moveClassToTopLevelClassAndMakePrivate/after/onDemandImport.kt b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassAndMakePrivate/after/onDemandImport.kt new file mode 100644 index 00000000000..69926dd5d39 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassAndMakePrivate/after/onDemandImport.kt @@ -0,0 +1,5 @@ +import A.* + +fun bar(s: String) { + val t: X = X() +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassAndMakePrivate/after/specificImport.kt b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassAndMakePrivate/after/specificImport.kt new file mode 100644 index 00000000000..cb131d7aca3 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassAndMakePrivate/after/specificImport.kt @@ -0,0 +1,5 @@ +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/moveAsMember/moveClassToTopLevelClassAndMakePrivate/before/main.java b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassAndMakePrivate/before/main.java new file mode 100644 index 00000000000..7adba028b6f --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassAndMakePrivate/before/main.java @@ -0,0 +1,9 @@ +public class A { + public static class X { + + } +} + +public class B { + +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassAndMakePrivate/before/noImports.kt b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassAndMakePrivate/before/noImports.kt new file mode 100644 index 00000000000..fd8f27738f6 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassAndMakePrivate/before/noImports.kt @@ -0,0 +1,3 @@ +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/moveAsMember/moveClassToTopLevelClassAndMakePrivate/before/onDemandImport.kt b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassAndMakePrivate/before/onDemandImport.kt new file mode 100644 index 00000000000..69926dd5d39 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassAndMakePrivate/before/onDemandImport.kt @@ -0,0 +1,5 @@ +import A.* + +fun bar(s: String) { + val t: X = X() +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassAndMakePrivate/before/specificImport.kt b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassAndMakePrivate/before/specificImport.kt new file mode 100644 index 00000000000..cb131d7aca3 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassAndMakePrivate/before/specificImport.kt @@ -0,0 +1,5 @@ +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/moveAsMember/moveClassToTopLevelClassAndMakePrivate/conflicts.txt b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassAndMakePrivate/conflicts.txt new file mode 100644 index 00000000000..5671f7051d3 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassAndMakePrivate/conflicts.txt @@ -0,0 +1,5 @@ +Class A.X is private and will not be accessible from file noImports.kt. +Class A.X is private and will not be accessible from file noImports.kt. +Class A.X is private and will not be accessible from file onDemandImport.kt. +Class A.X is private and will not be accessible from file onDemandImport.kt. +Class A.X is private and will not be accessible from file specificImport.kt. \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassAndMakePrivate/moveClassToTopLevelClassAndMakePrivate.test b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassAndMakePrivate/moveClassToTopLevelClassAndMakePrivate.test new file mode 100644 index 00000000000..3361c846a7b --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassAndMakePrivate/moveClassToTopLevelClassAndMakePrivate.test @@ -0,0 +1,6 @@ +{ + "mainFile": "main.java", + "type": "MOVE_MEMBERS", + "targetClass": "B", + "visibility": "private" +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassOfAnotherPackage/after/j/main.java b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassOfAnotherPackage/after/j/main.java new file mode 100644 index 00000000000..f7c05881ea9 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassOfAnotherPackage/after/j/main.java @@ -0,0 +1,11 @@ +package j; + +public class A { +} + +public class B { + + public static class X { + + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassOfAnotherPackage/after/k/noImports.kt b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassOfAnotherPackage/after/k/noImports.kt new file mode 100644 index 00000000000..f7e542a731d --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassOfAnotherPackage/after/k/noImports.kt @@ -0,0 +1,7 @@ +package k + +import j.B + +fun bar(s: String) { + val t: B.X = B.X() +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassOfAnotherPackage/after/k/onDemandImportOfClassMembers.kt b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassOfAnotherPackage/after/k/onDemandImportOfClassMembers.kt new file mode 100644 index 00000000000..d2a9fe679f5 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassOfAnotherPackage/after/k/onDemandImportOfClassMembers.kt @@ -0,0 +1,8 @@ +package k + +import j.A.* +import j.B + +fun bar(s: String) { + val t: B.X = B.X() +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassOfAnotherPackage/after/k/onDemandImportOfPackageMembers.kt b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassOfAnotherPackage/after/k/onDemandImportOfPackageMembers.kt new file mode 100644 index 00000000000..e4794785700 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassOfAnotherPackage/after/k/onDemandImportOfPackageMembers.kt @@ -0,0 +1,7 @@ +package k + +import j.* + +fun bar(s: String) { + val t: B.X = B.X() +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassOfAnotherPackage/after/k/specificClassImport.kt b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassOfAnotherPackage/after/k/specificClassImport.kt new file mode 100644 index 00000000000..df2c07587c6 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassOfAnotherPackage/after/k/specificClassImport.kt @@ -0,0 +1,8 @@ +package k + +import j.A +import j.B + +fun bar(s: String) { + val t: B.X = B.X() +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassOfAnotherPackage/after/k/specificClassMemberImport.kt b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassOfAnotherPackage/after/k/specificClassMemberImport.kt new file mode 100644 index 00000000000..e8468440b28 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassOfAnotherPackage/after/k/specificClassMemberImport.kt @@ -0,0 +1,7 @@ +package k + +import j.B.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/moveAsMember/moveClassToTopLevelClassOfAnotherPackage/before/j/main.java b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassOfAnotherPackage/before/j/main.java new file mode 100644 index 00000000000..6a3f02dc60e --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassOfAnotherPackage/before/j/main.java @@ -0,0 +1,11 @@ +package j; + +public class A { + public static class X { + + } +} + +public class B { + +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassOfAnotherPackage/before/k/noImports.kt b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassOfAnotherPackage/before/k/noImports.kt new file mode 100644 index 00000000000..861d5d3d48c --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassOfAnotherPackage/before/k/noImports.kt @@ -0,0 +1,5 @@ +package k + +fun bar(s: String) { + val t: j.A.X = j.A.X() +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassOfAnotherPackage/before/k/onDemandImportOfClassMembers.kt b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassOfAnotherPackage/before/k/onDemandImportOfClassMembers.kt new file mode 100644 index 00000000000..4445f68fbe3 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassOfAnotherPackage/before/k/onDemandImportOfClassMembers.kt @@ -0,0 +1,7 @@ +package k + +import j.A.* + +fun bar(s: String) { + val t: X = X() +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassOfAnotherPackage/before/k/onDemandImportOfPackageMembers.kt b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassOfAnotherPackage/before/k/onDemandImportOfPackageMembers.kt new file mode 100644 index 00000000000..47d48ef2967 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassOfAnotherPackage/before/k/onDemandImportOfPackageMembers.kt @@ -0,0 +1,7 @@ +package k + +import j.* + +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/moveAsMember/moveClassToTopLevelClassOfAnotherPackage/before/k/specificClassImport.kt b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassOfAnotherPackage/before/k/specificClassImport.kt new file mode 100644 index 00000000000..fe88b275fb0 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassOfAnotherPackage/before/k/specificClassImport.kt @@ -0,0 +1,7 @@ +package k + +import j.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/moveAsMember/moveClassToTopLevelClassOfAnotherPackage/before/k/specificClassMemberImport.kt b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassOfAnotherPackage/before/k/specificClassMemberImport.kt new file mode 100644 index 00000000000..59fb1aa42a8 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassOfAnotherPackage/before/k/specificClassMemberImport.kt @@ -0,0 +1,7 @@ +package k + +import j.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/moveAsMember/moveClassToTopLevelClassOfAnotherPackage/moveClassToTopLevelClassOfAnotherPackage.test b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassOfAnotherPackage/moveClassToTopLevelClassOfAnotherPackage.test new file mode 100644 index 00000000000..3fbd2d0230d --- /dev/null +++ b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassOfAnotherPackage/moveClassToTopLevelClassOfAnotherPackage.test @@ -0,0 +1,5 @@ +{ + "mainFile": "j/main.java", + "type": "MOVE_MEMBERS", + "targetClass": "j.B" +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveField/moveFieldToExternalNestedClass/after/dependency.java b/idea/testData/refactoring/move/java/moveField/moveFieldToExternalNestedClass/after/dependency.java new file mode 100644 index 00000000000..51ed2c82ee0 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveField/moveFieldToExternalNestedClass/after/dependency.java @@ -0,0 +1,6 @@ +public class B { + public static class C { + + public static String X = ""; + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveField/moveFieldToExternalNestedClass/after/main.java b/idea/testData/refactoring/move/java/moveField/moveFieldToExternalNestedClass/after/main.java new file mode 100644 index 00000000000..61ff2abcc95 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveField/moveFieldToExternalNestedClass/after/main.java @@ -0,0 +1,2 @@ +public class A { +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveField/moveFieldToExternalNestedClass/after/noImports.kt b/idea/testData/refactoring/move/java/moveField/moveFieldToExternalNestedClass/after/noImports.kt new file mode 100644 index 00000000000..231bcc16003 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveField/moveFieldToExternalNestedClass/after/noImports.kt @@ -0,0 +1,3 @@ +fun bar(s: String) { + B.C.X = s +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveField/moveFieldToExternalNestedClass/after/onDemandImportOfSourceClassMembers.kt b/idea/testData/refactoring/move/java/moveField/moveFieldToExternalNestedClass/after/onDemandImportOfSourceClassMembers.kt new file mode 100644 index 00000000000..6e91eb807e1 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveField/moveFieldToExternalNestedClass/after/onDemandImportOfSourceClassMembers.kt @@ -0,0 +1,5 @@ +import A.* + +fun bar(s: String) { + B.C.X = s +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveField/moveFieldToExternalNestedClass/after/onDemandImportOfTargetClassMembers.kt b/idea/testData/refactoring/move/java/moveField/moveFieldToExternalNestedClass/after/onDemandImportOfTargetClassMembers.kt new file mode 100644 index 00000000000..1c9e8c35c1d --- /dev/null +++ b/idea/testData/refactoring/move/java/moveField/moveFieldToExternalNestedClass/after/onDemandImportOfTargetClassMembers.kt @@ -0,0 +1,5 @@ +import B.* + +fun bar(s: String) { + C.X = s +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveField/moveFieldToExternalNestedClass/after/specificImport.kt b/idea/testData/refactoring/move/java/moveField/moveFieldToExternalNestedClass/after/specificImport.kt new file mode 100644 index 00000000000..31ef41a1a1e --- /dev/null +++ b/idea/testData/refactoring/move/java/moveField/moveFieldToExternalNestedClass/after/specificImport.kt @@ -0,0 +1,5 @@ +import B.C.X as XX + +fun bar(s: String) { + XX = s +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveField/moveFieldToExternalNestedClass/before/dependency.java b/idea/testData/refactoring/move/java/moveField/moveFieldToExternalNestedClass/before/dependency.java new file mode 100644 index 00000000000..de2ad731fd6 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveField/moveFieldToExternalNestedClass/before/dependency.java @@ -0,0 +1,5 @@ +public class B { + public static class C { + + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveField/moveFieldToExternalNestedClass/before/main.java b/idea/testData/refactoring/move/java/moveField/moveFieldToExternalNestedClass/before/main.java new file mode 100644 index 00000000000..0d405ac326a --- /dev/null +++ b/idea/testData/refactoring/move/java/moveField/moveFieldToExternalNestedClass/before/main.java @@ -0,0 +1,3 @@ +public class A { + public static String X = ""; +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveField/moveFieldToExternalNestedClass/before/noImports.kt b/idea/testData/refactoring/move/java/moveField/moveFieldToExternalNestedClass/before/noImports.kt new file mode 100644 index 00000000000..910678f8afd --- /dev/null +++ b/idea/testData/refactoring/move/java/moveField/moveFieldToExternalNestedClass/before/noImports.kt @@ -0,0 +1,3 @@ +fun bar(s: String) { + A.X = s +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveField/moveFieldToExternalNestedClass/before/onDemandImportOfSourceClassMembers.kt b/idea/testData/refactoring/move/java/moveField/moveFieldToExternalNestedClass/before/onDemandImportOfSourceClassMembers.kt new file mode 100644 index 00000000000..c1ff67a2ef8 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveField/moveFieldToExternalNestedClass/before/onDemandImportOfSourceClassMembers.kt @@ -0,0 +1,5 @@ +import A.* + +fun bar(s: String) { + X = s +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveField/moveFieldToExternalNestedClass/before/onDemandImportOfTargetClassMembers.kt b/idea/testData/refactoring/move/java/moveField/moveFieldToExternalNestedClass/before/onDemandImportOfTargetClassMembers.kt new file mode 100644 index 00000000000..6d531e831dd --- /dev/null +++ b/idea/testData/refactoring/move/java/moveField/moveFieldToExternalNestedClass/before/onDemandImportOfTargetClassMembers.kt @@ -0,0 +1,5 @@ +import B.* + +fun bar(s: String) { + A.X = s +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveField/moveFieldToExternalNestedClass/before/specificImport.kt b/idea/testData/refactoring/move/java/moveField/moveFieldToExternalNestedClass/before/specificImport.kt new file mode 100644 index 00000000000..a8f95cb7aa2 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveField/moveFieldToExternalNestedClass/before/specificImport.kt @@ -0,0 +1,5 @@ +import A.X as XX + +fun bar(s: String) { + XX = s +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveField/moveFieldToExternalNestedClass/moveFieldToExternalNestedClass.test b/idea/testData/refactoring/move/java/moveField/moveFieldToExternalNestedClass/moveFieldToExternalNestedClass.test new file mode 100644 index 00000000000..0328b5e3206 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveField/moveFieldToExternalNestedClass/moveFieldToExternalNestedClass.test @@ -0,0 +1,5 @@ +{ + "mainFile": "main.java", + "type": "MOVE_MEMBERS", + "targetClass": "B.C" +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveField/moveFieldToNestedSiblingClass/after/main.java b/idea/testData/refactoring/move/java/moveField/moveFieldToNestedSiblingClass/after/main.java new file mode 100644 index 00000000000..81c22a156c6 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveField/moveFieldToNestedSiblingClass/after/main.java @@ -0,0 +1,7 @@ +public class A { + + public static class B { + + public static String X = ""; + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveField/moveFieldToNestedSiblingClass/after/noImports.kt b/idea/testData/refactoring/move/java/moveField/moveFieldToNestedSiblingClass/after/noImports.kt new file mode 100644 index 00000000000..cfd4db3c5ae --- /dev/null +++ b/idea/testData/refactoring/move/java/moveField/moveFieldToNestedSiblingClass/after/noImports.kt @@ -0,0 +1,3 @@ +fun bar(s: String) { + A.B.X = s +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveField/moveFieldToNestedSiblingClass/after/onDemandImport.kt b/idea/testData/refactoring/move/java/moveField/moveFieldToNestedSiblingClass/after/onDemandImport.kt new file mode 100644 index 00000000000..356620c65f6 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveField/moveFieldToNestedSiblingClass/after/onDemandImport.kt @@ -0,0 +1,5 @@ +import A.* + +fun bar(s: String) { + B.X = s +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveField/moveFieldToNestedSiblingClass/after/specificImport.kt b/idea/testData/refactoring/move/java/moveField/moveFieldToNestedSiblingClass/after/specificImport.kt new file mode 100644 index 00000000000..40713230756 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveField/moveFieldToNestedSiblingClass/after/specificImport.kt @@ -0,0 +1,5 @@ +import A.B.X as XX + +fun bar(s: String) { + XX = s +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveField/moveFieldToNestedSiblingClass/before/main.java b/idea/testData/refactoring/move/java/moveField/moveFieldToNestedSiblingClass/before/main.java new file mode 100644 index 00000000000..266234fa10f --- /dev/null +++ b/idea/testData/refactoring/move/java/moveField/moveFieldToNestedSiblingClass/before/main.java @@ -0,0 +1,7 @@ +public class A { + public static String X = ""; + + public static class B { + + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveField/moveFieldToNestedSiblingClass/before/noImports.kt b/idea/testData/refactoring/move/java/moveField/moveFieldToNestedSiblingClass/before/noImports.kt new file mode 100644 index 00000000000..910678f8afd --- /dev/null +++ b/idea/testData/refactoring/move/java/moveField/moveFieldToNestedSiblingClass/before/noImports.kt @@ -0,0 +1,3 @@ +fun bar(s: String) { + A.X = s +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveField/moveFieldToNestedSiblingClass/before/onDemandImport.kt b/idea/testData/refactoring/move/java/moveField/moveFieldToNestedSiblingClass/before/onDemandImport.kt new file mode 100644 index 00000000000..c1ff67a2ef8 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveField/moveFieldToNestedSiblingClass/before/onDemandImport.kt @@ -0,0 +1,5 @@ +import A.* + +fun bar(s: String) { + X = s +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveField/moveFieldToNestedSiblingClass/before/specificImport.kt b/idea/testData/refactoring/move/java/moveField/moveFieldToNestedSiblingClass/before/specificImport.kt new file mode 100644 index 00000000000..a8f95cb7aa2 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveField/moveFieldToNestedSiblingClass/before/specificImport.kt @@ -0,0 +1,5 @@ +import A.X as XX + +fun bar(s: String) { + XX = s +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveField/moveFieldToNestedSiblingClass/moveFieldToNestedSiblingClass.test b/idea/testData/refactoring/move/java/moveField/moveFieldToNestedSiblingClass/moveFieldToNestedSiblingClass.test new file mode 100644 index 00000000000..e677dd4192f --- /dev/null +++ b/idea/testData/refactoring/move/java/moveField/moveFieldToNestedSiblingClass/moveFieldToNestedSiblingClass.test @@ -0,0 +1,5 @@ +{ + "mainFile": "main.java", + "type": "MOVE_MEMBERS", + "targetClass": "A.B" +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClass/after/main.java b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClass/after/main.java new file mode 100644 index 00000000000..8e054d83380 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClass/after/main.java @@ -0,0 +1,7 @@ +public class A { +} + +public class B { + + public static String X = ""; +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClass/after/noImports.kt b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClass/after/noImports.kt new file mode 100644 index 00000000000..1e1f02f6022 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClass/after/noImports.kt @@ -0,0 +1,3 @@ +fun bar(s: String) { + B.X = s +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClass/after/onDemandImport.kt b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClass/after/onDemandImport.kt new file mode 100644 index 00000000000..356620c65f6 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClass/after/onDemandImport.kt @@ -0,0 +1,5 @@ +import A.* + +fun bar(s: String) { + B.X = s +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClass/after/specificImport.kt b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClass/after/specificImport.kt new file mode 100644 index 00000000000..6349c07596f --- /dev/null +++ b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClass/after/specificImport.kt @@ -0,0 +1,5 @@ +import B.X as XX + +fun bar(s: String) { + XX = s +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClass/before/main.java b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClass/before/main.java new file mode 100644 index 00000000000..a501b98da8e --- /dev/null +++ b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClass/before/main.java @@ -0,0 +1,7 @@ +public class A { + public static String X = ""; +} + +public class B { + +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClass/before/noImports.kt b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClass/before/noImports.kt new file mode 100644 index 00000000000..910678f8afd --- /dev/null +++ b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClass/before/noImports.kt @@ -0,0 +1,3 @@ +fun bar(s: String) { + A.X = s +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClass/before/onDemandImport.kt b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClass/before/onDemandImport.kt new file mode 100644 index 00000000000..c1ff67a2ef8 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClass/before/onDemandImport.kt @@ -0,0 +1,5 @@ +import A.* + +fun bar(s: String) { + X = s +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClass/before/specificImport.kt b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClass/before/specificImport.kt new file mode 100644 index 00000000000..a8f95cb7aa2 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClass/before/specificImport.kt @@ -0,0 +1,5 @@ +import A.X as XX + +fun bar(s: String) { + XX = s +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClass/moveFieldToTopLevelClass.test b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClass/moveFieldToTopLevelClass.test new file mode 100644 index 00000000000..4f64ae3fb28 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClass/moveFieldToTopLevelClass.test @@ -0,0 +1,5 @@ +{ + "mainFile": "main.java", + "type": "MOVE_MEMBERS", + "targetClass": "B" +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassAndMakePackageLocal/after/main.java b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassAndMakePackageLocal/after/main.java new file mode 100644 index 00000000000..16784aeb0ae --- /dev/null +++ b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassAndMakePackageLocal/after/main.java @@ -0,0 +1,7 @@ +public class A { +} + +public class B { + + static String X = ""; +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassAndMakePackageLocal/after/noImports.kt b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassAndMakePackageLocal/after/noImports.kt new file mode 100644 index 00000000000..1e1f02f6022 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassAndMakePackageLocal/after/noImports.kt @@ -0,0 +1,3 @@ +fun bar(s: String) { + B.X = s +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassAndMakePackageLocal/after/onDemandImport.kt b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassAndMakePackageLocal/after/onDemandImport.kt new file mode 100644 index 00000000000..356620c65f6 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassAndMakePackageLocal/after/onDemandImport.kt @@ -0,0 +1,5 @@ +import A.* + +fun bar(s: String) { + B.X = s +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassAndMakePackageLocal/after/specificImport.kt b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassAndMakePackageLocal/after/specificImport.kt new file mode 100644 index 00000000000..6349c07596f --- /dev/null +++ b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassAndMakePackageLocal/after/specificImport.kt @@ -0,0 +1,5 @@ +import B.X as XX + +fun bar(s: String) { + XX = s +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassAndMakePackageLocal/before/main.java b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassAndMakePackageLocal/before/main.java new file mode 100644 index 00000000000..a501b98da8e --- /dev/null +++ b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassAndMakePackageLocal/before/main.java @@ -0,0 +1,7 @@ +public class A { + public static String X = ""; +} + +public class B { + +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassAndMakePackageLocal/before/noImports.kt b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassAndMakePackageLocal/before/noImports.kt new file mode 100644 index 00000000000..910678f8afd --- /dev/null +++ b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassAndMakePackageLocal/before/noImports.kt @@ -0,0 +1,3 @@ +fun bar(s: String) { + A.X = s +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassAndMakePackageLocal/before/onDemandImport.kt b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassAndMakePackageLocal/before/onDemandImport.kt new file mode 100644 index 00000000000..c1ff67a2ef8 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassAndMakePackageLocal/before/onDemandImport.kt @@ -0,0 +1,5 @@ +import A.* + +fun bar(s: String) { + X = s +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassAndMakePackageLocal/before/specificImport.kt b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassAndMakePackageLocal/before/specificImport.kt new file mode 100644 index 00000000000..a8f95cb7aa2 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassAndMakePackageLocal/before/specificImport.kt @@ -0,0 +1,5 @@ +import A.X as XX + +fun bar(s: String) { + XX = s +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassAndMakePackageLocal/moveFieldToTopLevelClassAndMakePackageLocal.test b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassAndMakePackageLocal/moveFieldToTopLevelClassAndMakePackageLocal.test new file mode 100644 index 00000000000..d99a43bfab8 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassAndMakePackageLocal/moveFieldToTopLevelClassAndMakePackageLocal.test @@ -0,0 +1,6 @@ +{ + "mainFile": "main.java", + "type": "MOVE_MEMBERS", + "targetClass": "B", + "visibility": "packageLocal" +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassAndMakePrivate/after/main.java b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassAndMakePrivate/after/main.java new file mode 100644 index 00000000000..b8eea268079 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassAndMakePrivate/after/main.java @@ -0,0 +1,7 @@ +public class A { + public static String X = ""; +} + +public class B { + +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassAndMakePrivate/after/noImports.kt b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassAndMakePrivate/after/noImports.kt new file mode 100644 index 00000000000..910678f8afd --- /dev/null +++ b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassAndMakePrivate/after/noImports.kt @@ -0,0 +1,3 @@ +fun bar(s: String) { + A.X = s +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassAndMakePrivate/after/onDemandImport.kt b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassAndMakePrivate/after/onDemandImport.kt new file mode 100644 index 00000000000..c1ff67a2ef8 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassAndMakePrivate/after/onDemandImport.kt @@ -0,0 +1,5 @@ +import A.* + +fun bar(s: String) { + X = s +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassAndMakePrivate/after/specificImport.kt b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassAndMakePrivate/after/specificImport.kt new file mode 100644 index 00000000000..a8f95cb7aa2 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassAndMakePrivate/after/specificImport.kt @@ -0,0 +1,5 @@ +import A.X as XX + +fun bar(s: String) { + XX = s +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassAndMakePrivate/before/main.java b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassAndMakePrivate/before/main.java new file mode 100644 index 00000000000..a501b98da8e --- /dev/null +++ b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassAndMakePrivate/before/main.java @@ -0,0 +1,7 @@ +public class A { + public static String X = ""; +} + +public class B { + +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassAndMakePrivate/before/noImports.kt b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassAndMakePrivate/before/noImports.kt new file mode 100644 index 00000000000..910678f8afd --- /dev/null +++ b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassAndMakePrivate/before/noImports.kt @@ -0,0 +1,3 @@ +fun bar(s: String) { + A.X = s +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassAndMakePrivate/before/onDemandImport.kt b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassAndMakePrivate/before/onDemandImport.kt new file mode 100644 index 00000000000..c1ff67a2ef8 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassAndMakePrivate/before/onDemandImport.kt @@ -0,0 +1,5 @@ +import A.* + +fun bar(s: String) { + X = s +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassAndMakePrivate/before/specificImport.kt b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassAndMakePrivate/before/specificImport.kt new file mode 100644 index 00000000000..a8f95cb7aa2 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassAndMakePrivate/before/specificImport.kt @@ -0,0 +1,5 @@ +import A.X as XX + +fun bar(s: String) { + XX = s +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassAndMakePrivate/conflicts.txt b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassAndMakePrivate/conflicts.txt new file mode 100644 index 00000000000..6c022491be0 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassAndMakePrivate/conflicts.txt @@ -0,0 +1,3 @@ +Field A.X is private and will not be accessible from file noImports.kt. +Field A.X is private and will not be accessible from file onDemandImport.kt. +Field A.X is private and will not be accessible from file specificImport.kt. \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassAndMakePrivate/moveFieldToTopLevelClassAndMakePrivate.test b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassAndMakePrivate/moveFieldToTopLevelClassAndMakePrivate.test new file mode 100644 index 00000000000..3361c846a7b --- /dev/null +++ b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassAndMakePrivate/moveFieldToTopLevelClassAndMakePrivate.test @@ -0,0 +1,6 @@ +{ + "mainFile": "main.java", + "type": "MOVE_MEMBERS", + "targetClass": "B", + "visibility": "private" +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassOfAnotherPackage/after/j/main.java b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassOfAnotherPackage/after/j/main.java new file mode 100644 index 00000000000..db794a9d084 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassOfAnotherPackage/after/j/main.java @@ -0,0 +1,9 @@ +package j; + +public class A { +} + +public class B { + + public static String X = ""; +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassOfAnotherPackage/after/k/noImports.kt b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassOfAnotherPackage/after/k/noImports.kt new file mode 100644 index 00000000000..3696fd7f476 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassOfAnotherPackage/after/k/noImports.kt @@ -0,0 +1,7 @@ +package k + +import j.B + +fun bar(s: String) { + B.X = s +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassOfAnotherPackage/after/k/onDemandImportOfClassMembers.kt b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassOfAnotherPackage/after/k/onDemandImportOfClassMembers.kt new file mode 100644 index 00000000000..dc801faff29 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassOfAnotherPackage/after/k/onDemandImportOfClassMembers.kt @@ -0,0 +1,8 @@ +package k + +import j.A.* +import j.B + +fun bar(s: String) { + B.X = s +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassOfAnotherPackage/after/k/onDemandImportOfPackageMembers.kt b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassOfAnotherPackage/after/k/onDemandImportOfPackageMembers.kt new file mode 100644 index 00000000000..a468414eb3a --- /dev/null +++ b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassOfAnotherPackage/after/k/onDemandImportOfPackageMembers.kt @@ -0,0 +1,7 @@ +package k + +import j.* + +fun bar(s: String) { + B.X = s +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassOfAnotherPackage/after/k/specificClassImport.kt b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassOfAnotherPackage/after/k/specificClassImport.kt new file mode 100644 index 00000000000..23af384a35f --- /dev/null +++ b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassOfAnotherPackage/after/k/specificClassImport.kt @@ -0,0 +1,8 @@ +package k + +import j.A +import j.B + +fun bar(s: String) { + B.X = s +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassOfAnotherPackage/after/k/specificClassMemberImport.kt b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassOfAnotherPackage/after/k/specificClassMemberImport.kt new file mode 100644 index 00000000000..25794107f45 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassOfAnotherPackage/after/k/specificClassMemberImport.kt @@ -0,0 +1,7 @@ +package k + +import j.B.X as XX + +fun bar(s: String) { + XX = s +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassOfAnotherPackage/before/j/main.java b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassOfAnotherPackage/before/j/main.java new file mode 100644 index 00000000000..fea8f5f1ea2 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassOfAnotherPackage/before/j/main.java @@ -0,0 +1,9 @@ +package j; + +public class A { + public static String X = ""; +} + +public class B { + +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassOfAnotherPackage/before/k/noImports.kt b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassOfAnotherPackage/before/k/noImports.kt new file mode 100644 index 00000000000..9559eab69f0 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassOfAnotherPackage/before/k/noImports.kt @@ -0,0 +1,5 @@ +package k + +fun bar(s: String) { + j.A.X = s +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassOfAnotherPackage/before/k/onDemandImportOfClassMembers.kt b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassOfAnotherPackage/before/k/onDemandImportOfClassMembers.kt new file mode 100644 index 00000000000..a80693cd0f5 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassOfAnotherPackage/before/k/onDemandImportOfClassMembers.kt @@ -0,0 +1,7 @@ +package k + +import j.A.* + +fun bar(s: String) { + X = s +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassOfAnotherPackage/before/k/onDemandImportOfPackageMembers.kt b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassOfAnotherPackage/before/k/onDemandImportOfPackageMembers.kt new file mode 100644 index 00000000000..a0ed6a4b8f2 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassOfAnotherPackage/before/k/onDemandImportOfPackageMembers.kt @@ -0,0 +1,7 @@ +package k + +import j.* + +fun bar(s: String) { + A.X = s +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassOfAnotherPackage/before/k/specificClassImport.kt b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassOfAnotherPackage/before/k/specificClassImport.kt new file mode 100644 index 00000000000..15dbb81f91a --- /dev/null +++ b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassOfAnotherPackage/before/k/specificClassImport.kt @@ -0,0 +1,7 @@ +package k + +import j.A + +fun bar(s: String) { + A.X = s +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassOfAnotherPackage/before/k/specificClassMemberImport.kt b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassOfAnotherPackage/before/k/specificClassMemberImport.kt new file mode 100644 index 00000000000..bf1102b7012 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassOfAnotherPackage/before/k/specificClassMemberImport.kt @@ -0,0 +1,7 @@ +package k + +import j.A.X as XX + +fun bar(s: String) { + XX = s +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassOfAnotherPackage/moveFieldToTopLevelClassOfAnotherPackage.test b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassOfAnotherPackage/moveFieldToTopLevelClassOfAnotherPackage.test new file mode 100644 index 00000000000..3fbd2d0230d --- /dev/null +++ b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassOfAnotherPackage/moveFieldToTopLevelClassOfAnotherPackage.test @@ -0,0 +1,5 @@ +{ + "mainFile": "j/main.java", + "type": "MOVE_MEMBERS", + "targetClass": "j.B" +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveMethod/moveMethodToExternalNestedClass/after/dependency.java b/idea/testData/refactoring/move/java/moveMethod/moveMethodToExternalNestedClass/after/dependency.java new file mode 100644 index 00000000000..ff777d69691 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveMethod/moveMethodToExternalNestedClass/after/dependency.java @@ -0,0 +1,8 @@ +public class B { + public static class C { + + public static void foo(String s) { + System.out.println(s) + } + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveMethod/moveMethodToExternalNestedClass/after/main.java b/idea/testData/refactoring/move/java/moveMethod/moveMethodToExternalNestedClass/after/main.java new file mode 100644 index 00000000000..61ff2abcc95 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveMethod/moveMethodToExternalNestedClass/after/main.java @@ -0,0 +1,2 @@ +public class A { +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveMethod/moveMethodToExternalNestedClass/after/noImports.kt b/idea/testData/refactoring/move/java/moveMethod/moveMethodToExternalNestedClass/after/noImports.kt new file mode 100644 index 00000000000..7ef05b4ca63 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveMethod/moveMethodToExternalNestedClass/after/noImports.kt @@ -0,0 +1,3 @@ +fun bar(s: String) { + B.C.foo(s) +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveMethod/moveMethodToExternalNestedClass/after/onDemandImportOfSourceClassMembers.kt b/idea/testData/refactoring/move/java/moveMethod/moveMethodToExternalNestedClass/after/onDemandImportOfSourceClassMembers.kt new file mode 100644 index 00000000000..3945f6f6a9e --- /dev/null +++ b/idea/testData/refactoring/move/java/moveMethod/moveMethodToExternalNestedClass/after/onDemandImportOfSourceClassMembers.kt @@ -0,0 +1,5 @@ +import A.* + +fun bar(s: String) { + B.C.foo(s) +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveMethod/moveMethodToExternalNestedClass/after/onDemandImportOfTargetClassMembers.kt b/idea/testData/refactoring/move/java/moveMethod/moveMethodToExternalNestedClass/after/onDemandImportOfTargetClassMembers.kt new file mode 100644 index 00000000000..9d487899fff --- /dev/null +++ b/idea/testData/refactoring/move/java/moveMethod/moveMethodToExternalNestedClass/after/onDemandImportOfTargetClassMembers.kt @@ -0,0 +1,5 @@ +import B.* + +fun bar(s: String) { + C.foo(s) +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveMethod/moveMethodToExternalNestedClass/after/specificImport.kt b/idea/testData/refactoring/move/java/moveMethod/moveMethodToExternalNestedClass/after/specificImport.kt new file mode 100644 index 00000000000..d84b3e19aaa --- /dev/null +++ b/idea/testData/refactoring/move/java/moveMethod/moveMethodToExternalNestedClass/after/specificImport.kt @@ -0,0 +1,5 @@ +import B.C.foo as foofoo + +fun bar(s: String) { + foofoo(s) +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveMethod/moveMethodToExternalNestedClass/before/dependency.java b/idea/testData/refactoring/move/java/moveMethod/moveMethodToExternalNestedClass/before/dependency.java new file mode 100644 index 00000000000..de2ad731fd6 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveMethod/moveMethodToExternalNestedClass/before/dependency.java @@ -0,0 +1,5 @@ +public class B { + public static class C { + + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveMethod/moveMethodToExternalNestedClass/before/main.java b/idea/testData/refactoring/move/java/moveMethod/moveMethodToExternalNestedClass/before/main.java new file mode 100644 index 00000000000..b6328dd5aca --- /dev/null +++ b/idea/testData/refactoring/move/java/moveMethod/moveMethodToExternalNestedClass/before/main.java @@ -0,0 +1,5 @@ +public class A { + public static void foo(String s) { + System.out.println(s) + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveMethod/moveMethodToExternalNestedClass/before/noImports.kt b/idea/testData/refactoring/move/java/moveMethod/moveMethodToExternalNestedClass/before/noImports.kt new file mode 100644 index 00000000000..637277334f8 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveMethod/moveMethodToExternalNestedClass/before/noImports.kt @@ -0,0 +1,3 @@ +fun bar(s: String) { + A.foo(s) +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveMethod/moveMethodToExternalNestedClass/before/onDemandImportOfSourceClassMembers.kt b/idea/testData/refactoring/move/java/moveMethod/moveMethodToExternalNestedClass/before/onDemandImportOfSourceClassMembers.kt new file mode 100644 index 00000000000..ba053a3026d --- /dev/null +++ b/idea/testData/refactoring/move/java/moveMethod/moveMethodToExternalNestedClass/before/onDemandImportOfSourceClassMembers.kt @@ -0,0 +1,5 @@ +import A.* + +fun bar(s: String) { + foo(s) +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveMethod/moveMethodToExternalNestedClass/before/onDemandImportOfTargetClassMembers.kt b/idea/testData/refactoring/move/java/moveMethod/moveMethodToExternalNestedClass/before/onDemandImportOfTargetClassMembers.kt new file mode 100644 index 00000000000..0968ee815d1 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveMethod/moveMethodToExternalNestedClass/before/onDemandImportOfTargetClassMembers.kt @@ -0,0 +1,5 @@ +import B.* + +fun bar(s: String) { + A.foo(s) +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveMethod/moveMethodToExternalNestedClass/before/specificImport.kt b/idea/testData/refactoring/move/java/moveMethod/moveMethodToExternalNestedClass/before/specificImport.kt new file mode 100644 index 00000000000..710c6f58a12 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveMethod/moveMethodToExternalNestedClass/before/specificImport.kt @@ -0,0 +1,5 @@ +import A.foo as foofoo + +fun bar(s: String) { + foofoo(s) +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveMethod/moveMethodToExternalNestedClass/moveMethodToExternalNestedClass.test b/idea/testData/refactoring/move/java/moveMethod/moveMethodToExternalNestedClass/moveMethodToExternalNestedClass.test new file mode 100644 index 00000000000..0328b5e3206 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveMethod/moveMethodToExternalNestedClass/moveMethodToExternalNestedClass.test @@ -0,0 +1,5 @@ +{ + "mainFile": "main.java", + "type": "MOVE_MEMBERS", + "targetClass": "B.C" +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveMethod/moveMethodToNestedSiblingClass/after/main.java b/idea/testData/refactoring/move/java/moveMethod/moveMethodToNestedSiblingClass/after/main.java new file mode 100644 index 00000000000..4d86438c997 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveMethod/moveMethodToNestedSiblingClass/after/main.java @@ -0,0 +1,9 @@ +public class A { + + public static class B { + + public static void foo(String s) { + System.out.println(s) + } + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveMethod/moveMethodToNestedSiblingClass/after/noImports.kt b/idea/testData/refactoring/move/java/moveMethod/moveMethodToNestedSiblingClass/after/noImports.kt new file mode 100644 index 00000000000..a2f553ca60d --- /dev/null +++ b/idea/testData/refactoring/move/java/moveMethod/moveMethodToNestedSiblingClass/after/noImports.kt @@ -0,0 +1,3 @@ +fun bar(s: String) { + A.B.foo(s) +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveMethod/moveMethodToNestedSiblingClass/after/onDemandImport.kt b/idea/testData/refactoring/move/java/moveMethod/moveMethodToNestedSiblingClass/after/onDemandImport.kt new file mode 100644 index 00000000000..8d1c9fa74f7 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveMethod/moveMethodToNestedSiblingClass/after/onDemandImport.kt @@ -0,0 +1,5 @@ +import A.* + +fun bar(s: String) { + B.foo(s) +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveMethod/moveMethodToNestedSiblingClass/after/specificImport.kt b/idea/testData/refactoring/move/java/moveMethod/moveMethodToNestedSiblingClass/after/specificImport.kt new file mode 100644 index 00000000000..bb9ab9784f1 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveMethod/moveMethodToNestedSiblingClass/after/specificImport.kt @@ -0,0 +1,5 @@ +import A.B.foo as foofoo + +fun bar(s: String) { + foofoo(s) +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveMethod/moveMethodToNestedSiblingClass/before/main.java b/idea/testData/refactoring/move/java/moveMethod/moveMethodToNestedSiblingClass/before/main.java new file mode 100644 index 00000000000..0016079ad28 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveMethod/moveMethodToNestedSiblingClass/before/main.java @@ -0,0 +1,9 @@ +public class A { + public static void foo(String s) { + System.out.println(s) + } + + public static class B { + + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveMethod/moveMethodToNestedSiblingClass/before/noImports.kt b/idea/testData/refactoring/move/java/moveMethod/moveMethodToNestedSiblingClass/before/noImports.kt new file mode 100644 index 00000000000..637277334f8 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveMethod/moveMethodToNestedSiblingClass/before/noImports.kt @@ -0,0 +1,3 @@ +fun bar(s: String) { + A.foo(s) +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveMethod/moveMethodToNestedSiblingClass/before/onDemandImport.kt b/idea/testData/refactoring/move/java/moveMethod/moveMethodToNestedSiblingClass/before/onDemandImport.kt new file mode 100644 index 00000000000..ba053a3026d --- /dev/null +++ b/idea/testData/refactoring/move/java/moveMethod/moveMethodToNestedSiblingClass/before/onDemandImport.kt @@ -0,0 +1,5 @@ +import A.* + +fun bar(s: String) { + foo(s) +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveMethod/moveMethodToNestedSiblingClass/before/specificImport.kt b/idea/testData/refactoring/move/java/moveMethod/moveMethodToNestedSiblingClass/before/specificImport.kt new file mode 100644 index 00000000000..710c6f58a12 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveMethod/moveMethodToNestedSiblingClass/before/specificImport.kt @@ -0,0 +1,5 @@ +import A.foo as foofoo + +fun bar(s: String) { + foofoo(s) +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveMethod/moveMethodToNestedSiblingClass/moveMethodToNestedSiblingClass.test b/idea/testData/refactoring/move/java/moveMethod/moveMethodToNestedSiblingClass/moveMethodToNestedSiblingClass.test new file mode 100644 index 00000000000..e677dd4192f --- /dev/null +++ b/idea/testData/refactoring/move/java/moveMethod/moveMethodToNestedSiblingClass/moveMethodToNestedSiblingClass.test @@ -0,0 +1,5 @@ +{ + "mainFile": "main.java", + "type": "MOVE_MEMBERS", + "targetClass": "A.B" +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClass/after/main.java b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClass/after/main.java new file mode 100644 index 00000000000..0e5b5653984 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClass/after/main.java @@ -0,0 +1,9 @@ +public class A { +} + +public class B { + + public static void foo(String s) { + System.out.println(s) + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClass/after/noImports.kt b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClass/after/noImports.kt new file mode 100644 index 00000000000..d0952c2bea5 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClass/after/noImports.kt @@ -0,0 +1,3 @@ +fun bar(s: String) { + B.foo(s) +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClass/after/onDemandImport.kt b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClass/after/onDemandImport.kt new file mode 100644 index 00000000000..8d1c9fa74f7 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClass/after/onDemandImport.kt @@ -0,0 +1,5 @@ +import A.* + +fun bar(s: String) { + B.foo(s) +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClass/after/specificImport.kt b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClass/after/specificImport.kt new file mode 100644 index 00000000000..1002d124589 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClass/after/specificImport.kt @@ -0,0 +1,5 @@ +import B.foo as foofoo + +fun bar(s: String) { + foofoo(s) +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClass/before/main.java b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClass/before/main.java new file mode 100644 index 00000000000..32286809dde --- /dev/null +++ b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClass/before/main.java @@ -0,0 +1,9 @@ +public class A { + public static void foo(String s) { + System.out.println(s) + } +} + +public class B { + +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClass/before/noImports.kt b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClass/before/noImports.kt new file mode 100644 index 00000000000..637277334f8 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClass/before/noImports.kt @@ -0,0 +1,3 @@ +fun bar(s: String) { + A.foo(s) +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClass/before/onDemandImport.kt b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClass/before/onDemandImport.kt new file mode 100644 index 00000000000..ba053a3026d --- /dev/null +++ b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClass/before/onDemandImport.kt @@ -0,0 +1,5 @@ +import A.* + +fun bar(s: String) { + foo(s) +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClass/before/specificImport.kt b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClass/before/specificImport.kt new file mode 100644 index 00000000000..710c6f58a12 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClass/before/specificImport.kt @@ -0,0 +1,5 @@ +import A.foo as foofoo + +fun bar(s: String) { + foofoo(s) +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClass/moveMethodToTopLevelClass.test b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClass/moveMethodToTopLevelClass.test new file mode 100644 index 00000000000..4f64ae3fb28 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClass/moveMethodToTopLevelClass.test @@ -0,0 +1,5 @@ +{ + "mainFile": "main.java", + "type": "MOVE_MEMBERS", + "targetClass": "B" +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassAndMakePackageLocal/after/main.java b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassAndMakePackageLocal/after/main.java new file mode 100644 index 00000000000..70dc67af14a --- /dev/null +++ b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassAndMakePackageLocal/after/main.java @@ -0,0 +1,9 @@ +public class A { +} + +public class B { + + static void foo(String s) { + System.out.println(s) + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassAndMakePackageLocal/after/noImports.kt b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassAndMakePackageLocal/after/noImports.kt new file mode 100644 index 00000000000..d0952c2bea5 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassAndMakePackageLocal/after/noImports.kt @@ -0,0 +1,3 @@ +fun bar(s: String) { + B.foo(s) +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassAndMakePackageLocal/after/onDemandImport.kt b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassAndMakePackageLocal/after/onDemandImport.kt new file mode 100644 index 00000000000..8d1c9fa74f7 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassAndMakePackageLocal/after/onDemandImport.kt @@ -0,0 +1,5 @@ +import A.* + +fun bar(s: String) { + B.foo(s) +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassAndMakePackageLocal/after/specificImport.kt b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassAndMakePackageLocal/after/specificImport.kt new file mode 100644 index 00000000000..1002d124589 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassAndMakePackageLocal/after/specificImport.kt @@ -0,0 +1,5 @@ +import B.foo as foofoo + +fun bar(s: String) { + foofoo(s) +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassAndMakePackageLocal/before/main.java b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassAndMakePackageLocal/before/main.java new file mode 100644 index 00000000000..32286809dde --- /dev/null +++ b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassAndMakePackageLocal/before/main.java @@ -0,0 +1,9 @@ +public class A { + public static void foo(String s) { + System.out.println(s) + } +} + +public class B { + +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassAndMakePackageLocal/before/noImports.kt b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassAndMakePackageLocal/before/noImports.kt new file mode 100644 index 00000000000..637277334f8 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassAndMakePackageLocal/before/noImports.kt @@ -0,0 +1,3 @@ +fun bar(s: String) { + A.foo(s) +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassAndMakePackageLocal/before/onDemandImport.kt b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassAndMakePackageLocal/before/onDemandImport.kt new file mode 100644 index 00000000000..ba053a3026d --- /dev/null +++ b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassAndMakePackageLocal/before/onDemandImport.kt @@ -0,0 +1,5 @@ +import A.* + +fun bar(s: String) { + foo(s) +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassAndMakePackageLocal/before/specificImport.kt b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassAndMakePackageLocal/before/specificImport.kt new file mode 100644 index 00000000000..710c6f58a12 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassAndMakePackageLocal/before/specificImport.kt @@ -0,0 +1,5 @@ +import A.foo as foofoo + +fun bar(s: String) { + foofoo(s) +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassAndMakePackageLocal/moveMethodToTopLevelClassAndMakePackageLocal.test b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassAndMakePackageLocal/moveMethodToTopLevelClassAndMakePackageLocal.test new file mode 100644 index 00000000000..d99a43bfab8 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassAndMakePackageLocal/moveMethodToTopLevelClassAndMakePackageLocal.test @@ -0,0 +1,6 @@ +{ + "mainFile": "main.java", + "type": "MOVE_MEMBERS", + "targetClass": "B", + "visibility": "packageLocal" +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassAndMakePrivate/after/main.java b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassAndMakePrivate/after/main.java new file mode 100644 index 00000000000..4e4f531332d --- /dev/null +++ b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassAndMakePrivate/after/main.java @@ -0,0 +1,9 @@ +public class A { + public static void foo(String s) { + System.out.println(s) + } +} + +public class B { + +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassAndMakePrivate/after/noImports.kt b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassAndMakePrivate/after/noImports.kt new file mode 100644 index 00000000000..637277334f8 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassAndMakePrivate/after/noImports.kt @@ -0,0 +1,3 @@ +fun bar(s: String) { + A.foo(s) +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassAndMakePrivate/after/onDemandImport.kt b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassAndMakePrivate/after/onDemandImport.kt new file mode 100644 index 00000000000..ba053a3026d --- /dev/null +++ b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassAndMakePrivate/after/onDemandImport.kt @@ -0,0 +1,5 @@ +import A.* + +fun bar(s: String) { + foo(s) +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassAndMakePrivate/after/specificImport.kt b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassAndMakePrivate/after/specificImport.kt new file mode 100644 index 00000000000..710c6f58a12 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassAndMakePrivate/after/specificImport.kt @@ -0,0 +1,5 @@ +import A.foo as foofoo + +fun bar(s: String) { + foofoo(s) +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassAndMakePrivate/before/main.java b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassAndMakePrivate/before/main.java new file mode 100644 index 00000000000..32286809dde --- /dev/null +++ b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassAndMakePrivate/before/main.java @@ -0,0 +1,9 @@ +public class A { + public static void foo(String s) { + System.out.println(s) + } +} + +public class B { + +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassAndMakePrivate/before/noImports.kt b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassAndMakePrivate/before/noImports.kt new file mode 100644 index 00000000000..637277334f8 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassAndMakePrivate/before/noImports.kt @@ -0,0 +1,3 @@ +fun bar(s: String) { + A.foo(s) +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassAndMakePrivate/before/onDemandImport.kt b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassAndMakePrivate/before/onDemandImport.kt new file mode 100644 index 00000000000..ba053a3026d --- /dev/null +++ b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassAndMakePrivate/before/onDemandImport.kt @@ -0,0 +1,5 @@ +import A.* + +fun bar(s: String) { + foo(s) +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassAndMakePrivate/before/specificImport.kt b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassAndMakePrivate/before/specificImport.kt new file mode 100644 index 00000000000..710c6f58a12 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassAndMakePrivate/before/specificImport.kt @@ -0,0 +1,5 @@ +import A.foo as foofoo + +fun bar(s: String) { + foofoo(s) +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassAndMakePrivate/conflicts.txt b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassAndMakePrivate/conflicts.txt new file mode 100644 index 00000000000..ff435111fed --- /dev/null +++ b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassAndMakePrivate/conflicts.txt @@ -0,0 +1,3 @@ +Method A.foo(String) is private and will not be accessible from file noImports.kt. +Method A.foo(String) is private and will not be accessible from file onDemandImport.kt. +Method A.foo(String) is private and will not be accessible from file specificImport.kt. \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassAndMakePrivate/moveMethodToTopLevelClassAndMakePrivate.test b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassAndMakePrivate/moveMethodToTopLevelClassAndMakePrivate.test new file mode 100644 index 00000000000..3361c846a7b --- /dev/null +++ b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassAndMakePrivate/moveMethodToTopLevelClassAndMakePrivate.test @@ -0,0 +1,6 @@ +{ + "mainFile": "main.java", + "type": "MOVE_MEMBERS", + "targetClass": "B", + "visibility": "private" +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassOfAnotherPackage/after/j/main.java b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassOfAnotherPackage/after/j/main.java new file mode 100644 index 00000000000..550018e8132 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassOfAnotherPackage/after/j/main.java @@ -0,0 +1,11 @@ +package j; + +public class A { +} + +public class B { + + public static void foo(String s) { + System.out.println(s); + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassOfAnotherPackage/after/k/noImports.kt b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassOfAnotherPackage/after/k/noImports.kt new file mode 100644 index 00000000000..7ad19c143a5 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassOfAnotherPackage/after/k/noImports.kt @@ -0,0 +1,7 @@ +package k + +import j.B + +fun bar(s: String) { + B.foo(s) +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassOfAnotherPackage/after/k/onDemandImportOfClassMembers.kt b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassOfAnotherPackage/after/k/onDemandImportOfClassMembers.kt new file mode 100644 index 00000000000..e65f844ecbc --- /dev/null +++ b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassOfAnotherPackage/after/k/onDemandImportOfClassMembers.kt @@ -0,0 +1,8 @@ +package k + +import j.A.* +import j.B + +fun bar(s: String) { + B.foo(s) +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassOfAnotherPackage/after/k/onDemandImportOfPackageMembers.kt b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassOfAnotherPackage/after/k/onDemandImportOfPackageMembers.kt new file mode 100644 index 00000000000..5114c97256d --- /dev/null +++ b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassOfAnotherPackage/after/k/onDemandImportOfPackageMembers.kt @@ -0,0 +1,7 @@ +package k + +import j.* + +fun bar(s: String) { + B.foo(s) +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassOfAnotherPackage/after/k/specificClassImport.kt b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassOfAnotherPackage/after/k/specificClassImport.kt new file mode 100644 index 00000000000..32954e6f287 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassOfAnotherPackage/after/k/specificClassImport.kt @@ -0,0 +1,8 @@ +package k + +import j.A +import j.B + +fun bar(s: String) { + B.foo(s) +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassOfAnotherPackage/after/k/specificClassMemberImport.kt b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassOfAnotherPackage/after/k/specificClassMemberImport.kt new file mode 100644 index 00000000000..95df36014d7 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassOfAnotherPackage/after/k/specificClassMemberImport.kt @@ -0,0 +1,7 @@ +package k + +import j.B.foo as foofoo + +fun bar(s: String) { + foofoo(s) +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassOfAnotherPackage/before/j/main.java b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassOfAnotherPackage/before/j/main.java new file mode 100644 index 00000000000..02d6e8200df --- /dev/null +++ b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassOfAnotherPackage/before/j/main.java @@ -0,0 +1,11 @@ +package j; + +public class A { + public static void foo(String s) { + System.out.println(s); + } +} + +public class B { + +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassOfAnotherPackage/before/k/noImports.kt b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassOfAnotherPackage/before/k/noImports.kt new file mode 100644 index 00000000000..33f1953924d --- /dev/null +++ b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassOfAnotherPackage/before/k/noImports.kt @@ -0,0 +1,5 @@ +package k + +fun bar(s: String) { + j.A.foo(s) +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassOfAnotherPackage/before/k/onDemandImportOfClassMembers.kt b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassOfAnotherPackage/before/k/onDemandImportOfClassMembers.kt new file mode 100644 index 00000000000..cfdac61b4e4 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassOfAnotherPackage/before/k/onDemandImportOfClassMembers.kt @@ -0,0 +1,7 @@ +package k + +import j.A.* + +fun bar(s: String) { + foo(s) +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassOfAnotherPackage/before/k/onDemandImportOfPackageMembers.kt b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassOfAnotherPackage/before/k/onDemandImportOfPackageMembers.kt new file mode 100644 index 00000000000..95fe32f1b01 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassOfAnotherPackage/before/k/onDemandImportOfPackageMembers.kt @@ -0,0 +1,7 @@ +package k + +import j.* + +fun bar(s: String) { + A.foo(s) +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassOfAnotherPackage/before/k/specificClassImport.kt b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassOfAnotherPackage/before/k/specificClassImport.kt new file mode 100644 index 00000000000..6921762f7eb --- /dev/null +++ b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassOfAnotherPackage/before/k/specificClassImport.kt @@ -0,0 +1,7 @@ +package k + +import j.A + +fun bar(s: String) { + A.foo(s) +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassOfAnotherPackage/before/k/specificClassMemberImport.kt b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassOfAnotherPackage/before/k/specificClassMemberImport.kt new file mode 100644 index 00000000000..b5e89232c47 --- /dev/null +++ b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassOfAnotherPackage/before/k/specificClassMemberImport.kt @@ -0,0 +1,7 @@ +package k + +import j.A.foo as foofoo + +fun bar(s: String) { + foofoo(s) +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassOfAnotherPackage/moveMethodToTopLevelClassOfAnotherPackage.test b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassOfAnotherPackage/moveMethodToTopLevelClassOfAnotherPackage.test new file mode 100644 index 00000000000..3fbd2d0230d --- /dev/null +++ b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassOfAnotherPackage/moveMethodToTopLevelClassOfAnotherPackage.test @@ -0,0 +1,5 @@ +{ + "mainFile": "j/main.java", + "type": "MOVE_MEMBERS", + "targetClass": "j.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 28004accc2a..9dc25ae5e08 100644 --- a/idea/tests/org/jetbrains/jet/plugin/refactoring/move/AbstractJetMoveTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/refactoring/move/AbstractJetMoveTest.kt @@ -20,6 +20,10 @@ import com.intellij.openapi.util.io.FileUtil import com.intellij.psi.PsiElement import org.jetbrains.jet.plugin.PluginTestCaseBase import java.io.File +import com.intellij.refactoring.move.moveMembers.MoveMembersProcessor +import com.intellij.refactoring.move.moveMembers.MockMoveMembersOptions +import org.jetbrains.jet.lang.psi.psiUtil.getParentByType +import com.intellij.psi.PsiMember import com.intellij.refactoring.BaseRefactoringProcessor.ConflictsInTestsException import com.google.gson.JsonObject import com.intellij.refactoring.MultiFileTestCase @@ -125,5 +129,20 @@ fun JsonObject.getString(name: String): String { fun JsonObject.getNullableString(name: String): String? = this[name]?.getAsString() enum class MoveAction { + MOVE_MEMBERS { + override fun runRefactoring(mainFile: PsiFile, elementAtCaret: PsiElement?, config: JsonObject) { + val member = elementAtCaret!!.getParentByType(javaClass())!! + val targetClassName = config.getString("targetClass") + val visibility = config.getNullableString("visibility") + + val options = MockMoveMembersOptions(targetClassName, array(member)) + if (visibility != null) { + options.setMemberVisibility(visibility) + } + + MoveMembersProcessor(mainFile.getProject(), options).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 9e3566cb38e..d50c69e4954 100644 --- a/idea/tests/org/jetbrains/jet/plugin/refactoring/move/JetMoveTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/refactoring/move/JetMoveTestGenerated.java @@ -36,4 +36,94 @@ public class JetMoveTestGenerated extends AbstractJetMoveTest { JetTestUtils.assertAllTestsPresentInSingleGeneratedClass(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("idea/testData/refactoring/move"), Pattern.compile("^(.+)\\.test$")); } + @TestMetadata("java/moveClass/moveAsMember/moveClassToExternalNestedClass/moveClassToExternalNestedClass.test") + public void testJava_moveClass_moveAsMember_moveClassToExternalNestedClass_MoveClassToExternalNestedClass() throws Exception { + doTest("idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToExternalNestedClass/moveClassToExternalNestedClass.test"); + } + + @TestMetadata("java/moveClass/moveAsMember/moveClassToNestedSiblingClass/moveClassToNestedSiblingClass.test") + public void testJava_moveClass_moveAsMember_moveClassToNestedSiblingClass_MoveClassToNestedSiblingClass() throws Exception { + doTest("idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToNestedSiblingClass/moveClassToNestedSiblingClass.test"); + } + + @TestMetadata("java/moveClass/moveAsMember/moveClassToTopLevelClass/moveClassToTopLevelClass.test") + public void testJava_moveClass_moveAsMember_moveClassToTopLevelClass_MoveClassToTopLevelClass() throws Exception { + doTest("idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClass/moveClassToTopLevelClass.test"); + } + + @TestMetadata("java/moveClass/moveAsMember/moveClassToTopLevelClassAndMakePackageLocal/moveClassToTopLevelClassAndMakePackageLocal.test") + public void testJava_moveClass_moveAsMember_moveClassToTopLevelClassAndMakePackageLocal_MoveClassToTopLevelClassAndMakePackageLocal() throws Exception { + doTest("idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassAndMakePackageLocal/moveClassToTopLevelClassAndMakePackageLocal.test"); + } + + @TestMetadata("java/moveClass/moveAsMember/moveClassToTopLevelClassAndMakePrivate/moveClassToTopLevelClassAndMakePrivate.test") + public void testJava_moveClass_moveAsMember_moveClassToTopLevelClassAndMakePrivate_MoveClassToTopLevelClassAndMakePrivate() throws Exception { + doTest("idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassAndMakePrivate/moveClassToTopLevelClassAndMakePrivate.test"); + } + + @TestMetadata("java/moveClass/moveAsMember/moveClassToTopLevelClassOfAnotherPackage/moveClassToTopLevelClassOfAnotherPackage.test") + public void testJava_moveClass_moveAsMember_moveClassToTopLevelClassOfAnotherPackage_MoveClassToTopLevelClassOfAnotherPackage() throws Exception { + doTest("idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassOfAnotherPackage/moveClassToTopLevelClassOfAnotherPackage.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"); + } + + @TestMetadata("java/moveField/moveFieldToNestedSiblingClass/moveFieldToNestedSiblingClass.test") + public void testJava_moveField_moveFieldToNestedSiblingClass_MoveFieldToNestedSiblingClass() throws Exception { + doTest("idea/testData/refactoring/move/java/moveField/moveFieldToNestedSiblingClass/moveFieldToNestedSiblingClass.test"); + } + + @TestMetadata("java/moveField/moveFieldToTopLevelClass/moveFieldToTopLevelClass.test") + public void testJava_moveField_moveFieldToTopLevelClass_MoveFieldToTopLevelClass() throws Exception { + doTest("idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClass/moveFieldToTopLevelClass.test"); + } + + @TestMetadata("java/moveField/moveFieldToTopLevelClassAndMakePackageLocal/moveFieldToTopLevelClassAndMakePackageLocal.test") + public void testJava_moveField_moveFieldToTopLevelClassAndMakePackageLocal_MoveFieldToTopLevelClassAndMakePackageLocal() throws Exception { + doTest("idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassAndMakePackageLocal/moveFieldToTopLevelClassAndMakePackageLocal.test"); + } + + @TestMetadata("java/moveField/moveFieldToTopLevelClassAndMakePrivate/moveFieldToTopLevelClassAndMakePrivate.test") + public void testJava_moveField_moveFieldToTopLevelClassAndMakePrivate_MoveFieldToTopLevelClassAndMakePrivate() throws Exception { + doTest("idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassAndMakePrivate/moveFieldToTopLevelClassAndMakePrivate.test"); + } + + @TestMetadata("java/moveField/moveFieldToTopLevelClassOfAnotherPackage/moveFieldToTopLevelClassOfAnotherPackage.test") + public void testJava_moveField_moveFieldToTopLevelClassOfAnotherPackage_MoveFieldToTopLevelClassOfAnotherPackage() throws Exception { + doTest("idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassOfAnotherPackage/moveFieldToTopLevelClassOfAnotherPackage.test"); + } + + @TestMetadata("java/moveMethod/moveMethodToExternalNestedClass/moveMethodToExternalNestedClass.test") + public void testJava_moveMethod_moveMethodToExternalNestedClass_MoveMethodToExternalNestedClass() throws Exception { + doTest("idea/testData/refactoring/move/java/moveMethod/moveMethodToExternalNestedClass/moveMethodToExternalNestedClass.test"); + } + + @TestMetadata("java/moveMethod/moveMethodToNestedSiblingClass/moveMethodToNestedSiblingClass.test") + public void testJava_moveMethod_moveMethodToNestedSiblingClass_MoveMethodToNestedSiblingClass() throws Exception { + doTest("idea/testData/refactoring/move/java/moveMethod/moveMethodToNestedSiblingClass/moveMethodToNestedSiblingClass.test"); + } + + @TestMetadata("java/moveMethod/moveMethodToTopLevelClass/moveMethodToTopLevelClass.test") + public void testJava_moveMethod_moveMethodToTopLevelClass_MoveMethodToTopLevelClass() throws Exception { + doTest("idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClass/moveMethodToTopLevelClass.test"); + } + + @TestMetadata("java/moveMethod/moveMethodToTopLevelClassAndMakePackageLocal/moveMethodToTopLevelClassAndMakePackageLocal.test") + public void testJava_moveMethod_moveMethodToTopLevelClassAndMakePackageLocal_MoveMethodToTopLevelClassAndMakePackageLocal() throws Exception { + doTest("idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassAndMakePackageLocal/moveMethodToTopLevelClassAndMakePackageLocal.test"); + } + + @TestMetadata("java/moveMethod/moveMethodToTopLevelClassAndMakePrivate/moveMethodToTopLevelClassAndMakePrivate.test") + public void testJava_moveMethod_moveMethodToTopLevelClassAndMakePrivate_MoveMethodToTopLevelClassAndMakePrivate() throws Exception { + doTest("idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassAndMakePrivate/moveMethodToTopLevelClassAndMakePrivate.test"); + } + + @TestMetadata("java/moveMethod/moveMethodToTopLevelClassOfAnotherPackage/moveMethodToTopLevelClassOfAnotherPackage.test") + public void testJava_moveMethod_moveMethodToTopLevelClassOfAnotherPackage_MoveMethodToTopLevelClassOfAnotherPackage() throws Exception { + doTest("idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassOfAnotherPackage/moveMethodToTopLevelClassOfAnotherPackage.test"); + } + }