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

Reformat ContractSerializer.kt according to code style

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2018-11-19 14:38:42 +03:00
parent b86ea7621c
commit 44ae7a19e6
1 changed files with 33 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/serialization/src/org/jetbrains/kotlin/serialization/ContractSerializer.kt
+17 -9
View File
@@ -50,7 +50,11 @@ class ContractSerializer {
} }
} }
private fun fillEffectProto(builder: ProtoBuf.Effect.Builder, effectDeclaration: EffectDeclaration, contractDescription: ContractDescription) { private fun fillEffectProto(
builder: ProtoBuf.Effect.Builder,
effectDeclaration: EffectDeclaration,
contractDescription: ContractDescription
) {
when (effectDeclaration) { when (effectDeclaration) {
is ConditionalEffectDeclaration -> { is ConditionalEffectDeclaration -> {
builder.setConclusionOfConditionalEffect(contractExpressionProto(effectDeclaration.condition, contractDescription)) builder.setConclusionOfConditionalEffect(contractExpressionProto(effectDeclaration.condition, contractDescription))
@@ -59,8 +63,10 @@ class ContractSerializer {
is ReturnsEffectDeclaration -> { is ReturnsEffectDeclaration -> {
when { when {
effectDeclaration.value == ConstantReference.NOT_NULL -> builder.effectType = ProtoBuf.Effect.EffectType.RETURNS_NOT_NULL effectDeclaration.value == ConstantReference.NOT_NULL -> builder.effectType =
effectDeclaration.value == ConstantReference.WILDCARD -> builder.effectType = ProtoBuf.Effect.EffectType.RETURNS_CONSTANT ProtoBuf.Effect.EffectType.RETURNS_NOT_NULL
effectDeclaration.value == ConstantReference.WILDCARD -> builder.effectType =
ProtoBuf.Effect.EffectType.RETURNS_CONSTANT
else -> { else -> {
builder.effectType = ProtoBuf.Effect.EffectType.RETURNS_CONSTANT builder.effectType = ProtoBuf.Effect.EffectType.RETURNS_CONSTANT
builder.addEffectConstructorArgument(contractExpressionProto(effectDeclaration.value, contractDescription)) builder.addEffectConstructorArgument(contractExpressionProto(effectDeclaration.value, contractDescription))
@@ -81,7 +87,10 @@ class ContractSerializer {
} }
} }
private fun contractExpressionProto(contractDescriptionElement: ContractDescriptionElement, contractDescription: ContractDescription): ProtoBuf.Expression.Builder { private fun contractExpressionProto(
contractDescriptionElement: ContractDescriptionElement,
contractDescription: ContractDescription
): ProtoBuf.Expression.Builder {
return contractDescriptionElement.accept(object : ContractDescriptionVisitor<ProtoBuf.Expression.Builder, Unit> { return contractDescriptionElement.accept(object : ContractDescriptionVisitor<ProtoBuf.Expression.Builder, Unit> {
override fun visitLogicalOr(logicalOr: LogicalOr, data: Unit): ProtoBuf.Expression.Builder { override fun visitLogicalOr(logicalOr: LogicalOr, data: Unit): ProtoBuf.Expression.Builder {
val leftBuilder = logicalOr.left.accept(this, data) val leftBuilder = logicalOr.left.accept(this, data)
@@ -92,8 +101,7 @@ class ContractSerializer {
addOrArgument(leftBuilder) addOrArgument(leftBuilder)
addOrArgument(contractExpressionProto(logicalOr.right, contractDescription)) addOrArgument(contractExpressionProto(logicalOr.right, contractDescription))
} }
} } else {
else {
// we can save some space by re-using left builder instead of nesting new one // we can save some space by re-using left builder instead of nesting new one
leftBuilder.apply { addOrArgument(contractExpressionProto(logicalOr.right, contractDescription)) } leftBuilder.apply { addOrArgument(contractExpressionProto(logicalOr.right, contractDescription)) }
} }
@@ -108,8 +116,7 @@ class ContractSerializer {
addAndArgument(leftBuilder) addAndArgument(leftBuilder)
addAndArgument(contractExpressionProto(logicalAnd.right, contractDescription)) addAndArgument(contractExpressionProto(logicalAnd.right, contractDescription))
} }
} } else {
else {
// we can save some space by re-using left builder instead of nesting new one // we can save some space by re-using left builder instead of nesting new one
leftBuilder.apply { addAndArgument(contractExpressionProto(logicalAnd.right, contractDescription)) } leftBuilder.apply { addAndArgument(contractExpressionProto(logicalAnd.right, contractDescription)) }
} }
@@ -188,7 +195,8 @@ class ContractSerializer {
InvocationKind.UNKNOWN -> null InvocationKind.UNKNOWN -> null
} }
private fun constantValueProtobufEnum(constantReference: ConstantReference): ProtoBuf.Expression.ConstantValue? = when (constantReference) { private fun constantValueProtobufEnum(constantReference: ConstantReference): ProtoBuf.Expression.ConstantValue? =
when (constantReference) {
BooleanConstantReference.TRUE -> ProtoBuf.Expression.ConstantValue.TRUE BooleanConstantReference.TRUE -> ProtoBuf.Expression.ConstantValue.TRUE
BooleanConstantReference.FALSE -> ProtoBuf.Expression.ConstantValue.FALSE BooleanConstantReference.FALSE -> ProtoBuf.Expression.ConstantValue.FALSE
ConstantReference.NULL -> ProtoBuf.Expression.ConstantValue.NULL ConstantReference.NULL -> ProtoBuf.Expression.ConstantValue.NULL