From 6ea82a0c7d2376d978b6131fe1d5875177deaa0e Mon Sep 17 00:00:00 2001 From: Dmitry Gridin Date: Wed, 23 Oct 2019 16:08:03 +0700 Subject: [PATCH] MoveMember: cleanup code --- .../idea/intentions/MoveMemberOutOfObjectIntention.kt | 7 ++++--- .../intentions/MoveMemberToCompanionObjectIntention.kt | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/MoveMemberOutOfObjectIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/MoveMemberOutOfObjectIntention.kt index 28e43eb14bf..5c5f3ebbcab 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/MoveMemberOutOfObjectIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/MoveMemberOutOfObjectIntention.kt @@ -28,12 +28,13 @@ import org.jetbrains.kotlin.psi.KtElement import org.jetbrains.kotlin.psi.KtNamedDeclaration import org.jetbrains.kotlin.psi.psiUtil.containingClassOrObject -abstract class MoveMemberOutOfObjectIntention(text: String) : SelfTargetingRangeIntention(KtNamedDeclaration::class.java, text) { +abstract class MoveMemberOutOfObjectIntention(text: String) : + SelfTargetingRangeIntention(KtNamedDeclaration::class.java, text) { override fun startInWriteAction() = false - abstract fun getDestination(element: KtNamedDeclaration) : KtElement + abstract fun getDestination(element: KtNamedDeclaration): KtElement - abstract fun addConflicts(element: KtNamedDeclaration,conflicts: MultiMap) + abstract fun addConflicts(element: KtNamedDeclaration, conflicts: MultiMap) override fun applyTo(element: KtNamedDeclaration, editor: Editor?) { val project = element.project diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/MoveMemberToCompanionObjectIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/MoveMemberToCompanionObjectIntention.kt index e5661ff21ee..1e5ebcbf342 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/MoveMemberToCompanionObjectIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/MoveMemberToCompanionObjectIntention.kt @@ -45,6 +45,7 @@ import org.jetbrains.kotlin.idea.caches.resolve.resolveToCall import org.jetbrains.kotlin.idea.caches.resolve.unsafeResolveToDescriptor import org.jetbrains.kotlin.idea.codeInsight.DescriptorToSourceUtilsIde import org.jetbrains.kotlin.idea.core.* +import org.jetbrains.kotlin.idea.core.util.runSynchronouslyWithProgress import org.jetbrains.kotlin.idea.quickfix.KotlinSingleIntentionActionFactory import org.jetbrains.kotlin.idea.refactoring.checkConflictsInteractively import org.jetbrains.kotlin.idea.refactoring.move.OuterInstanceReferenceUsageInfo @@ -52,7 +53,6 @@ import org.jetbrains.kotlin.idea.refactoring.move.collectOuterInstanceReferences import org.jetbrains.kotlin.idea.refactoring.move.moveDeclarations.* import org.jetbrains.kotlin.idea.refactoring.move.traverseOuterInstanceReferences import org.jetbrains.kotlin.idea.references.KtSimpleNameReference -import org.jetbrains.kotlin.idea.core.util.runSynchronouslyWithProgress import org.jetbrains.kotlin.idea.search.declarationsSearch.HierarchySearchRequest import org.jetbrains.kotlin.idea.search.declarationsSearch.searchOverriders import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers