From d204d65174fdbc744e0d203947b33d517de514d7 Mon Sep 17 00:00:00 2001
From: Kirill Rakhman <kirill.rakhman@jetbrains.com>
Date: Wed, 1 Feb 2023 17:00:49 +0100
Subject: [PATCH] [FIR] Reformat FirElementSerializer

---
 .../fir/serialization/FirElementSerializer.kt | 57 ++++++++++---------
 1 file changed, 30 insertions(+), 27 deletions(-)

diff --git a/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/FirElementSerializer.kt b/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/FirElementSerializer.kt
index a536e40e247..26a2c85286f 100644
--- a/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/FirElementSerializer.kt
+++ b/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/FirElementSerializer.kt
@@ -188,7 +188,8 @@ class FirElementSerializer private constructor(
         }
 
         fun FirClass.nestedClassifiers(): List<FirClassifierSymbol<*>> {
-            val scope = defaultType().scope(session, scopeSession, FakeOverrideTypeCalculator.DoNothing, requiredPhase = null) ?: return emptyList()
+            val scope =
+                defaultType().scope(session, scopeSession, FakeOverrideTypeCalculator.DoNothing, requiredPhase = null) ?: return emptyList()
             return buildList {
                 scope.getClassifierNames().mapNotNullTo(this) { scope.getSingleClassifier(it) }
                 addAll(providedNestedClassifiers)
@@ -636,36 +637,37 @@ class FirElementSerializer private constructor(
         return builder
     }
 
-    private fun typeParameterProto(typeParameter: FirTypeParameter): ProtoBuf.TypeParameter.Builder = whileAnalysing(session, typeParameter) {
-        val builder = ProtoBuf.TypeParameter.newBuilder()
+    private fun typeParameterProto(typeParameter: FirTypeParameter): ProtoBuf.TypeParameter.Builder =
+        whileAnalysing(session, typeParameter) {
+            val builder = ProtoBuf.TypeParameter.newBuilder()
 
-        builder.id = getTypeParameterId(typeParameter)
+            builder.id = getTypeParameterId(typeParameter)
 
-        builder.name = getSimpleNameIndex(typeParameter.name)
+            builder.name = getSimpleNameIndex(typeParameter.name)
 
-        if (typeParameter.isReified != builder.reified) {
-            builder.reified = typeParameter.isReified
-        }
-
-        val variance = ProtoEnumFlags.variance(typeParameter.variance)
-        if (variance != builder.variance) {
-            builder.variance = variance
-        }
-        extension.serializeTypeParameter(typeParameter, builder)
-
-        val upperBounds = typeParameter.bounds
-        if (upperBounds.size == 1 && upperBounds.single() is FirImplicitNullableAnyTypeRef) return builder
-
-        for (upperBound in upperBounds) {
-            if (useTypeTable()) {
-                builder.addUpperBoundId(typeId(upperBound))
-            } else {
-                builder.addUpperBound(typeProto(upperBound))
+            if (typeParameter.isReified != builder.reified) {
+                builder.reified = typeParameter.isReified
             }
-        }
 
-        return builder
-    }
+            val variance = ProtoEnumFlags.variance(typeParameter.variance)
+            if (variance != builder.variance) {
+                builder.variance = variance
+            }
+            extension.serializeTypeParameter(typeParameter, builder)
+
+            val upperBounds = typeParameter.bounds
+            if (upperBounds.size == 1 && upperBounds.single() is FirImplicitNullableAnyTypeRef) return builder
+
+            for (upperBound in upperBounds) {
+                if (useTypeTable()) {
+                    builder.addUpperBoundId(typeId(upperBound))
+                } else {
+                    builder.addUpperBound(typeProto(upperBound))
+                }
+            }
+
+            return builder
+        }
 
     fun typeId(typeRef: FirTypeRef): Int {
         if (typeRef !is FirResolvedTypeRef) {
@@ -978,7 +980,8 @@ class FirElementSerializer private constructor(
     private fun serializeVersionRequirementFromRequireKotlin(annotation: FirAnnotation): ProtoBuf.VersionRequirement.Builder? {
         val argumentMapping = annotation.argumentMapping.mapping
 
-        val versionString = (argumentMapping[RequireKotlinConstants.VERSION]?.toConstantValue(session) as? StringValue)?.value ?: return null
+        val versionString =
+            (argumentMapping[RequireKotlinConstants.VERSION]?.toConstantValue(session) as? StringValue)?.value ?: return null
         val matchResult = RequireKotlinConstants.VERSION_REGEX.matchEntire(versionString) ?: return null
 
         val major = matchResult.groupValues.getOrNull(1)?.toIntOrNull() ?: return null