Fix modifier order in generated overriden functions
Fixes #KT-21600
This commit is contained in:
committed by
Alexander Udalov
parent
99be75cbfc
commit
8bc020f31b
@@ -523,12 +523,11 @@ internal class DescriptorRendererImpl(
|
||||
val isInfix =
|
||||
functionDescriptor.isInfix && (functionDescriptor.overriddenDescriptors.none { it.isInfix } || alwaysRenderModifiers)
|
||||
|
||||
renderModifier(builder, isOperator, "operator")
|
||||
renderModifier(builder, isInfix, "infix")
|
||||
renderMemberModifiers(functionDescriptor, builder)
|
||||
renderModifier(builder, functionDescriptor.isInline, "inline")
|
||||
renderModifier(builder, functionDescriptor.isTailrec, "tailrec")
|
||||
renderModifier(builder, functionDescriptor.isSuspend, "suspend")
|
||||
renderModifier(builder, functionDescriptor.isInline, "inline")
|
||||
renderModifier(builder, isInfix, "infix")
|
||||
renderModifier(builder, isOperator, "operator")
|
||||
}
|
||||
|
||||
override fun render(declarationDescriptor: DeclarationDescriptor): String {
|
||||
@@ -624,10 +623,15 @@ internal class DescriptorRendererImpl(
|
||||
renderModalityForCallable(function, builder)
|
||||
|
||||
if (includeAdditionalModifiers) {
|
||||
renderAdditionalModifiers(function, builder)
|
||||
renderMemberModifiers(function, builder)
|
||||
}
|
||||
|
||||
renderOverride(function, builder)
|
||||
|
||||
if (includeAdditionalModifiers) {
|
||||
renderAdditionalModifiers(function, builder)
|
||||
}
|
||||
|
||||
renderMemberKind(function, builder)
|
||||
|
||||
if (verbose) {
|
||||
|
||||
Reference in New Issue
Block a user