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] Disable move files refactoring is the refactoring doesn't make sense

Browse Source 
#KTIJ-30984 Fixed

GitOrigin-RevId: d69b8c6960967e2d4ea0bcd8a35b1bb6f29880d0
This commit is contained in:
Bart van Helvert
2024-08-14 14:51:55 +02:00
committed by intellij-monorepo-bot
parent 2f762efb23
commit a8a016c683
1 changed files with 30 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
plugins/kotlin/refactorings/kotlin.refactorings.move.k2/src/org/jetbrains/kotlin/idea/k2/refactoring/move/ui/K2MoveModel.kt
View File

@@ -8,6 +8,7 @@ import com.intellij.openapi.util.NlsContexts
import com.intellij.psi.PsiDirectory
import com.intellij.psi.PsiElement
import com.intellij.psi.PsiFile
import com.intellij.psi.PsiJavaFile
import com.intellij.psi.util.parentOfType
import com.intellij.psi.util.parentOfTypes
import com.intellij.refactoring.RefactoringBundle
@@ -53,18 +54,8 @@ sealed class K2MoveModel {
@RequiresReadLock
abstract fun toDescriptor(): K2MoveOperationDescriptor<*>
fun isValidRefactoring(): Boolean {
fun KtFile.isTargetFile(): Boolean {
return (target as? K2MoveTargetModel.File)?.let { fileTarget ->
containingDirectory == fileTarget.directory
&& packageFqName == fileTarget.pkgName // check both pkg and directory in case of implicit pkg prefix
&& name == fileTarget.fileName
} ?: false
}
if (source.elements.isEmpty()) return false
if (target is K2MoveTargetModel.File && !(target as K2MoveTargetModel.File).fileName.isValidKotlinFile()) return false
val files = source.elements.map { it.containingFile }.toSet()
return files.size != 1 || !(files.single() as KtFile).isTargetFile()
open fun isValidRefactoring(): Boolean {
return source.elements.isNotEmpty()
}
enum class Setting(private val text: @NlsContexts.Checkbox String) {
@@ -128,6 +119,20 @@ sealed class K2MoveModel {
override val inSourceRoot: Boolean,
override val moveCallBack: MoveCallback? = null
) : K2MoveModel() {
private fun PsiFile.isAlreadyInTarget(): Boolean {
return parent == target.directory && when (this) {
is PsiJavaFile -> packageName == target.pkgName.asString()
is KtFile -> packageFqName == target.pkgName
else -> true
}
}
override fun isValidRefactoring(): Boolean {
if (!super.isValidRefactoring()) return false
if (source.elements.all { it is PsiFile && it.isAlreadyInTarget() }) return false
return true
}
override fun toDescriptor(): K2MoveOperationDescriptor.Files {
val srcDescr = source.toDescriptor()
val targetDescr = target.toDescriptor()
@@ -160,6 +165,19 @@ sealed class K2MoveModel {
override val inSourceRoot: Boolean,
override val moveCallBack: MoveCallback? = null
) : K2MoveModel() {
private fun KtFile.isTargetFile(): Boolean {
return containingDirectory == target.directory
&& packageFqName == target.pkgName
&& name == target.fileName
}
override fun isValidRefactoring(): Boolean {
if (!super.isValidRefactoring()) return false
if (!target.fileName.isValidKotlinFile()) return false
val files = source.elements.map { it.containingFile }
return files.size != 1 || !(files.single() as KtFile).isTargetFile()
}
override fun toDescriptor(): K2MoveOperationDescriptor.Declarations {
return K2MoveOperationDescriptor.Declarations(
project,