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

Minor. Extract FlatSignature factory

Browse Source
This commit is contained in:
Denis Zharkov
2016-12-01 15:57:11 +03:00
parent c45edaa420
commit 83056c71c9
2 changed files with 26 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/results/FlatSignature.kt
+24 -13
View File
@@ -36,7 +36,7 @@ interface TypeSpecificityComparator {
}
}
class FlatSignature<out T>(
class FlatSignature<out T> private constructor(
val origin: T,
val typeParameters: Collection<TypeParameterDescriptor>,
val valueParameterTypes: List<KotlinType?>,
@@ -48,20 +48,31 @@ class FlatSignature<out T>(
val isGeneric = typeParameters.isNotEmpty()
companion object {
fun <D : CallableDescriptor> createFromCallableDescriptor(descriptor: D): FlatSignature<D> =
FlatSignature(descriptor,
descriptor.typeParameters,
valueParameterTypes = descriptor.extensionReceiverTypeOrEmpty() + descriptor.valueParameters.map { it.argumentValueType },
hasExtensionReceiver = descriptor.extensionReceiverParameter != null,
hasVarargs = descriptor.valueParameters.any { it.varargElementType != null },
numDefaults = 0,
isPlatform = descriptor is MemberDescriptor && descriptor.isPlatform)
fun <T> create(
origin: T,
descriptor: CallableDescriptor,
numDefaults: Int,
parameterTypes: List<KotlinType?>
): FlatSignature<T> {
val extensionReceiverType = descriptor.extensionReceiverParameter?.type
val ValueParameterDescriptor.argumentValueType: KotlinType
get() = varargElementType ?: type
return FlatSignature(origin,
descriptor.typeParameters,
valueParameterTypes =
extensionReceiverType.singletonOrEmptyList() + parameterTypes,
hasExtensionReceiver = extensionReceiverType != null,
hasVarargs = descriptor.valueParameters.any { it.varargElementType != null },
numDefaults = numDefaults,
isPlatform = descriptor is MemberDescriptor && descriptor.isPlatform
)
}
fun CallableDescriptor.extensionReceiverTypeOrEmpty() =
extensionReceiverParameter?.type.singletonOrEmptyList()
fun <D : CallableDescriptor> createFromCallableDescriptor(
descriptor: D
): FlatSignature<D> =
create(descriptor, descriptor, numDefaults = 0, parameterTypes = descriptor.valueParameters.map { it.argumentValueType })
val ValueParameterDescriptor.argumentValueType get() = varargElementType ?: type
}
}