[K2] Slightly reformat code
This commit is contained in:
+5
-2
@@ -137,8 +137,11 @@ class FirJvmSerializerExtension(
|
|||||||
writeLocalProperties(proto, JvmProtoBuf.packageLocalVariable)
|
writeLocalProperties(proto, JvmProtoBuf.packageLocalVariable)
|
||||||
}
|
}
|
||||||
|
|
||||||
@Suppress("UNUSED_PARAMETER")
|
@Suppress("Reformat")
|
||||||
private fun <MessageType : GeneratedMessageLite.ExtendableMessage<MessageType>, BuilderType : GeneratedMessageLite.ExtendableBuilder<MessageType, BuilderType>> writeLocalProperties(
|
private fun <
|
||||||
|
MessageType : GeneratedMessageLite.ExtendableMessage<MessageType>,
|
||||||
|
BuilderType : GeneratedMessageLite.ExtendableBuilder<MessageType, BuilderType>
|
||||||
|
> writeLocalProperties(
|
||||||
proto: BuilderType,
|
proto: BuilderType,
|
||||||
extension: GeneratedMessageLite.GeneratedExtension<MessageType, List<ProtoBuf.Property>>
|
extension: GeneratedMessageLite.GeneratedExtension<MessageType, List<ProtoBuf.Property>>
|
||||||
) {
|
) {
|
||||||
|
|||||||
@@ -334,7 +334,7 @@ class Fir2IrClassifierStorage(
|
|||||||
|
|
||||||
fun registerIrClass(
|
fun registerIrClass(
|
||||||
regularClass: FirRegularClass,
|
regularClass: FirRegularClass,
|
||||||
parent: IrDeclarationParent? = null,
|
parent: IrDeclarationParent,
|
||||||
predefinedOrigin: IrDeclarationOrigin? = null
|
predefinedOrigin: IrDeclarationOrigin? = null
|
||||||
): IrClass {
|
): IrClass {
|
||||||
val visibility = regularClass.visibility
|
val visibility = regularClass.visibility
|
||||||
@@ -369,9 +369,7 @@ class Fir2IrClassifierStorage(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (parent != null) {
|
irClass.parent = parent
|
||||||
irClass.parent = parent
|
|
||||||
}
|
|
||||||
if (regularClass.visibility == Visibilities.Local) {
|
if (regularClass.visibility == Visibilities.Local) {
|
||||||
localStorage[regularClass] = irClass
|
localStorage[regularClass] = irClass
|
||||||
} else {
|
} else {
|
||||||
@@ -508,23 +506,22 @@ class Fir2IrClassifierStorage(
|
|||||||
|
|
||||||
fun getIrEnumEntry(
|
fun getIrEnumEntry(
|
||||||
enumEntry: FirEnumEntry,
|
enumEntry: FirEnumEntry,
|
||||||
irParent: IrClass?,
|
irParent: IrClass,
|
||||||
predefinedOrigin: IrDeclarationOrigin? = null,
|
predefinedOrigin: IrDeclarationOrigin? = null,
|
||||||
forceTopLevelPrivate: Boolean = false,
|
forceTopLevelPrivate: Boolean = false,
|
||||||
): IrEnumEntry {
|
): IrEnumEntry {
|
||||||
getCachedIrEnumEntry(enumEntry)?.let { return it }
|
getCachedIrEnumEntry(enumEntry)?.let { return it }
|
||||||
val containingFile = firProvider.getFirCallableContainerFile(enumEntry.symbol)
|
val containingFile = firProvider.getFirCallableContainerFile(enumEntry.symbol)
|
||||||
val irParentClass = irParent ?: enumEntry.containingClassLookupTag()?.let { findIrClass(it) }
|
|
||||||
|
|
||||||
@Suppress("NAME_SHADOWING")
|
@Suppress("NAME_SHADOWING")
|
||||||
val predefinedOrigin = predefinedOrigin ?: if (containingFile != null) {
|
val predefinedOrigin = predefinedOrigin ?: if (containingFile != null) {
|
||||||
IrDeclarationOrigin.DEFINED
|
IrDeclarationOrigin.DEFINED
|
||||||
} else {
|
} else {
|
||||||
irParentClass?.origin ?: IrDeclarationOrigin.IR_EXTERNAL_DECLARATION_STUB
|
irParent.origin
|
||||||
}
|
}
|
||||||
return createIrEnumEntry(
|
return createIrEnumEntry(
|
||||||
enumEntry,
|
enumEntry,
|
||||||
irParent = irParentClass,
|
irParent = irParent,
|
||||||
predefinedOrigin = predefinedOrigin,
|
predefinedOrigin = predefinedOrigin,
|
||||||
forceTopLevelPrivate
|
forceTopLevelPrivate
|
||||||
)
|
)
|
||||||
|
|||||||
Reference in New Issue
Block a user