azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up move refactoring

Browse Source
This commit is contained in:
Dmitry Gridin
2019-07-02 20:38:35 +07:00
parent beba1d82fc
commit 1a9abaeb2a
23 changed files with 714 additions and 968 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/refactoring/move/AutocreatingPsiDirectoryWrapper.kt
+3 -14
View File
@@ -1,17 +1,6 @@
/* /*
* Copyright 2010-2017 JetBrains s.r.o. * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
* * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/ */
package org.jetbrains.kotlin.idea.refactoring.move package org.jetbrains.kotlin.idea.refactoring.move
@@ -28,7 +17,7 @@ sealed class AutocreatingPsiDirectoryWrapper {
class ByMoveDestination(private val moveDestination: MoveDestination) : AutocreatingPsiDirectoryWrapper() { class ByMoveDestination(private val moveDestination: MoveDestination) : AutocreatingPsiDirectoryWrapper() {
override fun getPackageName() = moveDestination.targetPackage.qualifiedName override fun getPackageName() = moveDestination.targetPackage.qualifiedName
override fun getOrCreateDirectory(source: PsiDirectory) = moveDestination.getTargetDirectory(source) override fun getOrCreateDirectory(source: PsiDirectory): PsiDirectory = moveDestination.getTargetDirectory(source)
} }
abstract fun getPackageName(): String abstract fun getPackageName(): String
idea/src/org/jetbrains/kotlin/idea/refactoring/move/MoveJavaInnerClassKotlinUsagesHandler.kt
+3 -15
View File
@@ -1,17 +1,6 @@
/* /*
* Copyright 2010-2015 JetBrains s.r.o. * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
* * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/ */
package org.jetbrains.kotlin.idea.refactoring.move package org.jetbrains.kotlin.idea.refactoring.move
@@ -35,8 +24,7 @@ class MoveJavaInnerClassKotlinUsagesHandler: MoveInnerClassUsagesHandler {
val argumentToAdd = psiFactory.createArgument(receiverExpression ?: psiFactory.createExpression("this")) val argumentToAdd = psiFactory.createArgument(receiverExpression ?: psiFactory.createExpression("this"))
val argumentList = val argumentList = innerCall.valueArgumentList
innerCall.valueArgumentList
?: (innerCall.lambdaArguments.firstOrNull()?.let { lambdaArg -> ?: (innerCall.lambdaArguments.firstOrNull()?.let { lambdaArg ->
val anchor = PsiTreeUtil.skipSiblingsBackward(lambdaArg, PsiWhiteSpace::class.java) val anchor = PsiTreeUtil.skipSiblingsBackward(lambdaArg, PsiWhiteSpace::class.java)
innerCall.addAfter(psiFactory.createCallArguments("()"), anchor) innerCall.addAfter(psiFactory.createCallArguments("()"), anchor)
idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveClassesOrPackages/KotlinAwareMoveClassesOrPackagesToNewDirectoryDialog.kt
+2 -13
View File
@@ -1,17 +1,6 @@
/* /*
* Copyright 2010-2017 JetBrains s.r.o. * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
* * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/ */
package org.jetbrains.kotlin.idea.refactoring.move.moveClassesOrPackages package org.jetbrains.kotlin.idea.refactoring.move.moveClassesOrPackages
idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/ExtractDeclarationFromCurrentFileIntention.kt
+10 -14
View File
@@ -1,17 +1,6 @@
/* /*
* Copyright 2010-2015 JetBrains s.r.o. * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
* * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/ */
package org.jetbrains.kotlin.idea.refactoring.move.moveDeclarations package org.jetbrains.kotlin.idea.refactoring.move.moveDeclarations
@@ -98,7 +87,14 @@ class ExtractDeclarationFromCurrentFileIntention :
true, true,
true, true,
MoveCallback { MoveCallback {
runBlocking { withTimeoutOrNull(TIMEOUT_FOR_IMPORT_OPTIMIZING_MS) { OptimizeImportsProcessor(project, file).run() } } runBlocking {
withTimeoutOrNull(TIMEOUT_FOR_IMPORT_OPTIMIZING_MS) {
OptimizeImportsProcessor(
project,
file
).run()
}
}
} }
).show() ).show()
} }
idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/KotlinAwareMoveFilesOrDirectoriesProcessor.kt
+11 -32
View File
@@ -1,17 +1,6 @@
/* /*
* Copyright 2010-2016 JetBrains s.r.o. * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
* * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/ */
package org.jetbrains.kotlin.idea.refactoring.move.moveDeclarations package org.jetbrains.kotlin.idea.refactoring.move.moveDeclarations
@@ -41,40 +30,31 @@ class KotlinAwareMoveFilesOrDirectoriesProcessor @JvmOverloads constructor (
searchInNonJavaFiles: Boolean, searchInNonJavaFiles: Boolean,
moveCallback: MoveCallback?, moveCallback: MoveCallback?,
prepareSuccessfulCallback: Runnable = EmptyRunnable.INSTANCE prepareSuccessfulCallback: Runnable = EmptyRunnable.INSTANCE
) : MoveFilesOrDirectoriesProcessor(project, ) : MoveFilesOrDirectoriesProcessor(
elementsToMove.toTypedArray<PsiElement>(), project,
elementsToMove.toTypedArray(),
targetDirectory, targetDirectory,
true, true,
searchInComments, searchInComments,
searchInNonJavaFiles, searchInNonJavaFiles,
moveCallback, moveCallback,
prepareSuccessfulCallback) { prepareSuccessfulCallback
) {
override fun createUsageViewDescriptor(usages: Array<out UsageInfo>): UsageViewDescriptor { override fun createUsageViewDescriptor(usages: Array<out UsageInfo>): UsageViewDescriptor {
return MoveFilesWithDeclarationsViewDescriptor(elementsToMove.toTypedArray<PsiElement>(), targetDirectory) return MoveFilesWithDeclarationsViewDescriptor(elementsToMove.toTypedArray(), targetDirectory)
} }
override fun findUsages(): Array<UsageInfo> { override fun findUsages(): Array<UsageInfo> {
try { try {
markScopeToMove(elementsToMove) markScopeToMove(elementsToMove)
return if (searchReferences) super.findUsages() else UsageInfo.EMPTY_ARRAY return if (searchReferences) super.findUsages() else UsageInfo.EMPTY_ARRAY
} } finally {
finally {
markScopeToMove(null) markScopeToMove(null)
} }
} }
override fun preprocessUsages(refUsages: Ref<Array<UsageInfo>>): Boolean { override fun preprocessUsages(refUsages: Ref<Array<UsageInfo>>): Boolean {
val usages = refUsages.get() val (conflicts, usages) = MoveToKotlinFileProcessor.preprocessConflictUsages(refUsages)
val (conflictUsages, usagesToProcess) = usages.partition { it is ConflictUsageInfo }
val conflicts = MultiMap<PsiElement, String>()
for (conflictUsage in conflictUsages) {
conflicts.putValues(conflictUsage.element, (conflictUsage as ConflictUsageInfo).messages)
}
refUsages.set(usagesToProcess.toTypedArray())
return showConflicts(conflicts, usages) return showConflicts(conflicts, usages)
} }
@@ -101,8 +81,7 @@ class KotlinAwareMoveFilesOrDirectoriesProcessor @JvmOverloads constructor (
try { try {
markShouldFixFqName(true) markShouldFixFqName(true)
super.performRefactoring(usages) super.performRefactoring(usages)
} } finally {
finally {
markShouldFixFqName(false) markShouldFixFqName(false)
} }
} }
idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/KotlinMoveTarget.kt
+10 -21
View File
@@ -1,17 +1,6 @@
/* /*
* Copyright 2010-2015 JetBrains s.r.o. * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
* * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/ */
package org.jetbrains.kotlin.idea.refactoring.move.moveDeclarations package org.jetbrains.kotlin.idea.refactoring.move.moveDeclarations
@@ -53,12 +42,12 @@ interface KotlinDirectoryBasedMoveTarget : KotlinMoveTarget {
} }
object EmptyKotlinMoveTarget : KotlinMoveTarget { object EmptyKotlinMoveTarget : KotlinMoveTarget {
override val targetContainerFqName = null override val targetContainerFqName: FqName? = null
override val targetFile = null override val targetFile: VirtualFile? = null
override fun getOrCreateTargetPsi(originalPsi: PsiElement) = null override fun getOrCreateTargetPsi(originalPsi: PsiElement): KtElement? = null
override fun getTargetPsiIfExists(originalPsi: PsiElement) = null override fun getTargetPsiIfExists(originalPsi: PsiElement): KtElement? = null
override fun verify(file: PsiFile) = null override fun verify(file: PsiFile): String? = null
} }
class KotlinMoveTargetForExistingElement(val targetElement: KtElement) : KotlinMoveTarget { class KotlinMoveTargetForExistingElement(val targetElement: KtElement) : KotlinMoveTarget {
@@ -101,7 +90,7 @@ class KotlinMoveTargetForDeferredFile(
return createdFiles.getOrPutNullable(originalFile) { createFile(originalFile) } return createdFiles.getOrPutNullable(originalFile) { createFile(originalFile) }
} }
override fun getTargetPsiIfExists(originalPsi: PsiElement) = null override fun getTargetPsiIfExists(originalPsi: PsiElement): KtElement? = null
// No additional verification is needed // No additional verification is needed
override fun verify(file: PsiFile): String? = null override fun verify(file: PsiFile): String? = null
@@ -115,9 +104,9 @@ class KotlinDirectoryMoveTarget(
override fun getOrCreateTargetPsi(originalPsi: PsiElement) = originalPsi.containingFile as? KtFile override fun getOrCreateTargetPsi(originalPsi: PsiElement) = originalPsi.containingFile as? KtFile
override fun getTargetPsiIfExists(originalPsi: PsiElement) = null override fun getTargetPsiIfExists(originalPsi: PsiElement): KtElement? = null
override fun verify(file: PsiFile) = null override fun verify(file: PsiFile): String? = null
} }
fun KotlinMoveTarget.getTargetModule(project: Project) = targetScope?.getModule(project) fun KotlinMoveTarget.getTargetModule(project: Project) = targetScope?.getModule(project)
idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/MoveDeclarationsDelegate.kt
+3 -15
View File
@@ -1,17 +1,6 @@
/* /*
* Copyright 2010-2016 JetBrains s.r.o. * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
* * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/ */
package org.jetbrains.kotlin.idea.refactoring.move.moveDeclarations package org.jetbrains.kotlin.idea.refactoring.move.moveDeclarations
@@ -87,8 +76,7 @@ sealed class MoveDeclarationsDelegate {
moveDescriptor: MoveDeclarationsDescriptor, moveDescriptor: MoveDeclarationsDescriptor,
companionDescriptor: ClassDescriptor companionDescriptor: ClassDescriptor
): Boolean { ): Boolean {
val moveTarget = moveDescriptor.moveTarget return when (val moveTarget = moveDescriptor.moveTarget) {
return when (moveTarget) {
is KotlinMoveTargetForCompanion -> true is KotlinMoveTargetForCompanion -> true
is KotlinMoveTargetForExistingElement -> { is KotlinMoveTargetForExistingElement -> {
val targetClass = moveTarget.targetElement as? KtClassOrObject ?: return false val targetClass = moveTarget.targetElement as? KtClassOrObject ?: return false
idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/MoveFilesWithDeclarationsViewDescriptor.kt
+11 -19
View File
@@ -1,17 +1,6 @@
/* /*
* Copyright 2010-2017 JetBrains s.r.o. * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
* * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/ */
package org.jetbrains.kotlin.idea.refactoring.move.moveDeclarations package org.jetbrains.kotlin.idea.refactoring.move.moveDeclarations
@@ -33,13 +22,16 @@ internal class MoveFilesWithDeclarationsViewDescriptor(
init { init {
if (myElementsToMove.size == 1) { if (myElementsToMove.size == 1) {
myProcessedElementsHeader = RefactoringBundle.message("move.single.element.elements.header", myProcessedElementsHeader = RefactoringBundle.message(
"move.single.element.elements.header",
UsageViewUtil.getType(myElementsToMove[0]), UsageViewUtil.getType(myElementsToMove[0]),
newParent.virtualFile.presentableUrl).capitalize() newParent.virtualFile.presentableUrl
myCodeReferencesText = "References in code to ${UsageViewUtil.getType(myElementsToMove[0])} ${UsageViewUtil.getLongName(myElementsToMove[0])} and its declarations" ).capitalize()
} myCodeReferencesText =
else { "References in code to ${UsageViewUtil.getType(myElementsToMove[0])} ${UsageViewUtil.getLongName(myElementsToMove[0])} and its declarations"
myProcessedElementsHeader = StringUtil.capitalize(RefactoringBundle.message("move.files.elements.header", newParent.virtualFile.presentableUrl)) } else {
myProcessedElementsHeader =
StringUtil.capitalize(RefactoringBundle.message("move.files.elements.header", newParent.virtualFile.presentableUrl))
myCodeReferencesText = RefactoringBundle.message("references.found.in.code") myCodeReferencesText = RefactoringBundle.message("references.found.in.code")
} }
} }
idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/MoveKotlinDeclarationsProcessor.kt
+8 -17
View File
@@ -1,17 +1,6 @@
/* /*
* Copyright 2010-2016 JetBrains s.r.o. * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
* * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/ */
package org.jetbrains.kotlin.idea.refactoring.move.moveDeclarations package org.jetbrains.kotlin.idea.refactoring.move.moveDeclarations
@@ -153,10 +142,13 @@ class MoveKotlinDeclarationsProcessor(
private var nonCodeUsages: Array<NonCodeUsageInfo>? = null private var nonCodeUsages: Array<NonCodeUsageInfo>? = null
private val moveEntireFile = descriptor.moveSource is MoveSource.File private val moveEntireFile = descriptor.moveSource is MoveSource.File
private val elementsToMove = descriptor.moveSource.elementsToMove.filter { e -> e.parent != descriptor.moveTarget.getTargetPsiIfExists(e) } private val elementsToMove = descriptor.moveSource.elementsToMove.filter { e ->
e.parent != descriptor.moveTarget.getTargetPsiIfExists(e)
}
private val kotlinToLightElementsBySourceFile = elementsToMove private val kotlinToLightElementsBySourceFile = elementsToMove
.groupBy { it.containingKtFile } .groupBy { it.containingKtFile }
.mapValues { it.value.keysToMap { it.toLightElements().ifEmpty { listOf(it) } } } .mapValues { it.value.keysToMap { declaration -> declaration.toLightElements().ifEmpty { listOf(declaration) } } }
private val conflicts = MultiMap<PsiElement, String>() private val conflicts = MultiMap<PsiElement, String>()
override fun getRefactoringId() = REFACTORING_ID override fun getRefactoringId() = REFACTORING_ID
@@ -211,8 +203,7 @@ class MoveKotlinDeclarationsProcessor(
.mapNotNullTo(ArrayList()) { ref -> .mapNotNullTo(ArrayList()) { ref ->
if (foundReferences.add(ref) && elementsToMove.none { it.isAncestor(ref.element) }) { if (foundReferences.add(ref) && elementsToMove.none { it.isAncestor(ref.element) }) {
createMoveUsageInfoIfPossible(ref, lightElement, addImportToOriginalFile = true, isInternal = false) createMoveUsageInfoIfPossible(ref, lightElement, addImportToOriginalFile = true, isInternal = false)
} } else null
else null
} }
val name = lightElement.getKotlinFqName()?.quoteIfNeeded()?.asString() val name = lightElement.getKotlinFqName()?.quoteIfNeeded()?.asString()
idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/MoveToKotlinFileProcessor.kt
+25 -15
View File
@@ -38,14 +38,16 @@ class MoveToKotlinFileProcessor @JvmOverloads constructor (
searchInNonJavaFiles: Boolean, searchInNonJavaFiles: Boolean,
moveCallback: MoveCallback?, moveCallback: MoveCallback?,
prepareSuccessfulCallback: Runnable = EmptyRunnable.INSTANCE prepareSuccessfulCallback: Runnable = EmptyRunnable.INSTANCE
) : MoveFilesOrDirectoriesProcessor(project, ) : MoveFilesOrDirectoriesProcessor(
project,
arrayOf(sourceFile), arrayOf(sourceFile),
targetDirectory, targetDirectory,
true, true,
searchInComments, searchInComments,
searchInNonJavaFiles, searchInNonJavaFiles,
moveCallback, moveCallback,
prepareSuccessfulCallback) { prepareSuccessfulCallback
) {
override fun getCommandName() = "Move ${sourceFile.name}" override fun getCommandName() = "Move ${sourceFile.name}"
override fun createUsageViewDescriptor(usages: Array<out UsageInfo>): UsageViewDescriptor { override fun createUsageViewDescriptor(usages: Array<out UsageInfo>): UsageViewDescriptor {
@@ -53,17 +55,7 @@ class MoveToKotlinFileProcessor @JvmOverloads constructor (
} }
override fun preprocessUsages(refUsages: Ref<Array<UsageInfo>>): Boolean { override fun preprocessUsages(refUsages: Ref<Array<UsageInfo>>): Boolean {
val usages = refUsages.get() val (conflicts, usages) = preprocessConflictUsages(refUsages)
val (conflictUsages, usagesToProcess) = usages.partition { it is ConflictUsageInfo }
val conflicts = MultiMap<PsiElement, String>()
for (conflictUsage in conflictUsages) {
conflicts.putValues(conflictUsage.element, (conflictUsage as ConflictUsageInfo).messages)
}
refUsages.set(usagesToProcess.toTypedArray())
return showConflicts(conflicts, usages) return showConflicts(conflicts, usages)
} }
@@ -85,11 +77,29 @@ class MoveToKotlinFileProcessor @JvmOverloads constructor (
try { try {
super.performRefactoring(usages) super.performRefactoring(usages)
} } finally {
finally {
if (needTemporaryRename) { if (needTemporaryRename) {
sourceFile.name = targetFileName sourceFile.name = targetFileName
} }
} }
} }
companion object {
data class ConflictUsages(val conflicts: MultiMap<PsiElement, String>, @Suppress("ArrayInDataClass") val usages: Array<UsageInfo>)
fun preprocessConflictUsages(refUsages: Ref<Array<UsageInfo>>): ConflictUsages {
val usages: Array<UsageInfo> = refUsages.get()
val (conflictUsages, usagesToProcess) = usages.partition { it is ConflictUsageInfo }
val conflicts = MultiMap<PsiElement, String>()
for (conflictUsage in conflictUsages) {
conflicts.putValues(conflictUsage.element, (conflictUsage as ConflictUsageInfo).messages)
}
refUsages.set(usagesToProcess.toTypedArray())
return ConflictUsages(conflicts, usages)
}
}
} }
idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/moveConflictUtils.kt
+13 -28
View File
@@ -1,17 +1,6 @@
/* /*
* Copyright 2010-2016 JetBrains s.r.o. * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
* * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/ */
package org.jetbrains.kotlin.idea.refactoring.move.moveDeclarations package org.jetbrains.kotlin.idea.refactoring.move.moveDeclarations
@@ -62,6 +51,7 @@ import org.jetbrains.kotlin.lexer.KtTokens
import org.jetbrains.kotlin.load.java.JavaVisibilities import org.jetbrains.kotlin.load.java.JavaVisibilities
import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.platform.jvm.isJvm
import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.psi.psiUtil.* import org.jetbrains.kotlin.psi.psiUtil.*
import org.jetbrains.kotlin.renderer.ClassifierNamePolicy import org.jetbrains.kotlin.renderer.ClassifierNamePolicy
@@ -73,7 +63,6 @@ import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameOrNull
import org.jetbrains.kotlin.resolve.descriptorUtil.getImportableDescriptor import org.jetbrains.kotlin.resolve.descriptorUtil.getImportableDescriptor
import org.jetbrains.kotlin.resolve.descriptorUtil.getSuperClassNotAny import org.jetbrains.kotlin.resolve.descriptorUtil.getSuperClassNotAny
import org.jetbrains.kotlin.resolve.descriptorUtil.isSubclassOf import org.jetbrains.kotlin.resolve.descriptorUtil.isSubclassOf
import org.jetbrains.kotlin.platform.jvm.isJvm
import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
import org.jetbrains.kotlin.resolve.lazy.descriptors.findPackageFragmentForFile import org.jetbrains.kotlin.resolve.lazy.descriptors.findPackageFragmentForFile
import org.jetbrains.kotlin.resolve.source.KotlinSourceElement import org.jetbrains.kotlin.resolve.source.KotlinSourceElement
@@ -115,9 +104,7 @@ class MoveConflictChecker(
private fun KotlinMoveTarget.getContainerDescriptor(): DeclarationDescriptor? { private fun KotlinMoveTarget.getContainerDescriptor(): DeclarationDescriptor? {
return when (this) { return when (this) {
is KotlinMoveTargetForExistingElement -> { is KotlinMoveTargetForExistingElement -> when (val targetElement = targetElement) {
val targetElement = targetElement
when (targetElement) {
is KtNamedDeclaration -> resolutionFacade.resolveToDescriptor(targetElement) is KtNamedDeclaration -> resolutionFacade.resolveToDescriptor(targetElement)
is KtFile -> { is KtFile -> {
@@ -131,7 +118,6 @@ class MoveConflictChecker(
else -> null else -> null
} }
}
is KotlinDirectoryBasedMoveTarget -> { is KotlinDirectoryBasedMoveTarget -> {
val packageFqName = targetContainerFqName ?: return null val packageFqName = targetContainerFqName ?: return null
@@ -159,8 +145,7 @@ class MoveConflictChecker(
): DeclarationDescriptor? { ): DeclarationDescriptor? {
if (newContainer == null && newVisibility == null) return this if (newContainer == null && newVisibility == null) return this
val wrappedDescriptor = this return when (val wrappedDescriptor = this) {
return when (wrappedDescriptor) {
// We rely on visibility not depending on more specific type of CallableMemberDescriptor // We rely on visibility not depending on more specific type of CallableMemberDescriptor
is CallableMemberDescriptor -> object : CallableMemberDescriptor by wrappedDescriptor { is CallableMemberDescriptor -> object : CallableMemberDescriptor by wrappedDescriptor {
override fun getOriginal() = this override fun getOriginal() = this
@@ -255,7 +240,7 @@ class MoveConflictChecker(
val referencedElementsToSkip = newConflicts.keySet().mapNotNullTo(HashSet()) { it.namedUnwrappedElement } val referencedElementsToSkip = newConflicts.keySet().mapNotNullTo(HashSet()) { it.namedUnwrappedElement }
externalUsages.removeIf { externalUsages.removeIf {
it is MoveRenameUsageInfo && it is MoveRenameUsageInfo &&
it.referencedElement?.namedUnwrappedElement?.let { it in referencedElementsToSkip } ?: false it.referencedElement?.namedUnwrappedElement?.let { element -> element in referencedElementsToSkip } ?: false
} }
conflicts.putAllValues(newConflicts) conflicts.putAllValues(newConflicts)
} }
@@ -318,20 +303,20 @@ class MoveConflictChecker(
val renderedImportableTarget = DESCRIPTOR_RENDERER_FOR_COMPARISON.render(importableDescriptor) val renderedImportableTarget = DESCRIPTOR_RENDERER_FOR_COMPARISON.render(importableDescriptor)
val renderedTarget by lazy { DESCRIPTOR_RENDERER_FOR_COMPARISON.render(targetDescriptor) } val renderedTarget by lazy { DESCRIPTOR_RENDERER_FOR_COMPARISON.render(targetDescriptor) }
return newTargetDescriptors.any { return newTargetDescriptors.any { descriptor ->
if (DESCRIPTOR_RENDERER_FOR_COMPARISON.render(it) != renderedImportableTarget) return@any false if (DESCRIPTOR_RENDERER_FOR_COMPARISON.render(descriptor) != renderedImportableTarget) return@any false
if (importableDescriptor == targetDescriptor) return@any true if (importableDescriptor == targetDescriptor) return@any true
val candidateDescriptors: Collection<DeclarationDescriptor> = when (targetDescriptor) { val candidateDescriptors: Collection<DeclarationDescriptor> = when (targetDescriptor) {
is ConstructorDescriptor -> { is ConstructorDescriptor -> {
(it as? ClassDescriptor)?.constructors ?: emptyList<DeclarationDescriptor>() (descriptor as? ClassDescriptor)?.constructors ?: emptyList()
} }
is PropertyAccessorDescriptor -> { is PropertyAccessorDescriptor -> {
(it as? PropertyDescriptor) (descriptor as? PropertyDescriptor)
?.let { if (targetDescriptor is PropertyGetterDescriptor) it.getter else it.setter } ?.let { if (targetDescriptor is PropertyGetterDescriptor) it.getter else it.setter }
?.let { listOf(it) } ?.let { listOf(it) }
?: emptyList<DeclarationDescriptor>() ?: emptyList()
} }
else -> emptyList() else -> emptyList()
@@ -375,7 +360,7 @@ class MoveConflictChecker(
referencesToSkip += refExpr referencesToSkip += refExpr
} }
} }
internalUsages.removeIf { it.reference?.element?.let { it in referencesToSkip } ?: false } internalUsages.removeIf { it.reference?.element?.let { element -> element in referencesToSkip } ?: false }
} }
fun checkVisibilityInUsages(usages: Collection<UsageInfo>, conflicts: MultiMap<PsiElement, String>) { fun checkVisibilityInUsages(usages: Collection<UsageInfo>, conflicts: MultiMap<PsiElement, String>) {
@@ -396,7 +381,7 @@ class MoveConflictChecker(
) continue ) continue
val container = element.getUsageContext() val container = element.getUsageContext()
if (!declarationToContainers.getOrPut(referencedElement) { HashSet<PsiElement>() }.add(container)) continue if (!declarationToContainers.getOrPut(referencedElement) { HashSet() }.add(container)) continue
val targetContainer = moveTarget.getContainerDescriptor() ?: continue val targetContainer = moveTarget.getContainerDescriptor() ?: continue
idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/ui/KotlinAwareMoveFilesOrDirectoriesDialog.kt
+14 -12
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2000-2018 JetBrains s.r.o. and Kotlin Programming Language contributors. * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/ */
@@ -46,8 +46,8 @@ class KotlinAwareMoveFilesOrDirectoriesDialog(
private val callback: (KotlinAwareMoveFilesOrDirectoriesDialog?) -> Unit private val callback: (KotlinAwareMoveFilesOrDirectoriesDialog?) -> Unit
) : DialogWrapper(project, true) { ) : DialogWrapper(project, true) {
companion object { companion object {
private val RECENT_KEYS = "MoveFile.RECENT_KEYS" private const val RECENT_KEYS = "MoveFile.RECENT_KEYS"
private val MOVE_FILES_OPEN_IN_EDITOR = "MoveFile.OpenInEditor" private const val MOVE_FILES_OPEN_IN_EDITOR = "MoveFile.OpenInEditor"
} }
private val nameLabel = JBLabelDecorator.createJBLabelDecorator().setBold(true) private val nameLabel = JBLabelDecorator.createJBLabelDecorator().setBold(true)
@@ -81,11 +81,13 @@ class KotlinAwareMoveFilesOrDirectoriesDialog(
RecentsManager.getInstance(project).getRecentEntries(RECENT_KEYS)?.let { targetDirectoryField.childComponent.history = it } RecentsManager.getInstance(project).getRecentEntries(RECENT_KEYS)?.let { targetDirectoryField.childComponent.history = it }
val descriptor = FileChooserDescriptorFactory.createSingleFolderDescriptor() val descriptor = FileChooserDescriptorFactory.createSingleFolderDescriptor()
targetDirectoryField.addBrowseFolderListener(RefactoringBundle.message("select.target.directory"), targetDirectoryField.addBrowseFolderListener(
RefactoringBundle.message("select.target.directory"),
RefactoringBundle.message("the.file.will.be.moved.to.this.directory"), RefactoringBundle.message("the.file.will.be.moved.to.this.directory"),
project, project,
descriptor, descriptor,
TextComponentAccessor.TEXT_FIELD_WITH_HISTORY_WHOLE_TEXT) TextComponentAccessor.TEXT_FIELD_WITH_HISTORY_WHOLE_TEXT
)
val textField = targetDirectoryField.childComponent.textEditor val textField = targetDirectoryField.childComponent.textEditor
FileChooserFactory.getInstance().installFileCompletion(textField, descriptor, true, disposable) FileChooserFactory.getInstance().installFileCompletion(textField, descriptor, true, disposable)
textField.onTextChange { validateOKButton() } textField.onTextChange { validateOKButton() }
@@ -113,8 +115,7 @@ class KotlinAwareMoveFilesOrDirectoriesDialog(
is PsiFile -> RefactoringBundle.message("move.file.0", shortenedPath) is PsiFile -> RefactoringBundle.message("move.file.0", shortenedPath)
else -> RefactoringBundle.message("move.directory.0", shortenedPath) else -> RefactoringBundle.message("move.directory.0", shortenedPath)
} }
} } else {
else {
val isFile = psiElements.all { it is PsiFile } val isFile = psiElements.all { it is PsiFile }
val isDirectory = psiElements.all { it is PsiDirectory } val isDirectory = psiElements.all { it is PsiDirectory }
nameLabel.text = when { nameLabel.text = when {
@@ -150,7 +151,7 @@ class KotlinAwareMoveFilesOrDirectoriesDialog(
} }
private fun validateOKButton() { private fun validateOKButton() {
isOKActionEnabled = targetDirectoryField.childComponent.text.length > 0 isOKActionEnabled = targetDirectoryField.childComponent.text.isNotEmpty()
} }
override fun doOKAction() { override fun doOKAction() {
@@ -172,17 +173,18 @@ class KotlinAwareMoveFilesOrDirectoriesDialog(
} }
try { try {
targetDirectory = DirectoryUtil.mkdirs(PsiManager.getInstance(project), directoryName) targetDirectory = DirectoryUtil.mkdirs(PsiManager.getInstance(project), directoryName)
} } catch (e: IncorrectOperationException) {
catch (e: IncorrectOperationException) {
// ignore // ignore
} }
} }
if (targetDirectory == null) { if (targetDirectory == null) {
CommonRefactoringUtil.showErrorMessage(title, CommonRefactoringUtil.showErrorMessage(
title,
RefactoringBundle.message("cannot.create.directory"), RefactoringBundle.message("cannot.create.directory"),
helpID, helpID,
project) project
)
return@executeCommand return@executeCommand
} }
idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/ui/KotlinSelectNestedClassRefactoringDialog.kt
+6 -15
View File
@@ -1,17 +1,6 @@
/* /*
* Copyright 2010-2016 JetBrains s.r.o. * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
* * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/ */
package org.jetbrains.kotlin.idea.refactoring.move.moveDeclarations.ui package org.jetbrains.kotlin.idea.refactoring.move.moveDeclarations.ui
@@ -97,11 +86,13 @@ internal class KotlinSelectNestedClassRefactoringDialog private constructor (
nestedClass: KtClassOrObject, nestedClass: KtClassOrObject,
targetContainer: PsiElement? targetContainer: PsiElement?
): MoveKotlinNestedClassesDialog { ): MoveKotlinNestedClassesDialog {
return MoveKotlinNestedClassesDialog(nestedClass.project, return MoveKotlinNestedClassesDialog(
nestedClass.project,
listOf(nestedClass), listOf(nestedClass),
nestedClass.containingClassOrObject!!, nestedClass.containingClassOrObject!!,
targetContainer as? KtClassOrObject ?: nestedClass.containingClassOrObject!!, targetContainer as? KtClassOrObject ?: nestedClass.containingClassOrObject!!,
null) null
)
} }
fun chooseNestedClassRefactoring(nestedClass: KtClassOrObject, targetContainer: PsiElement?) { fun chooseNestedClassRefactoring(nestedClass: KtClassOrObject, targetContainer: PsiElement?) {
idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/ui/MoveKotlinNestedClassesDialog.java
+17 -42
View File
@@ -1,23 +1,10 @@
/* /*
* Copyright 2010-2016 JetBrains s.r.o. * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
* * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/ */
package org.jetbrains.kotlin.idea.refactoring.move.moveDeclarations.ui; package org.jetbrains.kotlin.idea.refactoring.move.moveDeclarations.ui;
import com.intellij.codeInsight.lookup.LookupElement;
import com.intellij.ide.util.ClassFilter;
import com.intellij.ide.util.TreeClassChooser; import com.intellij.ide.util.TreeClassChooser;
import com.intellij.ide.util.TreeJavaClassChooserDialog; import com.intellij.ide.util.TreeJavaClassChooserDialog;
import com.intellij.openapi.editor.event.DocumentEvent; import com.intellij.openapi.editor.event.DocumentEvent;
@@ -36,7 +23,6 @@ import com.intellij.refactoring.move.MoveCallback;
import com.intellij.refactoring.move.MoveHandler; import com.intellij.refactoring.move.MoveHandler;
import com.intellij.refactoring.ui.RefactoringDialog; import com.intellij.refactoring.ui.RefactoringDialog;
import kotlin.collections.CollectionsKt; import kotlin.collections.CollectionsKt;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.asJava.LightClassUtilsKt; import org.jetbrains.kotlin.asJava.LightClassUtilsKt;
@@ -59,8 +45,7 @@ import java.awt.*;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import java.awt.event.ActionListener; import java.awt.event.ActionListener;
import java.util.List; import java.util.List;
import java.util.Objects;
import static org.jetbrains.kotlin.idea.refactoring.move.moveDeclarations.MoveKotlinDeclarationsProcessorKt.MoveSource;
public class MoveKotlinNestedClassesDialog extends RefactoringDialog { public class MoveKotlinNestedClassesDialog extends RefactoringDialog {
private static final String RECENTS_KEY = MoveKotlinNestedClassesDialog.class.getName() + ".RECENTS_KEY"; private static final String RECENTS_KEY = MoveKotlinNestedClassesDialog.class.getName() + ".RECENTS_KEY";
@@ -74,6 +59,7 @@ public class MoveKotlinNestedClassesDialog extends RefactoringDialog {
private JPanel targetClassChooserPanel; private JPanel targetClassChooserPanel;
private KotlinMemberSelectionTable memberTable; private KotlinMemberSelectionTable memberTable;
private PsiElement targetClass; private PsiElement targetClass;
public MoveKotlinNestedClassesDialog( public MoveKotlinNestedClassesDialog(
@NotNull Project project, @NotNull Project project,
@NotNull List<KtClassOrObject> elementsToMove, @NotNull List<KtClassOrObject> elementsToMove,
@@ -111,9 +97,7 @@ public class MoveKotlinNestedClassesDialog extends RefactoringDialog {
RefactoringBundle.message("choose.destination.class"), RefactoringBundle.message("choose.destination.class"),
myProject, myProject,
GlobalSearchScope.projectScope(myProject), GlobalSearchScope.projectScope(myProject),
new ClassFilter() { aClass -> {
@Override
public boolean isAccepted(PsiClass aClass) {
if (!(aClass instanceof KtLightClassForSourceDeclaration)) return false; if (!(aClass instanceof KtLightClassForSourceDeclaration)) return false;
KtClassOrObject classOrObject = ((KtLightClassForSourceDeclaration) aClass).getKotlinOrigin(); KtClassOrObject classOrObject = ((KtLightClassForSourceDeclaration) aClass).getKotlinOrigin();
@@ -127,7 +111,6 @@ public class MoveKotlinNestedClassesDialog extends RefactoringDialog {
} }
return false; return false;
}
}, },
null, null,
null, null,
@@ -144,13 +127,14 @@ public class MoveKotlinNestedClassesDialog extends RefactoringDialog {
return LightClassUtilsKt.toLightClass(((KtClassOrObjectTreeNode) userObject).getValue()); return LightClassUtilsKt.toLightClass(((KtClassOrObjectTreeNode) userObject).getValue());
} }
}; };
chooser.selectDirectory((targetClass != null ? targetClass : originalClass).getContainingFile().getContainingDirectory()); chooser.selectDirectory(
(targetClass != null ? targetClass : originalClass).getContainingFile().getContainingDirectory());
chooser.showDialog(); chooser.showDialog();
PsiClass aClass = chooser.getSelected(); PsiClass aClass = chooser.getSelected();
if (aClass instanceof KtLightClassForSourceDeclaration) { if (aClass instanceof KtLightClassForSourceDeclaration) {
targetClass = ((KtLightClassForSourceDeclaration) aClass).getKotlinOrigin(); targetClass = ((KtLightClassForSourceDeclaration) aClass).getKotlinOrigin();
targetClassChooser.setText(aClass.getQualifiedName()); targetClassChooser.setText(Objects.requireNonNull(aClass.getQualifiedName()));
} }
else { else {
targetClass = aClass; targetClass = aClass;
@@ -164,16 +148,13 @@ public class MoveKotlinNestedClassesDialog extends RefactoringDialog {
if (codeFragment != null) { if (codeFragment != null) {
CompletionUtilsKt.setExtraCompletionFilter( CompletionUtilsKt.setExtraCompletionFilter(
codeFragment, codeFragment,
new Function1<LookupElement, Boolean>() { lookupElement -> {
@Override
public Boolean invoke(LookupElement lookupElement) {
Object lookupObject = lookupElement.getObject(); Object lookupObject = lookupElement.getObject();
if (!(lookupObject instanceof DeclarationLookupObject)) return false; if (!(lookupObject instanceof DeclarationLookupObject)) return false;
PsiElement psiElement = ((DeclarationLookupObject) lookupObject).getPsiElement(); PsiElement psiElement = ((DeclarationLookupObject) lookupObject).getPsiElement();
if (lookupObject instanceof PackageLookupObject) return true; if (lookupObject instanceof PackageLookupObject) return true;
return (psiElement instanceof KtClassOrObject) && KotlinRefactoringUtilKt.canRefactor(psiElement); return (psiElement instanceof KtClassOrObject) && KotlinRefactoringUtilKt.canRefactor(psiElement);
} }
}
); );
} }
targetClassChooser.getChildComponent().getDocument().addDocumentListener( targetClassChooser.getChildComponent().getDocument().addDocumentListener(
@@ -193,28 +174,27 @@ public class MoveKotlinNestedClassesDialog extends RefactoringDialog {
targetClassChooserPanel.add(targetClassChooser); targetClassChooserPanel.add(targetClassChooser);
} }
private void initMemberInfo(@NotNull final List<KtClassOrObject> elementsToMove) { private void initMemberInfo(@NotNull List<KtClassOrObject> elementsToMove) {
List<KotlinMemberInfo> memberInfos = CollectionsKt.mapNotNull( List<KotlinMemberInfo> memberInfos = CollectionsKt.mapNotNull(
originalClass.getDeclarations(), originalClass.getDeclarations(),
new Function1<KtDeclaration, KotlinMemberInfo>() { declaration -> {
@Override
public KotlinMemberInfo invoke(KtDeclaration declaration) {
if (!(declaration instanceof KtClassOrObject)) return null; if (!(declaration instanceof KtClassOrObject)) return null;
KtClassOrObject classOrObject = (KtClassOrObject) declaration; KtClassOrObject classOrObject = (KtClassOrObject) declaration;
if (classOrObject instanceof KtClass && ((KtClass) classOrObject).isInner()) return null; if (classOrObject instanceof KtClass && ((KtClass) classOrObject).isInner()) return null;
if (classOrObject instanceof KtObjectDeclaration && ((KtObjectDeclaration) classOrObject).isCompanion()) return null; if (classOrObject instanceof KtObjectDeclaration && ((KtObjectDeclaration) classOrObject).isCompanion()) {
return null;
}
KotlinMemberInfo memberInfo = new KotlinMemberInfo(classOrObject, false); KotlinMemberInfo memberInfo = new KotlinMemberInfo(classOrObject, false);
memberInfo.setChecked(elementsToMove.contains(declaration)); memberInfo.setChecked(elementsToMove.contains(declaration));
return memberInfo; return memberInfo;
} }
}
); );
KotlinMemberSelectionPanel selectionPanel = new KotlinMemberSelectionPanel(getTitle(), memberInfos, null); KotlinMemberSelectionPanel selectionPanel = new KotlinMemberSelectionPanel(getTitle(), memberInfos, null);
memberTable = selectionPanel.getTable(); memberTable = selectionPanel.getTable();
MemberInfoModelImpl memberInfoModel = new MemberInfoModelImpl(); MemberInfoModelImpl memberInfoModel = new MemberInfoModelImpl();
memberInfoModel.memberInfoChanged(new MemberInfoChange<KtNamedDeclaration, KotlinMemberInfo>(memberInfos)); memberInfoModel.memberInfoChanged(new MemberInfoChange<>(memberInfos));
selectionPanel.getTable().setMemberInfoModel(memberInfoModel); selectionPanel.getTable().setMemberInfoModel(memberInfoModel);
selectionPanel.getTable().addMemberInfoChangeListener(memberInfoModel); selectionPanel.getTable().addMemberInfoChangeListener(memberInfoModel);
membersInfoPanel.add(selectionPanel, BorderLayout.CENTER); membersInfoPanel.add(selectionPanel, BorderLayout.CENTER);
@@ -223,12 +203,7 @@ public class MoveKotlinNestedClassesDialog extends RefactoringDialog {
private List<KtClassOrObject> getSelectedElementsToMove() { private List<KtClassOrObject> getSelectedElementsToMove() {
return CollectionsKt.map( return CollectionsKt.map(
memberTable.getSelectedMemberInfos(), memberTable.getSelectedMemberInfos(),
new Function1<KotlinMemberInfo, KtClassOrObject>() { info -> (KtClassOrObject) info.getMember()
@Override
public KtClassOrObject invoke(KotlinMemberInfo info) {
return (KtClassOrObject) info.getMember();
}
}
); );
} }
@@ -266,7 +241,7 @@ public class MoveKotlinNestedClassesDialog extends RefactoringDialog {
MoveDeclarationsDelegate.NestedClass delegate = new MoveDeclarationsDelegate.NestedClass(); MoveDeclarationsDelegate.NestedClass delegate = new MoveDeclarationsDelegate.NestedClass();
MoveDeclarationsDescriptor descriptor = new MoveDeclarationsDescriptor( MoveDeclarationsDescriptor descriptor = new MoveDeclarationsDescriptor(
myProject, myProject,
MoveSource(elementsToMove), MoveKotlinDeclarationsProcessorKt.MoveSource(elementsToMove),
target, target,
delegate, delegate,
false, false,
idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/ui/MoveKotlinNestedClassesToUpperLevelDialog.java
+30 -57
View File
@@ -1,17 +1,6 @@
/* /*
* Copyright 2010-2016 JetBrains s.r.o. * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
* * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/ */
package org.jetbrains.kotlin.idea.refactoring.move.moveDeclarations.ui; package org.jetbrains.kotlin.idea.refactoring.move.moveDeclarations.ui;
@@ -66,13 +55,9 @@ import org.jetbrains.kotlin.types.KotlinType;
import javax.swing.*; import javax.swing.*;
import java.awt.*; import java.awt.*;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import static org.jetbrains.kotlin.idea.refactoring.move.moveDeclarations.MoveKotlinDeclarationsProcessorKt.MoveSource;
public class MoveKotlinNestedClassesToUpperLevelDialog extends MoveDialogBase { public class MoveKotlinNestedClassesToUpperLevelDialog extends MoveDialogBase {
@NonNls private static final String RECENTS_KEY = MoveKotlinNestedClassesToUpperLevelDialog.class.getName() + ".RECENTS_KEY"; @NonNls private static final String RECENTS_KEY = MoveKotlinNestedClassesToUpperLevelDialog.class.getName() + ".RECENTS_KEY";
@@ -160,7 +145,7 @@ public class MoveKotlinNestedClassesToUpperLevelDialog extends MoveDialogBase {
} }
private boolean isThisNeeded() { private boolean isThisNeeded() {
return innerClass instanceof KtClass && MoveUtilsKt.traverseOuterInstanceReferences((KtClass) innerClass, true); return innerClass instanceof KtClass && MoveUtilsKt.traverseOuterInstanceReferences(innerClass, true);
} }
@Nullable @Nullable
@@ -180,12 +165,7 @@ public class MoveKotlinNestedClassesToUpperLevelDialog extends MoveDialogBase {
if (innerClass instanceof KtClass && ((KtClass) innerClass).isInner()) { if (innerClass instanceof KtClass && ((KtClass) innerClass).isInner()) {
passOuterClassCheckBox.setSelected(true); passOuterClassCheckBox.setSelected(true);
passOuterClassCheckBox.addItemListener(new ItemListener() { passOuterClassCheckBox.addItemListener(e -> parameterField.setEnabled(passOuterClassCheckBox.isSelected()));
@Override
public void itemStateChanged(ItemEvent e) {
parameterField.setEnabled(passOuterClassCheckBox.isSelected());
}
});
} }
else { else {
passOuterClassCheckBox.setSelected(false); passOuterClassCheckBox.setSelected(false);
@@ -199,12 +179,9 @@ public class MoveKotlinNestedClassesToUpperLevelDialog extends MoveDialogBase {
parameterField.setEnabled(thisNeeded); parameterField.setEnabled(thisNeeded);
} }
passOuterClassCheckBox.addItemListener(new ItemListener() { passOuterClassCheckBox.addItemListener(e -> {
@Override
public void itemStateChanged(ItemEvent e) {
boolean selected = passOuterClassCheckBox.isSelected(); boolean selected = passOuterClassCheckBox.isSelected();
parameterField.getComponent().setEnabled(selected); parameterField.getComponent().setEnabled(selected);
}
}); });
if (!(targetContainer instanceof PsiDirectory)) { if (!(targetContainer instanceof PsiDirectory)) {
@@ -218,7 +195,7 @@ public class MoveKotlinNestedClassesToUpperLevelDialog extends MoveDialogBase {
innerClassBody != null innerClassBody != null
? new NewDeclarationNameValidator(innerClassBody, (PsiElement) null, ? new NewDeclarationNameValidator(innerClassBody, (PsiElement) null,
NewDeclarationNameValidator.Target.VARIABLES, NewDeclarationNameValidator.Target.VARIABLES,
Collections.<KtDeclaration>emptyList()) Collections.emptyList())
: new CollectingNameValidator(); : new CollectingNameValidator();
List<String> suggestions = KotlinNameSuggester.INSTANCE.suggestNamesByType(getOuterInstanceType(), validator, "outer"); List<String> suggestions = KotlinNameSuggester.INSTANCE.suggestNamesByType(getOuterInstanceType(), validator, "outer");
parameterField.setSuggestions(ArrayUtil.toStringArray(suggestions)); parameterField.setSuggestions(ArrayUtil.toStringArray(suggestions));
@@ -268,8 +245,8 @@ public class MoveKotlinNestedClassesToUpperLevelDialog extends MoveDialogBase {
if (!Comparing.equal(oldPackageFqName != null ? oldPackageFqName.asString() : null, targetName)) { if (!Comparing.equal(oldPackageFqName != null ? oldPackageFqName.asString() : null, targetName)) {
ProjectRootManager projectRootManager = ProjectRootManager.getInstance(project); ProjectRootManager projectRootManager = ProjectRootManager.getInstance(project);
List<VirtualFile> contentSourceRoots = JavaProjectRootsUtil.getSuitableDestinationSourceRoots(project); List<VirtualFile> contentSourceRoots = JavaProjectRootsUtil.getSuitableDestinationSourceRoots(project);
final PackageWrapper newPackage = new PackageWrapper(PsiManager.getInstance(project), targetName); PackageWrapper newPackage = new PackageWrapper(PsiManager.getInstance(project), targetName);
final VirtualFile targetSourceRoot; VirtualFile targetSourceRoot;
if (contentSourceRoots.size() > 1) { if (contentSourceRoots.size() > 1) {
PsiDirectory initialDir = null; PsiDirectory initialDir = null;
PsiPackage oldPackage = oldPackageFqName != null PsiPackage oldPackage = oldPackageFqName != null
@@ -293,16 +270,13 @@ public class MoveKotlinNestedClassesToUpperLevelDialog extends MoveDialogBase {
} }
PsiDirectory dir = RefactoringUtil.findPackageDirectoryInSourceRoot(newPackage, targetSourceRoot); PsiDirectory dir = RefactoringUtil.findPackageDirectoryInSourceRoot(newPackage, targetSourceRoot);
if (dir == null) { if (dir == null) {
dir = ApplicationManager.getApplication().runWriteAction(new NullableComputable<PsiDirectory>() { dir = ApplicationManager.getApplication().runWriteAction((NullableComputable<PsiDirectory>) () -> {
@Override
public PsiDirectory compute() {
try { try {
return RefactoringUtil.createPackageDirectoryInSourceRoot(newPackage, targetSourceRoot); return RefactoringUtil.createPackageDirectoryInSourceRoot(newPackage, targetSourceRoot);
} }
catch (IncorrectOperationException e) { catch (IncorrectOperationException e) {
return null; return null;
} }
}
}); });
} }
return dir; return dir;
@@ -321,12 +295,20 @@ public class MoveKotlinNestedClassesToUpperLevelDialog extends MoveDialogBase {
String className = getClassName(); String className = getClassName();
String parameterName = getParameterName(); String parameterName = getParameterName();
if (className != null && className.isEmpty()) throw new ConfigurationException(RefactoringBundle.message("no.class.name.specified")); if (className != null && className.isEmpty()) {
if (!KtPsiUtilKt.isIdentifier(className)) throw new ConfigurationException(RefactoringMessageUtil.getIncorrectIdentifierMessage(className)); throw new ConfigurationException(RefactoringBundle.message("no.class.name.specified"));
}
if (!KtPsiUtilKt.isIdentifier(className)) {
throw new ConfigurationException(RefactoringMessageUtil.getIncorrectIdentifierMessage(className));
}
if (passOuterClassCheckBox.isSelected()) { if (passOuterClassCheckBox.isSelected()) {
if (parameterName != null && parameterName.isEmpty()) throw new ConfigurationException(RefactoringBundle.message("no.parameter.name.specified")); if (parameterName != null && parameterName.isEmpty()) {
if (!KtPsiUtilKt.isIdentifier(parameterName)) throw new ConfigurationException(RefactoringMessageUtil.getIncorrectIdentifierMessage(parameterName)); throw new ConfigurationException(RefactoringBundle.message("no.parameter.name.specified"));
}
if (!KtPsiUtilKt.isIdentifier(parameterName)) {
throw new ConfigurationException(RefactoringMessageUtil.getIncorrectIdentifierMessage(parameterName));
}
} }
PsiElement targetContainer = getTargetContainer(); PsiElement targetContainer = getTargetContainer();
@@ -350,7 +332,9 @@ public class MoveKotlinNestedClassesToUpperLevelDialog extends MoveDialogBase {
.getPackage(targetPackageFqName) .getPackage(targetPackageFqName)
.getMemberScope() .getMemberScope()
.getContributedClassifier(Name.identifier(className), NoLookupLocation.FROM_IDE); .getContributedClassifier(Name.identifier(className), NoLookupLocation.FROM_IDE);
if (existingClass != null) throw new ConfigurationException("Class " + className + " already exists in package " + targetPackageFqName); if (existingClass != null) {
throw new ConfigurationException("Class " + className + " already exists in package " + targetPackageFqName);
}
PsiDirectory targetDir = targetContainer instanceof PsiDirectory PsiDirectory targetDir = targetContainer instanceof PsiDirectory
? (PsiDirectory) targetContainer ? (PsiDirectory) targetContainer
@@ -382,34 +366,23 @@ public class MoveKotlinNestedClassesToUpperLevelDialog extends MoveDialogBase {
KotlinMoveTarget moveTarget; KotlinMoveTarget moveTarget;
if (target instanceof PsiDirectory) { if (target instanceof PsiDirectory) {
final PsiDirectory targetDir = (PsiDirectory) target; PsiDirectory targetDir = (PsiDirectory) target;
final FqName targetPackageFqName = getTargetPackageFqName(target); FqName targetPackageFqName = getTargetPackageFqName(target);
if (targetPackageFqName == null) return; if (targetPackageFqName == null) return;
final String targetFileName = KotlinNameSuggester.INSTANCE.suggestNameByName( String targetFileName = KotlinNameSuggester.INSTANCE.suggestNameByName(
newClassName, newClassName,
new Function1<String, Boolean>() { s -> targetDir.findFile(s + "." + KotlinFileType.EXTENSION) == null
@Override
public Boolean invoke(String s) {
return targetDir.findFile(s + "." + KotlinFileType.EXTENSION) == null;
}
}
) + "." + KotlinFileType.EXTENSION; ) + "." + KotlinFileType.EXTENSION;
moveTarget = new KotlinMoveTargetForDeferredFile( moveTarget = new KotlinMoveTargetForDeferredFile(
targetPackageFqName, targetPackageFqName,
targetDir, targetDir,
null, null,
new Function1<KtFile, KtFile>() { originalFile -> KotlinRefactoringUtilKt.createKotlinFile(targetFileName, targetDir, targetPackageFqName.asString())
@Override
public KtFile invoke(@NotNull KtFile originalFile) {
return KotlinRefactoringUtilKt.createKotlinFile(targetFileName, targetDir, targetPackageFqName.asString());
}
}
); );
} }
else { else {
//noinspection ConstantConditions
moveTarget = new KotlinMoveTargetForExistingElement((KtElement) target); moveTarget = new KotlinMoveTargetForExistingElement((KtElement) target);
} }
@@ -417,7 +390,7 @@ public class MoveKotlinNestedClassesToUpperLevelDialog extends MoveDialogBase {
MoveDeclarationsDelegate delegate = new MoveDeclarationsDelegate.NestedClass(newClassName, outerInstanceParameterName); MoveDeclarationsDelegate delegate = new MoveDeclarationsDelegate.NestedClass(newClassName, outerInstanceParameterName);
MoveDeclarationsDescriptor moveDescriptor = new MoveDeclarationsDescriptor( MoveDeclarationsDescriptor moveDescriptor = new MoveDeclarationsDescriptor(
project, project,
MoveSource(innerClass), MoveKotlinDeclarationsProcessorKt.MoveSource(innerClass),
moveTarget, moveTarget,
delegate, delegate,
isSearchInComments(), isSearchInComments(),
idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/ui/MoveKotlinTopLevelDeclarationsDialog.java
+44 -143
View File
@@ -1,17 +1,6 @@
/* /*
* Copyright 2010-2015 JetBrains s.r.o. * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
* * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/ */
package org.jetbrains.kotlin.idea.refactoring.move.moveDeclarations.ui; package org.jetbrains.kotlin.idea.refactoring.move.moveDeclarations.ui;
@@ -32,8 +21,10 @@ import com.intellij.openapi.util.Pass;
import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.*; import com.intellij.psi.*;
import com.intellij.psi.impl.source.PsiFileImpl;
import com.intellij.refactoring.*; import com.intellij.refactoring.*;
import com.intellij.refactoring.classMembers.AbstractMemberInfoModel; import com.intellij.refactoring.classMembers.AbstractMemberInfoModel;
import com.intellij.refactoring.classMembers.MemberInfoBase;
import com.intellij.refactoring.classMembers.MemberInfoChange; import com.intellij.refactoring.classMembers.MemberInfoChange;
import com.intellij.refactoring.classMembers.MemberInfoChangeListener; import com.intellij.refactoring.classMembers.MemberInfoChangeListener;
import com.intellij.refactoring.move.MoveCallback; import com.intellij.refactoring.move.MoveCallback;
@@ -46,12 +37,9 @@ import com.intellij.refactoring.util.CommonRefactoringUtil;
import com.intellij.ui.ComboboxWithBrowseButton; import com.intellij.ui.ComboboxWithBrowseButton;
import com.intellij.ui.RecentsManager; import com.intellij.ui.RecentsManager;
import com.intellij.ui.ReferenceEditorComboWithBrowseButton; import com.intellij.ui.ReferenceEditorComboWithBrowseButton;
import com.intellij.util.Function;
import com.intellij.util.IncorrectOperationException; import com.intellij.util.IncorrectOperationException;
import com.intellij.util.ui.UIUtil; import com.intellij.util.ui.UIUtil;
import kotlin.collections.CollectionsKt; import kotlin.collections.CollectionsKt;
import kotlin.jvm.functions.Function0;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.idea.KotlinFileType; import org.jetbrains.kotlin.idea.KotlinFileType;
@@ -70,19 +58,17 @@ import org.jetbrains.kotlin.idea.util.application.ApplicationUtilsKt;
import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.FqName;
import org.jetbrains.kotlin.psi.KtFile; import org.jetbrains.kotlin.psi.KtFile;
import org.jetbrains.kotlin.psi.KtNamedDeclaration; import org.jetbrains.kotlin.psi.KtNamedDeclaration;
import org.jetbrains.kotlin.psi.KtPureElement;
import org.jetbrains.kotlin.psi.psiUtil.KtPsiUtilKt; import org.jetbrains.kotlin.psi.psiUtil.KtPsiUtilKt;
import javax.swing.*; import javax.swing.*;
import java.awt.*; import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.io.File; import java.io.File;
import java.nio.file.Path; import java.nio.file.Path;
import java.util.List; import java.util.List;
import java.util.*; import java.util.*;
import static java.util.Collections.emptyList; import static java.util.Collections.emptyList;
import static org.jetbrains.kotlin.idea.refactoring.move.moveDeclarations.MoveKotlinDeclarationsProcessorKt.MoveSource;
public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog { public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog {
private static final String RECENTS_KEY = "MoveKotlinTopLevelDeclarationsDialog.RECENTS_KEY"; private static final String RECENTS_KEY = "MoveKotlinTopLevelDeclarationsDialog.RECENTS_KEY";
@@ -143,12 +129,7 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog {
return CollectionsKt.distinct( return CollectionsKt.distinct(
CollectionsKt.map( CollectionsKt.map(
elementsToMove, elementsToMove,
new Function1<KtNamedDeclaration, KtFile>() { KtPureElement::getContainingKtFile
@Override
public KtFile invoke(KtNamedDeclaration declaration) {
return declaration.getContainingKtFile();
}
}
) )
); );
} }
@@ -159,12 +140,7 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog {
CollectionsKt.distinct( CollectionsKt.distinct(
CollectionsKt.map( CollectionsKt.map(
sourceFiles, sourceFiles,
new Function1<KtFile, PsiDirectory>() { PsiFileImpl::getParent
@Override
public PsiDirectory invoke(KtFile jetFile) {
return jetFile.getParent();
}
}
) )
) )
); );
@@ -174,12 +150,7 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog {
return CollectionsKt.filterIsInstance( return CollectionsKt.filterIsInstance(
CollectionsKt.flatMap( CollectionsKt.flatMap(
sourceFiles, sourceFiles,
new Function1<KtFile, Iterable<?>>() { KtPsiUtilKt::getFileOrScriptDeclarations
@Override
public Iterable<?> invoke(KtFile ktFile) {
return KtPsiUtilKt.getFileOrScriptDeclarations(ktFile);
}
}
), ),
KtNamedDeclaration.class KtNamedDeclaration.class
); );
@@ -196,7 +167,7 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog {
private static List<PsiFile> getFilesExistingInTargetDir( private static List<PsiFile> getFilesExistingInTargetDir(
@NotNull List<KtFile> sourceFiles, @NotNull List<KtFile> sourceFiles,
@Nullable String targetFileName, @Nullable String targetFileName,
@Nullable final PsiDirectory targetDirectory @Nullable PsiDirectory targetDirectory
) { ) {
if (targetDirectory == null) return emptyList(); if (targetDirectory == null) return emptyList();
@@ -205,62 +176,44 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog {
? Collections.singletonList(targetFileName) ? Collections.singletonList(targetFileName)
: CollectionsKt.map( : CollectionsKt.map(
sourceFiles, sourceFiles,
new Function1<KtFile, String>() { PsiFileImpl::getName
@Override
public String invoke(KtFile jetFile) {
return jetFile.getName();
}
}
); );
return CollectionsKt.filterNotNull( return CollectionsKt.filterNotNull(
CollectionsKt.map( CollectionsKt.map(
fileNames, fileNames,
new Function1<String, PsiFile>() { targetDirectory::findFile
@Override
public PsiFile invoke(String s) {
return targetDirectory.findFile(s);
}
}
) )
); );
} }
private void initMemberInfo( private void initMemberInfo(
@NotNull final Set<KtNamedDeclaration> elementsToMove, @NotNull Set<KtNamedDeclaration> elementsToMove,
@NotNull List<KtFile> sourceFiles @NotNull List<KtFile> sourceFiles
) { ) {
final List<KotlinMemberInfo> memberInfos = CollectionsKt.map( List<KotlinMemberInfo> memberInfos = CollectionsKt.map(
getAllDeclarations(sourceFiles), getAllDeclarations(sourceFiles),
new Function1<KtNamedDeclaration, KotlinMemberInfo>() { declaration -> {
@Override
public KotlinMemberInfo invoke(KtNamedDeclaration declaration) {
KotlinMemberInfo memberInfo = new KotlinMemberInfo(declaration, false); KotlinMemberInfo memberInfo = new KotlinMemberInfo(declaration, false);
memberInfo.setChecked(elementsToMove.contains(declaration)); memberInfo.setChecked(elementsToMove.contains(declaration));
return memberInfo; return memberInfo;
} }
}
); );
KotlinMemberSelectionPanel selectionPanel = new KotlinMemberSelectionPanel(getTitle(), memberInfos, null); KotlinMemberSelectionPanel selectionPanel = new KotlinMemberSelectionPanel(getTitle(), memberInfos, null);
memberTable = selectionPanel.getTable(); memberTable = selectionPanel.getTable();
MemberInfoModelImpl memberInfoModel = new MemberInfoModelImpl(); MemberInfoModelImpl memberInfoModel = new MemberInfoModelImpl();
memberInfoModel.memberInfoChanged(new MemberInfoChange<KtNamedDeclaration, KotlinMemberInfo>(memberInfos)); memberInfoModel.memberInfoChanged(new MemberInfoChange<>(memberInfos));
selectionPanel.getTable().setMemberInfoModel(memberInfoModel); selectionPanel.getTable().setMemberInfoModel(memberInfoModel);
selectionPanel.getTable().addMemberInfoChangeListener(memberInfoModel); selectionPanel.getTable().addMemberInfoChangeListener(memberInfoModel);
selectionPanel.getTable().addMemberInfoChangeListener( selectionPanel.getTable().addMemberInfoChangeListener(
new MemberInfoChangeListener<KtNamedDeclaration, KotlinMemberInfo>() { new MemberInfoChangeListener<KtNamedDeclaration, KotlinMemberInfo>() {
private boolean shouldUpdateFileNameField(final Collection<KotlinMemberInfo> changedMembers) { private boolean shouldUpdateFileNameField(Collection<KotlinMemberInfo> changedMembers) {
if (!tfFileNameInPackage.isEnabled()) return true; if (!tfFileNameInPackage.isEnabled()) return true;
Collection<KtNamedDeclaration> previousDeclarations = CollectionsKt.filterNotNull( Collection<KtNamedDeclaration> previousDeclarations = CollectionsKt.filterNotNull(
CollectionsKt.map( CollectionsKt.map(
memberInfos, memberInfos,
new Function1<KotlinMemberInfo, KtNamedDeclaration>() { info -> changedMembers.contains(info) != info.isChecked() ? info.getMember() : null
@Override
public KtNamedDeclaration invoke(KotlinMemberInfo info) {
return changedMembers.contains(info) != info.isChecked() ? info.getMember() : null;
}
}
) )
); );
String suggestedText = previousDeclarations.isEmpty() String suggestedText = previousDeclarations.isEmpty()
@@ -270,7 +223,7 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog {
} }
@Override @Override
public void memberInfoChanged(MemberInfoChange<KtNamedDeclaration, KotlinMemberInfo> event) { public void memberInfoChanged(@NotNull MemberInfoChange<KtNamedDeclaration, KotlinMemberInfo> event) {
updatePackageDirectiveCheckBox(); updatePackageDirectiveCheckBox();
updateFileNameInPackageField(); updateFileNameInPackageField();
// Update file name field only if it user hasn't changed it to some non-default value // Update file name field only if it user hasn't changed it to some non-default value
@@ -285,7 +238,6 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog {
private void updateSuggestedFileName() { private void updateSuggestedFileName() {
tfFileNameInPackage.setText(MoveUtilsKt.guessNewFileName(getSelectedElementsToMove())); tfFileNameInPackage.setText(MoveUtilsKt.guessNewFileName(getSelectedElementsToMove()));
} }
private void updateFileNameInPackageField() { private void updateFileNameInPackageField() {
@@ -316,14 +268,7 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog {
classPackageChooser.getChildComponent() classPackageChooser.getChildComponent()
); );
cbSpecifyFileNameInPackage.addActionListener( cbSpecifyFileNameInPackage.addActionListener(e -> updateFileNameInPackageField());
new ActionListener() {
@Override
public void actionPerformed(@NotNull ActionEvent e) {
updateFileNameInPackageField();
}
}
);
cbUpdatePackageDirective.setSelected(arePackagesAndDirectoryMatched(sourceFiles)); cbUpdatePackageDirective.setSelected(arePackagesAndDirectoryMatched(sourceFiles));
} }
@@ -342,23 +287,17 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog {
} }
rbMoveToPackage.addActionListener( rbMoveToPackage.addActionListener(
new ActionListener() { e -> {
@Override
public void actionPerformed(@NotNull ActionEvent e) {
classPackageChooser.requestFocus(); classPackageChooser.requestFocus();
updateControls(); updateControls();
} }
}
); );
rbMoveToFile.addActionListener( rbMoveToFile.addActionListener(
new ActionListener() { e -> {
@Override
public void actionPerformed(@NotNull ActionEvent e) {
fileChooser.requestFocus(); fileChooser.requestFocus();
updateControls(); updateControls();
} }
}
); );
} }
@@ -367,22 +306,20 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog {
@NotNull Set<KtNamedDeclaration> elementsToMove, @NotNull Set<KtNamedDeclaration> elementsToMove,
@NotNull List<KtFile> sourceFiles @NotNull List<KtFile> sourceFiles
) { ) {
final PsiDirectory sourceDir = sourceFiles.get(0).getParent(); PsiDirectory sourceDir = sourceFiles.get(0).getParent();
assert sourceDir != null : sourceFiles.get(0).getVirtualFile().getPath(); assert sourceDir != null : sourceFiles.get(0).getVirtualFile().getPath();
fileChooser.addActionListener( fileChooser.addActionListener(
new ActionListener() { e -> {
@Override
public void actionPerformed(ActionEvent e) {
KotlinFileChooserDialog dialog = new KotlinFileChooserDialog("Choose Containing File", myProject); KotlinFileChooserDialog dialog = new KotlinFileChooserDialog("Choose Containing File", myProject);
File targetFile = new File(getTargetFilePath()); File targetFile1 = new File(getTargetFilePath());
PsiFile targetPsiFile = PhysicalFileSystemUtilsKt.toPsiFile(targetFile, myProject); PsiFile targetPsiFile = PhysicalFileSystemUtilsKt.toPsiFile(targetFile1, myProject);
if (targetPsiFile instanceof KtFile) { if (targetPsiFile instanceof KtFile) {
dialog.select((KtFile) targetPsiFile); dialog.select((KtFile) targetPsiFile);
} }
else { else {
PsiDirectory targetDir = PhysicalFileSystemUtilsKt.toPsiDirectory(targetFile.getParentFile(), myProject); PsiDirectory targetDir = PhysicalFileSystemUtilsKt.toPsiDirectory(targetFile1.getParentFile(), myProject);
if (targetDir == null) { if (targetDir == null) {
targetDir = sourceDir; targetDir = sourceDir;
} }
@@ -395,7 +332,6 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog {
fileChooser.setText(selectedFile.getVirtualFile().getPath()); fileChooser.setText(selectedFile.getVirtualFile().getPath());
} }
} }
}
); );
String initialTargetPath = String initialTargetPath =
@@ -446,12 +382,7 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog {
private boolean isFullFileMove() { private boolean isFullFileMove() {
Map<KtFile, List<KtNamedDeclaration>> fileToElements = CollectionsKt.groupBy( Map<KtFile, List<KtNamedDeclaration>> fileToElements = CollectionsKt.groupBy(
getSelectedElementsToMove(), getSelectedElementsToMove(),
new Function1<KtNamedDeclaration, KtFile>() { KtPureElement::getContainingKtFile
@Override
public KtFile invoke(KtNamedDeclaration declaration) {
return declaration.getContainingKtFile();
}
}
); );
for (Map.Entry<KtFile, List<KtNamedDeclaration>> entry : fileToElements.entrySet()) { for (Map.Entry<KtFile, List<KtNamedDeclaration>> entry : fileToElements.entrySet()) {
if (KtPsiUtilKt.getFileOrScriptDeclarations(entry.getKey()).size() != entry.getValue().size()) return false; if (KtPsiUtilKt.getFileOrScriptDeclarations(entry.getKey()).size() != entry.getValue().size()) return false;
@@ -525,9 +456,9 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog {
if (targetDirWithMoveDestination == null) return null; if (targetDirWithMoveDestination == null) return null;
VirtualFile targetDir = targetDirWithMoveDestination.getFirst(); VirtualFile targetDir = targetDirWithMoveDestination.getFirst();
final MoveDestination moveDestination = targetDirWithMoveDestination.getSecond(); MoveDestination moveDestination = targetDirWithMoveDestination.getSecond();
final String targetFileName = sourceFiles.size() > 1 ? null : tfFileNameInPackage.getText(); String targetFileName = sourceFiles.size() > 1 ? null : tfFileNameInPackage.getText();
if (targetFileName != null && !checkTargetFileName(targetFileName)) return null; if (targetFileName != null && !checkTargetFileName(targetFileName)) return null;
PsiDirectory targetDirectory = moveDestination.getTargetIfExists(sourceDirectory); PsiDirectory targetDirectory = moveDestination.getTargetIfExists(sourceDirectory);
@@ -537,12 +468,7 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog {
if (filesExistingInTargetDir.size() > 1) { if (filesExistingInTargetDir.size() > 1) {
String filePathsToReport = StringUtil.join( String filePathsToReport = StringUtil.join(
filesExistingInTargetDir, filesExistingInTargetDir,
new Function<PsiFile, String>() { file -> file.getVirtualFile().getPath(),
@Override
public String fun(PsiFile file) {
return file.getVirtualFile().getPath();
}
},
"\n" "\n"
); );
Messages.showErrorDialog( Messages.showErrorDialog(
@@ -576,19 +502,14 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog {
new FqName(getTargetPackage()), new FqName(getTargetPackage()),
moveDestination.getTargetIfExists(sourceFiles.get(0)), moveDestination.getTargetIfExists(sourceFiles.get(0)),
targetDir, targetDir,
new Function1<KtFile, KtFile>() { originalFile -> KotlinRefactoringUtilKt.getOrCreateKotlinFile(
@Override
public KtFile invoke(@NotNull KtFile originalFile) {
return KotlinRefactoringUtilKt.getOrCreateKotlinFile(
targetFileName != null ? targetFileName : originalFile.getName(), targetFileName != null ? targetFileName : originalFile.getName(),
moveDestination.getTargetDirectory(originalFile) moveDestination.getTargetDirectory(originalFile)
); )
}
}
); );
} }
final File targetFile = new File(getTargetFilePath()); File targetFile = new File(getTargetFilePath());
if (!checkTargetFileName(targetFile.getName())) return null; if (!checkTargetFileName(targetFile.getName())) return null;
KtFile jetFile = (KtFile) PhysicalFileSystemUtilsKt.toPsiFile(targetFile, myProject); KtFile jetFile = (KtFile) PhysicalFileSystemUtilsKt.toPsiFile(targetFile, myProject);
if (jetFile != null) { if (jetFile != null) {
@@ -602,7 +523,7 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog {
Path targetFilePath = targetFile.toPath(); Path targetFilePath = targetFile.toPath();
Path targetDirPath = targetFilePath.getParent(); Path targetDirPath = targetFilePath.getParent();
if (targetDirPath == null || !targetDirPath.startsWith(getProject().getBasePath())) { if (targetDirPath == null || !targetDirPath.startsWith(Objects.requireNonNull(getProject().getBasePath()))) {
setErrorText("Incorrect target path. Directory " + targetDirPath + " does not belong to current project."); setErrorText("Incorrect target path. Directory " + targetDirPath + " does not belong to current project.");
return null; return null;
} }
@@ -625,7 +546,7 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog {
} }
File targetDir = targetDirPath.toFile(); File targetDir = targetDirPath.toFile();
final PsiDirectory psiDirectory = targetDir != null ? PhysicalFileSystemUtilsKt.toPsiDirectory(targetDir, myProject) : null; PsiDirectory psiDirectory = targetDir != null ? PhysicalFileSystemUtilsKt.toPsiDirectory(targetDir, myProject) : null;
if (psiDirectory == null) { if (psiDirectory == null) {
setErrorText("No directory found for file: " + targetFile.getPath()); setErrorText("No directory found for file: " + targetFile.getPath());
return null; return null;
@@ -633,13 +554,8 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog {
Set<FqName> sourcePackageFqNames = CollectionsKt.mapTo( Set<FqName> sourcePackageFqNames = CollectionsKt.mapTo(
sourceFiles, sourceFiles,
new LinkedHashSet<FqName>(), new LinkedHashSet<>(),
new Function1<KtFile, FqName>() { KtFile::getPackageFqName
@Override
public FqName invoke(KtFile file) {
return file.getPackageFqName();
}
}
); );
FqName targetPackageFqName = CollectionsKt.singleOrNull(sourcePackageFqNames); FqName targetPackageFqName = CollectionsKt.singleOrNull(sourcePackageFqNames);
if (targetPackageFqName == null) { if (targetPackageFqName == null) {
@@ -651,17 +567,12 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog {
targetPackageFqName = new FqName(psiPackage.getQualifiedName()); targetPackageFqName = new FqName(psiPackage.getQualifiedName());
} }
final String finalTargetPackageFqName = targetPackageFqName.asString(); String finalTargetPackageFqName = targetPackageFqName.asString();
return new KotlinMoveTargetForDeferredFile( return new KotlinMoveTargetForDeferredFile(
targetPackageFqName, targetPackageFqName,
psiDirectory, psiDirectory,
null, null,
new Function1<KtFile, KtFile>() { originalFile -> KotlinRefactoringUtilKt.getOrCreateKotlinFile(targetFile.getName(), psiDirectory, finalTargetPackageFqName)
@Override
public KtFile invoke(@NotNull KtFile originalFile) {
return KotlinRefactoringUtilKt.getOrCreateKotlinFile(targetFile.getName(), psiDirectory, finalTargetPackageFqName);
}
}
); );
} }
@@ -692,12 +603,7 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog {
private List<KtNamedDeclaration> getSelectedElementsToMove() { private List<KtNamedDeclaration> getSelectedElementsToMove() {
return CollectionsKt.map( return CollectionsKt.map(
memberTable.getSelectedMemberInfos(), memberTable.getSelectedMemberInfos(),
new Function1<KotlinMemberInfo, KtNamedDeclaration>() { MemberInfoBase::getMember
@Override
public KtNamedDeclaration invoke(KotlinMemberInfo info) {
return info.getMember();
}
}
); );
} }
@@ -736,7 +642,7 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog {
List<KtNamedDeclaration> elementsToMove = getSelectedElementsToMove(); List<KtNamedDeclaration> elementsToMove = getSelectedElementsToMove();
List<KtFile> sourceFiles = getSourceFiles(elementsToMove); List<KtFile> sourceFiles = getSourceFiles(elementsToMove);
final PsiDirectory sourceDirectory = getSourceDirectory(sourceFiles); PsiDirectory sourceDirectory = getSourceDirectory(sourceFiles);
for (PsiElement element : elementsToMove) { for (PsiElement element : elementsToMove) {
String message = target.verify(element.getContainingFile()); String message = target.verify(element.getContainingFile());
@@ -754,7 +660,7 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog {
Pair<VirtualFile, ? extends MoveDestination> sourceRootWithMoveDestination = Pair<VirtualFile, ? extends MoveDestination> sourceRootWithMoveDestination =
selectPackageBasedTargetDirAndDestination(false); selectPackageBasedTargetDirAndDestination(false);
//noinspection ConstantConditions //noinspection ConstantConditions
final MoveDestination moveDestination = sourceRootWithMoveDestination.getSecond(); MoveDestination moveDestination = sourceRootWithMoveDestination.getSecond();
PsiDirectory targetDir = moveDestination.getTargetIfExists(sourceDirectory); PsiDirectory targetDir = moveDestination.getTargetIfExists(sourceDirectory);
String targetFileName = sourceFiles.size() > 1 ? null : tfFileNameInPackage.getText(); String targetFileName = sourceFiles.size() > 1 ? null : tfFileNameInPackage.getText();
@@ -762,12 +668,7 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog {
if (filesExistingInTargetDir.isEmpty() if (filesExistingInTargetDir.isEmpty()
|| (filesExistingInTargetDir.size() == 1 && sourceFiles.contains(filesExistingInTargetDir.get(0)))) { || (filesExistingInTargetDir.size() == 1 && sourceFiles.contains(filesExistingInTargetDir.get(0)))) {
PsiDirectory targetDirectory = ApplicationUtilsKt.runWriteAction( PsiDirectory targetDirectory = ApplicationUtilsKt.runWriteAction(
new Function0<PsiDirectory>() { () -> moveDestination.getTargetDirectory(sourceDirectory)
@Override
public PsiDirectory invoke() {
return moveDestination.getTargetDirectory(sourceDirectory);
}
}
); );
for (KtFile sourceFile : sourceFiles) { for (KtFile sourceFile : sourceFiles) {
@@ -809,7 +710,7 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog {
MoveDeclarationsDescriptor options = new MoveDeclarationsDescriptor( MoveDeclarationsDescriptor options = new MoveDeclarationsDescriptor(
myProject, myProject,
MoveSource(elementsToMove), MoveKotlinDeclarationsProcessorKt.MoveSource(elementsToMove),
target, target,
MoveDeclarationsDelegate.TopLevel.INSTANCE, MoveDeclarationsDelegate.TopLevel.INSTANCE,
isSearchInComments(), isSearchInComments(),
idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveFilesOrDirectories/FqNameFixingMoveJavaFIleHandler.kt
+8 -15
View File
@@ -1,17 +1,6 @@
/* /*
* Copyright 2010-2017 JetBrains s.r.o. * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
* * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/ */
package org.jetbrains.kotlin.idea.refactoring.move.moveFilesOrDirectories package org.jetbrains.kotlin.idea.refactoring.move.moveFilesOrDirectories
@@ -33,8 +22,12 @@ class FqNameFixingMoveJavaFileHandler : MoveFileHandler() {
override fun canProcessElement(element: PsiFile) = override fun canProcessElement(element: PsiFile) =
delegate.canProcessElement(element) delegate.canProcessElement(element)
override fun findUsages(psiFile: PsiFile, newParent: PsiDirectory?, searchInComments: Boolean, searchInNonJavaFiles: Boolean) = override fun findUsages(
delegate.findUsages(psiFile, newParent, searchInComments, searchInNonJavaFiles) psiFile: PsiFile,
newParent: PsiDirectory?,
searchInComments: Boolean,
searchInNonJavaFiles: Boolean
): MutableList<UsageInfo>? = delegate.findUsages(psiFile, newParent, searchInComments, searchInNonJavaFiles)
override fun prepareMovedFile(file: PsiFile, moveDestination: PsiDirectory, oldToNewMap: MutableMap<PsiElement, PsiElement>) { override fun prepareMovedFile(file: PsiFile, moveDestination: PsiDirectory, oldToNewMap: MutableMap<PsiElement, PsiElement>) {
delegate.prepareMovedFile(file, moveDestination, oldToNewMap) delegate.prepareMovedFile(file, moveDestination, oldToNewMap)
idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveFilesOrDirectories/KotlinMoveDirectoryWithClassesHelper.kt
+5 -16
View File
@@ -1,17 +1,6 @@
/* /*
* Copyright 2010-2015 JetBrains s.r.o. * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
* * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/ */
package org.jetbrains.kotlin.idea.refactoring.move.moveFilesOrDirectories package org.jetbrains.kotlin.idea.refactoring.move.moveFilesOrDirectories
@@ -67,7 +56,8 @@ class KotlinMoveDirectoryWithClassesHelper : MoveDirectoryWithClassesHelper() {
result: MutableCollection<UsageInfo>, result: MutableCollection<UsageInfo>,
searchInComments: Boolean, searchInComments: Boolean,
searchInNonJavaFiles: Boolean, searchInNonJavaFiles: Boolean,
project: Project) { project: Project
) {
filesToMove filesToMove
.filterIsInstance<KtFile>() .filterIsInstance<KtFile>()
.mapTo(result) { FileUsagesWrapper(it, fileHandler.findUsages(it, null, false), null) } .mapTo(result) { FileUsagesWrapper(it, fileHandler.findUsages(it, null, false), null) }
@@ -142,8 +132,7 @@ class KotlinMoveDirectoryWithClassesHelper : MoveDirectoryWithClassesHelper() {
usagesToProcess += FileUsagesWrapper(movedFile as KtFile, it.usages, moveDeclarationsProcessor) usagesToProcess += FileUsagesWrapper(movedFile as KtFile, it.usages, moveDeclarationsProcessor)
} }
usagesToProcess.forEach { fileHandler.retargetUsages(it.usages, it.moveDeclarationsProcessor!!) } usagesToProcess.forEach { fileHandler.retargetUsages(it.usages, it.moveDeclarationsProcessor!!) }
} } finally {
finally {
this.fileToMoveContext = null this.fileToMoveContext = null
} }
} }
idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveFilesOrDirectories/KotlinMoveFilesOrDirectoriesHandler.kt
+9 -14
View File
@@ -1,17 +1,6 @@
/* /*
* Copyright 2010-2015 JetBrains s.r.o. * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
* * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/ */
package org.jetbrains.kotlin.idea.refactoring.move.moveFilesOrDirectories package org.jetbrains.kotlin.idea.refactoring.move.moveFilesOrDirectories
@@ -62,7 +51,13 @@ class KotlinMoveFilesOrDirectoriesHandler : MoveFilesOrDirectoriesHandler() {
) )
} }
override fun tryToMove(element: PsiElement, project: Project, dataContext: DataContext?, reference: PsiReference?, editor: Editor?): Boolean { override fun tryToMove(
element: PsiElement,
project: Project,
dataContext: DataContext?,
reference: PsiReference?,
editor: Editor?
): Boolean {
if (element is KtLightClassForFacade) { if (element is KtLightClassForFacade) {
doMove(project, element.files.toTypedArray(), dataContext?.getData(LangDataKeys.TARGET_PSI_ELEMENT), null) doMove(project, element.files.toTypedArray(), dataContext?.getData(LangDataKeys.TARGET_PSI_ELEMENT), null)
return true return true
idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveFilesOrDirectories/MoveKotlinFileHandler.kt
+9 -18
View File
@@ -1,17 +1,6 @@
/* /*
* Copyright 2010-2015 JetBrains s.r.o. * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
* * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/ */
package org.jetbrains.kotlin.idea.refactoring.move.moveFilesOrDirectories package org.jetbrains.kotlin.idea.refactoring.move.moveFilesOrDirectories
@@ -61,12 +50,15 @@ class MoveKotlinFileHandler : MoveFileHandler() {
if (!shouldUpdatePackageDirective) return null if (!shouldUpdatePackageDirective) return null
val oldPackageName = packageFqName val oldPackageName = packageFqName
val newPackage = newParent?.getPackage() ?: return ContainerChangeInfo(ContainerInfo.Package(oldPackageName), val newPackage = newParent?.getPackage() ?: return ContainerChangeInfo(
ContainerInfo.UnknownPackage) ContainerInfo.Package(oldPackageName),
ContainerInfo.UnknownPackage
)
val newPackageName = FqNameUnsafe(newPackage.qualifiedName) val newPackageName = FqNameUnsafe(newPackage.qualifiedName)
if (oldPackageName.asString() == newPackageName.asString() if (oldPackageName.asString() == newPackageName.asString()
&& ModuleUtilCore.findModuleForPsiElement(this) == ModuleUtilCore.findModuleForPsiElement(newParent)) return null && ModuleUtilCore.findModuleForPsiElement(this) == ModuleUtilCore.findModuleForPsiElement(newParent)
) return null
if (!newPackageName.hasIdentifiersOnly()) return null if (!newPackageName.hasIdentifiersOnly()) return null
return ContainerChangeInfo(ContainerInfo.Package(oldPackageName), ContainerInfo.Package(newPackageName.toSafe())) return ContainerChangeInfo(ContainerInfo.Package(oldPackageName), ContainerInfo.Package(newPackageName.toSafe()))
@@ -78,8 +70,7 @@ class MoveKotlinFileHandler : MoveFileHandler() {
val project = psiFile.project val project = psiFile.project
val newPackage = packageNameInfo.newContainer val moveTarget = when (val newPackage = packageNameInfo.newContainer) {
val moveTarget = when (newPackage) {
ContainerInfo.UnknownPackage -> EmptyKotlinMoveTarget ContainerInfo.UnknownPackage -> EmptyKotlinMoveTarget
else -> KotlinMoveTargetForDeferredFile(newPackage.fqName!!, newParent) { else -> KotlinMoveTargetForDeferredFile(newPackage.fqName!!, newParent) {
idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveUtils.kt
+73 -32
View File
@@ -1,17 +1,6 @@
/* /*
* Copyright 2010-2015 JetBrains s.r.o. * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
* * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/ */
package org.jetbrains.kotlin.idea.refactoring.move package org.jetbrains.kotlin.idea.refactoring.move
@@ -64,7 +53,7 @@ sealed class ContainerInfo {
abstract fun matches(descriptor: DeclarationDescriptor): Boolean abstract fun matches(descriptor: DeclarationDescriptor): Boolean
object UnknownPackage : ContainerInfo() { object UnknownPackage : ContainerInfo() {
override val fqName = null override val fqName: FqName? = null
override fun matches(descriptor: DeclarationDescriptor) = descriptor is PackageViewDescriptor override fun matches(descriptor: DeclarationDescriptor) = descriptor is PackageViewDescriptor
} }
@@ -111,8 +100,7 @@ fun KtElement.processInternalReferencesToUpdateOnPackageNameChange(
val fqName = DescriptorUtils.getFqName(descriptor).let { if (it.isSafe) it.toSafe() else return@isImported false } val fqName = DescriptorUtils.getFqName(descriptor).let { if (it.isSafe) it.toSafe() else return@isImported false }
if (importPaths.any { fqName.isImported(it, false) }) return true if (importPaths.any { fqName.isImported(it, false) }) return true
val containingDescriptor = descriptor.containingDeclaration return when (val containingDescriptor = descriptor.containingDeclaration) {
return when (containingDescriptor) {
is ClassDescriptor, is PackageViewDescriptor -> isImported(containingDescriptor) is ClassDescriptor, is PackageViewDescriptor -> isImported(containingDescriptor)
else -> false else -> false
} }
@@ -138,7 +126,8 @@ fun KtElement.processInternalReferencesToUpdateOnPackageNameChange(
var result = DescriptorToSourceUtilsIde.getAnyDeclaration(project, descriptor) ?: return@lazy null var result = DescriptorToSourceUtilsIde.getAnyDeclaration(project, descriptor) ?: return@lazy null
if (descriptor.isCompanionObject() if (descriptor.isCompanionObject()
&& bindingContext[BindingContext.SHORT_REFERENCE_TO_COMPANION_OBJECT, refExpr] != null) { && bindingContext[BindingContext.SHORT_REFERENCE_TO_COMPANION_OBJECT, refExpr] != null
) {
result = (result as KtObjectDeclaration).containingClassOrObject ?: result result = (result as KtObjectDeclaration).containingClassOrObject ?: result
} }
@@ -150,8 +139,8 @@ fun KtElement.processInternalReferencesToUpdateOnPackageNameChange(
if (isExtension && containingDescriptor is ClassDescriptor) { if (isExtension && containingDescriptor is ClassDescriptor) {
val dispatchReceiver = refExpr.getResolvedCall(bindingContext)?.dispatchReceiver val dispatchReceiver = refExpr.getResolvedCall(bindingContext)?.dispatchReceiver
val implicitClass = (dispatchReceiver as? ImplicitClassReceiver)?.classDescriptor val implicitClass = (dispatchReceiver as? ImplicitClassReceiver)?.classDescriptor
if (implicitClass?.isCompanionObject ?: false) { if (implicitClass?.isCompanionObject == true) {
return { ImplicitCompanionAsDispatchReceiverUsageInfo(it, implicitClass!!) } return { ImplicitCompanionAsDispatchReceiverUsageInfo(it, implicitClass) }
} }
if (dispatchReceiver != null || containingDescriptor.kind != ClassKind.OBJECT) return null if (dispatchReceiver != null || containingDescriptor.kind != ClassKind.OBJECT) return null
} }
@@ -160,7 +149,8 @@ fun KtElement.processInternalReferencesToUpdateOnPackageNameChange(
if (!isExtension) { if (!isExtension) {
if (!(containingDescriptor is PackageFragmentDescriptor if (!(containingDescriptor is PackageFragmentDescriptor
|| containingDescriptor is ClassDescriptor && containingDescriptor.kind == ClassKind.OBJECT || containingDescriptor is ClassDescriptor && containingDescriptor.kind == ClassKind.OBJECT
|| descriptor is JavaCallableMemberDescriptor && ((declaration as? PsiMember)?.hasModifierProperty(PsiModifier.STATIC) ?: false))) return null || descriptor is JavaCallableMemberDescriptor && ((declaration as? PsiMember)?.hasModifierProperty(PsiModifier.STATIC) == true))
) return null
} }
} }
@@ -243,9 +233,23 @@ class UnqualifiableMoveRenameUsageInfo(
val originalFile: PsiFile, val originalFile: PsiFile,
val addImportToOriginalFile: Boolean, val addImportToOriginalFile: Boolean,
override val isInternal: Boolean override val isInternal: Boolean
): MoveRenameUsageInfo(element, reference, reference.rangeInElement.startOffset, reference.rangeInElement.endOffset, referencedElement, false), KotlinMoveUsage { ) : MoveRenameUsageInfo(
element,
reference,
reference.rangeInElement.startOffset,
reference.rangeInElement.endOffset,
referencedElement,
false
), KotlinMoveUsage {
override fun refresh(refExpr: KtSimpleNameExpression, referencedElement: PsiElement): UsageInfo? { override fun refresh(refExpr: KtSimpleNameExpression, referencedElement: PsiElement): UsageInfo? {
return UnqualifiableMoveRenameUsageInfo(refExpr, refExpr.mainReference, referencedElement, originalFile, addImportToOriginalFile, isInternal) return UnqualifiableMoveRenameUsageInfo(
refExpr,
refExpr.mainReference,
referencedElement,
originalFile,
addImportToOriginalFile,
isInternal
)
} }
} }
@@ -254,7 +258,14 @@ class QualifiableMoveRenameUsageInfo(
reference: PsiReference, reference: PsiReference,
referencedElement: PsiElement, referencedElement: PsiElement,
override val isInternal: Boolean override val isInternal: Boolean
): MoveRenameUsageInfo(element, reference, reference.rangeInElement.startOffset, reference.rangeInElement.endOffset, referencedElement, false), ) : MoveRenameUsageInfo(
element,
reference,
reference.rangeInElement.startOffset,
reference.rangeInElement.endOffset,
referencedElement,
false
),
KotlinMoveUsage { KotlinMoveUsage {
override fun refresh(refExpr: KtSimpleNameExpression, referencedElement: PsiElement): UsageInfo? { override fun refresh(refExpr: KtSimpleNameExpression, referencedElement: PsiElement): UsageInfo? {
return QualifiableMoveRenameUsageInfo(refExpr, refExpr.mainReference, referencedElement, isInternal) return QualifiableMoveRenameUsageInfo(refExpr, refExpr.mainReference, referencedElement, isInternal)
@@ -272,9 +283,23 @@ class CallableReferenceMoveRenameUsageInfo(
val originalFile: PsiFile, val originalFile: PsiFile,
val addImportToOriginalFile: Boolean, val addImportToOriginalFile: Boolean,
override val isInternal: Boolean override val isInternal: Boolean
) : MoveRenameUsageInfo(element, reference, reference.rangeInElement.startOffset, reference.rangeInElement.endOffset, referencedElement, false), DeferredKotlinMoveUsage { ) : MoveRenameUsageInfo(
element,
reference,
reference.rangeInElement.startOffset,
reference.rangeInElement.endOffset,
referencedElement,
false
), DeferredKotlinMoveUsage {
override fun refresh(refExpr: KtSimpleNameExpression, referencedElement: PsiElement): UsageInfo? { override fun refresh(refExpr: KtSimpleNameExpression, referencedElement: PsiElement): UsageInfo? {
return CallableReferenceMoveRenameUsageInfo(refExpr, refExpr.mainReference, referencedElement, originalFile, addImportToOriginalFile, isInternal) return CallableReferenceMoveRenameUsageInfo(
refExpr,
refExpr.mainReference,
referencedElement,
originalFile,
addImportToOriginalFile,
isInternal
)
} }
override fun resolve(newElement: PsiElement): UsageInfo? { override fun resolve(newElement: PsiElement): UsageInfo? {
@@ -284,7 +309,14 @@ class CallableReferenceMoveRenameUsageInfo(
val referencedElement = referencedElement ?: return null val referencedElement = referencedElement ?: return null
if (target != null && target.isTopLevelKtOrJavaMember()) { if (target != null && target.isTopLevelKtOrJavaMember()) {
element.getStrictParentOfType<KtCallableReferenceExpression>()?.receiverExpression?.delete() element.getStrictParentOfType<KtCallableReferenceExpression>()?.receiverExpression?.delete()
return UnqualifiableMoveRenameUsageInfo(element, reference, referencedElement, element.containingFile!!, addImportToOriginalFile, isInternal) return UnqualifiableMoveRenameUsageInfo(
element,
reference,
referencedElement,
element.containingFile!!,
addImportToOriginalFile,
isInternal
)
} }
return QualifiableMoveRenameUsageInfo(element, reference, referencedElement, isInternal) return QualifiableMoveRenameUsageInfo(element, reference, referencedElement, isInternal)
} }
@@ -384,7 +416,8 @@ private fun updateJavaReference(reference: PsiReferenceExpression, oldElement: P
if (newClass != null && reference.qualifierExpression != null) { if (newClass != null && reference.qualifierExpression != null) {
val mockMoveMembersOptions = MockMoveMembersOptions(newClass.qualifiedName, arrayOf(newElement)) val mockMoveMembersOptions = MockMoveMembersOptions(newClass.qualifiedName, arrayOf(newElement))
val moveMembersUsageInfo = MoveMembersProcessor.MoveMembersUsageInfo( val moveMembersUsageInfo = MoveMembersProcessor.MoveMembersUsageInfo(
newElement, reference.element, newClass, reference.qualifierExpression, reference) newElement, reference.element, newClass, reference.qualifierExpression, reference
)
val moveMemberHandler = MoveMemberHandler.EP_NAME.forLanguage(reference.element.language) val moveMemberHandler = MoveMemberHandler.EP_NAME.forLanguage(reference.element.language)
if (moveMemberHandler != null) { if (moveMemberHandler != null) {
moveMemberHandler.changeExternalUsage(mockMoveMembersOptions, moveMembersUsageInfo) moveMemberHandler.changeExternalUsage(mockMoveMembersOptions, moveMembersUsageInfo)
@@ -420,7 +453,12 @@ private fun postProcessMoveUsage(
} }
is UnqualifiableMoveRenameUsageInfo -> { is UnqualifiableMoveRenameUsageInfo -> {
val file = with(usage) { if (addImportToOriginalFile) originalFile else mapToNewOrThis(originalFile, oldToNewElementsMapping) } as KtFile val file = with(usage) {
if (addImportToOriginalFile) originalFile else mapToNewOrThis(
originalFile,
oldToNewElementsMapping
)
} as KtFile
addDelayedImportRequest(newElement, file) addDelayedImportRequest(newElement, file)
} }
@@ -438,8 +476,7 @@ private fun processReference(reference: PsiReference?, newElement: PsiElement, s
reference is PsiReferenceExpression && updateJavaReference(reference, oldElement, newElement) -> return reference is PsiReferenceExpression && updateJavaReference(reference, oldElement, newElement) -> return
else -> reference?.bindToElement(newElement) else -> reference?.bindToElement(newElement)
} }
} } catch (e: IncorrectOperationException) {
catch (e: IncorrectOperationException) {
// Suppress exception if bindToElement is not implemented // Suppress exception if bindToElement is not implemented
} }
} }
@@ -453,7 +490,7 @@ fun postProcessMoveUsages(
shorteningMode: ShorteningMode = ShorteningMode.DELAYED_SHORTENING shorteningMode: ShorteningMode = ShorteningMode.DELAYED_SHORTENING
): List<NonCodeUsageInfo> { ): List<NonCodeUsageInfo> {
val sortedUsages = usages.sortedWith( val sortedUsages = usages.sortedWith(
Comparator<UsageInfo> { o1, o2 -> Comparator { o1, o2 ->
val file1 = o1.virtualFile val file1 = o1.virtualFile
val file2 = o2.virtualFile val file2 = o2.virtualFile
if (Comparing.equal(file1, file2)) { if (Comparing.equal(file1, file2)) {
@@ -535,7 +572,11 @@ sealed class OuterInstanceReferenceUsageInfo(element: PsiElement, private val is
} }
@JvmOverloads @JvmOverloads
fun traverseOuterInstanceReferences(member: KtNamedDeclaration, stopAtFirst: Boolean, body: (OuterInstanceReferenceUsageInfo) -> Unit = {}): Boolean { fun traverseOuterInstanceReferences(
member: KtNamedDeclaration,
stopAtFirst: Boolean,
body: (OuterInstanceReferenceUsageInfo) -> Unit = {}
): Boolean {
if (member is KtObjectDeclaration || member is KtClass && !member.isInner()) return false if (member is KtObjectDeclaration || member is KtClass && !member.isInner()) return false
val context = member.analyzeWithContent() val context = member.analyzeWithContent()
idea/tests/org/jetbrains/kotlin/idea/refactoring/move/AbstractMoveTest.kt
+13 -14
View File
@@ -24,10 +24,12 @@ import org.jetbrains.kotlin.idea.core.util.toPsiDirectory
import org.jetbrains.kotlin.idea.core.util.toPsiFile import org.jetbrains.kotlin.idea.core.util.toPsiFile
import org.jetbrains.kotlin.idea.jsonUtils.getNullableString import org.jetbrains.kotlin.idea.jsonUtils.getNullableString
import org.jetbrains.kotlin.idea.jsonUtils.getString import org.jetbrains.kotlin.idea.jsonUtils.getString
import org.jetbrains.kotlin.idea.refactoring.* import org.jetbrains.kotlin.idea.refactoring.AbstractMultifileRefactoringTest
import org.jetbrains.kotlin.idea.refactoring.createKotlinFile
import org.jetbrains.kotlin.idea.refactoring.move.changePackage.KotlinChangePackageRefactoring import org.jetbrains.kotlin.idea.refactoring.move.changePackage.KotlinChangePackageRefactoring
import org.jetbrains.kotlin.idea.refactoring.move.moveClassesOrPackages.KotlinAwareDelegatingMoveDestination import org.jetbrains.kotlin.idea.refactoring.move.moveClassesOrPackages.KotlinAwareDelegatingMoveDestination
import org.jetbrains.kotlin.idea.refactoring.move.moveDeclarations.* import org.jetbrains.kotlin.idea.refactoring.move.moveDeclarations.*
import org.jetbrains.kotlin.idea.refactoring.runRefactoringTest
import org.jetbrains.kotlin.idea.search.allScope import org.jetbrains.kotlin.idea.search.allScope
import org.jetbrains.kotlin.idea.search.projectScope import org.jetbrains.kotlin.idea.search.projectScope
import org.jetbrains.kotlin.idea.stubindex.KotlinFullClassNameIndex import org.jetbrains.kotlin.idea.stubindex.KotlinFullClassNameIndex
@@ -97,8 +99,7 @@ enum class MoveAction : AbstractMultifileRefactoringTest.RefactoringAction {
targetPackage, targetPackage,
targetDirectory targetDirectory
) )
} } else {
else {
MultipleRootsMoveDestination(targetPackageWrapper) MultipleRootsMoveDestination(targetPackageWrapper)
} }
@@ -161,8 +162,7 @@ enum class MoveAction : AbstractMultifileRefactoringTest.RefactoringAction {
ActionRunner.runInsideWriteAction { VfsUtil.createDirectoryIfMissing(rootDir, targetDirPath) } ActionRunner.runInsideWriteAction { VfsUtil.createDirectoryIfMissing(rootDir, targetDirPath) }
val newParent = if (targetPackage != null) { val newParent = if (targetPackage != null) {
JavaPsiFacade.getInstance(project).findPackage(targetPackage)!!.directories[0] JavaPsiFacade.getInstance(project).findPackage(targetPackage)!!.directories[0]
} } else {
else {
rootDir.findFileByRelativePath(targetDirPath)!!.toPsiDirectory(project)!! rootDir.findFileByRelativePath(targetDirPath)!!.toPsiDirectory(project)!!
} }
MoveFilesOrDirectoriesProcessor( MoveFilesOrDirectoriesProcessor(
@@ -174,8 +174,7 @@ enum class MoveAction : AbstractMultifileRefactoringTest.RefactoringAction {
/* moveCallback = */ null, /* moveCallback = */ null,
/* prepareSuccessfulCallback = */ null /* prepareSuccessfulCallback = */ null
).run() ).run()
} } else {
else {
val targetFile = config.getString("targetFile") val targetFile = config.getString("targetFile")
MoveHandler.doMove( MoveHandler.doMove(
@@ -251,7 +250,7 @@ enum class MoveAction : AbstractMultifileRefactoringTest.RefactoringAction {
val project = mainFile.project val project = mainFile.project
val sourceDir = rootDir.findFileByRelativePath(config.getString("sourceDir"))!!.toPsiDirectory(project)!! val sourceDir = rootDir.findFileByRelativePath(config.getString("sourceDir"))!!.toPsiDirectory(project)!!
val targetDir = rootDir.findFileByRelativePath(config.getString("targetDir"))!!.toPsiDirectory(project)!! val targetDir = rootDir.findFileByRelativePath(config.getString("targetDir"))!!.toPsiDirectory(project)!!
MoveDirectoryWithClassesProcessor(project, arrayOf(sourceDir), targetDir, true, true, true, {}).run() MoveDirectoryWithClassesProcessor(project, arrayOf(sourceDir), targetDir, true, true, true) {}.run()
} }
}, },
@@ -263,15 +262,15 @@ enum class MoveAction : AbstractMultifileRefactoringTest.RefactoringAction {
val targetClass = val targetClass =
if (targetClassName != null) { if (targetClassName != null) {
KotlinFullClassNameIndex.getInstance().get(targetClassName, project, project.projectScope()).first()!! KotlinFullClassNameIndex.getInstance().get(targetClassName, project, project.projectScope()).first()!!
} } else null
else null val delegate = MoveDeclarationsDelegate.NestedClass(
val delegate = MoveDeclarationsDelegate.NestedClass(config.getNullableString("newName"), config.getNullableString("newName"),
config.getNullableString("outerInstanceParameter")) config.getNullableString("outerInstanceParameter")
)
val moveTarget = val moveTarget =
if (targetClass != null) { if (targetClass != null) {
KotlinMoveTargetForExistingElement(targetClass) KotlinMoveTargetForExistingElement(targetClass)
} } else {
else {
val fileName = (delegate.newClassName ?: elementToMove.name!!) + ".kt" val fileName = (delegate.newClassName ?: elementToMove.name!!) + ".kt"
val targetPackageFqName = (mainFile as KtFile).packageFqName val targetPackageFqName = (mainFile as KtFile).packageFqName
val targetDir = mainFile.containingDirectory!! val targetDir = mainFile.containingDirectory!!