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

Minor code refactoring

Browse Source
This commit is contained in:
Valentin Kipyatkov
2014-09-22 18:23:15 +04:00
committed by valentin
parent f4924299dd
commit 7d6542854b
1 changed files with 31 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/codeInsight/TipsManager.kt
+31 -28
View File
@@ -38,40 +38,43 @@ public object TipsManager{
val parent = expression.getParent() val parent = expression.getParent()
val resolutionScope = context[BindingContext.RESOLUTION_SCOPE, expression] ?: return listOf() val resolutionScope = context[BindingContext.RESOLUTION_SCOPE, expression] ?: return listOf()
val inPositionForCompletionWithReceiver = parent is JetCallExpression if (receiverExpression != null) {
|| parent is JetQualifiedExpression val inPositionForCompletionWithReceiver = parent is JetCallExpression
|| parent is JetBinaryExpression || parent is JetQualifiedExpression
if (receiverExpression != null && inPositionForCompletionWithReceiver) { || parent is JetBinaryExpression
val isInfixCall = parent is JetBinaryExpression if (inPositionForCompletionWithReceiver) {
fun filterIfInfix(descriptor: DeclarationDescriptor) val isInfixCall = parent is JetBinaryExpression
= if (isInfixCall) descriptor is SimpleFunctionDescriptor && descriptor.getValueParameters().size == 1 else true fun filterIfInfix(descriptor: DeclarationDescriptor)
= if (isInfixCall) descriptor is SimpleFunctionDescriptor && descriptor.getValueParameters().size == 1 else true
// Process as call expression // Process as call expression
val descriptors = HashSet<DeclarationDescriptor>() val descriptors = HashSet<DeclarationDescriptor>()
val qualifier = context[BindingContext.QUALIFIER, receiverExpression] val qualifier = context[BindingContext.QUALIFIER, receiverExpression]
if (qualifier != null) { if (qualifier != null) {
// It's impossible to add extension function for package or class (if it's class object, expression type is not null) // It's impossible to add extension function for package or class (if it's class object, expression type is not null)
qualifier.scope.getAllDescriptors().filterTo(descriptors, ::filterIfInfix) qualifier.scope.getAllDescriptors().filterTo(descriptors, ::filterIfInfix)
}
val expressionType = context[BindingContext.EXPRESSION_TYPE, receiverExpression]
if (expressionType != null && !expressionType.isError()) {
val receiverValue = ExpressionReceiver(receiverExpression, expressionType)
val dataFlowInfo = context.getDataFlowInfo(expression)
for (variant in AutoCastUtils.getAutoCastVariants(receiverValue, context, dataFlowInfo)) {
variant.getMemberScope().getAllDescriptors().filterTo(descriptors) { filterIfInfix(it) && !it.isExtension }
} }
JetScopeUtils.getAllExtensions(resolutionScope).filterTo(descriptors) { val expressionType = context[BindingContext.EXPRESSION_TYPE, receiverExpression]
ExpressionTypingUtils.checkIsExtensionCallable(receiverValue, it, isInfixCall, context, dataFlowInfo) if (expressionType != null && !expressionType.isError()) {
} val receiverValue = ExpressionReceiver(receiverExpression, expressionType)
} val dataFlowInfo = context.getDataFlowInfo(expression)
return descriptors for (variant in AutoCastUtils.getAutoCastVariants(receiverValue, context, dataFlowInfo)) {
variant.getMemberScope().getAllDescriptors().filterTo(descriptors) { filterIfInfix(it) && !it.isExtension }
}
JetScopeUtils.getAllExtensions(resolutionScope).filterTo(descriptors) {
ExpressionTypingUtils.checkIsExtensionCallable(receiverValue, it, isInfixCall, context, dataFlowInfo)
}
}
return descriptors
}
} }
else if (parent is JetImportDirective || parent is JetPackageDirective) {
if (parent is JetImportDirective || parent is JetPackageDirective) {
return excludeNonPackageDescriptors(resolutionScope.getAllDescriptors()) return excludeNonPackageDescriptors(resolutionScope.getAllDescriptors())
} }
else { else {