From 8bbf8e185a504d1933bf90b1cff76d31b33cb30a Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Mon, 24 Apr 2017 18:24:07 +0300 Subject: [PATCH] Move: Filter out usages with visibility error before refactoring If declaration is already invisible before move, no visibility conflict should be reported #KT-17571 Fixed --- .../moveDeclarations/moveConflictUtils.kt | 18 ++++---- .../after/a/dependency.kt | 0 .../after/a/main.kt | 0 .../after/a/noImports.java | 0 .../after/a/noImports.kt | 0 .../after/b/Test.kt | 0 .../before/a/dependency.kt | 0 .../before/a/main.kt | 0 .../before/a/noImports.java | 0 .../before/a/noImports.kt | 0 .../classAlreadyInaccessible.test} | 0 .../after/a/dependency.kt | 0 .../after/a/main.kt | 0 .../after/a/noImports.java | 0 .../after/a/noImports.kt | 0 .../after/b/test.kt | 0 .../before/a/dependency.kt | 0 .../before/a/main.kt | 0 .../before/a/noImports.java | 0 .../before/a/noImports.kt | 0 .../functionAlreadyInaccessible.test} | 0 .../conflicts.txt | 4 -- .../conflicts.txt | 4 -- .../conflicts.txt | 4 -- .../conflicts.txt | 4 -- .../after/a/dependency.kt | 0 .../after/a/main.kt | 0 .../after/a/noImports.java | 0 .../after/a/noImports.kt | 0 .../after/b/Test.kt | 0 .../before/a/dependency.kt | 0 .../before/a/main.kt | 0 .../before/a/noImports.java | 0 .../before/a/noImports.kt | 0 .../objectAlreadyInaccessible.test} | 0 .../after/a/dependency.kt | 0 .../after/a/main.kt | 0 .../after/a/noImports.java | 0 .../after/a/noImports.kt | 0 .../after/b/test.kt | 0 .../before/a/dependency.kt | 0 .../before/a/main.kt | 0 .../before/a/noImports.java | 0 .../before/a/noImports.kt | 0 .../propertyAlreadyInaccessible.test} | 0 .../refactoring/move/MoveTestGenerated.java | 42 +++++++++---------- 46 files changed, 32 insertions(+), 44 deletions(-) rename idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/{moveClassToPackageWithConflicts => classAlreadyInaccessible}/after/a/dependency.kt (100%) rename idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/{moveClassToPackageWithConflicts => classAlreadyInaccessible}/after/a/main.kt (100%) rename idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/{moveClassToPackageWithConflicts => classAlreadyInaccessible}/after/a/noImports.java (100%) rename idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/{moveClassToPackageWithConflicts => classAlreadyInaccessible}/after/a/noImports.kt (100%) rename idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/{moveClassToPackageWithConflicts => classAlreadyInaccessible}/after/b/Test.kt (100%) rename idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/{moveClassToPackageWithConflicts => classAlreadyInaccessible}/before/a/dependency.kt (100%) rename idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/{moveClassToPackageWithConflicts => classAlreadyInaccessible}/before/a/main.kt (100%) rename idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/{moveClassToPackageWithConflicts => classAlreadyInaccessible}/before/a/noImports.java (100%) rename idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/{moveClassToPackageWithConflicts => classAlreadyInaccessible}/before/a/noImports.kt (100%) rename idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/{moveClassToPackageWithConflicts/moveClassToPackageWithConflicts.test => classAlreadyInaccessible/classAlreadyInaccessible.test} (100%) rename idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/{moveFunctionToPackageWithConflicts => functionAlreadyInaccessible}/after/a/dependency.kt (100%) rename idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/{moveFunctionToPackageWithConflicts => functionAlreadyInaccessible}/after/a/main.kt (100%) rename idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/{moveFunctionToPackageWithConflicts => functionAlreadyInaccessible}/after/a/noImports.java (100%) rename idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/{moveFunctionToPackageWithConflicts => functionAlreadyInaccessible}/after/a/noImports.kt (100%) rename idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/{moveFunctionToPackageWithConflicts => functionAlreadyInaccessible}/after/b/test.kt (100%) rename idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/{moveFunctionToPackageWithConflicts => functionAlreadyInaccessible}/before/a/dependency.kt (100%) rename idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/{moveFunctionToPackageWithConflicts => functionAlreadyInaccessible}/before/a/main.kt (100%) rename idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/{moveFunctionToPackageWithConflicts => functionAlreadyInaccessible}/before/a/noImports.java (100%) rename idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/{moveFunctionToPackageWithConflicts => functionAlreadyInaccessible}/before/a/noImports.kt (100%) rename idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/{moveFunctionToPackageWithConflicts/moveFunctionToPackageWithConflicts.test => functionAlreadyInaccessible/functionAlreadyInaccessible.test} (100%) delete mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToPackageWithConflicts/conflicts.txt delete mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackageWithConflicts/conflicts.txt delete mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackageWithConflicts/conflicts.txt delete mode 100644 idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackageWithConflicts/conflicts.txt rename idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/{moveObjectToPackageWithConflicts => objectAlreadyInaccessible}/after/a/dependency.kt (100%) rename idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/{moveObjectToPackageWithConflicts => objectAlreadyInaccessible}/after/a/main.kt (100%) rename idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/{moveObjectToPackageWithConflicts => objectAlreadyInaccessible}/after/a/noImports.java (100%) rename idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/{moveObjectToPackageWithConflicts => objectAlreadyInaccessible}/after/a/noImports.kt (100%) rename idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/{moveObjectToPackageWithConflicts => objectAlreadyInaccessible}/after/b/Test.kt (100%) rename idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/{moveObjectToPackageWithConflicts => objectAlreadyInaccessible}/before/a/dependency.kt (100%) rename idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/{moveObjectToPackageWithConflicts => objectAlreadyInaccessible}/before/a/main.kt (100%) rename idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/{moveObjectToPackageWithConflicts => objectAlreadyInaccessible}/before/a/noImports.java (100%) rename idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/{moveObjectToPackageWithConflicts => objectAlreadyInaccessible}/before/a/noImports.kt (100%) rename idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/{moveObjectToPackageWithConflicts/moveObjectToPackageWithConflicts.test => objectAlreadyInaccessible/objectAlreadyInaccessible.test} (100%) rename idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/{movePropertyToPackageWithConflicts => propertyAlreadyInaccessible}/after/a/dependency.kt (100%) rename idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/{movePropertyToPackageWithConflicts => propertyAlreadyInaccessible}/after/a/main.kt (100%) rename idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/{movePropertyToPackageWithConflicts => propertyAlreadyInaccessible}/after/a/noImports.java (100%) rename idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/{movePropertyToPackageWithConflicts => propertyAlreadyInaccessible}/after/a/noImports.kt (100%) rename idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/{movePropertyToPackageWithConflicts => propertyAlreadyInaccessible}/after/b/test.kt (100%) rename idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/{movePropertyToPackageWithConflicts => propertyAlreadyInaccessible}/before/a/dependency.kt (100%) rename idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/{movePropertyToPackageWithConflicts => propertyAlreadyInaccessible}/before/a/main.kt (100%) rename idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/{movePropertyToPackageWithConflicts => propertyAlreadyInaccessible}/before/a/noImports.java (100%) rename idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/{movePropertyToPackageWithConflicts => propertyAlreadyInaccessible}/before/a/noImports.kt (100%) rename idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/{movePropertyToPackageWithConflicts/movePropertyToPackageWithConflicts.test => propertyAlreadyInaccessible/propertyAlreadyInaccessible.test} (100%) diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/moveConflictUtils.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/moveConflictUtils.kt index 55bc2f3044f..a159b48b6d0 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/moveConflictUtils.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/moveConflictUtils.kt @@ -25,7 +25,10 @@ import com.intellij.psi.search.GlobalSearchScope import com.intellij.psi.search.searches.ReferencesSearch import com.intellij.psi.util.PsiTreeUtil import com.intellij.refactoring.RefactoringBundle -import com.intellij.refactoring.util.* +import com.intellij.refactoring.util.CommonRefactoringUtil +import com.intellij.refactoring.util.MoveRenameUsageInfo +import com.intellij.refactoring.util.NonCodeUsageInfo +import com.intellij.refactoring.util.RefactoringUIUtil import com.intellij.usageView.UsageInfo import com.intellij.util.containers.MultiMap import org.jetbrains.kotlin.asJava.namedUnwrappedElement @@ -317,7 +320,7 @@ class MoveConflictChecker( val targetContainer = moveTarget.getContainerDescriptor() ?: continue val descriptorToCheck = referencedDescriptor.asPredicted(targetContainer) ?: continue - if (!descriptorToCheck.isVisibleIn(referencingDescriptor)) { + if (referencedDescriptor.isVisibleIn(referencingDescriptor) && !descriptorToCheck.isVisibleIn(referencingDescriptor)) { val message = "${render(container)} uses ${render(referencedElement)} which will be inaccessible after move" conflicts.putValue(element, message.capitalize()) } @@ -358,12 +361,13 @@ class MoveConflictChecker( val targetVisibility = visibility.normalize() if (targetVisibility == Visibilities.PUBLIC) return true + val referrer = ref.element.getStrictParentOfType() + val referrerDescriptor = referrer?.resolveToDescriptor() ?: return true + + if (!isVisibleIn(referrerDescriptor)) return true + return when (targetVisibility) { - Visibilities.PROTECTED -> { - val referrer = ref.element.getStrictParentOfType() - val referrerDescriptor = referrer?.resolveToDescriptor() ?: return true - isProtectedVisible(referrerDescriptor) - } + Visibilities.PROTECTED -> isProtectedVisible(referrerDescriptor) else -> isVisibleIn(targetContainer) } } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToPackageWithConflicts/after/a/dependency.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/classAlreadyInaccessible/after/a/dependency.kt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToPackageWithConflicts/after/a/dependency.kt rename to idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/classAlreadyInaccessible/after/a/dependency.kt diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToPackageWithConflicts/after/a/main.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/classAlreadyInaccessible/after/a/main.kt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToPackageWithConflicts/after/a/main.kt rename to idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/classAlreadyInaccessible/after/a/main.kt diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToPackageWithConflicts/after/a/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/classAlreadyInaccessible/after/a/noImports.java similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToPackageWithConflicts/after/a/noImports.java rename to idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/classAlreadyInaccessible/after/a/noImports.java diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToPackageWithConflicts/after/a/noImports.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/classAlreadyInaccessible/after/a/noImports.kt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToPackageWithConflicts/after/a/noImports.kt rename to idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/classAlreadyInaccessible/after/a/noImports.kt diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToPackageWithConflicts/after/b/Test.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/classAlreadyInaccessible/after/b/Test.kt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToPackageWithConflicts/after/b/Test.kt rename to idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/classAlreadyInaccessible/after/b/Test.kt diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToPackageWithConflicts/before/a/dependency.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/classAlreadyInaccessible/before/a/dependency.kt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToPackageWithConflicts/before/a/dependency.kt rename to idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/classAlreadyInaccessible/before/a/dependency.kt diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToPackageWithConflicts/before/a/main.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/classAlreadyInaccessible/before/a/main.kt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToPackageWithConflicts/before/a/main.kt rename to idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/classAlreadyInaccessible/before/a/main.kt diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToPackageWithConflicts/before/a/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/classAlreadyInaccessible/before/a/noImports.java similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToPackageWithConflicts/before/a/noImports.java rename to idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/classAlreadyInaccessible/before/a/noImports.java diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToPackageWithConflicts/before/a/noImports.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/classAlreadyInaccessible/before/a/noImports.kt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToPackageWithConflicts/before/a/noImports.kt rename to idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/classAlreadyInaccessible/before/a/noImports.kt diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToPackageWithConflicts/moveClassToPackageWithConflicts.test b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/classAlreadyInaccessible/classAlreadyInaccessible.test similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToPackageWithConflicts/moveClassToPackageWithConflicts.test rename to idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/classAlreadyInaccessible/classAlreadyInaccessible.test diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackageWithConflicts/after/a/dependency.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/functionAlreadyInaccessible/after/a/dependency.kt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackageWithConflicts/after/a/dependency.kt rename to idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/functionAlreadyInaccessible/after/a/dependency.kt diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackageWithConflicts/after/a/main.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/functionAlreadyInaccessible/after/a/main.kt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackageWithConflicts/after/a/main.kt rename to idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/functionAlreadyInaccessible/after/a/main.kt diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackageWithConflicts/after/a/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/functionAlreadyInaccessible/after/a/noImports.java similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackageWithConflicts/after/a/noImports.java rename to idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/functionAlreadyInaccessible/after/a/noImports.java diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackageWithConflicts/after/a/noImports.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/functionAlreadyInaccessible/after/a/noImports.kt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackageWithConflicts/after/a/noImports.kt rename to idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/functionAlreadyInaccessible/after/a/noImports.kt diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackageWithConflicts/after/b/test.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/functionAlreadyInaccessible/after/b/test.kt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackageWithConflicts/after/b/test.kt rename to idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/functionAlreadyInaccessible/after/b/test.kt diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackageWithConflicts/before/a/dependency.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/functionAlreadyInaccessible/before/a/dependency.kt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackageWithConflicts/before/a/dependency.kt rename to idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/functionAlreadyInaccessible/before/a/dependency.kt diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackageWithConflicts/before/a/main.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/functionAlreadyInaccessible/before/a/main.kt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackageWithConflicts/before/a/main.kt rename to idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/functionAlreadyInaccessible/before/a/main.kt diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackageWithConflicts/before/a/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/functionAlreadyInaccessible/before/a/noImports.java similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackageWithConflicts/before/a/noImports.java rename to idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/functionAlreadyInaccessible/before/a/noImports.java diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackageWithConflicts/before/a/noImports.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/functionAlreadyInaccessible/before/a/noImports.kt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackageWithConflicts/before/a/noImports.kt rename to idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/functionAlreadyInaccessible/before/a/noImports.kt diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackageWithConflicts/moveFunctionToPackageWithConflicts.test b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/functionAlreadyInaccessible/functionAlreadyInaccessible.test similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackageWithConflicts/moveFunctionToPackageWithConflicts.test rename to idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/functionAlreadyInaccessible/functionAlreadyInaccessible.test diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToPackageWithConflicts/conflicts.txt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToPackageWithConflicts/conflicts.txt deleted file mode 100644 index 8f39a515003..00000000000 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToPackageWithConflicts/conflicts.txt +++ /dev/null @@ -1,4 +0,0 @@ -Class Test uses class Foo which will be inaccessible after move -Class Test uses function foo(Foo) which will be inaccessible after move -Method bar() uses class Test which will be inaccessible after move -Variable t uses class Test which will be inaccessible after move \ No newline at end of file diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackageWithConflicts/conflicts.txt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackageWithConflicts/conflicts.txt deleted file mode 100644 index c181c625b2a..00000000000 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackageWithConflicts/conflicts.txt +++ /dev/null @@ -1,4 +0,0 @@ -Function bar() uses function test() which will be inaccessible after move -Function test() uses class Foo which will be inaccessible after move -Function test() uses function foo(Foo) which will be inaccessible after move -Method bar() uses function test() which will be inaccessible after move \ No newline at end of file diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackageWithConflicts/conflicts.txt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackageWithConflicts/conflicts.txt deleted file mode 100644 index 2f1a7f43272..00000000000 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackageWithConflicts/conflicts.txt +++ /dev/null @@ -1,4 +0,0 @@ -Method bar() uses object Test which will be inaccessible after move -Object Test uses class Foo which will be inaccessible after move -Object Test uses function foo(Foo) which will be inaccessible after move -Variable t uses object Test which will be inaccessible after move \ No newline at end of file diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackageWithConflicts/conflicts.txt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackageWithConflicts/conflicts.txt deleted file mode 100644 index e38a822bd2f..00000000000 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackageWithConflicts/conflicts.txt +++ /dev/null @@ -1,4 +0,0 @@ -Function bar() uses property test which will be inaccessible after move -Method bar() uses property test which will be inaccessible after move -Property test uses class Foo which will be inaccessible after move -Property test uses function foo(Foo) which will be inaccessible after move \ No newline at end of file diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackageWithConflicts/after/a/dependency.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/objectAlreadyInaccessible/after/a/dependency.kt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackageWithConflicts/after/a/dependency.kt rename to idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/objectAlreadyInaccessible/after/a/dependency.kt diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackageWithConflicts/after/a/main.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/objectAlreadyInaccessible/after/a/main.kt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackageWithConflicts/after/a/main.kt rename to idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/objectAlreadyInaccessible/after/a/main.kt diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackageWithConflicts/after/a/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/objectAlreadyInaccessible/after/a/noImports.java similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackageWithConflicts/after/a/noImports.java rename to idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/objectAlreadyInaccessible/after/a/noImports.java diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackageWithConflicts/after/a/noImports.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/objectAlreadyInaccessible/after/a/noImports.kt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackageWithConflicts/after/a/noImports.kt rename to idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/objectAlreadyInaccessible/after/a/noImports.kt diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackageWithConflicts/after/b/Test.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/objectAlreadyInaccessible/after/b/Test.kt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackageWithConflicts/after/b/Test.kt rename to idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/objectAlreadyInaccessible/after/b/Test.kt diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackageWithConflicts/before/a/dependency.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/objectAlreadyInaccessible/before/a/dependency.kt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackageWithConflicts/before/a/dependency.kt rename to idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/objectAlreadyInaccessible/before/a/dependency.kt diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackageWithConflicts/before/a/main.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/objectAlreadyInaccessible/before/a/main.kt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackageWithConflicts/before/a/main.kt rename to idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/objectAlreadyInaccessible/before/a/main.kt diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackageWithConflicts/before/a/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/objectAlreadyInaccessible/before/a/noImports.java similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackageWithConflicts/before/a/noImports.java rename to idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/objectAlreadyInaccessible/before/a/noImports.java diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackageWithConflicts/before/a/noImports.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/objectAlreadyInaccessible/before/a/noImports.kt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackageWithConflicts/before/a/noImports.kt rename to idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/objectAlreadyInaccessible/before/a/noImports.kt diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackageWithConflicts/moveObjectToPackageWithConflicts.test b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/objectAlreadyInaccessible/objectAlreadyInaccessible.test similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackageWithConflicts/moveObjectToPackageWithConflicts.test rename to idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/objectAlreadyInaccessible/objectAlreadyInaccessible.test diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackageWithConflicts/after/a/dependency.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/propertyAlreadyInaccessible/after/a/dependency.kt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackageWithConflicts/after/a/dependency.kt rename to idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/propertyAlreadyInaccessible/after/a/dependency.kt diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackageWithConflicts/after/a/main.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/propertyAlreadyInaccessible/after/a/main.kt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackageWithConflicts/after/a/main.kt rename to idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/propertyAlreadyInaccessible/after/a/main.kt diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackageWithConflicts/after/a/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/propertyAlreadyInaccessible/after/a/noImports.java similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackageWithConflicts/after/a/noImports.java rename to idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/propertyAlreadyInaccessible/after/a/noImports.java diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackageWithConflicts/after/a/noImports.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/propertyAlreadyInaccessible/after/a/noImports.kt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackageWithConflicts/after/a/noImports.kt rename to idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/propertyAlreadyInaccessible/after/a/noImports.kt diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackageWithConflicts/after/b/test.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/propertyAlreadyInaccessible/after/b/test.kt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackageWithConflicts/after/b/test.kt rename to idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/propertyAlreadyInaccessible/after/b/test.kt diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackageWithConflicts/before/a/dependency.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/propertyAlreadyInaccessible/before/a/dependency.kt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackageWithConflicts/before/a/dependency.kt rename to idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/propertyAlreadyInaccessible/before/a/dependency.kt diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackageWithConflicts/before/a/main.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/propertyAlreadyInaccessible/before/a/main.kt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackageWithConflicts/before/a/main.kt rename to idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/propertyAlreadyInaccessible/before/a/main.kt diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackageWithConflicts/before/a/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/propertyAlreadyInaccessible/before/a/noImports.java similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackageWithConflicts/before/a/noImports.java rename to idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/propertyAlreadyInaccessible/before/a/noImports.java diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackageWithConflicts/before/a/noImports.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/propertyAlreadyInaccessible/before/a/noImports.kt similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackageWithConflicts/before/a/noImports.kt rename to idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/propertyAlreadyInaccessible/before/a/noImports.kt diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackageWithConflicts/movePropertyToPackageWithConflicts.test b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/propertyAlreadyInaccessible/propertyAlreadyInaccessible.test similarity index 100% rename from idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackageWithConflicts/movePropertyToPackageWithConflicts.test rename to idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/propertyAlreadyInaccessible/propertyAlreadyInaccessible.test diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/MoveTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/MoveTestGenerated.java index a568f4d6535..7034d14091f 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/MoveTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/MoveTestGenerated.java @@ -474,6 +474,18 @@ public class MoveTestGenerated extends AbstractMoveTest { doTest(fileName); } + @TestMetadata("kotlin/moveTopLevelDeclarations/classAlreadyInaccessible/classAlreadyInaccessible.test") + public void testKotlin_moveTopLevelDeclarations_classAlreadyInaccessible_ClassAlreadyInaccessible() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/classAlreadyInaccessible/classAlreadyInaccessible.test"); + doTest(fileName); + } + + @TestMetadata("kotlin/moveTopLevelDeclarations/functionAlreadyInaccessible/functionAlreadyInaccessible.test") + public void testKotlin_moveTopLevelDeclarations_functionAlreadyInaccessible_FunctionAlreadyInaccessible() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/functionAlreadyInaccessible/functionAlreadyInaccessible.test"); + doTest(fileName); + } + @TestMetadata("kotlin/moveTopLevelDeclarations/implicitInvokeCalls/differentSource/differentSource.test") public void testKotlin_moveTopLevelDeclarations_implicitInvokeCalls_differentSource_DifferentSource() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/implicitInvokeCalls/differentSource/differentSource.test"); @@ -642,12 +654,6 @@ public class MoveTestGenerated extends AbstractMoveTest { doTest(fileName); } - @TestMetadata("kotlin/moveTopLevelDeclarations/moveClassToPackageWithConflicts/moveClassToPackageWithConflicts.test") - public void testKotlin_moveTopLevelDeclarations_moveClassToPackageWithConflicts_MoveClassToPackageWithConflicts() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToPackageWithConflicts/moveClassToPackageWithConflicts.test"); - doTest(fileName); - } - @TestMetadata("kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/moveExtensionFunctionToFile.test") public void testKotlin_moveTopLevelDeclarations_moveExtensionFunctionToFil_MoveExtensionFunctionToFile() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/moveExtensionFunctionToFile.test"); @@ -678,12 +684,6 @@ public class MoveTestGenerated extends AbstractMoveTest { doTest(fileName); } - @TestMetadata("kotlin/moveTopLevelDeclarations/moveFunctionToPackageWithConflicts/moveFunctionToPackageWithConflicts.test") - public void testKotlin_moveTopLevelDeclarations_moveFunctionToPackageWithConflicts_MoveFunctionToPackageWithConflicts() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackageWithConflicts/moveFunctionToPackageWithConflicts.test"); - doTest(fileName); - } - @TestMetadata("kotlin/moveTopLevelDeclarations/moveObjectToFile/moveObjectToFile.test") public void testKotlin_moveTopLevelDeclarations_moveObjectToFile_MoveObjectToFile() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/moveObjectToFile.test"); @@ -696,12 +696,6 @@ public class MoveTestGenerated extends AbstractMoveTest { doTest(fileName); } - @TestMetadata("kotlin/moveTopLevelDeclarations/moveObjectToPackageWithConflicts/moveObjectToPackageWithConflicts.test") - public void testKotlin_moveTopLevelDeclarations_moveObjectToPackageWithConflicts_MoveObjectToPackageWithConflicts() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackageWithConflicts/moveObjectToPackageWithConflicts.test"); - doTest(fileName); - } - @TestMetadata("kotlin/moveTopLevelDeclarations/moveOnlyFunctionToPackageUsedInJava/moveOnlyFunctionToPackageUsedInJava.test") public void testKotlin_moveTopLevelDeclarations_moveOnlyFunctionToPackageUsedInJava_MoveOnlyFunctionToPackageUsedInJava() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveOnlyFunctionToPackageUsedInJava/moveOnlyFunctionToPackageUsedInJava.test"); @@ -744,9 +738,15 @@ public class MoveTestGenerated extends AbstractMoveTest { doTest(fileName); } - @TestMetadata("kotlin/moveTopLevelDeclarations/movePropertyToPackageWithConflicts/movePropertyToPackageWithConflicts.test") - public void testKotlin_moveTopLevelDeclarations_movePropertyToPackageWithConflicts_MovePropertyToPackageWithConflicts() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackageWithConflicts/movePropertyToPackageWithConflicts.test"); + @TestMetadata("kotlin/moveTopLevelDeclarations/objectAlreadyInaccessible/objectAlreadyInaccessible.test") + public void testKotlin_moveTopLevelDeclarations_objectAlreadyInaccessible_ObjectAlreadyInaccessible() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/objectAlreadyInaccessible/objectAlreadyInaccessible.test"); + doTest(fileName); + } + + @TestMetadata("kotlin/moveTopLevelDeclarations/propertyAlreadyInaccessible/propertyAlreadyInaccessible.test") + public void testKotlin_moveTopLevelDeclarations_propertyAlreadyInaccessible_PropertyAlreadyInaccessible() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/propertyAlreadyInaccessible/propertyAlreadyInaccessible.test"); doTest(fileName); }