diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveUtils.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveUtils.kt index 8226142be86..c790493c767 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveUtils.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveUtils.kt @@ -16,47 +16,38 @@ package org.jetbrains.kotlin.idea.refactoring.move +import com.intellij.openapi.util.Comparing +import com.intellij.openapi.vfs.VirtualFile +import com.intellij.psi.* +import com.intellij.refactoring.move.moveMembers.MockMoveMembersOptions +import com.intellij.refactoring.move.moveMembers.MoveMemberHandler +import com.intellij.refactoring.move.moveMembers.MoveMembersProcessor +import com.intellij.refactoring.util.MoveRenameUsageInfo +import com.intellij.refactoring.util.NonCodeUsageInfo +import com.intellij.usageView.UsageInfo +import com.intellij.util.IncorrectOperationException +import org.jetbrains.kotlin.asJava.namedUnwrappedElement +import org.jetbrains.kotlin.asJava.unwrapped +import org.jetbrains.kotlin.descriptors.* +import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor.Kind +import org.jetbrains.kotlin.idea.JetFileType +import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptor +import org.jetbrains.kotlin.idea.codeInsight.DescriptorToSourceUtilsIde import org.jetbrains.kotlin.idea.codeInsight.JetFileReferencesResolver +import org.jetbrains.kotlin.idea.refactoring.fqName.isImported +import org.jetbrains.kotlin.idea.references.JetReference +import org.jetbrains.kotlin.idea.references.JetSimpleNameReference +import org.jetbrains.kotlin.idea.references.JetSimpleNameReference.ShorteningMode +import org.jetbrains.kotlin.idea.util.ImportInsertHelper +import org.jetbrains.kotlin.name.FqName +import org.jetbrains.kotlin.psi.* +import org.jetbrains.kotlin.psi.psiUtil.* import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.DescriptorUtils -import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor -import org.jetbrains.kotlin.idea.references.JetSimpleNameReference -import org.jetbrains.kotlin.name.FqName -import org.jetbrains.kotlin.idea.JetFileType -import org.jetbrains.kotlin.idea.codeInsight.DescriptorToSourceUtilsIde -import org.jetbrains.kotlin.psi.psiUtil.isAncestor -import java.util.Collections -import org.jetbrains.kotlin.idea.refactoring.fqName.isImported -import org.jetbrains.kotlin.descriptors.DeclarationDescriptor -import org.jetbrains.kotlin.descriptors.ClassDescriptor -import org.jetbrains.kotlin.descriptors.PackageViewDescriptor -import com.intellij.usageView.UsageInfo -import org.jetbrains.kotlin.psi.psiUtil.isExtensionDeclaration -import com.intellij.psi.PsiElement -import com.intellij.psi.PsiReference -import com.intellij.refactoring.util.MoveRenameUsageInfo -import org.jetbrains.kotlin.idea.references.JetReference -import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType -import java.util.ArrayList -import com.intellij.refactoring.util.NonCodeUsageInfo -import org.jetbrains.kotlin.idea.util.ImportInsertHelper -import org.jetbrains.kotlin.idea.references.JetSimpleNameReference.ShorteningMode -import com.intellij.openapi.vfs.VirtualFile -import com.intellij.openapi.util.Comparing -import java.util.Comparator -import com.intellij.util.IncorrectOperationException -import com.intellij.psi.PsiFile import org.jetbrains.kotlin.resolve.descriptorUtil.getImportableDescriptor -import org.jetbrains.kotlin.psi.psiUtil.getReceiverExpression -import org.jetbrains.kotlin.descriptors.CallableDescriptor -import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor -import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor.Kind -import org.jetbrains.kotlin.psi.psiUtil.getQualifiedElementSelector -import org.jetbrains.kotlin.psi.* -import org.jetbrains.kotlin.idea.caches.resolve.* -import org.jetbrains.kotlin.asJava.* -import org.jetbrains.kotlin.psi.JetSuperExpression -import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType +import java.util.ArrayList +import java.util.Collections +import java.util.Comparator public class PackageNameInfo(val oldPackageName: FqName, val newPackageName: FqName) @@ -171,6 +162,24 @@ public fun JetNamedDeclaration.getFileNameAfterMove(): String? { } } +// returns true if successful +private fun updateJavaReference(reference: PsiReferenceExpression, newElement: PsiElement): Boolean { + if (newElement is PsiMember) { + val newClass = newElement.getContainingClass() + if (newClass != null && reference.getQualifierExpression() != null) { + val mockMoveMembersOptions = MockMoveMembersOptions(newClass.getQualifiedName(), array(newElement)) + val moveMembersUsageInfo = MoveMembersProcessor.MoveMembersUsageInfo( + newElement, reference.getElement(), newClass, reference.getQualifierExpression(), reference) + val moveMemberHandler = MoveMemberHandler.EP_NAME.forLanguage(reference.getElement().getLanguage()) + if (moveMemberHandler != null) { + moveMemberHandler.changeExternalUsage(mockMoveMembersOptions, moveMembersUsageInfo) + return true + } + } + } + return false +} + /** * Perform usage postprocessing and return non-code usages */ @@ -222,6 +231,8 @@ fun postProcessMoveUsages(usages: List, if (it is JetSimpleNameReference) { it.bindToElement(newElement, shorteningMode) } + else if (it is PsiReferenceExpression && updateJavaReference(it, newElement)) { + } else { it.bindToElement(newElement) } diff --git a/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/after/a/noImports.java b/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/after/a/noImports.java index a8303af57de..4c8bd9a511f 100644 --- a/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/after/a/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/after/a/noImports.java @@ -1,15 +1,16 @@ package a; +import b.BPackage; import b.Test; class J { void bar() { Test t = new Test(); - b.BPackage.test(); - b.BPackage.test(t); - System.out.println(b.BPackage.getTEST()); - System.out.println(b.BPackage.getTEST(t)); - b.BPackage.setTEST(""); - b.BPackage.setTEST(t, ""); + BPackage.test(); + BPackage.test(t); + System.out.println(BPackage.getTEST()); + System.out.println(BPackage.getTEST(t)); + BPackage.setTEST(""); + BPackage.setTEST(t, ""); } } diff --git a/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/after/c/noImports.java b/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/after/c/noImports.java index f3e65e2c231..221f414f204 100644 --- a/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/after/c/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/after/c/noImports.java @@ -1,15 +1,16 @@ package c; +import b.BPackage; import b.Test; class J { void bar() { Test t = new Test(); - b.BPackage.test(); - b.BPackage.test(t); - System.out.println(b.BPackage.getTEST()); - System.out.println(b.BPackage.getTEST(t)); - b.BPackage.setTEST(""); - b.BPackage.setTEST(t, ""); + BPackage.test(); + BPackage.test(t); + System.out.println(BPackage.getTEST()); + System.out.println(BPackage.getTEST(t)); + BPackage.setTEST(""); + BPackage.setTEST(t, ""); } } diff --git a/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/after/c/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/after/c/onDemandImport.java index f3e65e2c231..221f414f204 100644 --- a/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/after/c/onDemandImport.java +++ b/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/after/c/onDemandImport.java @@ -1,15 +1,16 @@ package c; +import b.BPackage; import b.Test; class J { void bar() { Test t = new Test(); - b.BPackage.test(); - b.BPackage.test(t); - System.out.println(b.BPackage.getTEST()); - System.out.println(b.BPackage.getTEST(t)); - b.BPackage.setTEST(""); - b.BPackage.setTEST(t, ""); + BPackage.test(); + BPackage.test(t); + System.out.println(BPackage.getTEST()); + System.out.println(BPackage.getTEST(t)); + BPackage.setTEST(""); + BPackage.setTEST(t, ""); } } diff --git a/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/after/c/specificImports.java b/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/after/c/specificImports.java index f3e65e2c231..e4992ef479d 100644 --- a/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/after/c/specificImports.java +++ b/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/after/c/specificImports.java @@ -1,15 +1,16 @@ package c; import b.Test; +import b.BPackage; class J { void bar() { Test t = new Test(); - b.BPackage.test(); - b.BPackage.test(t); - System.out.println(b.BPackage.getTEST()); - System.out.println(b.BPackage.getTEST(t)); - b.BPackage.setTEST(""); - b.BPackage.setTEST(t, ""); + BPackage.test(); + BPackage.test(t); + System.out.println(BPackage.getTEST()); + System.out.println(BPackage.getTEST(t)); + BPackage.setTEST(""); + BPackage.setTEST(t, ""); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/a/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/a/noImports.java index f555342e625..42e63726b7f 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/a/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/a/noImports.java @@ -1,7 +1,9 @@ package a; +import b.BPackage; + class J { void bar() { - b.BPackage.test(new Test()); + BPackage.test(new Test()); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/b/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/b/noImports.java index 97cb94a716e..0ecbf9d8547 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/b/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/b/noImports.java @@ -2,6 +2,6 @@ package b; class J { void bar() { - b.BPackage.test(new a.Test()); + BPackage.test(new a.Test()); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/b/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/b/onDemandImport.java index d6af08036ea..4fcac4b9ccb 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/b/onDemandImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/b/onDemandImport.java @@ -4,6 +4,6 @@ import a.*; class J { void bar() { - b.BPackage.test(new Test()); + BPackage.test(new Test()); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/b/specificImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/b/specificImports.java index 6ed04772f5f..07ffddcd61a 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/b/specificImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/b/specificImports.java @@ -4,6 +4,6 @@ import a.Test; class J { void bar() { - b.BPackage.test(new Test()); + BPackage.test(new Test()); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/c/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/c/noImports.java index 4f0834f00e3..634998e4f31 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/c/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/c/noImports.java @@ -1,7 +1,9 @@ package c; +import b.BPackage; + class J { void bar() { - b.BPackage.test(new a.Test()); + BPackage.test(new a.Test()); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/c/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/c/onDemandImport.java index a061026f9e3..e9b0c3c2054 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/c/onDemandImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/c/onDemandImport.java @@ -1,9 +1,10 @@ package c; import a.*; +import b.BPackage; class J { void bar() { - b.BPackage.test(new Test()); + BPackage.test(new Test()); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/c/specificImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/c/specificImports.java index ee64c7621bb..b97791089c3 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/c/specificImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/c/specificImports.java @@ -1,9 +1,10 @@ package c; import a.Test; +import b.BPackage; class J { void bar() { - b.BPackage.test(new Test()); + BPackage.test(new Test()); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/a/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/a/noImports.java index 1f03744b539..cd8418019b7 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/a/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/a/noImports.java @@ -1,8 +1,10 @@ package a; +import b.BPackage; + class J { void bar() { - b.BPackage.getTest(new Test()); - b.BPackage.setTest(new Test(), 0); + BPackage.getTest(new Test()); + BPackage.setTest(new Test(), 0); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/b/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/b/noImports.java index 4659899092a..004a594849e 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/b/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/b/noImports.java @@ -2,7 +2,7 @@ package b; class J { void bar() { - b.BPackage.getTest(new a.Test()); - b.BPackage.setTest(new a.Test(), 0); + BPackage.getTest(new a.Test()); + BPackage.setTest(new a.Test(), 0); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/b/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/b/onDemandImport.java index b65e8c40cb1..0e08f403e74 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/b/onDemandImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/b/onDemandImport.java @@ -4,7 +4,7 @@ import a.*; class J { void bar() { - b.BPackage.getTest(new Test()); - b.BPackage.setTest(new Test(), 0); + BPackage.getTest(new Test()); + BPackage.setTest(new Test(), 0); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/b/specificImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/b/specificImports.java index 986f71f398a..d09ea04452b 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/b/specificImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/b/specificImports.java @@ -4,7 +4,7 @@ import a.Test; class J { void bar() { - b.BPackage.getTest(new Test()); - b.BPackage.setTest(new Test(), 0); + BPackage.getTest(new Test()); + BPackage.setTest(new Test(), 0); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/c/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/c/noImports.java index e011168da1f..51e5af162b9 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/c/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/c/noImports.java @@ -1,8 +1,10 @@ package c; +import b.BPackage; + class J { void bar() { - b.BPackage.getTest(new a.Test()); - b.BPackage.setTest(new a.Test(), 0); + BPackage.getTest(new a.Test()); + BPackage.setTest(new a.Test(), 0); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/c/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/c/onDemandImport.java index f6ad760538b..45df93fdde9 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/c/onDemandImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/c/onDemandImport.java @@ -1,10 +1,11 @@ package c; import a.*; +import b.BPackage; class J { void bar() { - b.BPackage.getTest(new Test()); - b.BPackage.setTest(new Test(), 0); + BPackage.getTest(new Test()); + BPackage.setTest(new Test(), 0); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/c/specificImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/c/specificImports.java index 55e7914de74..59d327e57fe 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/c/specificImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/c/specificImports.java @@ -1,10 +1,11 @@ package c; import a.Test; +import b.BPackage; class J { void bar() { - b.BPackage.getTest(new Test()); - b.BPackage.setTest(new Test(), 0); + BPackage.getTest(new Test()); + BPackage.setTest(new Test(), 0); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/a/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/a/noImports.java index d43fc44523a..a472510bd94 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/a/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/a/noImports.java @@ -1,7 +1,9 @@ package a; +import b.BPackage; + class J { void bar() { - b.BPackage.test(); + BPackage.test(); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/noImports.java index 377df2c11af..4ed21109d58 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/noImports.java @@ -2,6 +2,6 @@ package b; class J { void bar() { - b.BPackage.test(); + BPackage.test(); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/onDemandImport.java index 377df2c11af..4ed21109d58 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/onDemandImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/onDemandImport.java @@ -2,6 +2,6 @@ package b; class J { void bar() { - b.BPackage.test(); + BPackage.test(); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/specificImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/specificImports.java index 377df2c11af..4ed21109d58 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/specificImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/specificImports.java @@ -2,6 +2,6 @@ package b; class J { void bar() { - b.BPackage.test(); + BPackage.test(); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/c/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/c/noImports.java index fef0d1afe56..4509d5b41a7 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/c/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/c/noImports.java @@ -1,7 +1,9 @@ package c; +import b.BPackage; + class J { void bar() { - b.BPackage.test(); + BPackage.test(); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/c/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/c/onDemandImport.java index fef0d1afe56..4509d5b41a7 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/c/onDemandImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/c/onDemandImport.java @@ -1,7 +1,9 @@ package c; +import b.BPackage; + class J { void bar() { - b.BPackage.test(); + BPackage.test(); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/c/specificImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/c/specificImports.java index fef0d1afe56..4509d5b41a7 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/c/specificImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/c/specificImports.java @@ -1,7 +1,9 @@ package c; +import b.BPackage; + class J { void bar() { - b.BPackage.test(); + BPackage.test(); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/a/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/a/noImports.java index d43fc44523a..a472510bd94 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/a/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/a/noImports.java @@ -1,7 +1,9 @@ package a; +import b.BPackage; + class J { void bar() { - b.BPackage.test(); + BPackage.test(); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/b/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/b/noImports.java index 377df2c11af..4ed21109d58 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/b/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/b/noImports.java @@ -2,6 +2,6 @@ package b; class J { void bar() { - b.BPackage.test(); + BPackage.test(); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/b/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/b/onDemandImport.java index 377df2c11af..4ed21109d58 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/b/onDemandImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/b/onDemandImport.java @@ -2,6 +2,6 @@ package b; class J { void bar() { - b.BPackage.test(); + BPackage.test(); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/b/specificImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/b/specificImports.java index 377df2c11af..4ed21109d58 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/b/specificImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/b/specificImports.java @@ -2,6 +2,6 @@ package b; class J { void bar() { - b.BPackage.test(); + BPackage.test(); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/c/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/c/noImports.java index fef0d1afe56..4509d5b41a7 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/c/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/c/noImports.java @@ -1,7 +1,9 @@ package c; +import b.BPackage; + class J { void bar() { - b.BPackage.test(); + BPackage.test(); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/c/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/c/onDemandImport.java index fef0d1afe56..4509d5b41a7 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/c/onDemandImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/c/onDemandImport.java @@ -1,7 +1,9 @@ package c; +import b.BPackage; + class J { void bar() { - b.BPackage.test(); + BPackage.test(); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/c/specificImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/c/specificImports.java index fef0d1afe56..4509d5b41a7 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/c/specificImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/c/specificImports.java @@ -1,7 +1,9 @@ package c; +import b.BPackage; + class J { void bar() { - b.BPackage.test(); + BPackage.test(); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackageUsedInJava/after/JavaUsage.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackageUsedInJava/after/JavaUsage.java new file mode 100644 index 00000000000..8865366fa0c --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackageUsedInJava/after/JavaUsage.java @@ -0,0 +1,7 @@ +import newPackage.NewPackagePackage; + +class JavaUsage { + public static void main(String[] args) { + NewPackagePackage.foo(); + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackageUsedInJava/after/newPackage/foo.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackageUsedInJava/after/newPackage/foo.kt new file mode 100644 index 00000000000..948529ddba0 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackageUsedInJava/after/newPackage/foo.kt @@ -0,0 +1,4 @@ +package newPackage + +fun foo() { +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackageUsedInJava/after/oldPackage/fun.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackageUsedInJava/after/oldPackage/fun.kt new file mode 100644 index 00000000000..dc435d78822 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackageUsedInJava/after/oldPackage/fun.kt @@ -0,0 +1,5 @@ +package oldPackage + +fun other() { + +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackageUsedInJava/before/JavaUsage.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackageUsedInJava/before/JavaUsage.java new file mode 100644 index 00000000000..f4507dfc8d8 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackageUsedInJava/before/JavaUsage.java @@ -0,0 +1,7 @@ +import oldPackage.OldPackagePackage; + +class JavaUsage { + public static void main(String[] args) { + OldPackagePackage.foo(); + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackageUsedInJava/before/oldPackage/fun.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackageUsedInJava/before/oldPackage/fun.kt new file mode 100644 index 00000000000..0afc492dbf6 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackageUsedInJava/before/oldPackage/fun.kt @@ -0,0 +1,8 @@ +package oldPackage + +fun foo() { +} + +fun other() { + +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackageUsedInJava/moveFunctionToPackageUsedInJava.test b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackageUsedInJava/moveFunctionToPackageUsedInJava.test new file mode 100644 index 00000000000..0c0c3048a70 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackageUsedInJava/moveFunctionToPackageUsedInJava.test @@ -0,0 +1,5 @@ +{ + "mainFile": "oldPackage/fun.kt", + "type": "MOVE_KOTLIN_TOP_LEVEL_DECLARATIONS", + "targetPackage": "newPackage" +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveOnlyFunctionToPackageUsedInJava/after/JavaUsage.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveOnlyFunctionToPackageUsedInJava/after/JavaUsage.java new file mode 100644 index 00000000000..8ad4d9dfde1 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveOnlyFunctionToPackageUsedInJava/after/JavaUsage.java @@ -0,0 +1,9 @@ +// TODO Import of old package stays here because of a bug +import newPackage.NewPackagePackage; +import oldPackage.OldPackagePackage; + +class JavaUsage { + public static void main(String[] args) { + NewPackagePackage.foo(); + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveOnlyFunctionToPackageUsedInJava/after/newPackage/fun.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveOnlyFunctionToPackageUsedInJava/after/newPackage/fun.kt new file mode 100644 index 00000000000..948529ddba0 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveOnlyFunctionToPackageUsedInJava/after/newPackage/fun.kt @@ -0,0 +1,4 @@ +package newPackage + +fun foo() { +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveOnlyFunctionToPackageUsedInJava/after/oldPackage/fun.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveOnlyFunctionToPackageUsedInJava/after/oldPackage/fun.kt new file mode 100644 index 00000000000..c747cb6d255 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveOnlyFunctionToPackageUsedInJava/after/oldPackage/fun.kt @@ -0,0 +1,2 @@ +package oldPackage + diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveOnlyFunctionToPackageUsedInJava/before/JavaUsage.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveOnlyFunctionToPackageUsedInJava/before/JavaUsage.java new file mode 100644 index 00000000000..39b49501f2d --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveOnlyFunctionToPackageUsedInJava/before/JavaUsage.java @@ -0,0 +1,8 @@ +// TODO Import of old package stays here because of a bug +import oldPackage.OldPackagePackage; + +class JavaUsage { + public static void main(String[] args) { + OldPackagePackage.foo(); + } +} \ No newline at end of file diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveOnlyFunctionToPackageUsedInJava/before/oldPackage/fun.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveOnlyFunctionToPackageUsedInJava/before/oldPackage/fun.kt new file mode 100644 index 00000000000..41d29fbba0f --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveOnlyFunctionToPackageUsedInJava/before/oldPackage/fun.kt @@ -0,0 +1,5 @@ +package oldPackage + +fun foo() { +} + diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveOnlyFunctionToPackageUsedInJava/moveOnlyFunctionToPackageUsedInJava.test b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveOnlyFunctionToPackageUsedInJava/moveOnlyFunctionToPackageUsedInJava.test new file mode 100644 index 00000000000..0c0c3048a70 --- /dev/null +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveOnlyFunctionToPackageUsedInJava/moveOnlyFunctionToPackageUsedInJava.test @@ -0,0 +1,5 @@ +{ + "mainFile": "oldPackage/fun.kt", + "type": "MOVE_KOTLIN_TOP_LEVEL_DECLARATIONS", + "targetPackage": "newPackage" +} diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/a/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/a/noImports.java index b973de71c0c..906d240d2dc 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/a/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/a/noImports.java @@ -1,8 +1,10 @@ package a; +import b.BPackage; + class J { void bar() { - b.BPackage.setTest(""); - System.out.println(b.BPackage.getTest()); + BPackage.setTest(""); + System.out.println(BPackage.getTest()); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/noImports.java index 8648539c9f7..2c89e9d36e8 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/noImports.java @@ -2,7 +2,7 @@ package b; class J { void bar() { - b.BPackage.setTest(""); - System.out.println(b.BPackage.getTest()); + BPackage.setTest(""); + System.out.println(BPackage.getTest()); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/onDemandImport.java index 8648539c9f7..2c89e9d36e8 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/onDemandImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/onDemandImport.java @@ -2,7 +2,7 @@ package b; class J { void bar() { - b.BPackage.setTest(""); - System.out.println(b.BPackage.getTest()); + BPackage.setTest(""); + System.out.println(BPackage.getTest()); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/specificImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/specificImports.java index 8648539c9f7..2c89e9d36e8 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/specificImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/specificImports.java @@ -2,7 +2,7 @@ package b; class J { void bar() { - b.BPackage.setTest(""); - System.out.println(b.BPackage.getTest()); + BPackage.setTest(""); + System.out.println(BPackage.getTest()); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/c/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/c/noImports.java index 1309a310809..6171f6a8a62 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/c/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/c/noImports.java @@ -1,8 +1,10 @@ package c; +import b.BPackage; + class J { void bar() { - b.BPackage.setTest(""); - System.out.println(b.BPackage.getTest()); + BPackage.setTest(""); + System.out.println(BPackage.getTest()); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/c/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/c/onDemandImport.java index 1309a310809..6171f6a8a62 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/c/onDemandImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/c/onDemandImport.java @@ -1,8 +1,10 @@ package c; +import b.BPackage; + class J { void bar() { - b.BPackage.setTest(""); - System.out.println(b.BPackage.getTest()); + BPackage.setTest(""); + System.out.println(BPackage.getTest()); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/c/specificImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/c/specificImports.java index 1309a310809..6171f6a8a62 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/c/specificImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/c/specificImports.java @@ -1,8 +1,10 @@ package c; +import b.BPackage; + class J { void bar() { - b.BPackage.setTest(""); - System.out.println(b.BPackage.getTest()); + BPackage.setTest(""); + System.out.println(BPackage.getTest()); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/a/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/a/noImports.java index b973de71c0c..906d240d2dc 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/a/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/a/noImports.java @@ -1,8 +1,10 @@ package a; +import b.BPackage; + class J { void bar() { - b.BPackage.setTest(""); - System.out.println(b.BPackage.getTest()); + BPackage.setTest(""); + System.out.println(BPackage.getTest()); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/b/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/b/noImports.java index 8648539c9f7..2c89e9d36e8 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/b/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/b/noImports.java @@ -2,7 +2,7 @@ package b; class J { void bar() { - b.BPackage.setTest(""); - System.out.println(b.BPackage.getTest()); + BPackage.setTest(""); + System.out.println(BPackage.getTest()); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/b/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/b/onDemandImport.java index 8648539c9f7..2c89e9d36e8 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/b/onDemandImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/b/onDemandImport.java @@ -2,7 +2,7 @@ package b; class J { void bar() { - b.BPackage.setTest(""); - System.out.println(b.BPackage.getTest()); + BPackage.setTest(""); + System.out.println(BPackage.getTest()); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/b/specificImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/b/specificImports.java index 8648539c9f7..2c89e9d36e8 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/b/specificImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/b/specificImports.java @@ -2,7 +2,7 @@ package b; class J { void bar() { - b.BPackage.setTest(""); - System.out.println(b.BPackage.getTest()); + BPackage.setTest(""); + System.out.println(BPackage.getTest()); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/c/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/c/noImports.java index 1309a310809..6171f6a8a62 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/c/noImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/c/noImports.java @@ -1,8 +1,10 @@ package c; +import b.BPackage; + class J { void bar() { - b.BPackage.setTest(""); - System.out.println(b.BPackage.getTest()); + BPackage.setTest(""); + System.out.println(BPackage.getTest()); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/c/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/c/onDemandImport.java index 1309a310809..6171f6a8a62 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/c/onDemandImport.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/c/onDemandImport.java @@ -1,8 +1,10 @@ package c; +import b.BPackage; + class J { void bar() { - b.BPackage.setTest(""); - System.out.println(b.BPackage.getTest()); + BPackage.setTest(""); + System.out.println(BPackage.getTest()); } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/c/specificImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/c/specificImports.java index 1309a310809..6171f6a8a62 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/c/specificImports.java +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/c/specificImports.java @@ -1,8 +1,10 @@ package c; +import b.BPackage; + class J { void bar() { - b.BPackage.setTest(""); - System.out.println(b.BPackage.getTest()); + BPackage.setTest(""); + System.out.println(BPackage.getTest()); } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/JetMoveTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/JetMoveTestGenerated.java index 5b73c9de48a..543541ebee7 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/JetMoveTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/JetMoveTestGenerated.java @@ -336,6 +336,12 @@ public class JetMoveTestGenerated extends AbstractJetMoveTest { doTest(fileName); } + @TestMetadata("kotlin/moveTopLevelDeclarations/moveFunctionToPackageUsedInJava/moveFunctionToPackageUsedInJava.test") + public void testKotlin_moveTopLevelDeclarations_moveFunctionToPackageUsedInJava_MoveFunctionToPackageUsedInJava() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackageUsedInJava/moveFunctionToPackageUsedInJava.test"); + doTest(fileName); + } + @TestMetadata("kotlin/moveTopLevelDeclarations/moveFunctionToPackageWithConflicts/moveFunctionToPackageWithConflicts.test") public void testKotlin_moveTopLevelDeclarations_moveFunctionToPackageWithConflicts_MoveFunctionToPackageWithConflicts() throws Exception { String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackageWithConflicts/moveFunctionToPackageWithConflicts.test"); @@ -360,6 +366,12 @@ public class JetMoveTestGenerated extends AbstractJetMoveTest { doTest(fileName); } + @TestMetadata("kotlin/moveTopLevelDeclarations/moveOnlyFunctionToPackageUsedInJava/moveOnlyFunctionToPackageUsedInJava.test") + public void testKotlin_moveTopLevelDeclarations_moveOnlyFunctionToPackageUsedInJava_MoveOnlyFunctionToPackageUsedInJava() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveOnlyFunctionToPackageUsedInJava/moveOnlyFunctionToPackageUsedInJava.test"); + doTest(fileName); + } + @TestMetadata("kotlin/moveTopLevelDeclarations/movePropertyToFile/movePropertyToFile.test") public void testKotlin_moveTopLevelDeclarations_movePropertyToFile_MovePropertyToFile() throws Exception { String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/movePropertyToFile.test");