Avoid conflicts when moving members wiith package-local visibility

Add tests for Java "Move members" refactoring
 #KT-4459 Fixed

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);

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 {
+
+        }
+    }
+}

idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToExternalNestedClass/after/main.java

@@ -0,0 +1,2 @@
+public class A {
+}

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()
+}

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()
+}

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()
+}

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()
+}

idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToExternalNestedClass/before/dependency.java

@@ -0,0 +1,5 @@
+public class B {
+    public static class C {
+
+    }
+}

idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToExternalNestedClass/before/main.java

@@ -0,0 +1,5 @@
+public class A {
+    public static class <caret>X {
+
+    }
+}

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()
+}

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()
+}

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()
+}

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()
+}

idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToExternalNestedClass/moveClassToExternalNestedClass.test

@@ -0,0 +1,5 @@
+{
+  "mainFile": "main.java",
+  "type": "MOVE_MEMBERS",
+  "targetClass": "B.C"
+}

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 {
+
+        }
+    }
+}

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()
+}

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()
+}

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()
+}

idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToNestedSiblingClass/before/main.java

@@ -0,0 +1,9 @@
+public class A {
+    public static class <caret>X {
+
+    }
+
+    public static class 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()
+}

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()
+}

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()
+}

idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToNestedSiblingClass/moveClassToNestedSiblingClass.test

@@ -0,0 +1,5 @@
+{
+  "mainFile": "main.java",
+  "type": "MOVE_MEMBERS",
+  "targetClass": "A.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 {
+
+    }
+}

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()
+}

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()
+}

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()
+}

idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClass/before/main.java

@@ -0,0 +1,9 @@
+public class A {
+    public static class <caret>X {
+
+    }
+}
+
+public class 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()
+}

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()
+}

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()
+}

idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClass/moveClassToTopLevelClass.test

@@ -0,0 +1,5 @@
+{
+  "mainFile": "main.java",
+  "type": "MOVE_MEMBERS",
+  "targetClass": "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 {
+
+    }
+}

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()
+}

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()
+}

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()
+}

idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassAndMakePackageLocal/before/main.java

@@ -0,0 +1,9 @@
+public class A {
+    public static class <caret>X {
+
+    }
+}
+
+public class 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()
+}

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()
+}

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()
+}

idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassAndMakePackageLocal/moveClassToTopLevelClassAndMakePackageLocal.test

@@ -0,0 +1,6 @@
+{
+  "mainFile": "main.java",
+  "type": "MOVE_MEMBERS",
+  "targetClass": "B",
+  "visibility": "packageLocal"
+}

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 {
+
+}

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()
+}

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()
+}

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()
+}

idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassAndMakePrivate/before/main.java

@@ -0,0 +1,9 @@
+public class A {
+    public static class <caret>X {
+
+    }
+}
+
+public class 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()
+}

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()
+}

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()
+}

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.

idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassAndMakePrivate/moveClassToTopLevelClassAndMakePrivate.test

@@ -0,0 +1,6 @@
+{
+  "mainFile": "main.java",
+  "type": "MOVE_MEMBERS",
+  "targetClass": "B",
+  "visibility": "private"
+}

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 {
+
+    }
+}

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()
+}

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()
+}

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()
+}

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()
+}

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()
+}

idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassOfAnotherPackage/before/j/main.java

@@ -0,0 +1,11 @@
+package j;
+
+public class A {
+    public static class <caret>X {
+
+    }
+}
+
+public class 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()
+}

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()
+}

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()
+}

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()
+}

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()
+}

idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassOfAnotherPackage/moveClassToTopLevelClassOfAnotherPackage.test

@@ -0,0 +1,5 @@
+{
+  "mainFile": "j/main.java",
+  "type": "MOVE_MEMBERS",
+  "targetClass": "j.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 = "";
+    }
+}

idea/testData/refactoring/move/java/moveField/moveFieldToExternalNestedClass/after/main.java

@@ -0,0 +1,2 @@
+public class A {
+}

idea/testData/refactoring/move/java/moveField/moveFieldToExternalNestedClass/after/noImports.kt

@@ -0,0 +1,3 @@
+fun bar(s: String) {
+    B.C.X = s
+}

idea/testData/refactoring/move/java/moveField/moveFieldToExternalNestedClass/after/onDemandImportOfSourceClassMembers.kt

@@ -0,0 +1,5 @@
+import A.*
+
+fun bar(s: String) {
+    B.C.X = s
+}

idea/testData/refactoring/move/java/moveField/moveFieldToExternalNestedClass/after/onDemandImportOfTargetClassMembers.kt

@@ -0,0 +1,5 @@
+import B.*
+
+fun bar(s: String) {
+    C.X = s
+}

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
+}

