diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml index 1a15828fdd8..8b852761d18 100644 --- a/idea/src/META-INF/plugin.xml +++ b/idea/src/META-INF/plugin.xml @@ -358,6 +358,7 @@ + > { + internal class OptimizeImportsTask( + private val task: SequentialModalProgressTask, + pointers: Set> + ) : SequentialTask { + private val pointerIterator = pointers.iterator() + private val myTotal: Int = pointers.size + private var myCount: Int = 0 + + override fun prepare() {} + + override fun isDone() = !pointerIterator.hasNext() + + override fun iteration(): Boolean { + task.indicator?.fraction = myCount++.toDouble() / myTotal + + val pointer = pointerIterator.next() + + val directive = pointer.element + if (directive == null || !directive.isValid) return isDone + + try { + directive.delete() + } + catch (e: IncorrectOperationException) { + LOG.error(e) + } + + return isDone + } + + override fun stop() {} + + companion object { + private val LOG = Logger.getInstance("#" + OptimizeImportsTask::class.java.name) + } + } + + companion object { + private val REMOVING_REDUNDANT_IMPORTS_TITLE = "Removing redundant imports" + } + + override fun prepareOperation(usages: Array): Set { + return usages.mapNotNullTo(LinkedHashSet()) { + if (!it.isNonCodeUsage) it.file as? KtFile else null + } + } + + override fun performOperation(project: Project, operationData: Set) { + CodeStyleManager.getInstance(project).performActionWithFormatterDisabled { + PsiDocumentManager.getInstance(project).commitAllDocuments() + } + + if (operationData.isEmpty()) return + + val unusedImports = LinkedHashSet>() + val findRedundantImports = { + DumbService.getInstance(project).runReadActionInSmartMode { + val progressIndicator = ProgressManager.getInstance().progressIndicator + val fileCount = operationData.size + for ((i, file) in operationData.withIndex()) { + if (!file.isValid) continue + val virtualFile = file.virtualFile ?: continue + + progressIndicator?.text2 = virtualFile.presentableUrl + progressIndicator?.fraction = i.toDouble() / fileCount + + val fileImportData = KotlinUnusedImportInspection.analyzeImports(file) ?: continue + fileImportData.unusedImports.mapTo(unusedImports) { it.createSmartPointer() } + } + } + } + if (!ProgressManager.getInstance().runProcessWithProgressSynchronously( + findRedundantImports, REMOVING_REDUNDANT_IMPORTS_TITLE, false, project + )) return + + runWriteAction { + val progressTask = SequentialModalProgressTask(project, REMOVING_REDUNDANT_IMPORTS_TITLE, false).apply { + setMinIterationTime(200) + setTask(OptimizeImportsTask(this, unusedImports)) + } + ProgressManager.getInstance().run(progressTask) + } + } +} diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/KotlinUnusedImportInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/KotlinUnusedImportInspection.kt index 9b0defdcbfd..661120730dd 100644 --- a/idea/src/org/jetbrains/kotlin/idea/inspections/KotlinUnusedImportInspection.kt +++ b/idea/src/org/jetbrains/kotlin/idea/inspections/KotlinUnusedImportInspection.kt @@ -48,78 +48,94 @@ import org.jetbrains.kotlin.idea.imports.importableFqName import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.psi.KtCodeFragment import org.jetbrains.kotlin.psi.KtFile +import org.jetbrains.kotlin.psi.KtImportDirective import org.jetbrains.kotlin.resolve.ImportPath import java.util.* class KotlinUnusedImportInspection : AbstractKotlinInspection() { + data class ImportData( + val unusedImports: List, + val optimizerData: OptimizedImportsBuilder.InputData + ) + + companion object { + fun analyzeImports(file: KtFile): ImportData? { + if (file is KtCodeFragment) return null + if (!file.manager.isInProject(file)) return null + if (file.importDirectives.isEmpty()) return null + + val optimizerData = KotlinImportOptimizer.collectDescriptorsToImport(file) + + val directives = file.importDirectives + val explicitlyImportedFqNames = directives + .asSequence() + .mapNotNull { it.importPath } + .filter { !it.isAllUnder && !it.hasAlias() } + .map { it.fqName } + .toSet() + + val fqNames = HashSet() + val parentFqNames = HashSet() + for (descriptor in optimizerData.descriptorsToImport) { + val fqName = descriptor.importableFqName!! + fqNames.add(fqName) + + if (fqName !in explicitlyImportedFqNames) { // we don't add parents of explicitly imported fq-names because such imports are not needed + val parentFqName = fqName.parent() + if (!parentFqName.isRoot) { + parentFqNames.add(parentFqName) + } + } + } + + val importPaths = HashSet(directives.size) + val unusedImports = ArrayList() + + for (directive in directives) { + val importPath = directive.importPath ?: continue + if (importPath.alias != null) continue // highlighting of unused alias imports not supported yet + + val isUsed = if (!importPaths.add(importPath)) { + false + } + else if (importPath.isAllUnder) { + importPath.fqName in parentFqNames + } + else { + importPath.fqName in fqNames + } + + if (!isUsed) { + if (directive.targetDescriptors().isEmpty()) continue // do not highlight unresolved imports as unused + unusedImports += directive + } + } + + return ImportData(unusedImports, optimizerData) + } + } + override fun runForWholeFile() = true override fun checkFile(file: PsiFile, manager: InspectionManager, isOnTheFly: Boolean): Array? { - if (file !is KtFile || file is KtCodeFragment) return null - if (!file.manager.isInProject(file)) return null - if (file.importDirectives.isEmpty()) return null + if (file !is KtFile) return null + val data = analyzeImports(file) ?: return null - val data = KotlinImportOptimizer.collectDescriptorsToImport(file) - - val directives = file.importDirectives - val explicitlyImportedFqNames = directives - .asSequence() - .mapNotNull { it.importPath } - .filter { !it.isAllUnder && !it.hasAlias() } - .map { it.fqName } - .toSet() - - val fqNames = HashSet() - val parentFqNames = HashSet() - for (descriptor in data.descriptorsToImport) { - val fqName = descriptor.importableFqName!! - fqNames.add(fqName) - - if (fqName !in explicitlyImportedFqNames) { // we don't add parents of explicitly imported fq-names because such imports are not needed - val parentFqName = fqName.parent() - if (!parentFqName.isRoot) { - parentFqNames.add(parentFqName) - } - } - } - - val problems = ArrayList() - - val importPaths = HashSet(directives.size) - - for (directive in directives) { - val importPath = directive.importPath ?: continue - if (importPath.alias != null) continue // highlighting of unused alias imports not supported yet - - val isUsed = if (!importPaths.add(importPath)) { - false - } - else if (importPath.isAllUnder) { - importPath.fqName in parentFqNames - } - else { - importPath.fqName in fqNames - } - - if (!isUsed) { - if (directive.targetDescriptors().isEmpty()) continue // do not highlight unresolved imports as unused - - val fixes = arrayListOf() - fixes.add(OptimizeImportsQuickFix(file)) - if (!CodeInsightSettings.getInstance().OPTIMIZE_IMPORTS_ON_THE_FLY) { - fixes.add(EnableOptimizeImportsOnTheFlyFix(file)) - } - - problems.add(manager.createProblemDescriptor(directive, - "Unused import directive", - isOnTheFly, - fixes.toTypedArray(), - ProblemHighlightType.LIKE_UNUSED_SYMBOL)) + val problems = data.unusedImports.map { + val fixes = arrayListOf() + fixes.add(OptimizeImportsQuickFix(file)) + if (!CodeInsightSettings.getInstance().OPTIMIZE_IMPORTS_ON_THE_FLY) { + fixes.add(EnableOptimizeImportsOnTheFlyFix(file)) } + manager.createProblemDescriptor(it, + "Unused import directive", + isOnTheFly, + fixes.toTypedArray(), + ProblemHighlightType.LIKE_UNUSED_SYMBOL) } if (isOnTheFly) { - scheduleOptimizeImportsOnTheFly(file, data) + scheduleOptimizeImportsOnTheFly(file, data.optimizerData) } return problems.toTypedArray() diff --git a/idea/testData/multiFileIntentions/reconcilePackageWithDirectory/addQuotation/after/in/foo/fun/usagesWithImports.kt b/idea/testData/multiFileIntentions/reconcilePackageWithDirectory/addQuotation/after/in/foo/fun/usagesWithImports.kt index 5857a5540f1..f2aaf62bf10 100644 --- a/idea/testData/multiFileIntentions/reconcilePackageWithDirectory/addQuotation/after/in/foo/fun/usagesWithImports.kt +++ b/idea/testData/multiFileIntentions/reconcilePackageWithDirectory/addQuotation/after/in/foo/fun/usagesWithImports.kt @@ -1,8 +1,5 @@ package `in`.foo.`fun` -import `in`.foo.`fun`.Foo -import `in`.foo.`fun`.foo - fun test() { Foo() foo() diff --git a/idea/testData/multiFileIntentions/reconcilePackageWithDirectory/changeToDefaultPackage/after/usagesWithImports.kt b/idea/testData/multiFileIntentions/reconcilePackageWithDirectory/changeToDefaultPackage/after/usagesWithImports.kt index b79e12ef3cb..bf2b7529d08 100644 --- a/idea/testData/multiFileIntentions/reconcilePackageWithDirectory/changeToDefaultPackage/after/usagesWithImports.kt +++ b/idea/testData/multiFileIntentions/reconcilePackageWithDirectory/changeToDefaultPackage/after/usagesWithImports.kt @@ -1,6 +1,3 @@ -import Foo -import foo - fun test() { Foo() foo() diff --git a/idea/testData/multiFileIntentions/reconcilePackageWithDirectory/changeToNonDefaultPackage/after/target/usagesWithImports.kt b/idea/testData/multiFileIntentions/reconcilePackageWithDirectory/changeToNonDefaultPackage/after/target/usagesWithImports.kt index 147a343d79d..a14e5ef3203 100644 --- a/idea/testData/multiFileIntentions/reconcilePackageWithDirectory/changeToNonDefaultPackage/after/target/usagesWithImports.kt +++ b/idea/testData/multiFileIntentions/reconcilePackageWithDirectory/changeToNonDefaultPackage/after/target/usagesWithImports.kt @@ -1,8 +1,5 @@ package target -import target.Foo -import target.foo - fun test() { Foo() foo() diff --git a/idea/testData/refactoring/changeSignature/JavaMethodKotlinUsagesAfter.1.kt b/idea/testData/refactoring/changeSignature/JavaMethodKotlinUsagesAfter.1.kt index 0269874ea59..a775825e038 100644 --- a/idea/testData/refactoring/changeSignature/JavaMethodKotlinUsagesAfter.1.kt +++ b/idea/testData/refactoring/changeSignature/JavaMethodKotlinUsagesAfter.1.kt @@ -1,5 +1,3 @@ -import J.bar - fun test() { J.bar("1") J.bar("3") diff --git a/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToExternalNestedClass/after/onDemandImportOfSourceClassMembers.kt b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToExternalNestedClass/after/onDemandImportOfSourceClassMembers.kt index bd8e0e84326..6b412d83dab 100644 --- a/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToExternalNestedClass/after/onDemandImportOfSourceClassMembers.kt +++ b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToExternalNestedClass/after/onDemandImportOfSourceClassMembers.kt @@ -1,5 +1,3 @@ -import A.* - fun bar(s: String) { val t: B.C.X = B.C.X() } \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClass/after/onDemandImport.kt b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClass/after/onDemandImport.kt index 7b1bf28b928..8b616b22226 100644 --- a/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClass/after/onDemandImport.kt +++ b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClass/after/onDemandImport.kt @@ -1,5 +1,3 @@ -import A.* - fun bar(s: String) { val t: B.X = B.X() } \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassAndMakePackageLocal/after/onDemandImport.kt b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassAndMakePackageLocal/after/onDemandImport.kt index 7b1bf28b928..8b616b22226 100644 --- a/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassAndMakePackageLocal/after/onDemandImport.kt +++ b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassAndMakePackageLocal/after/onDemandImport.kt @@ -1,5 +1,3 @@ -import A.* - fun bar(s: String) { val t: B.X = B.X() } \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassAndMakePrivate/after/onDemandImport.kt b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassAndMakePrivate/after/onDemandImport.kt index 7b1bf28b928..8b616b22226 100644 --- a/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassAndMakePrivate/after/onDemandImport.kt +++ b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassAndMakePrivate/after/onDemandImport.kt @@ -1,5 +1,3 @@ -import A.* - fun bar(s: String) { val t: B.X = B.X() } \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassOfAnotherPackage/after/k/onDemandImportOfClassMembers.kt b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassOfAnotherPackage/after/k/onDemandImportOfClassMembers.kt index d2a9fe679f5..f7e542a731d 100644 --- a/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassOfAnotherPackage/after/k/onDemandImportOfClassMembers.kt +++ b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassOfAnotherPackage/after/k/onDemandImportOfClassMembers.kt @@ -1,6 +1,5 @@ package k -import j.A.* import j.B fun bar(s: String) { diff --git a/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassOfAnotherPackage/after/k/specificClassImport.kt b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassOfAnotherPackage/after/k/specificClassImport.kt index df2c07587c6..f7e542a731d 100644 --- a/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassOfAnotherPackage/after/k/specificClassImport.kt +++ b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassOfAnotherPackage/after/k/specificClassImport.kt @@ -1,6 +1,5 @@ package k -import j.A import j.B fun bar(s: String) { diff --git a/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInAnotherPackage/after/b/onDemandImport.kt b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInAnotherPackage/after/b/onDemandImport.kt index 40fc2c20dd9..153afd08647 100644 --- a/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInAnotherPackage/after/b/onDemandImport.kt +++ b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInAnotherPackage/after/b/onDemandImport.kt @@ -1,7 +1,5 @@ package b -import b.* - fun bar() { val t: X = X() } \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackage/after/a/onDemandImport.kt b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackage/after/a/onDemandImport.kt index ce8631747b3..03041662aba 100644 --- a/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackage/after/a/onDemandImport.kt +++ b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackage/after/a/onDemandImport.kt @@ -1,7 +1,5 @@ package a -import a.A.* - fun bar(s: String) { val t: X = X() } \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstance/after/a/onDemandImport.kt b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstance/after/a/onDemandImport.kt index 1ed0891d2c2..8e4e4077ba1 100644 --- a/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstance/after/a/onDemandImport.kt +++ b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstance/after/a/onDemandImport.kt @@ -1,7 +1,5 @@ package a -import a.A.* - fun bar(s: String) { val t: X = X(A(), "test") } \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstance/after/a/specificImport.kt b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstance/after/a/specificImport.kt index 30c6ec5d031..8e4e4077ba1 100644 --- a/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstance/after/a/specificImport.kt +++ b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstance/after/a/specificImport.kt @@ -1,7 +1,5 @@ package a -import a.X - fun bar(s: String) { val t: X = X(A(), "test") } \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstanceWithLambda/after/a/onDemandImport.kt b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstanceWithLambda/after/a/onDemandImport.kt index d0cd1a55579..8eb18554713 100644 --- a/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstanceWithLambda/after/a/onDemandImport.kt +++ b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstanceWithLambda/after/a/onDemandImport.kt @@ -1,7 +1,5 @@ package a -import a.A.* - fun bar(s: String) { val t: X = X(A()) { s } } \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstanceWithLambda/after/a/specificImport.kt b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstanceWithLambda/after/a/specificImport.kt index 6ef143a0921..8eb18554713 100644 --- a/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstanceWithLambda/after/a/specificImport.kt +++ b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstanceWithLambda/after/a/specificImport.kt @@ -1,7 +1,5 @@ package a -import a.X - fun bar(s: String) { val t: X = X(A()) { s } } \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndRename/after/a/onDemandImport.kt b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndRename/after/a/onDemandImport.kt index 8fd87b89ade..06cc224bba3 100644 --- a/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndRename/after/a/onDemandImport.kt +++ b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndRename/after/a/onDemandImport.kt @@ -1,7 +1,5 @@ package a -import a.A.* - fun bar(s: String) { val t: Y = Y() } \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveTop/moveTopLevelClassToAnotherPackage/after/b/onDemandSourcePackageImport.kt b/idea/testData/refactoring/move/java/moveClass/moveTop/moveTopLevelClassToAnotherPackage/after/b/onDemandSourcePackageImport.kt index 3700d2bbc00..11e0790c3bd 100644 --- a/idea/testData/refactoring/move/java/moveClass/moveTop/moveTopLevelClassToAnotherPackage/after/b/onDemandSourcePackageImport.kt +++ b/idea/testData/refactoring/move/java/moveClass/moveTop/moveTopLevelClassToAnotherPackage/after/b/onDemandSourcePackageImport.kt @@ -1,7 +1,5 @@ package b -import a.* - fun bar() { val t: A = A() } \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveClass/moveTop/moveTopLevelClassToAnotherPackage/after/c/onDemandSourcePackageImport.kt b/idea/testData/refactoring/move/java/moveClass/moveTop/moveTopLevelClassToAnotherPackage/after/c/onDemandSourcePackageImport.kt index 622ab5ebf7f..2c3b198bdd1 100644 --- a/idea/testData/refactoring/move/java/moveClass/moveTop/moveTopLevelClassToAnotherPackage/after/c/onDemandSourcePackageImport.kt +++ b/idea/testData/refactoring/move/java/moveClass/moveTop/moveTopLevelClassToAnotherPackage/after/c/onDemandSourcePackageImport.kt @@ -1,6 +1,5 @@ package c -import a.* import b.A fun bar() { diff --git a/idea/testData/refactoring/move/java/moveField/moveFieldToExternalNestedClass/after/onDemandImportOfSourceClassMembers.kt b/idea/testData/refactoring/move/java/moveField/moveFieldToExternalNestedClass/after/onDemandImportOfSourceClassMembers.kt index 6e91eb807e1..231bcc16003 100644 --- a/idea/testData/refactoring/move/java/moveField/moveFieldToExternalNestedClass/after/onDemandImportOfSourceClassMembers.kt +++ b/idea/testData/refactoring/move/java/moveField/moveFieldToExternalNestedClass/after/onDemandImportOfSourceClassMembers.kt @@ -1,5 +1,3 @@ -import A.* - fun bar(s: String) { B.C.X = s } \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClass/after/onDemandImport.kt b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClass/after/onDemandImport.kt index 356620c65f6..1e1f02f6022 100644 --- a/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClass/after/onDemandImport.kt +++ b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClass/after/onDemandImport.kt @@ -1,5 +1,3 @@ -import A.* - fun bar(s: String) { B.X = s } \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassAndMakePackageLocal/after/onDemandImport.kt b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassAndMakePackageLocal/after/onDemandImport.kt index 356620c65f6..1e1f02f6022 100644 --- a/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassAndMakePackageLocal/after/onDemandImport.kt +++ b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassAndMakePackageLocal/after/onDemandImport.kt @@ -1,5 +1,3 @@ -import A.* - fun bar(s: String) { B.X = s } \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassAndMakePrivate/after/onDemandImport.kt b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassAndMakePrivate/after/onDemandImport.kt index 356620c65f6..1e1f02f6022 100644 --- a/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassAndMakePrivate/after/onDemandImport.kt +++ b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassAndMakePrivate/after/onDemandImport.kt @@ -1,5 +1,3 @@ -import A.* - fun bar(s: String) { B.X = s } \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassOfAnotherPackage/after/k/onDemandImportOfClassMembers.kt b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassOfAnotherPackage/after/k/onDemandImportOfClassMembers.kt index dc801faff29..3696fd7f476 100644 --- a/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassOfAnotherPackage/after/k/onDemandImportOfClassMembers.kt +++ b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassOfAnotherPackage/after/k/onDemandImportOfClassMembers.kt @@ -1,6 +1,5 @@ package k -import j.A.* import j.B fun bar(s: String) { diff --git a/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassOfAnotherPackage/after/k/specificClassImport.kt b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassOfAnotherPackage/after/k/specificClassImport.kt index 23af384a35f..3696fd7f476 100644 --- a/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassOfAnotherPackage/after/k/specificClassImport.kt +++ b/idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassOfAnotherPackage/after/k/specificClassImport.kt @@ -1,6 +1,5 @@ package k -import j.A import j.B fun bar(s: String) { diff --git a/idea/testData/refactoring/move/java/moveFile/moveFileToAnotherPackage/after/b/onDemandSourcePackageImport.kt b/idea/testData/refactoring/move/java/moveFile/moveFileToAnotherPackage/after/b/onDemandSourcePackageImport.kt index 3700d2bbc00..11e0790c3bd 100644 --- a/idea/testData/refactoring/move/java/moveFile/moveFileToAnotherPackage/after/b/onDemandSourcePackageImport.kt +++ b/idea/testData/refactoring/move/java/moveFile/moveFileToAnotherPackage/after/b/onDemandSourcePackageImport.kt @@ -1,7 +1,5 @@ package b -import a.* - fun bar() { val t: A = A() } \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveMethod/moveMethodToExternalNestedClass/after/onDemandImportOfSourceClassMembers.kt b/idea/testData/refactoring/move/java/moveMethod/moveMethodToExternalNestedClass/after/onDemandImportOfSourceClassMembers.kt index 3945f6f6a9e..7ef05b4ca63 100644 --- a/idea/testData/refactoring/move/java/moveMethod/moveMethodToExternalNestedClass/after/onDemandImportOfSourceClassMembers.kt +++ b/idea/testData/refactoring/move/java/moveMethod/moveMethodToExternalNestedClass/after/onDemandImportOfSourceClassMembers.kt @@ -1,5 +1,3 @@ -import A.* - fun bar(s: String) { B.C.foo(s) } \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClass/after/onDemandImport.kt b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClass/after/onDemandImport.kt index 8d1c9fa74f7..d0952c2bea5 100644 --- a/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClass/after/onDemandImport.kt +++ b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClass/after/onDemandImport.kt @@ -1,5 +1,3 @@ -import A.* - fun bar(s: String) { B.foo(s) } \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassAndMakePackageLocal/after/onDemandImport.kt b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassAndMakePackageLocal/after/onDemandImport.kt index 8d1c9fa74f7..d0952c2bea5 100644 --- a/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassAndMakePackageLocal/after/onDemandImport.kt +++ b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassAndMakePackageLocal/after/onDemandImport.kt @@ -1,5 +1,3 @@ -import A.* - fun bar(s: String) { B.foo(s) } \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassAndMakePrivate/after/onDemandImport.kt b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassAndMakePrivate/after/onDemandImport.kt index 8d1c9fa74f7..d0952c2bea5 100644 --- a/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassAndMakePrivate/after/onDemandImport.kt +++ b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassAndMakePrivate/after/onDemandImport.kt @@ -1,5 +1,3 @@ -import A.* - fun bar(s: String) { B.foo(s) } \ No newline at end of file diff --git a/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassOfAnotherPackage/after/k/onDemandImportOfClassMembers.kt b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassOfAnotherPackage/after/k/onDemandImportOfClassMembers.kt index e65f844ecbc..7ad19c143a5 100644 --- a/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassOfAnotherPackage/after/k/onDemandImportOfClassMembers.kt +++ b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassOfAnotherPackage/after/k/onDemandImportOfClassMembers.kt @@ -1,6 +1,5 @@ package k -import j.A.* import j.B fun bar(s: String) { diff --git a/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassOfAnotherPackage/after/k/specificClassImport.kt b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassOfAnotherPackage/after/k/specificClassImport.kt index 32954e6f287..7ad19c143a5 100644 --- a/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassOfAnotherPackage/after/k/specificClassImport.kt +++ b/idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassOfAnotherPackage/after/k/specificClassImport.kt @@ -1,6 +1,5 @@ package k -import j.A import j.B fun bar(s: String) { diff --git a/idea/testData/refactoring/move/kotlin/changePackage/changeToDefaultPackage/after/usagesWithImports.kt b/idea/testData/refactoring/move/kotlin/changePackage/changeToDefaultPackage/after/usagesWithImports.kt index b79e12ef3cb..bf2b7529d08 100644 --- a/idea/testData/refactoring/move/kotlin/changePackage/changeToDefaultPackage/after/usagesWithImports.kt +++ b/idea/testData/refactoring/move/kotlin/changePackage/changeToDefaultPackage/after/usagesWithImports.kt @@ -1,6 +1,3 @@ -import Foo -import foo - fun test() { Foo() foo() diff --git a/idea/testData/refactoring/move/kotlin/changePackage/changeToNonDefaultPackage/after/target/usagesWithImports.kt b/idea/testData/refactoring/move/kotlin/changePackage/changeToNonDefaultPackage/after/target/usagesWithImports.kt index 147a343d79d..a14e5ef3203 100644 --- a/idea/testData/refactoring/move/kotlin/changePackage/changeToNonDefaultPackage/after/target/usagesWithImports.kt +++ b/idea/testData/refactoring/move/kotlin/changePackage/changeToNonDefaultPackage/after/target/usagesWithImports.kt @@ -1,8 +1,5 @@ package target -import target.Foo -import target.foo - fun test() { Foo() foo() diff --git a/idea/testData/refactoring/move/kotlin/moveFile/callableReferences/after/b/test.kt b/idea/testData/refactoring/move/kotlin/moveFile/callableReferences/after/b/test.kt index 42fe0350373..565c61faa07 100644 --- a/idea/testData/refactoring/move/kotlin/moveFile/callableReferences/after/b/test.kt +++ b/idea/testData/refactoring/move/kotlin/moveFile/callableReferences/after/b/test.kt @@ -1,7 +1,6 @@ package b import a.f2 -import b.f3 import c.f4 fun test() { diff --git a/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/after/c/onDemandImport.kt b/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/after/c/onDemandImport.kt index d66011cba0f..67edab88ec3 100644 --- a/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/after/c/onDemandImport.kt +++ b/idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/after/c/onDemandImport.kt @@ -1,6 +1,5 @@ package c -import a.* import b.TEST import b.Test import b.test diff --git a/idea/testData/refactoring/move/kotlin/moveNestedClass/deepInnerToTopLevelWithThis/after/usages3.kt b/idea/testData/refactoring/move/kotlin/moveNestedClass/deepInnerToTopLevelWithThis/after/usages3.kt index a785c6ebf86..af02fff3fed 100644 --- a/idea/testData/refactoring/move/kotlin/moveNestedClass/deepInnerToTopLevelWithThis/after/usages3.kt +++ b/idea/testData/refactoring/move/kotlin/moveNestedClass/deepInnerToTopLevelWithThis/after/usages3.kt @@ -1,7 +1,6 @@ package test2 import test.A -import test.A.B import test.C fun foo2(): C { diff --git a/idea/testData/refactoring/move/kotlin/moveNestedClass/deepNonInnerToTopLevel/after/usages.kt b/idea/testData/refactoring/move/kotlin/moveNestedClass/deepNonInnerToTopLevel/after/usages.kt index 1ba1c0843bb..cc5203bc1e3 100644 --- a/idea/testData/refactoring/move/kotlin/moveNestedClass/deepNonInnerToTopLevel/after/usages.kt +++ b/idea/testData/refactoring/move/kotlin/moveNestedClass/deepNonInnerToTopLevel/after/usages.kt @@ -1,6 +1,5 @@ package test2 -import test.A import test.C fun foo(): C { diff --git a/idea/testData/refactoring/move/kotlin/moveNestedClass/deepNonInnerToTopLevel/after/usages3.kt b/idea/testData/refactoring/move/kotlin/moveNestedClass/deepNonInnerToTopLevel/after/usages3.kt index b619da37c21..cc5203bc1e3 100644 --- a/idea/testData/refactoring/move/kotlin/moveNestedClass/deepNonInnerToTopLevel/after/usages3.kt +++ b/idea/testData/refactoring/move/kotlin/moveNestedClass/deepNonInnerToTopLevel/after/usages3.kt @@ -1,6 +1,5 @@ package test2 -import test.A.B import test.C fun foo(): C { diff --git a/idea/testData/refactoring/move/kotlin/moveNestedClass/innerToTopLevelNoThis/after/usages.kt b/idea/testData/refactoring/move/kotlin/moveNestedClass/innerToTopLevelNoThis/after/usages.kt index a4144525b4e..203a5c48065 100644 --- a/idea/testData/refactoring/move/kotlin/moveNestedClass/innerToTopLevelNoThis/after/usages.kt +++ b/idea/testData/refactoring/move/kotlin/moveNestedClass/innerToTopLevelNoThis/after/usages.kt @@ -1,6 +1,5 @@ package test2 -import test.A import test.B fun foo(): B { diff --git a/idea/testData/refactoring/move/kotlin/moveNestedClass/innerToTopLevelNoThis/after/usages2.kt b/idea/testData/refactoring/move/kotlin/moveNestedClass/innerToTopLevelNoThis/after/usages2.kt index 041f2898975..4f9de412567 100644 --- a/idea/testData/refactoring/move/kotlin/moveNestedClass/innerToTopLevelNoThis/after/usages2.kt +++ b/idea/testData/refactoring/move/kotlin/moveNestedClass/innerToTopLevelNoThis/after/usages2.kt @@ -1,6 +1,5 @@ package test2 -import test.A import test.B fun foo2(): B { diff --git a/idea/testData/refactoring/move/kotlin/moveNestedClass/nonInnerToOuterClass1/after/usages3.kt b/idea/testData/refactoring/move/kotlin/moveNestedClass/nonInnerToOuterClass1/after/usages3.kt index 686f5fef9b4..61cbf87f733 100644 --- a/idea/testData/refactoring/move/kotlin/moveNestedClass/nonInnerToOuterClass1/after/usages3.kt +++ b/idea/testData/refactoring/move/kotlin/moveNestedClass/nonInnerToOuterClass1/after/usages3.kt @@ -1,7 +1,6 @@ package test2 import test.A -import test.A.B fun foo(): A.C { return A.C() diff --git a/idea/testData/refactoring/move/kotlin/moveNestedClass/nonInnerToOuterClass2/after/usages3.kt b/idea/testData/refactoring/move/kotlin/moveNestedClass/nonInnerToOuterClass2/after/usages3.kt index 686f5fef9b4..61cbf87f733 100644 --- a/idea/testData/refactoring/move/kotlin/moveNestedClass/nonInnerToOuterClass2/after/usages3.kt +++ b/idea/testData/refactoring/move/kotlin/moveNestedClass/nonInnerToOuterClass2/after/usages3.kt @@ -1,7 +1,6 @@ package test2 import test.A -import test.A.B fun foo(): A.C { return A.C() diff --git a/idea/testData/refactoring/move/kotlin/moveNestedClass/nonInnerToTopLevel/after/usages.kt b/idea/testData/refactoring/move/kotlin/moveNestedClass/nonInnerToTopLevel/after/usages.kt index a4144525b4e..203a5c48065 100644 --- a/idea/testData/refactoring/move/kotlin/moveNestedClass/nonInnerToTopLevel/after/usages.kt +++ b/idea/testData/refactoring/move/kotlin/moveNestedClass/nonInnerToTopLevel/after/usages.kt @@ -1,6 +1,5 @@ package test2 -import test.A import test.B fun foo(): B { diff --git a/idea/testData/refactoring/move/kotlin/moveNestedClass/nonInnerToTopLevelClass/after/usages.kt b/idea/testData/refactoring/move/kotlin/moveNestedClass/nonInnerToTopLevelClass/after/usages.kt index 8a7acc956c6..c6e7fb4e8cd 100644 --- a/idea/testData/refactoring/move/kotlin/moveNestedClass/nonInnerToTopLevelClass/after/usages.kt +++ b/idea/testData/refactoring/move/kotlin/moveNestedClass/nonInnerToTopLevelClass/after/usages.kt @@ -1,6 +1,5 @@ package test2 -import test.A import test3.D fun foo(): D.C { diff --git a/idea/testData/refactoring/move/kotlin/moveNestedClass/nonInnerToTopLevelClass/after/usages3.kt b/idea/testData/refactoring/move/kotlin/moveNestedClass/nonInnerToTopLevelClass/after/usages3.kt index cd89a25f2d6..c6e7fb4e8cd 100644 --- a/idea/testData/refactoring/move/kotlin/moveNestedClass/nonInnerToTopLevelClass/after/usages3.kt +++ b/idea/testData/refactoring/move/kotlin/moveNestedClass/nonInnerToTopLevelClass/after/usages3.kt @@ -1,6 +1,5 @@ package test2 -import test.A.B import test3.D fun foo(): D.C { diff --git a/idea/testData/refactoring/move/kotlin/moveNestedClass/objectToTopLevel/after/usages.kt b/idea/testData/refactoring/move/kotlin/moveNestedClass/objectToTopLevel/after/usages.kt index 96507d86d49..b1c38174b45 100644 --- a/idea/testData/refactoring/move/kotlin/moveNestedClass/objectToTopLevel/after/usages.kt +++ b/idea/testData/refactoring/move/kotlin/moveNestedClass/objectToTopLevel/after/usages.kt @@ -1,6 +1,5 @@ package test2 -import test.A import test.B fun foo(): B { diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/internalReferences/after/source/A.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/internalReferences/after/source/A.kt index 2174b98f5e6..99acff8d12c 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/internalReferences/after/source/A.kt +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/internalReferences/after/source/A.kt @@ -1,5 +1,2 @@ package source -import library.B -import library.bar - diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/b/onDemandImport.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/b/onDemandImport.kt index 5916652a84f..5996754ebd8 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/b/onDemandImport.kt +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/b/onDemandImport.kt @@ -1,7 +1,5 @@ package b -import a.* - fun bar() { val t: Test = Test() } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/b/specificImports.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/b/specificImports.kt index 912cbbdb0d1..5996754ebd8 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/b/specificImports.kt +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/b/specificImports.kt @@ -1,7 +1,5 @@ package b -import b.Test - fun bar() { val t: Test = Test() } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/c/onDemandImport.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/c/onDemandImport.kt index 7d3b78c3a61..5aee576bfa6 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/c/onDemandImport.kt +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/after/c/onDemandImport.kt @@ -1,6 +1,5 @@ package c -import a.* import b.Test fun bar() { diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToNewFileAndQuotePackage/after/q/in/fun/usage.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToNewFileAndQuotePackage/after/q/in/fun/usage.kt index 58d268463f7..fa37c6b0099 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToNewFileAndQuotePackage/after/q/in/fun/usage.kt +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToNewFileAndQuotePackage/after/q/in/fun/usage.kt @@ -1,5 +1,3 @@ package q.`in`.`fun` -import q.`in`.`fun`.To - class Usage : To() {} \ No newline at end of file diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToPackage/after/b/onDemandImport.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToPackage/after/b/onDemandImport.kt index 5916652a84f..5996754ebd8 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToPackage/after/b/onDemandImport.kt +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToPackage/after/b/onDemandImport.kt @@ -1,7 +1,5 @@ package b -import a.* - fun bar() { val t: Test = Test() } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToPackage/after/b/specificImports.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToPackage/after/b/specificImports.kt index 912cbbdb0d1..5996754ebd8 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToPackage/after/b/specificImports.kt +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToPackage/after/b/specificImports.kt @@ -1,7 +1,5 @@ package b -import b.Test - fun bar() { val t: Test = Test() } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToPackage/after/c/onDemandImport.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToPackage/after/c/onDemandImport.kt index 7d3b78c3a61..5aee576bfa6 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToPackage/after/c/onDemandImport.kt +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToPackage/after/c/onDemandImport.kt @@ -1,6 +1,5 @@ package c -import a.* import b.Test fun bar() { diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/b/specificImports.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/b/specificImports.kt index 8fde694e977..3c15a01093f 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/b/specificImports.kt +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/b/specificImports.kt @@ -1,6 +1,5 @@ package b -import b.test import a.Test fun bar() { diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/b/specificImports.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/b/specificImports.kt index da1a2034e55..04f221083d6 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/b/specificImports.kt +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/b/specificImports.kt @@ -1,6 +1,5 @@ package b -import b.test import a.Test fun bar() { diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/onDemandImport.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/onDemandImport.kt index b3a977adfe6..1222643879a 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/onDemandImport.kt +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/onDemandImport.kt @@ -1,7 +1,5 @@ package b -import a.* - fun bar() { test() } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/specificImports.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/specificImports.kt index 3b8a5e8ae20..1222643879a 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/specificImports.kt +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/specificImports.kt @@ -1,7 +1,5 @@ package b -import b.test - fun bar() { test() } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/c/onDemandImport.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/c/onDemandImport.kt index faedee2e0ef..658ae63ed1a 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/c/onDemandImport.kt +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/c/onDemandImport.kt @@ -1,6 +1,5 @@ package c -import a.* import b.test fun bar() { diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/b/onDemandImport.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/b/onDemandImport.kt index b3a977adfe6..1222643879a 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/b/onDemandImport.kt +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/b/onDemandImport.kt @@ -1,7 +1,5 @@ package b -import a.* - fun bar() { test() } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/b/specificImports.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/b/specificImports.kt index 3b8a5e8ae20..1222643879a 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/b/specificImports.kt +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/b/specificImports.kt @@ -1,7 +1,5 @@ package b -import b.test - fun bar() { test() } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/c/onDemandImport.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/c/onDemandImport.kt index faedee2e0ef..658ae63ed1a 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/c/onDemandImport.kt +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/c/onDemandImport.kt @@ -1,6 +1,5 @@ package c -import a.* import b.test fun bar() { diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/b/onDemandImport.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/b/onDemandImport.kt index 0367e6e35a3..32e72da8b89 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/b/onDemandImport.kt +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/b/onDemandImport.kt @@ -1,7 +1,5 @@ package b -import a.* - fun bar() { val t: Test = Test } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/b/specificImports.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/b/specificImports.kt index b7f379045a9..32e72da8b89 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/b/specificImports.kt +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/b/specificImports.kt @@ -1,7 +1,5 @@ package b -import b.Test - fun bar() { val t: Test = Test } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/c/onDemandImport.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/c/onDemandImport.kt index 23c30dc6b57..b0866ddf9da 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/c/onDemandImport.kt +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/c/onDemandImport.kt @@ -1,6 +1,5 @@ package c -import a.* import b.Test fun bar() { diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/after/b/onDemandImport.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/after/b/onDemandImport.kt index 0367e6e35a3..32e72da8b89 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/after/b/onDemandImport.kt +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/after/b/onDemandImport.kt @@ -1,7 +1,5 @@ package b -import a.* - fun bar() { val t: Test = Test } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/after/b/specificImports.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/after/b/specificImports.kt index b7f379045a9..32e72da8b89 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/after/b/specificImports.kt +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/after/b/specificImports.kt @@ -1,7 +1,5 @@ package b -import b.Test - fun bar() { val t: Test = Test } diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/after/c/onDemandImport.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/after/c/onDemandImport.kt index 23c30dc6b57..b0866ddf9da 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/after/c/onDemandImport.kt +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/after/c/onDemandImport.kt @@ -1,6 +1,5 @@ package c -import a.* import b.Test fun bar() { diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/onDemandImport.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/onDemandImport.kt index 7f05a5ae342..8d8f59100de 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/onDemandImport.kt +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/onDemandImport.kt @@ -1,7 +1,5 @@ package b -import a.* - fun bar() { test = "" println(test) diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/specificImports.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/specificImports.kt index 6a531687734..8d8f59100de 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/specificImports.kt +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/specificImports.kt @@ -1,7 +1,5 @@ package b -import b.test - fun bar() { test = "" println(test) diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/c/onDemandImport.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/c/onDemandImport.kt index a51aa659840..90955bfba8b 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/c/onDemandImport.kt +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/c/onDemandImport.kt @@ -1,6 +1,5 @@ package c -import a.* import b.test fun bar() { diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/b/onDemandImport.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/b/onDemandImport.kt index 7f05a5ae342..8d8f59100de 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/b/onDemandImport.kt +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/b/onDemandImport.kt @@ -1,7 +1,5 @@ package b -import a.* - fun bar() { test = "" println(test) diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/b/specificImports.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/b/specificImports.kt index 6a531687734..8d8f59100de 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/b/specificImports.kt +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/b/specificImports.kt @@ -1,7 +1,5 @@ package b -import b.test - fun bar() { test = "" println(test) diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/c/onDemandImport.kt b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/c/onDemandImport.kt index a51aa659840..90955bfba8b 100644 --- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/c/onDemandImport.kt +++ b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/c/onDemandImport.kt @@ -1,6 +1,5 @@ package c -import a.* import b.test fun bar() { diff --git a/idea/testData/refactoring/rename/renameKotlinPackage/after/RenameKotlinPackage.kt b/idea/testData/refactoring/rename/renameKotlinPackage/after/RenameKotlinPackage.kt index 7d6a6615e9d..a3b92700950 100644 --- a/idea/testData/refactoring/rename/renameKotlinPackage/after/RenameKotlinPackage.kt +++ b/idea/testData/refactoring/rename/renameKotlinPackage/after/RenameKotlinPackage.kt @@ -1,7 +1,5 @@ package some.bar.more -import some.bar.other.Test - fun test() { some.bar.more.test() some.bar.other.testFunction() diff --git a/plugins/android-extensions/android-extensions-idea/testData/android/rename/commonElementId/expected/commonElementId.kt b/plugins/android-extensions/android-extensions-idea/testData/android/rename/commonElementId/expected/commonElementId.kt index f387ae77593..fc937dc80c3 100644 --- a/plugins/android-extensions/android-extensions-idea/testData/android/rename/commonElementId/expected/commonElementId.kt +++ b/plugins/android-extensions/android-extensions-idea/testData/android/rename/commonElementId/expected/commonElementId.kt @@ -2,7 +2,6 @@ package com.myapp import android.app.Activity import android.os.Bundle -import java.io.File import kotlinx.android.synthetic.main.layout.* // KT-16132 Renaming property provided by kotlinx leads to renaming another members diff --git a/plugins/android-extensions/android-extensions-idea/testData/android/rename/simple/expected/simple.kt b/plugins/android-extensions/android-extensions-idea/testData/android/rename/simple/expected/simple.kt index 7c5d7d6cda2..4e5533fa6ce 100644 --- a/plugins/android-extensions/android-extensions-idea/testData/android/rename/simple/expected/simple.kt +++ b/plugins/android-extensions/android-extensions-idea/testData/android/rename/simple/expected/simple.kt @@ -2,7 +2,6 @@ package com.myapp import android.app.Activity import android.os.Bundle -import java.io.File import kotlinx.android.synthetic.main.layout.* public class MyActivity : Activity() { diff --git a/plugins/android-extensions/android-extensions-idea/testData/android/rename/simpleFragment/expected/simpleFragment.kt b/plugins/android-extensions/android-extensions-idea/testData/android/rename/simpleFragment/expected/simpleFragment.kt index 781026d0469..b854e083568 100644 --- a/plugins/android-extensions/android-extensions-idea/testData/android/rename/simpleFragment/expected/simpleFragment.kt +++ b/plugins/android-extensions/android-extensions-idea/testData/android/rename/simpleFragment/expected/simpleFragment.kt @@ -1,7 +1,6 @@ package com.myapp import android.app.Fragment -import java.io.File import kotlinx.android.synthetic.main.layout.* public class MyFragment : Fragment() {