Minor: reformat code

This commit is contained in:
Dmitry Petrov
2018-03-16 15:22:20 +03:00
parent 26dc5840f1
commit bfcf1584a2
2 changed files with 108 additions and 105 deletions
@@ -55,8 +55,8 @@ class TypeAliasConstructorDescriptorImpl private constructor(
kind: Kind, kind: Kind,
source: SourceElement source: SourceElement
) : TypeAliasConstructorDescriptor, ) : TypeAliasConstructorDescriptor,
FunctionDescriptorImpl(typeAliasDescriptor, original, annotations, Name.special("<init>"), kind, source) FunctionDescriptorImpl(typeAliasDescriptor, original, annotations, Name.special("<init>"), kind, source) {
{
init { init {
isActual = typeAliasDescriptor.isActual isActual = typeAliasDescriptor.isActual
} }
@@ -75,8 +75,8 @@ class TypeAliasConstructorDescriptorImpl private constructor(
underlyingConstructorDescriptor.kind, underlyingConstructorDescriptor.kind,
typeAliasDescriptor.source typeAliasDescriptor.source
).also { typeAliasConstructor -> ).also { typeAliasConstructor ->
val substitutorForUnderlyingClass = typeAliasDescriptor.getTypeSubstitutorForUnderlyingClass() ?: val substitutorForUnderlyingClass =
return@createNullableLazyValue null typeAliasDescriptor.getTypeSubstitutorForUnderlyingClass() ?: return@createNullableLazyValue null
typeAliasConstructor.initialize( typeAliasConstructor.initialize(
null, null,
@@ -159,7 +159,8 @@ class TypeAliasConstructorDescriptorImpl private constructor(
underlyingConstructorDescriptor, underlyingConstructorDescriptor,
this, this,
annotations, annotations,
Kind.DECLARATION, source) Kind.DECLARATION, source
)
} }
companion object { companion object {
@@ -178,7 +179,8 @@ class TypeAliasConstructorDescriptorImpl private constructor(
val typeAliasConstructor = val typeAliasConstructor =
TypeAliasConstructorDescriptorImpl( TypeAliasConstructorDescriptorImpl(
storageManager, typeAliasDescriptor, constructor, null, constructor.annotations, storageManager, typeAliasDescriptor, constructor, null, constructor.annotations,
constructor.kind, typeAliasDescriptor.source) constructor.kind, typeAliasDescriptor.source
)
val valueParameters = val valueParameters =
FunctionDescriptorImpl.getSubstitutedValueParameters( FunctionDescriptorImpl.getSubstitutedValueParameters(
@@ -192,7 +194,8 @@ class TypeAliasConstructorDescriptorImpl private constructor(
returnTypeNoAbbreviation.unwrap().lowerIfFlexible().withAbbreviation(typeAliasDescriptor.defaultType) returnTypeNoAbbreviation.unwrap().lowerIfFlexible().withAbbreviation(typeAliasDescriptor.defaultType)
} }
val receiverParameterType = constructor.dispatchReceiverParameter?.let { substitutorForUnderlyingClass.safeSubstitute(it.type, Variance.INVARIANT) } val receiverParameterType =
constructor.dispatchReceiverParameter?.let { substitutorForUnderlyingClass.safeSubstitute(it.type, Variance.INVARIANT) }
typeAliasConstructor.initialize( typeAliasConstructor.initialize(
receiverParameterType, receiverParameterType,