idea/testData/refactoring/move/java/moveField/moveFieldToExternalNestedClass/before/dependency.java

@@ -0,0 +1,5 @@
+public class B {
+    public static class C {
+
+    }
+}

idea/testData/refactoring/move/java/moveField/moveFieldToExternalNestedClass/before/main.java

@@ -0,0 +1,3 @@
+public class A {
+    public static String <caret>X = "";
+}

idea/testData/refactoring/move/java/moveField/moveFieldToExternalNestedClass/before/noImports.kt

@@ -0,0 +1,3 @@
+fun bar(s: String) {
+    A.X = s
+}

idea/testData/refactoring/move/java/moveField/moveFieldToExternalNestedClass/before/onDemandImportOfSourceClassMembers.kt

@@ -0,0 +1,5 @@
+import A.*
+
+fun bar(s: String) {
+    X = s
+}

idea/testData/refactoring/move/java/moveField/moveFieldToExternalNestedClass/before/onDemandImportOfTargetClassMembers.kt

@@ -0,0 +1,5 @@
+import B.*
+
+fun bar(s: String) {
+    A.X = s
+}

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
+}

idea/testData/refactoring/move/java/moveField/moveFieldToExternalNestedClass/moveFieldToExternalNestedClass.test

@@ -0,0 +1,5 @@
+{
+  "mainFile": "main.java",
+  "type": "MOVE_MEMBERS",
+  "targetClass": "B.C"
+}

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 = "";
+    }
+}

idea/testData/refactoring/move/java/moveField/moveFieldToNestedSiblingClass/after/noImports.kt

@@ -0,0 +1,3 @@
+fun bar(s: String) {
+    A.B.X = s
+}

idea/testData/refactoring/move/java/moveField/moveFieldToNestedSiblingClass/after/onDemandImport.kt

@@ -0,0 +1,5 @@
+import A.*
+
+fun bar(s: String) {
+    B.X = s
+}

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
+}

idea/testData/refactoring/move/java/moveField/moveFieldToNestedSiblingClass/before/main.java

@@ -0,0 +1,7 @@
+public class A {
+    public static String <caret>X = "";
+
+    public static class B {
+
+    }
+}

idea/testData/refactoring/move/java/moveField/moveFieldToNestedSiblingClass/before/noImports.kt

@@ -0,0 +1,3 @@
+fun bar(s: String) {
+    A.X = s
+}

idea/testData/refactoring/move/java/moveField/moveFieldToNestedSiblingClass/before/onDemandImport.kt

@@ -0,0 +1,5 @@
+import A.*
+
+fun bar(s: String) {
+    X = s
+}

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
+}

idea/testData/refactoring/move/java/moveField/moveFieldToNestedSiblingClass/moveFieldToNestedSiblingClass.test

@@ -0,0 +1,5 @@
+{
+  "mainFile": "main.java",
+  "type": "MOVE_MEMBERS",
+  "targetClass": "A.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 = "";
+}

idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClass/after/noImports.kt

@@ -0,0 +1,3 @@
+fun bar(s: String) {
+    B.X = s
+}

idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClass/after/onDemandImport.kt

@@ -0,0 +1,5 @@
+import A.*
+
+fun bar(s: String) {
+    B.X = s
+}

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
+}

idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClass/before/main.java

@@ -0,0 +1,7 @@
+public class A {
+    public static String <caret>X = "";
+}
+
+public class B {
+
+}

idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClass/before/noImports.kt

@@ -0,0 +1,3 @@
+fun bar(s: String) {
+    A.X = s
+}

idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClass/before/onDemandImport.kt

@@ -0,0 +1,5 @@
+import A.*
+
+fun bar(s: String) {
+    X = s
+}

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
+}

idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClass/moveFieldToTopLevelClass.test

@@ -0,0 +1,5 @@
+{
+  "mainFile": "main.java",
+  "type": "MOVE_MEMBERS",
+  "targetClass": "B"
+}

idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassAndMakePackageLocal/after/main.java

@@ -0,0 +1,7 @@
+public class A {
+}
+
+public class B {
+
+    static String X = "";
+}

idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassAndMakePackageLocal/after/noImports.kt

@@ -0,0 +1,3 @@
+fun bar(s: String) {
+    B.X = s
+}

idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassAndMakePackageLocal/after/onDemandImport.kt

@@ -0,0 +1,5 @@
+import A.*
+
+fun bar(s: String) {
+    B.X = s
+}

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
+}

idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassAndMakePackageLocal/before/main.java

@@ -0,0 +1,7 @@
+public class A {
+    public static String <caret>X = "";
+}
+
+public class B {
+
+}