Reformat IR tree declarations and implementations

Most of the changes are to the incorrect formatting introduced in
d1fd1da56f.

compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrClass.kt

@@ -28,22 +28,22 @@ import org.jetbrains.kotlin.name.Name
 import java.util.*
 
 internal class PersistentIrClass(
-        override val startOffset: Int,
-        override val endOffset: Int,
-        origin: IrDeclarationOrigin,
-        override val symbol: IrClassSymbol,
-        override val name: Name,
-        override val kind: ClassKind,
-        visibility: DescriptorVisibility,
-        modality: Modality,
-        override val isCompanion: Boolean = false,
-        override val isInner: Boolean = false,
-        override val isData: Boolean = false,
-        override val isExternal: Boolean = false,
-        override val isInline: Boolean = false,
-        override val isExpect: Boolean = false,
-        override val isFun: Boolean = false,
-        override val source: SourceElement = SourceElement.NO_SOURCE
+    override val startOffset: Int,
+    override val endOffset: Int,
+    origin: IrDeclarationOrigin,
+    override val symbol: IrClassSymbol,
+    override val name: Name,
+    override val kind: ClassKind,
+    visibility: DescriptorVisibility,
+    modality: Modality,
+    override val isCompanion: Boolean = false,
+    override val isInner: Boolean = false,
+    override val isData: Boolean = false,
+    override val isExternal: Boolean = false,
+    override val isInline: Boolean = false,
+    override val isExpect: Boolean = false,
+    override val isFun: Boolean = false,
+    override val source: SourceElement = SourceElement.NO_SOURCE
 ) : IrClass(),
     PersistentIrDeclarationBase<ClassCarrier>,
     ClassCarrier {

compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrConstructor.kt

@@ -31,18 +31,18 @@ import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource
 
 internal class PersistentIrConstructor(
-        override val startOffset: Int,
-        override val endOffset: Int,
-        origin: IrDeclarationOrigin,
-        override val symbol: IrConstructorSymbol,
-        override val name: Name,
-        visibility: DescriptorVisibility,
-        returnType: IrType,
-        override val isInline: Boolean,
-        override val isExternal: Boolean,
-        override val isPrimary: Boolean,
-        override val isExpect: Boolean,
-        override val containerSource: DeserializedContainerSource?
+    override val startOffset: Int,
+    override val endOffset: Int,
+    origin: IrDeclarationOrigin,
+    override val symbol: IrConstructorSymbol,
+    override val name: Name,
+    visibility: DescriptorVisibility,
+    returnType: IrType,
+    override val isInline: Boolean,
+    override val isExternal: Boolean,
+    override val isPrimary: Boolean,
+    override val isExpect: Boolean,
+    override val containerSource: DeserializedContainerSource?
 ) : IrConstructor(),
     PersistentIrDeclarationBase<ConstructorCarrier>,
     ConstructorCarrier {

compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrFactory.kt

@@ -30,22 +30,22 @@ object PersistentIrFactory : IrFactory {
         PersistentIrAnonymousInitializer(startOffset, endOffset, origin, symbol, isStatic)
 
     override fun createClass(
-            startOffset: Int,
-            endOffset: Int,
-            origin: IrDeclarationOrigin,
-            symbol: IrClassSymbol,
-            name: Name,
-            kind: ClassKind,
-            visibility: DescriptorVisibility,
-            modality: Modality,
-            isCompanion: Boolean,
-            isInner: Boolean,
-            isData: Boolean,
-            isExternal: Boolean,
-            isInline: Boolean,
-            isExpect: Boolean,
-            isFun: Boolean,
-            source: SourceElement,
+        startOffset: Int,
+        endOffset: Int,
+        origin: IrDeclarationOrigin,
+        symbol: IrClassSymbol,
+        name: Name,
+        kind: ClassKind,
+        visibility: DescriptorVisibility,
+        modality: Modality,
+        isCompanion: Boolean,
+        isInner: Boolean,
+        isData: Boolean,
+        isExternal: Boolean,
+        isInline: Boolean,
+        isExpect: Boolean,
+        isFun: Boolean,
+        source: SourceElement,
     ): IrClass =
         PersistentIrClass(
             startOffset, endOffset, origin, symbol, name, kind, visibility, modality,
@@ -53,18 +53,18 @@ object PersistentIrFactory : IrFactory {
         )
 
     override fun createConstructor(
-            startOffset: Int,
-            endOffset: Int,
-            origin: IrDeclarationOrigin,
-            symbol: IrConstructorSymbol,
-            name: Name,
-            visibility: DescriptorVisibility,
-            returnType: IrType,
-            isInline: Boolean,
-            isExternal: Boolean,
-            isPrimary: Boolean,
-            isExpect: Boolean,
-            containerSource: DeserializedContainerSource?,
+        startOffset: Int,
+        endOffset: Int,
+        origin: IrDeclarationOrigin,
+        symbol: IrConstructorSymbol,
+        name: Name,
+        visibility: DescriptorVisibility,
+        returnType: IrType,
+        isInline: Boolean,
+        isExternal: Boolean,
+        isPrimary: Boolean,
+        isExpect: Boolean,
+        containerSource: DeserializedContainerSource?,
     ): IrConstructor =
         PersistentIrConstructor(
             startOffset, endOffset, origin, symbol, name, visibility, returnType, isInline, isExternal, isPrimary, isExpect,
@@ -88,37 +88,37 @@ object PersistentIrFactory : IrFactory {
         PersistentIrErrorDeclaration(startOffset, endOffset, descriptor)
 
     override fun createField(
-            startOffset: Int,
-            endOffset: Int,
-            origin: IrDeclarationOrigin,
-            symbol: IrFieldSymbol,
-            name: Name,
-            type: IrType,
-            visibility: DescriptorVisibility,
-            isFinal: Boolean,
-            isExternal: Boolean,
-            isStatic: Boolean,
+        startOffset: Int,
+        endOffset: Int,
+        origin: IrDeclarationOrigin,
+        symbol: IrFieldSymbol,
+        name: Name,
+        type: IrType,
+        visibility: DescriptorVisibility,
+        isFinal: Boolean,
+        isExternal: Boolean,
+        isStatic: Boolean,
     ): IrField =
         PersistentIrField(startOffset, endOffset, origin, symbol, name, type, visibility, isFinal, isExternal, isStatic)
 
     override fun createFunction(
-            startOffset: Int,
-            endOffset: Int,
-            origin: IrDeclarationOrigin,
-            symbol: IrSimpleFunctionSymbol,
-            name: Name,
-            visibility: DescriptorVisibility,
-            modality: Modality,
-            returnType: IrType,
-            isInline: Boolean,
-            isExternal: Boolean,
-            isTailrec: Boolean,
-            isSuspend: Boolean,
-            isOperator: Boolean,
-            isInfix: Boolean,
-            isExpect: Boolean,
-            isFakeOverride: Boolean,
-            containerSource: DeserializedContainerSource?,
+        startOffset: Int,
+        endOffset: Int,
+        origin: IrDeclarationOrigin,
+        symbol: IrSimpleFunctionSymbol,
+        name: Name,
+        visibility: DescriptorVisibility,
+        modality: Modality,
+        returnType: IrType,
+        isInline: Boolean,
+        isExternal: Boolean,
+        isTailrec: Boolean,
+        isSuspend: Boolean,
+        isOperator: Boolean,
+        isInfix: Boolean,
+        isExpect: Boolean,
+        isFakeOverride: Boolean,
+        containerSource: DeserializedContainerSource?,
     ): IrSimpleFunction =
         PersistentIrFunction(
             startOffset, endOffset, origin, symbol, name, visibility, modality, returnType,
@@ -127,20 +127,20 @@ object PersistentIrFactory : IrFactory {
         )
 
     override fun createFakeOverrideFunction(
-            startOffset: Int,
-            endOffset: Int,
-            origin: IrDeclarationOrigin,
-            name: Name,
-            visibility: DescriptorVisibility,
-            modality: Modality,
-            returnType: IrType,
-            isInline: Boolean,
-            isExternal: Boolean,
-            isTailrec: Boolean,
-            isSuspend: Boolean,
-            isOperator: Boolean,
-            isInfix: Boolean,
-            isExpect: Boolean,
+        startOffset: Int,
+        endOffset: Int,
+        origin: IrDeclarationOrigin,
+        name: Name,
+        visibility: DescriptorVisibility,
+        modality: Modality,
+        returnType: IrType,
+        isInline: Boolean,
+        isExternal: Boolean,
+        isTailrec: Boolean,
+        isSuspend: Boolean,
+        isOperator: Boolean,
+        isInfix: Boolean,
+        isExpect: Boolean,
     ): IrSimpleFunction =
         PersistentIrFakeOverrideFunction(
             startOffset, endOffset, origin, name, visibility, modality, returnType,
@@ -161,21 +161,21 @@ object PersistentIrFactory : IrFactory {
         )
 
     override fun createProperty(
-            startOffset: Int,
-            endOffset: Int,
-            origin: IrDeclarationOrigin,
-            symbol: IrPropertySymbol,
-            name: Name,
-            visibility: DescriptorVisibility,
-            modality: Modality,
-            isVar: Boolean,
-            isConst: Boolean,
-            isLateinit: Boolean,
-            isDelegated: Boolean,
-            isExternal: Boolean,
-            isExpect: Boolean,
-            isFakeOverride: Boolean,
-            containerSource: DeserializedContainerSource?,
+        startOffset: Int,
+        endOffset: Int,
+        origin: IrDeclarationOrigin,
+        symbol: IrPropertySymbol,
+        name: Name,
+        visibility: DescriptorVisibility,
+        modality: Modality,
+        isVar: Boolean,
+        isConst: Boolean,
+        isLateinit: Boolean,
+        isDelegated: Boolean,
+        isExternal: Boolean,
+        isExpect: Boolean,
+        isFakeOverride: Boolean,
+        containerSource: DeserializedContainerSource?,
     ): IrProperty =
         PersistentIrProperty(
             startOffset, endOffset, origin, symbol, name, visibility, modality,
@@ -184,18 +184,18 @@ object PersistentIrFactory : IrFactory {
         )
 
     override fun createFakeOverrideProperty(
-            startOffset: Int,
-            endOffset: Int,
-            origin: IrDeclarationOrigin,
-            name: Name,
-            visibility: DescriptorVisibility,
-            modality: Modality,
-            isVar: Boolean,
-            isConst: Boolean,
-            isLateinit: Boolean,
-            isDelegated: Boolean,
-            isExternal: Boolean,
-            isExpect: Boolean,
+        startOffset: Int,
+        endOffset: Int,
+        origin: IrDeclarationOrigin,
+        name: Name,
+        visibility: DescriptorVisibility,
+        modality: Modality,
+        isVar: Boolean,
+        isConst: Boolean,
+        isLateinit: Boolean,
+        isDelegated: Boolean,
+        isExternal: Boolean,
+        isExpect: Boolean,
     ): IrProperty =
         PersistentIrFakeOverrideProperty(
             startOffset, endOffset, origin, name, visibility, modality,
@@ -203,14 +203,14 @@ object PersistentIrFactory : IrFactory {
         )
 
     override fun createTypeAlias(
-            startOffset: Int,
-            endOffset: Int,
-            symbol: IrTypeAliasSymbol,
-            name: Name,
-            visibility: DescriptorVisibility,
-            expandedType: IrType,
-            isActual: Boolean,
-            origin: IrDeclarationOrigin,
+        startOffset: Int,
+        endOffset: Int,
+        symbol: IrTypeAliasSymbol,
+        name: Name,
+        visibility: DescriptorVisibility,
+        expandedType: IrType,
+        isActual: Boolean,
+        origin: IrDeclarationOrigin,
     ): IrTypeAlias =
         PersistentIrTypeAlias(startOffset, endOffset, symbol, name, visibility, expandedType, isActual, origin)
 
@@ -239,7 +239,9 @@ object PersistentIrFactory : IrFactory {
         isNoinline: Boolean,
         isHidden: Boolean
     ): IrValueParameter =
-        PersistentIrValueParameter(startOffset, endOffset, origin, symbol, name, index, type, varargElementType, isCrossinline, isNoinline, isHidden)
+        PersistentIrValueParameter(
+            startOffset, endOffset, origin, symbol, name, index, type, varargElementType, isCrossinline, isNoinline, isHidden
+        )
 
     override fun createExpressionBody(
         startOffset: Int,

compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrField.kt

@@ -30,16 +30,16 @@ import org.jetbrains.kotlin.ir.types.IrType
 import org.jetbrains.kotlin.name.Name
 
 internal class PersistentIrField(
-        override val startOffset: Int,
-        override val endOffset: Int,
-        origin: IrDeclarationOrigin,
-        override val symbol: IrFieldSymbol,
-        override val name: Name,
-        type: IrType,
-        override var visibility: DescriptorVisibility,
-        override val isFinal: Boolean,
-        override val isExternal: Boolean,
-        override val isStatic: Boolean
+    override val startOffset: Int,
+    override val endOffset: Int,
+    origin: IrDeclarationOrigin,
+    override val symbol: IrFieldSymbol,
+    override val name: Name,
+    type: IrType,
+    override var visibility: DescriptorVisibility,
+    override val isFinal: Boolean,
+    override val isExternal: Boolean,
+    override val isStatic: Boolean
 ) : IrField(),
     PersistentIrDeclarationBase<FieldCarrier>,
     FieldCarrier {

compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrFunction.kt

@@ -23,20 +23,20 @@ import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource
 
 internal abstract class PersistentIrFunctionCommon(
-        override val startOffset: Int,
-        override val endOffset: Int,
-        origin: IrDeclarationOrigin,
-        override val name: Name,
-        visibility: DescriptorVisibility,
-        returnType: IrType,
-        override val isInline: Boolean,
-        override val isExternal: Boolean,
-        override val isTailrec: Boolean,
-        override val isSuspend: Boolean,
-        override val isOperator: Boolean,
-        override val isInfix: Boolean,
-        override val isExpect: Boolean,
-        override val containerSource: DeserializedContainerSource? = null
+    override val startOffset: Int,
+    override val endOffset: Int,
+    origin: IrDeclarationOrigin,
+    override val name: Name,
+    visibility: DescriptorVisibility,
+    returnType: IrType,
+    override val isInline: Boolean,
+    override val isExternal: Boolean,
+    override val isTailrec: Boolean,
+    override val isSuspend: Boolean,
+    override val isOperator: Boolean,
+    override val isInfix: Boolean,
+    override val isExpect: Boolean,
+    override val containerSource: DeserializedContainerSource? = null
 ) : IrSimpleFunction(),
     PersistentIrDeclarationBase<FunctionCarrier>,
     FunctionCarrier {
@@ -175,23 +175,23 @@ internal abstract class PersistentIrFunctionCommon(
 }
 
 internal class PersistentIrFunction(
-        startOffset: Int,
-        endOffset: Int,
-        origin: IrDeclarationOrigin,
-        override val symbol: IrSimpleFunctionSymbol,
-        name: Name,
-        visibility: DescriptorVisibility,
-        override val modality: Modality,
-        returnType: IrType,
-        isInline: Boolean,
-        isExternal: Boolean,
-        isTailrec: Boolean,
-        isSuspend: Boolean,
-        isOperator: Boolean,
-        isInfix: Boolean,
-        isExpect: Boolean,
-        override val isFakeOverride: Boolean = origin == IrDeclarationOrigin.FAKE_OVERRIDE,
-        containerSource: DeserializedContainerSource?
+    startOffset: Int,
+    endOffset: Int,
+    origin: IrDeclarationOrigin,
+    override val symbol: IrSimpleFunctionSymbol,
+    name: Name,
+    visibility: DescriptorVisibility,
+    override val modality: Modality,
+    returnType: IrType,
+    isInline: Boolean,
+    isExternal: Boolean,
+    isTailrec: Boolean,
+    isSuspend: Boolean,
+    isOperator: Boolean,
+    isInfix: Boolean,
+    isExpect: Boolean,
+    override val isFakeOverride: Boolean = origin == IrDeclarationOrigin.FAKE_OVERRIDE,
+    containerSource: DeserializedContainerSource?
 ) : PersistentIrFunctionCommon(
     startOffset, endOffset, origin, name, visibility, returnType, isInline,
     isExternal, isTailrec, isSuspend, isOperator, isInfix, isExpect,
@@ -207,20 +207,20 @@ internal class PersistentIrFunction(
 }
 
 internal class PersistentIrFakeOverrideFunction(
-        startOffset: Int,
-        endOffset: Int,
-        origin: IrDeclarationOrigin,
-        name: Name,
-        override var visibility: DescriptorVisibility,
-        override var modality: Modality,
-        returnType: IrType,
-        isInline: Boolean,
-        isExternal: Boolean,
-        isTailrec: Boolean,
-        isSuspend: Boolean,
-        isOperator: Boolean,
-        isInfix: Boolean,
-        isExpect: Boolean,
+    startOffset: Int,
+    endOffset: Int,
+    origin: IrDeclarationOrigin,
+    name: Name,
+    override var visibility: DescriptorVisibility,
+    override var modality: Modality,
+    returnType: IrType,
+    isInline: Boolean,
+    isExternal: Boolean,
+    isTailrec: Boolean,
+    isSuspend: Boolean,
+    isOperator: Boolean,
+    isInfix: Boolean,
+    isExpect: Boolean,
 ) : PersistentIrFunctionCommon(
     startOffset, endOffset, origin, name, visibility, returnType, isInline,
     isExternal, isTailrec, isSuspend, isOperator, isInfix, isExpect,

compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrProperty.kt

@@ -30,18 +30,18 @@ import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource
 
 internal abstract class PersistentIrPropertyCommon(
-        override val startOffset: Int,
-        override val endOffset: Int,
-        origin: IrDeclarationOrigin,
-        override val name: Name,
-        override var visibility: DescriptorVisibility,
-        override val isVar: Boolean,
-        override val isConst: Boolean,
-        override val isLateinit: Boolean,
-        override val isDelegated: Boolean,
-        override val isExternal: Boolean,
-        override val isExpect: Boolean,
-        override val containerSource: DeserializedContainerSource?,
+    override val startOffset: Int,
+    override val endOffset: Int,
+    origin: IrDeclarationOrigin,
+    override val name: Name,
+    override var visibility: DescriptorVisibility,
+    override val isVar: Boolean,
+    override val isConst: Boolean,
+    override val isLateinit: Boolean,
+    override val isDelegated: Boolean,
+    override val isExternal: Boolean,
+    override val isExpect: Boolean,
+    override val containerSource: DeserializedContainerSource?,
 ) : IrProperty(),
     PersistentIrDeclarationBase<PropertyCarrier>,
     PropertyCarrier {
@@ -109,21 +109,21 @@ internal abstract class PersistentIrPropertyCommon(
 }
 
 internal class PersistentIrProperty(
-        startOffset: Int,
-        endOffset: Int,
-        origin: IrDeclarationOrigin,
-        override val symbol: IrPropertySymbol,
-        name: Name,
-        visibility: DescriptorVisibility,
-        override val modality: Modality,
-        isVar: Boolean,
-        isConst: Boolean,
-        isLateinit: Boolean,
-        isDelegated: Boolean,
-        isExternal: Boolean,
-        isExpect: Boolean = false,
-        override val isFakeOverride: Boolean = origin == IrDeclarationOrigin.FAKE_OVERRIDE,
-        containerSource: DeserializedContainerSource?,
+    startOffset: Int,
+    endOffset: Int,
+    origin: IrDeclarationOrigin,
+    override val symbol: IrPropertySymbol,
+    name: Name,
+    visibility: DescriptorVisibility,
+    override val modality: Modality,
+    isVar: Boolean,
+    isConst: Boolean,
+    isLateinit: Boolean,
+    isDelegated: Boolean,
+    isExternal: Boolean,
+    isExpect: Boolean = false,
+    override val isFakeOverride: Boolean = origin == IrDeclarationOrigin.FAKE_OVERRIDE,
+    containerSource: DeserializedContainerSource?,
 ) : PersistentIrPropertyCommon(
     startOffset, endOffset, origin, name, visibility, isVar, isConst, isLateinit, isDelegated, isExternal, isExpect,
     containerSource,
@@ -138,18 +138,18 @@ internal class PersistentIrProperty(
 }
 
 internal class PersistentIrFakeOverrideProperty(
-        startOffset: Int,
-        endOffset: Int,
-        origin: IrDeclarationOrigin,
-        name: Name,
-        visibility: DescriptorVisibility,
-        override var modality: Modality,
-        isVar: Boolean,
-        isConst: Boolean,
-        isLateinit: Boolean,
-        isDelegated: Boolean,
-        isExternal: Boolean,
-        isExpect: Boolean,
+    startOffset: Int,
+    endOffset: Int,
+    origin: IrDeclarationOrigin,
+    name: Name,
+    visibility: DescriptorVisibility,
+    override var modality: Modality,
+    isVar: Boolean,
+    isConst: Boolean,
+    isLateinit: Boolean,
+    isDelegated: Boolean,
+    isExternal: Boolean,
+    isExpect: Boolean,
 ) : PersistentIrPropertyCommon(
     startOffset, endOffset, origin, name, visibility, isVar, isConst, isLateinit,
     isDelegated, isExternal, isExpect,

compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrTypeAlias.kt

@@ -17,14 +17,14 @@ import org.jetbrains.kotlin.ir.types.IrType
 import org.jetbrains.kotlin.name.Name
 
 internal class PersistentIrTypeAlias(
-        override val startOffset: Int,
-        override val endOffset: Int,
-        override val symbol: IrTypeAliasSymbol,
-        override val name: Name,
-        override var visibility: DescriptorVisibility,
-        expandedType: IrType,
-        override val isActual: Boolean,
-        origin: IrDeclarationOrigin
+    override val startOffset: Int,
+    override val endOffset: Int,
+    override val symbol: IrTypeAliasSymbol,
+    override val name: Name,
+    override var visibility: DescriptorVisibility,
+    expandedType: IrType,
+    override val isActual: Boolean,
+    origin: IrDeclarationOrigin
 ) : IrTypeAlias(),
     PersistentIrDeclarationBase<TypeAliasCarrier>,
     TypeAliasCarrier {

compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrTypeParameter.kt

@@ -29,7 +29,6 @@ import org.jetbrains.kotlin.ir.symbols.IrTypeParameterSymbol
 import org.jetbrains.kotlin.ir.types.IrType
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.types.Variance
-import org.jetbrains.kotlin.utils.SmartList
 
 internal class PersistentIrTypeParameter(
     override val startOffset: Int,

compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/PersistentIrValueParameter.kt

@@ -53,7 +53,7 @@ internal class PersistentIrValueParameter(
     init {
         symbol.bind(this)
     }
-    
+
     override var lastModified: Int = stageController.currentStage
     override var loweredUpTo: Int = stageController.currentStage
     override var values: Array<Carrier>? = null

compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/carriers/ClassCarrier.kt

@@ -38,15 +38,15 @@ internal interface ClassCarrier : DeclarationCarrier {
 }
 
 internal class ClassCarrierImpl(
-        override val lastModified: Int,
-        override var parentField: IrDeclarationParent?,
-        override var originField: IrDeclarationOrigin,
-        override var annotationsField: List<IrConstructorCall>,
-        override var thisReceiverField: IrValueParameter?,
-        override var metadataField: MetadataSource?,
-        override var visibilityField: DescriptorVisibility,
-        override var modalityField: Modality,
-        override var attributeOwnerIdField: IrAttributeContainer,
-        override var typeParametersField: List<IrTypeParameter>,
-        override var superTypesField: List<IrType>
+    override val lastModified: Int,
+    override var parentField: IrDeclarationParent?,
+    override var originField: IrDeclarationOrigin,
+    override var annotationsField: List<IrConstructorCall>,
+    override var thisReceiverField: IrValueParameter?,
+    override var metadataField: MetadataSource?,
+    override var visibilityField: DescriptorVisibility,
+    override var modalityField: Modality,
+    override var attributeOwnerIdField: IrAttributeContainer,
+    override var typeParametersField: List<IrTypeParameter>,
+    override var superTypesField: List<IrType>
 ) : ClassCarrier

compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/carriers/ConstructorCarrier.kt

@@ -31,16 +31,16 @@ internal interface ConstructorCarrier : FunctionBaseCarrier {
 }
 
 internal class ConstructorCarrierImpl(
-        override val lastModified: Int,
-        override var parentField: IrDeclarationParent?,
-        override var originField: IrDeclarationOrigin,
-        override var annotationsField: List<IrConstructorCall>,
-        override var returnTypeFieldField: IrType,
-        override var dispatchReceiverParameterField: IrValueParameter?,
-        override var extensionReceiverParameterField: IrValueParameter?,
-        override var bodyField: IrBody?,
-        override var metadataField: MetadataSource?,
-        override var visibilityField: DescriptorVisibility,
-        override var typeParametersField: List<IrTypeParameter>,
-        override var valueParametersField: List<IrValueParameter>
+    override val lastModified: Int,
+    override var parentField: IrDeclarationParent?,
+    override var originField: IrDeclarationOrigin,
+    override var annotationsField: List<IrConstructorCall>,
+    override var returnTypeFieldField: IrType,
+    override var dispatchReceiverParameterField: IrValueParameter?,
+    override var extensionReceiverParameterField: IrValueParameter?,
+    override var bodyField: IrBody?,
+    override var metadataField: MetadataSource?,
+    override var visibilityField: DescriptorVisibility,
+    override var typeParametersField: List<IrTypeParameter>,
+    override var valueParametersField: List<IrValueParameter>
 ) : ConstructorCarrier

compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/carriers/DeclarationCarrier.kt

@@ -9,7 +9,7 @@ import org.jetbrains.kotlin.ir.declarations.IrDeclarationOrigin
 import org.jetbrains.kotlin.ir.declarations.IrDeclarationParent
 import org.jetbrains.kotlin.ir.expressions.IrConstructorCall
 
-interface DeclarationCarrier: Carrier {
+interface DeclarationCarrier : Carrier {
     var parentField: IrDeclarationParent?
     var originField: IrDeclarationOrigin
     var annotationsField: List<IrConstructorCall>

compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/carriers/EnumEntryCarrier.kt

@@ -14,7 +14,7 @@ import org.jetbrains.kotlin.ir.expressions.IrExpressionBody
 internal interface EnumEntryCarrier : DeclarationCarrier {
     var correspondingClassField: IrClass?
     var initializerExpressionField: IrExpressionBody?
-    
+
     override fun clone(): EnumEntryCarrier {
         return EnumEntryCarrierImpl(
             lastModified,

compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/carriers/FieldCarrier.kt

@@ -42,4 +42,4 @@ internal class FieldCarrierImpl(
     override var initializerField: IrExpressionBody?,
     override var correspondingPropertySymbolField: IrPropertySymbol?,
     override var metadataField: MetadataSource?
-): FieldCarrier
+) : FieldCarrier

compiler/ir/ir.tree.persistent/src/org/jetbrains/kotlin/ir/declarations/persistent/carriers/FunctionCarrier.kt

@@ -40,19 +40,19 @@ internal interface FunctionCarrier : FunctionBaseCarrier {
 }
 
 internal class FunctionCarrierImpl(
-        override val lastModified: Int,
-        override var parentField: IrDeclarationParent?,
-        override var originField: IrDeclarationOrigin,
-        override var annotationsField: List<IrConstructorCall>,
-        override var returnTypeFieldField: IrType,
-        override var dispatchReceiverParameterField: IrValueParameter?,
-        override var extensionReceiverParameterField: IrValueParameter?,
-        override var bodyField: IrBody?,
-        override var metadataField: MetadataSource?,
-        override var visibilityField: DescriptorVisibility,
-        override var typeParametersField: List<IrTypeParameter>,
-        override var valueParametersField: List<IrValueParameter>,
-        override var correspondingPropertySymbolField: IrPropertySymbol?,
-        override var overriddenSymbolsField: List<IrSimpleFunctionSymbol>,
-        override var attributeOwnerIdField: IrAttributeContainer
+    override val lastModified: Int,
+    override var parentField: IrDeclarationParent?,
+    override var originField: IrDeclarationOrigin,
+    override var annotationsField: List<IrConstructorCall>,
+    override var returnTypeFieldField: IrType,
+    override var dispatchReceiverParameterField: IrValueParameter?,
+    override var extensionReceiverParameterField: IrValueParameter?,
+    override var bodyField: IrBody?,
+    override var metadataField: MetadataSource?,
+    override var visibilityField: DescriptorVisibility,
+    override var typeParametersField: List<IrTypeParameter>,
+    override var valueParametersField: List<IrValueParameter>,
+    override var correspondingPropertySymbolField: IrPropertySymbol?,
+    override var overriddenSymbolsField: List<IrSimpleFunctionSymbol>,
+    override var attributeOwnerIdField: IrAttributeContainer
 ) : FunctionCarrier