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

MoveMemberOutOfCompanionObject: reformat

Browse Source
This commit is contained in:
Mikhail Glukhikh
2018-02-14 11:11:49 +03:00
parent d4dbd4cd6a
commit 57d0da9843
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/intentions/MoveMemberOutOfCompanionObjectIntention.kt
+16 -16
View File
@@ -47,22 +47,22 @@ class MoveMemberOutOfCompanionObjectIntention : MoveMemberOutOfObjectIntention("
val refsRequiringClassInstance = element.project.runSynchronouslyWithProgress("Searching for ${element.name}", true) { val refsRequiringClassInstance = element.project.runSynchronouslyWithProgress("Searching for ${element.name}", true) {
runReadAction { runReadAction {
ReferencesSearch ReferencesSearch
.search(element) .search(element)
.mapNotNull { it.element } .mapNotNull { it.element }
.filter { .filter {
if (it !is KtElement) return@filter true if (it !is KtElement) return@filter true
val resolvedCall = it.getResolvedCall(it.analyze()) ?: return@filter false val resolvedCall = it.getResolvedCall(it.analyze()) ?: return@filter false
val dispatchReceiver = resolvedCall.dispatchReceiver ?: return@filter false val dispatchReceiver = resolvedCall.dispatchReceiver ?: return@filter false
if (dispatchReceiver !is ImplicitClassReceiver) return@filter true if (dispatchReceiver !is ImplicitClassReceiver) return@filter true
it.parents it.parents
.filterIsInstance<KtClassOrObject>() .filterIsInstance<KtClassOrObject>()
.none { .none {
val classDescriptor = it.resolveToDescriptorIfAny() as? ClassDescriptor val classDescriptor = it.resolveToDescriptorIfAny() as? ClassDescriptor
if (classDescriptor != null && classDescriptor.isSubclassOf(targetClassDescriptor)) return@none true if (classDescriptor != null && classDescriptor.isSubclassOf(targetClassDescriptor)) return@none true
if (it.isTopLevel() || it is KtObjectDeclaration || (it is KtClass && !it.isInner())) return@filter true if (it.isTopLevel() || it is KtObjectDeclaration || (it is KtClass && !it.isInner())) return@filter true
false false
} }
} }
} }
} ?: return } ?: return