MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-02-04 23:39:07 +07:00
Code Issues Packages Projects Releases Wiki Activity

[kotlin] Allow for K2 move tests with a class/object target

Browse Source 
KTIJ-28595

GitOrigin-RevId: 3d9aee42e2ff4a20ac93a0003fdc86c350e7475f
This commit is contained in:
Frederik Haselmeier
2024-12-16 18:23:55 +01:00
committed by intellij-monorepo-bot
parent 13e2dd0069
commit 95d723caa5
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/kotlin/refactorings/kotlin.refactorings.move.k2/kotlin.refactorings.move.k2.iml
View File

@@ -53,5 +53,6 @@
<orderEntry type="module" module-name="kotlin.base.test" scope="TEST" />
<orderEntry type="module" module-name="kotlin.base.plugin" scope="TEST" />
<orderEntry type="module" module-name="kotlin.searching.k2" />
<orderEntry type="module" module-name="kotlin.base.indices" scope="TEST" />
</component>
</module>

11
plugins/kotlin/refactorings/kotlin.refactorings.move.k2/test/org/jetbrains/kotlin/idea/k2/refactoring/move/AbstractK2MoveNestedTest.kt
View File

@@ -12,6 +12,7 @@ import org.jetbrains.kotlin.analysis.api.permissions.KaAllowAnalysisOnEdt
import org.jetbrains.kotlin.analysis.api.permissions.allowAnalysisOnEdt
import org.jetbrains.kotlin.idea.base.util.getNullableString
import org.jetbrains.kotlin.idea.base.util.getString
import org.jetbrains.kotlin.idea.base.util.projectScope
import org.jetbrains.kotlin.idea.core.util.toPsiDirectory
import org.jetbrains.kotlin.idea.k2.refactoring.move.descriptor.K2MoveDescriptor
import org.jetbrains.kotlin.idea.k2.refactoring.move.descriptor.K2MoveOperationDescriptor
@@ -19,6 +20,7 @@ import org.jetbrains.kotlin.idea.k2.refactoring.move.descriptor.K2MoveSourceDesc
import org.jetbrains.kotlin.idea.k2.refactoring.move.descriptor.K2MoveTargetDescriptor
import org.jetbrains.kotlin.idea.k2.refactoring.move.processor.K2MoveNestedDeclarationsRefactoringProcessor
import org.jetbrains.kotlin.idea.refactoring.runRefactoringTest
import org.jetbrains.kotlin.idea.stubindex.KotlinFullClassNameIndex
import org.jetbrains.kotlin.idea.util.sourceRoot
import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.psi.KtFile
@@ -41,15 +43,22 @@ internal object K2MoveNestedRefactoringAction : KotlinMoveRefactoringAction {
val project = mainFile.project
val elementToMove = elementsAtCaret.single().getNonStrictParentOfType<KtNamedDeclaration>()!!
val fileName = (elementToMove.name!!) + ".kt"
val targetClassName = config.getNullableString("targetClass")
val targetPackageFqName = config.getNullableString("targetPackage")?.let {
FqName(it)
} ?: (mainFile as KtFile).packageFqName
val targetDir = mainFile.sourceRoot?.toPsiDirectory(project)!!
val dirStructureMatchesPkg = mainFile.sourceRoot != mainFile.virtualFile.parent
val target = if (targetClassName != null) {
val targetClass = KotlinFullClassNameIndex[targetClassName, project, project.projectScope()].first()
K2MoveTargetDescriptor.ClassOrObject(targetClass)
} else {
K2MoveTargetDescriptor.File(fileName, targetPackageFqName, targetDir)
}
val moveDescriptor = K2MoveDescriptor.Declarations(
project,
source = K2MoveSourceDescriptor.ElementSource(listOf(elementToMove)),
target = K2MoveTargetDescriptor.File(fileName, targetPackageFqName, targetDir),
target = target,
)
val moveOperationDescriptor = allowAnalysisOnEdt {
K2MoveOperationDescriptor.NestedDeclarations(