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

Minor. Reformat usagesSearch/utils.kt

Browse Source
This commit is contained in:
Denis Zharkov
2018-12-11 11:01:08 +03:00
parent 2b436b493c
commit 9e07b0d31a
1 changed files with 32 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/utils.kt
+32 -28
View File
@@ -31,9 +31,9 @@ import org.jetbrains.kotlin.asJava.toLightMethods
import org.jetbrains.kotlin.asJava.unwrapped import org.jetbrains.kotlin.asJava.unwrapped
import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.descriptors.*
import org.jetbrains.kotlin.idea.caches.resolve.analyze import org.jetbrains.kotlin.idea.caches.resolve.analyze
import org.jetbrains.kotlin.idea.caches.resolve.util.getJavaMethodDescriptor
import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptorIfAny import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptorIfAny
import org.jetbrains.kotlin.idea.caches.resolve.resolveToParameterDescriptorIfAny import org.jetbrains.kotlin.idea.caches.resolve.resolveToParameterDescriptorIfAny
import org.jetbrains.kotlin.idea.caches.resolve.util.getJavaMethodDescriptor
import org.jetbrains.kotlin.idea.references.unwrappedTargets import org.jetbrains.kotlin.idea.references.unwrappedTargets
import org.jetbrains.kotlin.idea.search.declarationsSearch.HierarchySearchRequest import org.jetbrains.kotlin.idea.search.declarationsSearch.HierarchySearchRequest
import org.jetbrains.kotlin.idea.search.declarationsSearch.searchInheritors import org.jetbrains.kotlin.idea.search.declarationsSearch.searchInheritors
@@ -67,22 +67,22 @@ val KtParameter.propertyDescriptor: PropertyDescriptor?
get() = this.resolveToDescriptorIfAny(BodyResolveMode.FULL) as? PropertyDescriptor get() = this.resolveToDescriptorIfAny(BodyResolveMode.FULL) as? PropertyDescriptor
fun PsiReference.checkUsageVsOriginalDescriptor( fun PsiReference.checkUsageVsOriginalDescriptor(
targetDescriptor: DeclarationDescriptor, targetDescriptor: DeclarationDescriptor,
declarationToDescriptor: (KtDeclaration) -> DeclarationDescriptor? = {it.descriptor}, declarationToDescriptor: (KtDeclaration) -> DeclarationDescriptor? = { it.descriptor },
checker: (usageDescriptor: DeclarationDescriptor, targetDescriptor: DeclarationDescriptor) -> Boolean checker: (usageDescriptor: DeclarationDescriptor, targetDescriptor: DeclarationDescriptor) -> Boolean
): Boolean { ): Boolean {
return unwrappedTargets return unwrappedTargets
.filterIsInstance<KtDeclaration>() .filterIsInstance<KtDeclaration>()
.any { .any {
val usageDescriptor = declarationToDescriptor(it) val usageDescriptor = declarationToDescriptor(it)
usageDescriptor != null && checker(usageDescriptor, targetDescriptor) usageDescriptor != null && checker(usageDescriptor, targetDescriptor)
} }
} }
fun PsiReference.isImportUsage(): Boolean = fun PsiReference.isImportUsage(): Boolean =
element!!.getNonStrictParentOfType<KtImportDirective>() != null element!!.getNonStrictParentOfType<KtImportDirective>() != null
fun PsiReference.isConstructorUsage(ktClassOrObject: KtClassOrObject): Boolean = with (element!!) { fun PsiReference.isConstructorUsage(ktClassOrObject: KtClassOrObject): Boolean = with(element!!) {
fun checkJavaUsage(): Boolean { fun checkJavaUsage(): Boolean {
val call = getNonStrictParentOfType<PsiConstructorCall>() val call = getNonStrictParentOfType<PsiConstructorCall>()
return call == parent && call?.resolveConstructor()?.containingClass?.navigationElement == ktClassOrObject return call == parent && call?.resolveConstructor()?.containingClass?.navigationElement == ktClassOrObject
@@ -132,7 +132,10 @@ fun PsiElement.buildProcessDelegationCallConstructorUsagesTask(scope: SearchScop
return { task1() && task2() } return { task1() && task2() }
} }
private fun PsiElement.buildProcessDelegationCallKotlinConstructorUsagesTask(scope: SearchScope, process: (KtCallElement) -> Boolean): () -> Boolean { private fun PsiElement.buildProcessDelegationCallKotlinConstructorUsagesTask(
scope: SearchScope,
process: (KtCallElement) -> Boolean
): () -> Boolean {
val element = unwrapped val element = unwrapped
if (element != null && element !in scope) return { true } if (element != null && element !in scope) return { true }
@@ -151,7 +154,10 @@ private fun PsiElement.buildProcessDelegationCallKotlinConstructorUsagesTask(sco
return { processInheritorsDelegatingCallToSpecifiedConstructor(klass, scope, descriptor, process) } return { processInheritorsDelegatingCallToSpecifiedConstructor(klass, scope, descriptor, process) }
} }
private fun PsiElement.buildProcessDelegationCallJavaConstructorUsagesTask(scope: SearchScope, process: (KtCallElement) -> Boolean): () -> Boolean { private fun PsiElement.buildProcessDelegationCallJavaConstructorUsagesTask(
scope: SearchScope,
process: (KtCallElement) -> Boolean
): () -> Boolean {
if (this is KtLightElement<*, *>) return { true } if (this is KtLightElement<*, *>) return { true }
// TODO: Temporary hack to avoid NPE while KotlinNoOriginLightMethod is around // TODO: Temporary hack to avoid NPE while KotlinNoOriginLightMethod is around
if (this is KtLightMethod && this.kotlinOrigin == null) return { true } if (this is KtLightMethod && this.kotlinOrigin == null) return { true }
@@ -163,10 +169,10 @@ private fun PsiElement.buildProcessDelegationCallJavaConstructorUsagesTask(scope
private fun processInheritorsDelegatingCallToSpecifiedConstructor( private fun processInheritorsDelegatingCallToSpecifiedConstructor(
klass: PsiElement, klass: PsiElement,
scope: SearchScope, scope: SearchScope,
descriptor: ConstructorDescriptor, descriptor: ConstructorDescriptor,
process: (KtCallElement) -> Boolean process: (KtCallElement) -> Boolean
): Boolean { ): Boolean {
return HierarchySearchRequest(klass, scope, false).searchInheritors().all { return HierarchySearchRequest(klass, scope, false).searchInheritors().all {
runReadAction { runReadAction {
@@ -180,7 +186,7 @@ private fun processInheritorsDelegatingCallToSpecifiedConstructor(
} }
private fun processClassDelegationCallsToSpecifiedConstructor( private fun processClassDelegationCallsToSpecifiedConstructor(
klass: KtClass, constructor: DeclarationDescriptor, process: (KtCallElement) -> Boolean klass: KtClass, constructor: DeclarationDescriptor, process: (KtCallElement) -> Boolean
): Boolean { ): Boolean {
for (secondaryConstructor in klass.secondaryConstructors) { for (secondaryConstructor in klass.secondaryConstructors) {
val delegationCallDescriptor = secondaryConstructor.getDelegationCall().getConstructorCallDescriptor() val delegationCallDescriptor = secondaryConstructor.getDelegationCall().getConstructorCallDescriptor()
@@ -210,13 +216,13 @@ fun PsiReference.isExtensionOfDeclarationClassUsage(declaration: KtNamedDeclarat
usageDescriptor !is FunctionDescriptor -> false usageDescriptor !is FunctionDescriptor -> false
else -> { else -> {
val receiverDescriptor = val receiverDescriptor =
usageDescriptor.extensionReceiverParameter?.type?.constructor?.declarationDescriptor usageDescriptor.extensionReceiverParameter?.type?.constructor?.declarationDescriptor
val containingDescriptor = targetDescriptor.containingDeclaration val containingDescriptor = targetDescriptor.containingDeclaration
containingDescriptor == receiverDescriptor containingDescriptor == receiverDescriptor
|| (containingDescriptor is ClassDescriptor || (containingDescriptor is ClassDescriptor
&& receiverDescriptor is ClassDescriptor && receiverDescriptor is ClassDescriptor
&& DescriptorUtils.isSubclass(containingDescriptor, receiverDescriptor)) && DescriptorUtils.isSubclass(containingDescriptor, receiverDescriptor))
} }
} }
} }
@@ -228,7 +234,7 @@ fun PsiReference.isUsageInContainingDeclaration(declaration: KtNamedDeclaration)
val descriptor = declaration.descriptor ?: return false val descriptor = declaration.descriptor ?: return false
return checkUsageVsOriginalDescriptor(descriptor) { usageDescriptor, targetDescriptor -> return checkUsageVsOriginalDescriptor(descriptor) { usageDescriptor, targetDescriptor ->
usageDescriptor != targetDescriptor usageDescriptor != targetDescriptor
&& usageDescriptor.containingDeclaration == targetDescriptor.containingDeclaration && usageDescriptor.containingDeclaration == targetDescriptor.containingDeclaration
} }
} }
@@ -237,8 +243,7 @@ fun PsiReference.isCallableOverrideUsage(declaration: KtNamedDeclaration): Boole
if (declaration is KtParameter) { if (declaration is KtParameter) {
// we don't treat parameters in overriding method as "override" here (overriding parameters usages are searched optionally and via searching of overriding methods first) // we don't treat parameters in overriding method as "override" here (overriding parameters usages are searched optionally and via searching of overriding methods first)
if (declaration.hasValOrVar()) declaration.propertyDescriptor else null if (declaration.hasValOrVar()) declaration.propertyDescriptor else null
} } else {
else {
declaration.descriptor as? CallableDescriptor declaration.descriptor as? CallableDescriptor
} }
} }
@@ -263,8 +268,7 @@ fun PsiElement.searchReferencesOrMethodReferences(): Collection<PsiReference> {
val lightMethods = toLightMethods() val lightMethods = toLightMethods()
return if (lightMethods.isNotEmpty()) { return if (lightMethods.isNotEmpty()) {
lightMethods.flatMapTo(LinkedHashSet()) { MethodReferencesSearch.search(it) } lightMethods.flatMapTo(LinkedHashSet()) { MethodReferencesSearch.search(it) }
} } else {
else {
ReferencesSearch.search(this).findAll() ReferencesSearch.search(this).findAll()
} }
} }