Rebase + reformat

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrValueDeclaration.kt

@@ -7,6 +7,7 @@ package org.jetbrains.kotlin.ir.declarations
 
 import org.jetbrains.kotlin.descriptors.ValueDescriptor
 import org.jetbrains.kotlin.ir.symbols.IrValueSymbol
+import org.jetbrains.kotlin.ir.types.IrType
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.types.KotlinType
 
@@ -15,5 +16,5 @@ interface IrValueDeclaration : IrDeclaration, IrSymbolOwner {
     override val symbol: IrValueSymbol
 
     val name: Name
-    val type: KotlinType
+    val type: IrType
 }

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrAnonymousInitializerImpl.kt

@@ -30,12 +30,22 @@ class IrAnonymousInitializerImpl(
     endOffset: Int,
     origin: IrDeclarationOrigin,
     override val symbol: IrAnonymousInitializerSymbol
-) : IrDeclarationBase(startOffset, endOffset, origin), IrAnonymousInitializer {
+) : IrDeclarationBase(startOffset, endOffset, origin),
-    constructor(startOffset: Int, endOffset: Int, origin: IrDeclarationOrigin, descriptor: ClassDescriptor) :
+    IrAnonymousInitializer {
+
+    constructor(
+        startOffset: Int,
+        endOffset: Int,
+        origin: IrDeclarationOrigin,
+        descriptor: ClassDescriptor
+    ) :
             this(startOffset, endOffset, origin, IrAnonymousInitializerSymbolImpl(descriptor))
 
     constructor(
-        startOffset: Int, endOffset: Int, origin: IrDeclarationOrigin, descriptor: ClassDescriptor,
+        startOffset: Int,
+        endOffset: Int,
+        origin: IrDeclarationOrigin,
+        descriptor: ClassDescriptor,
         body: IrBlockBody
     ) : this(startOffset, endOffset, origin, descriptor) {
         this.body = body

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrClassImpl.kt

@@ -46,7 +46,12 @@ class IrClassImpl(
 ) : IrDeclarationBase(startOffset, endOffset, origin),
     IrClass {
 
-    constructor(startOffset: Int, endOffset: Int, origin: IrDeclarationOrigin, symbol: IrClassSymbol) :
+    constructor(
+        startOffset: Int,
+        endOffset: Int,
+        origin: IrDeclarationOrigin,
+        symbol: IrClassSymbol
+    ) :
             this(
                 startOffset, endOffset, origin, symbol,
                 symbol.descriptor.name, symbol.descriptor.kind,
@@ -57,7 +62,12 @@ class IrClassImpl(
                 isExternal = symbol.descriptor.isEffectivelyExternal()
             )
 
-    constructor(startOffset: Int, endOffset: Int, origin: IrDeclarationOrigin, descriptor: ClassDescriptor) :
+    constructor(
+        startOffset: Int,
+        endOffset: Int,
+        origin: IrDeclarationOrigin,
+        descriptor: ClassDescriptor
+    ) :
             this(startOffset, endOffset, origin, IrClassSymbolImpl(descriptor))
 
     constructor(

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrEnumEntryImpl.kt

@@ -36,15 +36,29 @@ class IrEnumEntryImpl(
 ) : IrDeclarationBase(startOffset, endOffset, origin),
     IrEnumEntry {
 
-    constructor(startOffset: Int, endOffset: Int, origin: IrDeclarationOrigin, symbol: IrEnumEntrySymbol) :
+    constructor(
+        startOffset: Int,
+        endOffset: Int,
+        origin: IrDeclarationOrigin,
+        symbol: IrEnumEntrySymbol
+    ) :
             this(startOffset, endOffset, origin, symbol, symbol.descriptor.name)
 
-    constructor(startOffset: Int, endOffset: Int, origin: IrDeclarationOrigin, descriptor: ClassDescriptor) :
+    constructor(
+        startOffset: Int,
+        endOffset: Int,
+        origin: IrDeclarationOrigin,
+        descriptor: ClassDescriptor
+    ) :
             this(startOffset, endOffset, origin, IrEnumEntrySymbolImpl(descriptor))
 
     constructor(
-        startOffset: Int, endOffset: Int, origin: IrDeclarationOrigin, descriptor: ClassDescriptor,
+        startOffset: Int,
-        correspondingClass: IrClass?, initializerExpression: IrExpression?
+        endOffset: Int,
+        origin: IrDeclarationOrigin,
+        descriptor: ClassDescriptor,
+        correspondingClass: IrClass?,
+        initializerExpression: IrExpression?
     ) : this(startOffset, endOffset, origin, descriptor) {
         this.correspondingClass = correspondingClass
         this.initializerExpression = initializerExpression

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrExternalPackageFragmentImpl.kt

@@ -29,7 +29,8 @@ import org.jetbrains.kotlin.name.FqName
 class IrExternalPackageFragmentImpl(
     override val symbol: IrExternalPackageFragmentSymbol,
     override val fqName: FqName
-) : IrExternalPackageFragment, IrElementBase(UNDEFINED_OFFSET, UNDEFINED_OFFSET) {
+) : IrElementBase(UNDEFINED_OFFSET, UNDEFINED_OFFSET),
+    IrExternalPackageFragment {
 
     constructor(symbol: IrExternalPackageFragmentSymbol) : this(symbol, symbol.descriptor.fqName)
 

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrFieldImpl.kt

@@ -53,8 +53,8 @@ class IrFieldImpl(
             this(
                 startOffset, endOffset, origin, symbol,
                 symbol.descriptor.name, type, symbol.descriptor.visibility,
-                !symbol.descriptor.isVar,
+                isFinal = !symbol.descriptor.isVar,
-                symbol.descriptor.isEffectivelyExternal()
+                isExternal = symbol.descriptor.isEffectivelyExternal()
             )
 
     constructor(

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrFileImpl.kt

@@ -38,10 +38,16 @@ class IrFileImpl(
     IrElementBase(0, fileEntry.maxOffset),
     IrFile {
 
-    constructor(fileEntry: SourceManager.FileEntry, symbol: IrFileSymbol) :
+    constructor(
+        fileEntry: SourceManager.FileEntry,
+        symbol: IrFileSymbol
+    ) :
             this(fileEntry, symbol, symbol.descriptor.fqName)
 
-    constructor(fileEntry: SourceManager.FileEntry, packageFragmentDescriptor: PackageFragmentDescriptor) :
+    constructor(
+        fileEntry: SourceManager.FileEntry,
+        packageFragmentDescriptor: PackageFragmentDescriptor
+    ) :
             this(fileEntry, IrFileSymbolImpl(packageFragmentDescriptor), packageFragmentDescriptor.fqName)
 
     constructor(

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrBlockBodyImpl.kt

@@ -23,7 +23,12 @@ import org.jetbrains.kotlin.ir.visitors.IrElementTransformer
 import org.jetbrains.kotlin.ir.visitors.IrElementVisitor
 import java.util.*
 
-class IrBlockBodyImpl(startOffset: Int, endOffset: Int) : IrElementBase(startOffset, endOffset), IrBlockBody {
+class IrBlockBodyImpl(
+    startOffset: Int,
+    endOffset: Int
+) :
+    IrElementBase(startOffset, endOffset),
+    IrBlockBody {
 
     constructor(startOffset: Int, endOffset: Int, statements: List<IrStatement>) : this(startOffset, endOffset) {
         this.statements.addAll(statements)

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrBreakContinueBase.kt

@@ -25,6 +25,8 @@ abstract class IrBreakContinueBase(
     endOffset: Int,
     type: IrType,
     override var loop: IrLoop
-) : IrTerminalExpressionBase(startOffset, endOffset, type), IrBreakContinue {
+) : IrTerminalExpressionBase(startOffset, endOffset, type),
+    IrBreakContinue {
+
     override var label: String? = null
 }

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrBreakImpl.kt

@@ -26,7 +26,9 @@ class IrBreakImpl(
     endOffset: Int,
     type: IrType,
     loop: IrLoop
-) : IrBreakContinueBase(startOffset, endOffset, type, loop), IrBreak {
+) : IrBreakContinueBase(startOffset, endOffset, type, loop),
+    IrBreak {
+
     override fun <R, D> accept(visitor: IrElementVisitor<R, D>, data: D): R =
         visitor.visitBreak(this, data)
 }

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrCallWithIndexedArgumentsBase.kt

@@ -29,7 +29,15 @@ abstract class IrCallWithIndexedArgumentsBase(
     typeArgumentsCount: Int,
     valueArgumentsCount: Int,
     origin: IrStatementOrigin? = null
-) : IrMemberAccessExpressionBase(startOffset, endOffset, type, typeArgumentsCount, valueArgumentsCount, origin) {
+) :
+    IrMemberAccessExpressionBase(
+        startOffset,
+        endOffset,
+        type,
+        typeArgumentsCount,
+        valueArgumentsCount,
+        origin
+    ) {
 
     private val argumentsByParameterIndex: Array<IrExpression?> = arrayOfNulls(valueArgumentsCount)
 

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrConstImpl.kt

@@ -28,7 +28,10 @@ class IrConstImpl<T>(
     type: IrType,
     override val kind: IrConstKind<T>,
     override val value: T
-) : IrTerminalExpressionBase(startOffset, endOffset, type), IrConst<T> {
+) :
+    IrTerminalExpressionBase(startOffset, endOffset, type),
+    IrConst<T> {
+
     override fun <R, D> accept(visitor: IrElementVisitor<R, D>, data: D): R =
         visitor.visitConst(this, data)
 

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrContainerExpressionBase.kt

@@ -31,7 +31,9 @@ abstract class IrContainerExpressionBase(
     type: IrType,
     override val origin: IrStatementOrigin? = null
 ) :
-    IrExpressionBase(startOffset, endOffset, type), IrContainerExpression {
+    IrExpressionBase(startOffset, endOffset, type),
+    IrContainerExpression {
+
     override val statements: MutableList<IrStatement> = ArrayList(2)
 
     override fun <D> acceptChildren(visitor: IrElementVisitor<Unit, D>, data: D) {

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrContinueImpl.kt

@@ -26,7 +26,10 @@ class IrContinueImpl(
     endOffset: Int,
     type: IrType,
     loop: IrLoop
-) : IrBreakContinueBase(startOffset, endOffset, type, loop), IrContinue {
+) :
+    IrBreakContinueBase(startOffset, endOffset, type, loop),
+    IrContinue {
+
     override fun <R, D> accept(visitor: IrElementVisitor<R, D>, data: D): R =
         visitor.visitContinue(this, data)
 }

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrDeclarationReferenceBase.kt

@@ -27,5 +27,6 @@ abstract class IrDeclarationReferenceBase<out S : IrSymbol, out D : DeclarationD
     type: IrType,
     override val symbol: S,
     override val descriptor: D
-) : IrExpressionBase(startOffset, endOffset, type),
+) :
+    IrExpressionBase(startOffset, endOffset, type),
     IrDeclarationReference

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrErrorCallExpressionImpl.kt

@@ -28,7 +28,10 @@ class IrErrorCallExpressionImpl(
     endOffset: Int,
     type: IrType,
     override val description: String
-) : IrExpressionBase(startOffset, endOffset, type), IrErrorCallExpression {
+) :
+    IrExpressionBase(startOffset, endOffset, type),
+    IrErrorCallExpression {
+
     override var explicitReceiver: IrExpression? = null
     override val arguments: MutableList<IrExpression> = SmartList()
 

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrErrorExpressionImpl.kt

@@ -26,7 +26,11 @@ class IrErrorExpressionImpl(
     endOffset: Int,
     type: IrType,
     override val description: String
-) : IrTerminalExpressionBase(startOffset, endOffset, type), IrExpressionWithCopy, IrErrorExpression {
+) :
+    IrTerminalExpressionBase(startOffset, endOffset, type),
+    IrExpressionWithCopy,
+    IrErrorExpression {
+
     override fun <R, D> accept(visitor: IrElementVisitor<R, D>, data: D): R =
         visitor.visitErrorExpression(this, data)
 

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrExpressionBodyImpl.kt

@@ -22,7 +22,12 @@ import org.jetbrains.kotlin.ir.expressions.IrExpressionBody
 import org.jetbrains.kotlin.ir.visitors.IrElementTransformer
 import org.jetbrains.kotlin.ir.visitors.IrElementVisitor
 
-class IrExpressionBodyImpl(startOffset: Int, endOffset: Int) : IrElementBase(startOffset, endOffset), IrExpressionBody {
+class IrExpressionBodyImpl(
+    startOffset: Int,
+    endOffset: Int
+) :
+    IrElementBase(startOffset, endOffset),
+    IrExpressionBody {
 
     constructor(startOffset: Int, endOffset: Int, expression: IrExpression) : this(startOffset, endOffset) {
         this.expression = expression

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrGetFieldImpl.kt

@@ -36,7 +36,8 @@ class IrGetFieldImpl(
     type: IrType,
     origin: IrStatementOrigin? = null,
     superQualifierSymbol: IrClassSymbol? = null
-) : IrFieldExpressionBase(startOffset, endOffset, symbol, type, origin, superQualifierSymbol),
+) :
+    IrFieldExpressionBase(startOffset, endOffset, symbol, type, origin, superQualifierSymbol),
     IrGetField {
 
     @Deprecated("Creates unbound symbol")

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrGetValueImpl.kt

@@ -30,14 +30,16 @@ class IrGetValueImpl(
     type: IrType,
     symbol: IrValueSymbol,
     override val origin: IrStatementOrigin? = null
-) : IrGetValue,
+) :
     IrTerminalDeclarationReferenceBase<IrValueSymbol, ValueDescriptor>(
         startOffset,
         endOffset,
         type,
         symbol,
         symbol.descriptor
-    ) {
+    ),
+    IrGetValue {
+
     @Deprecated("Creates unbound reference")
     constructor(
         startOffset: Int,

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrIfThenElseImpl.kt

@@ -27,7 +27,9 @@ class IrIfThenElseImpl(
     endOffset: Int,
     type: IrType,
     override val origin: IrStatementOrigin? = null
-) : IrWhenBase(startOffset, endOffset, type) {
+) :
+    IrWhenBase(startOffset, endOffset, type) {
+
     override val branches: MutableList<IrBranch> = SmartList()
 
     constructor(

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrInstanceInitializerCallImpl.kt

@@ -28,7 +28,9 @@ class IrInstanceInitializerCallImpl(
     endOffset: Int,
     override val classSymbol: IrClassSymbol,
     type: IrType
-) : IrTerminalExpressionBase(startOffset, endOffset, type), IrInstanceInitializerCall {
+) :
+    IrTerminalExpressionBase(startOffset, endOffset, type),
+    IrInstanceInitializerCall {
 
     @Deprecated("Creates unbound symbol")
     constructor(

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrLocalDelegatedPropertyReferenceImpl.kt

@@ -33,7 +33,8 @@ class IrLocalDelegatedPropertyReferenceImpl(
     override val getter: IrFunctionSymbol,
     override val setter: IrFunctionSymbol?,
     origin: IrStatementOrigin? = null
-) : IrNoArgumentsCallableReferenceBase(startOffset, endOffset, type, 0, origin),
+) :
+    IrNoArgumentsCallableReferenceBase(startOffset, endOffset, type, 0, origin),
     IrLocalDelegatedPropertyReference {
 
     override fun <R, D> accept(visitor: IrElementVisitor<R, D>, data: D): R =

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrMemberAccessExpressionBase.kt

@@ -30,7 +30,8 @@ abstract class IrMemberAccessExpressionBase(
     final override val typeArgumentsCount: Int,
     final override val valueArgumentsCount: Int,
     final override val origin: IrStatementOrigin? = null
-) : IrExpressionBase(startOffset, endOffset, type),
+) :
+    IrExpressionBase(startOffset, endOffset, type),
     IrMemberAccessExpression {
 
     override var dispatchReceiver: IrExpression? = null

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrNoArgumentsCallableReferenceBase.kt

@@ -27,7 +27,8 @@ abstract class IrNoArgumentsCallableReferenceBase(
     type: IrType,
     typeArgumentsCount: Int,
     origin: IrStatementOrigin? = null
-) : IrMemberAccessExpressionBase(startOffset, endOffset, type, typeArgumentsCount, 0, origin),
+) :
+    IrMemberAccessExpressionBase(startOffset, endOffset, type, typeArgumentsCount, 0, origin),
     IrCallableReference {
 
     private fun throwNoValueArguments(): Nothing {

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrPropertyAccessorCall.kt

@@ -38,7 +38,8 @@ abstract class IrPropertyAccessorCallBase(
     valueArgumentsCount: Int,
     origin: IrStatementOrigin? = null,
     override val superQualifierSymbol: IrClassSymbol? = null
-) : IrMemberAccessExpressionBase(startOffset, endOffset, type, typeArgumentsCount, valueArgumentsCount, origin),
+) :
+    IrMemberAccessExpressionBase(startOffset, endOffset, type, typeArgumentsCount, valueArgumentsCount, origin),
     IrCall {
 
     override val superQualifier: ClassDescriptor? get() = superQualifierSymbol?.descriptor

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrPropertyReferenceImpl.kt

@@ -34,7 +34,8 @@ class IrPropertyReferenceImpl(
     override val getter: IrFunctionSymbol?,
     override val setter: IrFunctionSymbol?,
     origin: IrStatementOrigin? = null
-) : IrNoArgumentsCallableReferenceBase(startOffset, endOffset, type, typeArgumentsCount, origin),
+) :
+    IrNoArgumentsCallableReferenceBase(startOffset, endOffset, type, typeArgumentsCount, origin),
     IrPropertyReference {
 
     override fun <R, D> accept(visitor: IrElementVisitor<R, D>, data: D): R =

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrSpreadElementImpl.kt

@@ -25,7 +25,9 @@ import org.jetbrains.kotlin.ir.visitors.IrElementVisitor
 class IrSpreadElementImpl(
     startOffset: Int,
     endOffset: Int
-) : IrElementBase(startOffset, endOffset), IrSpreadElement {
+) :
+    IrElementBase(startOffset, endOffset),
+    IrSpreadElement {
 
     constructor(startOffset: Int, endOffset: Int, expression: IrExpression) : this(startOffset, endOffset) {
         this.expression = expression

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrTerminalDeclarationReferenceBase.kt

@@ -29,7 +29,8 @@ abstract class IrTerminalDeclarationReferenceBase<out S : IrSymbol, out D : Decl
     type: IrType,
     symbol: S,
     descriptor: D
-) : IrDeclarationReferenceBase<S, D>(startOffset, endOffset, type, symbol, descriptor),
+) :
+    IrDeclarationReferenceBase<S, D>(startOffset, endOffset, type, symbol, descriptor),
     IrDeclarationReference {
 
     override fun <D> acceptChildren(visitor: IrElementVisitor<Unit, D>, data: D) {

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrTerminalExpressionBase.kt

@@ -25,6 +25,7 @@ abstract class IrTerminalExpressionBase(
     endOffset: Int,
     type: IrType
 ) : IrExpressionBase(startOffset, endOffset, type) {
+
     override fun <D> acceptChildren(visitor: IrElementVisitor<Unit, D>, data: D) {
         // No children
     }

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrThrowImpl.kt

@@ -26,7 +26,10 @@ class IrThrowImpl(
     startOffset: Int,
     endOffset: Int,
     type: IrType
-) : IrExpressionBase(startOffset, endOffset, type), IrThrow {
+) :
+    IrExpressionBase(startOffset, endOffset, type),
+    IrThrow {
+
     constructor(
         startOffset: Int,
         endOffset: Int,

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrWhenImpl.kt

@@ -28,7 +28,8 @@ abstract class IrWhenBase(
     endOffset: Int,
     type: IrType,
     override val origin: IrStatementOrigin? = null
-) : IrExpressionBase(startOffset, endOffset, type),
+) :
+    IrExpressionBase(startOffset, endOffset, type),
     IrWhen {
 
     override fun <R, D> accept(visitor: IrElementVisitor<R, D>, data: D): R =