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

Code cleanup: shadowed declarations filter

Browse Source
This commit is contained in:
Mikhail Glukhikh
2017-09-29 14:27:42 +03:00
parent edbf360852
commit 9aa25f8af8
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/ide-common/src/org/jetbrains/kotlin/idea/util/ShadowedDeclarationsFilter.kt
+9 -10
View File
@@ -102,14 +102,13 @@ class ShadowedDeclarationsFilter(
} }
} }
private fun signature(descriptor: DeclarationDescriptor): Any { private fun signature(descriptor: DeclarationDescriptor): Any =
return when (descriptor) { when (descriptor) {
is SimpleFunctionDescriptor -> FunctionSignature(descriptor) is SimpleFunctionDescriptor -> FunctionSignature(descriptor)
is VariableDescriptor -> descriptor.name is VariableDescriptor -> descriptor.name
is ClassDescriptor -> descriptor.importableFqName ?: descriptor is ClassDescriptor -> descriptor.importableFqName ?: descriptor
else -> descriptor else -> descriptor
} }
}
private fun packageName(descriptor: DeclarationDescriptor) = descriptor.importableFqName?.parent() private fun packageName(descriptor: DeclarationDescriptor) = descriptor.importableFqName?.parent()
@@ -122,7 +121,7 @@ class ShadowedDeclarationsFilter(
val first = descriptors.first() val first = descriptors.first()
if (first is ClassDescriptor) { // for classes with the same FQ-name we simply take the first one if (first is ClassDescriptor) { // for classes with the same FQ-name we simply take the first one
return listOf<TDescriptor>(first) return listOf(first)
} }
val isFunction = first is FunctionDescriptor val isFunction = first is FunctionDescriptor
@@ -203,7 +202,7 @@ class ShadowedDeclarationsFilter(
val dataFlowInfo = bindingContext.getDataFlowInfoBefore(context) val dataFlowInfo = bindingContext.getDataFlowInfoBefore(context)
val context = BasicCallResolutionContext.create(bindingTrace, scope, newCall, TypeUtils.NO_EXPECTED_TYPE, dataFlowInfo, val context = BasicCallResolutionContext.create(bindingTrace, scope, newCall, TypeUtils.NO_EXPECTED_TYPE, dataFlowInfo,
ContextDependency.INDEPENDENT, CheckArgumentTypesMode.CHECK_VALUE_ARGUMENTS, ContextDependency.INDEPENDENT, CheckArgumentTypesMode.CHECK_VALUE_ARGUMENTS,
false, resolutionFacade.frontendService<LanguageVersionSettings>()) false, /* languageVersionSettings */ resolutionFacade.frontendService())
val callResolver = resolutionFacade.frontendService<CallResolver>() val callResolver = resolutionFacade.frontendService<CallResolver>()
val results = if (isFunction) callResolver.resolveFunctionCall(context) else callResolver.resolveSimpleProperty(context) val results = if (isFunction) callResolver.resolveFunctionCall(context) else callResolver.resolveSimpleProperty(context)
val resultingDescriptors = results.resultingCalls.map { it.resultingDescriptor } val resultingDescriptors = results.resultingCalls.map { it.resultingDescriptor }