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

Move: Fix element listener retrieval

Browse Source 
Get element listener before original declaration is invalidated by the refactoring
This commit is contained in:
Alexey Sedunov
2017-03-09 01:28:30 +03:00
parent 1a8aa6091a
commit d1857d68bc
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/MoveKotlinDeclarationsProcessor.kt
+3 -1
View File
@@ -260,6 +260,8 @@ class MoveKotlinDeclarationsProcessor(
) )
for ((sourceFile, kotlinToLightElements) in kotlinToLightElementsBySourceFile) { for ((sourceFile, kotlinToLightElements) in kotlinToLightElementsBySourceFile) {
for ((oldDeclaration, oldLightElements) in kotlinToLightElements) { for ((oldDeclaration, oldLightElements) in kotlinToLightElements) {
val elementListener = transaction!!.getElementListener(oldDeclaration)
val newDeclaration = moveDeclaration(oldDeclaration, descriptor.moveTarget) val newDeclaration = moveDeclaration(oldDeclaration, descriptor.moveTarget)
if (newDeclaration == null) { if (newDeclaration == null) {
for (oldElement in oldLightElements) { for (oldElement in oldLightElements) {
@@ -270,7 +272,7 @@ class MoveKotlinDeclarationsProcessor(
oldToNewElementsMapping[sourceFile] = newDeclaration.containingKtFile oldToNewElementsMapping[sourceFile] = newDeclaration.containingKtFile
transaction!!.getElementListener(oldDeclaration).elementMoved(newDeclaration) elementListener.elementMoved(newDeclaration)
for ((oldElement, newElement) in oldLightElements.asSequence().zip(newDeclaration.toLightElements().asSequence())) { for ((oldElement, newElement) in oldLightElements.asSequence().zip(newDeclaration.toLightElements().asSequence())) {
oldToNewElementsMapping[oldElement] = newElement oldToNewElementsMapping[oldElement] = newElement
} }