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

Remove deprecated method usage

Browse Source
This commit is contained in:
Igor Yakovlev
2019-12-19 01:19:41 +03:00
parent 6fb788d446
commit 0f1592b023
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/actions/internal/refactoringTesting/cases/MoveRefactoringCase.kt
+1 -1
View File
@@ -36,7 +36,7 @@ internal class MoveRefactoringCase : RefactoringCase {
val handler = MoveKotlinDeclarationsHandler(MoveKotlinDeclarationsHandlerTestActions(testDataKeeper)) val handler = MoveKotlinDeclarationsHandler(MoveKotlinDeclarationsHandlerTestActions(testDataKeeper))
if (!handler.canMove(sourceClassAsArray, targetClass)) { if (!handler.canMove(sourceClassAsArray, targetClass, /*reference = */ null)) {
return RandomMoveRefactoringResult.Failed return RandomMoveRefactoringResult.Failed
} }
idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/MoveKotlinDeclarationsHandler.kt
+1 -1
View File
@@ -267,7 +267,7 @@ class MoveKotlinDeclarationsHandler internal constructor(private val handlerActi
|| element.parent?.let { recursivelyTryToMove(it, project, dataContext, reference, editor) } ?: false || element.parent?.let { recursivelyTryToMove(it, project, dataContext, reference, editor) } ?: false
} }
override fun canMove(elements: Array<out PsiElement>, targetContainer: PsiElement?): Boolean { override fun canMove(elements: Array<out PsiElement>, targetContainer: PsiElement?, reference: PsiReference?): Boolean {
return canMove(elements, targetContainer, false) return canMove(elements, targetContainer, false)
} }
idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveFilesOrDirectories/KotlinMoveFilesOrDirectoriesHandler.kt
+2 -2
View File
@@ -35,11 +35,11 @@ class KotlinMoveFilesOrDirectoriesHandler : MoveFilesOrDirectoriesHandler() {
}.toTypedArray() }.toTypedArray()
} }
override fun canMove(elements: Array<PsiElement>, targetContainer: PsiElement?): Boolean { override fun canMove(elements: Array<PsiElement>, targetContainer: PsiElement?, reference: PsiReference?): Boolean {
val adjustedElements = adjustElements(elements) ?: return false val adjustedElements = adjustElements(elements) ?: return false
if (adjustedElements.none { it is KtFile }) return false if (adjustedElements.none { it is KtFile }) return false
return super.canMove(adjustedElements, targetContainer) return super.canMove(adjustedElements, targetContainer, reference)
} }
override fun adjustForMove( override fun adjustForMove(