Move to Companion: Fix AssertionError on running refactoring from Conflicts View
#KT-13874 Fixed
This commit is contained in:
@@ -112,6 +112,7 @@ These artifacts include extensions for the types available in the latter JDKs, s
|
||||
|
||||
- [`KT-9490`](https://youtrack.jetbrains.com/issue/KT-9490) Convert receiver to parameter: use template instead of the dialog
|
||||
- [`KT-11483`](https://youtrack.jetbrains.com/issue/KT-11483) Move to Companion: Do not use qualified names as labels
|
||||
- [`KT-13874`](https://youtrack.jetbrains.com/issue/KT-13874) Move to Companion: Fix AssertionError on running refactoring from Conflicts View
|
||||
|
||||
##### New features
|
||||
|
||||
|
||||
+5
-2
@@ -24,6 +24,7 @@ import com.intellij.util.containers.MultiMap
|
||||
import org.jetbrains.kotlin.idea.refactoring.checkConflictsInteractively
|
||||
import org.jetbrains.kotlin.idea.refactoring.move.moveDeclarations.*
|
||||
import org.jetbrains.kotlin.idea.refactoring.runSynchronouslyWithProgress
|
||||
import org.jetbrains.kotlin.idea.util.application.runWriteAction
|
||||
import org.jetbrains.kotlin.psi.*
|
||||
import org.jetbrains.kotlin.psi.psiUtil.containingClassOrObject
|
||||
import org.jetbrains.kotlin.psi.psiUtil.isAncestor
|
||||
@@ -73,8 +74,10 @@ class MoveMemberOutOfCompanionObjectIntention : SelfTargetingRangeIntention<KtNa
|
||||
}
|
||||
|
||||
project.checkConflictsInteractively(conflicts) {
|
||||
Mover.Default(element, targetClass)
|
||||
deleteCompanionIfEmpty()
|
||||
runWriteAction {
|
||||
Mover.Default(element, targetClass)
|
||||
deleteCompanionIfEmpty()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user