From 8dd467bde0a77014e0d0e0cb912b17b45e856523 Mon Sep 17 00:00:00 2001 From: Igor Yakovlev Date: Tue, 24 Dec 2019 19:12:12 +0300 Subject: [PATCH] Fix build for bunch 191 --- .../move/MoveHandlerDelegateCompat.kt | 14 +++++++++ .../move/MoveHandlerDelegateCompat.kt.191 | 29 +++++++++++++++++++ .../MoveKotlinDeclarationsHandler.kt | 4 +-- .../KotlinMoveFilesOrDirectoriesHandler.kt | 6 ++-- 4 files changed, 48 insertions(+), 5 deletions(-) create mode 100644 idea/src/org/jetbrains/kotlin/idea/refactoring/move/MoveHandlerDelegateCompat.kt create mode 100644 idea/src/org/jetbrains/kotlin/idea/refactoring/move/MoveHandlerDelegateCompat.kt.191 diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/MoveHandlerDelegateCompat.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/MoveHandlerDelegateCompat.kt new file mode 100644 index 00000000000..d79a0cd3f41 --- /dev/null +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/MoveHandlerDelegateCompat.kt @@ -0,0 +1,14 @@ +/* + * 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. + */ + +package org.jetbrains.kotlin.idea.refactoring.move + +import com.intellij.refactoring.move.MoveHandlerDelegate +import com.intellij.refactoring.move.moveFilesOrDirectories.MoveFilesOrDirectoriesHandler + +// BUNCH: 191 +typealias MoveHandlerDelegateCompat = MoveHandlerDelegate +// BUNCH: 191 +typealias MoveFilesOrDirectoriesHandlerCompat = MoveFilesOrDirectoriesHandler \ No newline at end of file diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/MoveHandlerDelegateCompat.kt.191 b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/MoveHandlerDelegateCompat.kt.191 new file mode 100644 index 00000000000..dfc26cd613f --- /dev/null +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/MoveHandlerDelegateCompat.kt.191 @@ -0,0 +1,29 @@ +/* + * 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. + */ + +package org.jetbrains.kotlin.idea.refactoring.move + +import com.intellij.psi.PsiElement +import com.intellij.psi.PsiReference +import com.intellij.refactoring.move.MoveHandlerDelegate +import com.intellij.refactoring.move.moveFilesOrDirectories.MoveFilesOrDirectoriesHandler + +// BUNCH: 191 +abstract class MoveHandlerDelegateCompat : MoveHandlerDelegate() { + override fun canMove(elements: Array, targetContainer: PsiElement?): Boolean = + canMove(elements, targetContainer, null) + + open fun canMove(elements: Array, targetContainer: PsiElement?, reference: PsiReference?): Boolean = + super.canMove(elements, targetContainer) +} + +// BUNCH: 191 +abstract class MoveFilesOrDirectoriesHandlerCompat : MoveFilesOrDirectoriesHandler() { + override fun canMove(elements: Array, targetContainer: PsiElement?): Boolean = + canMove(elements, targetContainer, null) + + open fun canMove(elements: Array, targetContainer: PsiElement?, reference: PsiReference?): Boolean = + super.canMove(elements, targetContainer) +} \ No newline at end of file diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/MoveKotlinDeclarationsHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/MoveKotlinDeclarationsHandler.kt index 8a6081eb0d8..32896101761 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/MoveKotlinDeclarationsHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/MoveKotlinDeclarationsHandler.kt @@ -24,13 +24,13 @@ import com.intellij.psi.* import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringSettings import com.intellij.refactoring.RefactoringBundle import com.intellij.refactoring.move.MoveCallback -import com.intellij.refactoring.move.MoveHandlerDelegate import com.intellij.refactoring.move.moveClassesOrPackages.MoveClassesOrPackagesImpl import com.intellij.refactoring.move.moveFilesOrDirectories.MoveFilesOrDirectoriesUtil import com.intellij.refactoring.util.CommonRefactoringUtil import org.jetbrains.kotlin.asJava.unwrapped import org.jetbrains.kotlin.idea.core.getPackage import org.jetbrains.kotlin.idea.refactoring.canRefactor +import org.jetbrains.kotlin.idea.refactoring.move.MoveHandlerDelegateCompat import org.jetbrains.kotlin.idea.refactoring.move.moveDeclarations.ui.KotlinAwareMoveFilesOrDirectoriesDialog import org.jetbrains.kotlin.idea.refactoring.move.moveDeclarations.ui.KotlinSelectNestedClassRefactoringDialog import org.jetbrains.kotlin.idea.refactoring.move.moveDeclarations.ui.MoveKotlinNestedClassesDialog @@ -92,7 +92,7 @@ private val defaultHandlerActions = object : MoveKotlinDeclarationsHandlerAction } class MoveKotlinDeclarationsHandler internal constructor(private val handlerActions: MoveKotlinDeclarationsHandlerActions) : - MoveHandlerDelegate() { + MoveHandlerDelegateCompat() { constructor() : this(defaultHandlerActions) diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveFilesOrDirectories/KotlinMoveFilesOrDirectoriesHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveFilesOrDirectories/KotlinMoveFilesOrDirectoriesHandler.kt index 403a49874e0..3fcec0099ad 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveFilesOrDirectories/KotlinMoveFilesOrDirectoriesHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveFilesOrDirectories/KotlinMoveFilesOrDirectoriesHandler.kt @@ -13,16 +13,16 @@ import com.intellij.openapi.project.Project import com.intellij.psi.* import com.intellij.refactoring.move.MoveCallback import com.intellij.refactoring.move.MoveHandler -import com.intellij.refactoring.move.moveFilesOrDirectories.MoveFilesOrDirectoriesHandler import com.intellij.refactoring.move.moveFilesOrDirectories.MoveFilesOrDirectoriesUtil import org.jetbrains.kotlin.asJava.classes.KtLightClassForFacade +import org.jetbrains.kotlin.idea.refactoring.move.MoveFilesOrDirectoriesHandlerCompat import org.jetbrains.kotlin.idea.refactoring.move.moveDeclarations.ui.KotlinAwareMoveFilesOrDirectoriesDialog import org.jetbrains.kotlin.idea.refactoring.move.moveDeclarations.ui.KotlinAwareMoveFilesOrDirectoriesModel import org.jetbrains.kotlin.idea.util.application.executeCommand import org.jetbrains.kotlin.psi.KtClassOrObject import org.jetbrains.kotlin.psi.KtFile -class KotlinMoveFilesOrDirectoriesHandler : MoveFilesOrDirectoriesHandler() { +class KotlinMoveFilesOrDirectoriesHandler : MoveFilesOrDirectoriesHandlerCompat() { private fun adjustElements(elements: Array): Array? { return elements.map { when { @@ -35,7 +35,7 @@ class KotlinMoveFilesOrDirectoriesHandler : MoveFilesOrDirectoriesHandler() { }.toTypedArray() } - override fun canMove(elements: Array, targetContainer: PsiElement?, reference: PsiReference?): Boolean { + override fun canMove(elements: Array, targetContainer: PsiElement?, reference: PsiReference?): Boolean { val adjustedElements = adjustElements(elements) ?: return false if (adjustedElements.none { it is KtFile }) return false