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

Minor code refactorings

Browse Source
This commit is contained in:
Valentin Kipyatkov
2014-11-19 13:59:30 +03:00
parent 5036fdca14
commit 8006f16e46
1 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/util/extensionsUtils.kt
+8 -17
View File
@@ -31,6 +31,7 @@ import org.jetbrains.jet.lang.types.Variance
import org.jetbrains.jet.lang.resolve.calls.inference.ConstraintPosition import org.jetbrains.jet.lang.resolve.calls.inference.ConstraintPosition
import org.jetbrains.jet.lang.resolve.calls.inference.ConstraintsUtil import org.jetbrains.jet.lang.resolve.calls.inference.ConstraintsUtil
import org.jetbrains.jet.lang.resolve.name.Name import org.jetbrains.jet.lang.resolve.name.Name
import org.jetbrains.jet.utils.addIfNotNull
import java.util.HashSet import java.util.HashSet
public fun CallableDescriptor.isExtensionCallable(receivers: Collection<ReceiverValue>, public fun CallableDescriptor.isExtensionCallable(receivers: Collection<ReceiverValue>,
@@ -52,13 +53,8 @@ public fun CallableDescriptor.isExtensionCallable(
return false return false
} }
val types = SmartCastUtils.getSmartCastVariants(receiver, bindingContext, dataFlowInfo) return SmartCastUtils.getSmartCastVariants(receiver, bindingContext, dataFlowInfo)
.any { checkReceiverResolution(receiver, it, this) }
for (type in types) {
if (checkReceiverResolution(receiver, type, this)) return true
}
return false
} }
private fun checkReceiverResolution(receiverArgument: ReceiverValue, receiverType: JetType, callableDescriptor: CallableDescriptor): Boolean { private fun checkReceiverResolution(receiverArgument: ReceiverValue, receiverType: JetType, callableDescriptor: CallableDescriptor): Boolean {
@@ -73,7 +69,8 @@ private fun checkReceiverResolution(receiverArgument: ReceiverValue, receiverTyp
return false return false
} }
val typeNamesInReceiver = collectUsedTypeNames(receiverParameter.getType()) val typeNamesInReceiver = HashSet<Name>()
typeNamesInReceiver.addUsedTypeNames(receiverParameter.getType())
val constraintSystem = ConstraintSystemImpl() val constraintSystem = ConstraintSystemImpl()
val typeVariables = LinkedHashMap<TypeParameterDescriptor, Variance>() val typeVariables = LinkedHashMap<TypeParameterDescriptor, Variance>()
@@ -88,18 +85,12 @@ private fun checkReceiverResolution(receiverArgument: ReceiverValue, receiverTyp
return constraintSystem.getStatus().isSuccessful() && ConstraintsUtil.checkBoundsAreSatisfied(constraintSystem, true) return constraintSystem.getStatus().isSuccessful() && ConstraintsUtil.checkBoundsAreSatisfied(constraintSystem, true)
} }
private fun collectUsedTypeNames(jetType: JetType): Set<Name> { private fun MutableSet<Name>.addUsedTypeNames(jetType: JetType) {
val typeNames = HashSet<Name>()
val descriptor = jetType.getConstructor().getDeclarationDescriptor() val descriptor = jetType.getConstructor().getDeclarationDescriptor()
if (descriptor != null) { addIfNotNull(descriptor?.getName())
typeNames.add(descriptor.getName())
}
for (argument in jetType.getArguments()) { for (argument in jetType.getArguments()) {
typeNames.addAll(collectUsedTypeNames(argument.getType())) addUsedTypeNames(argument.getType())
} }
return typeNames
} }