FIC: render fun before interfaces in descriptor renderer

compiler/testData/diagnostics/tests/funInterface/basicFunInterface.txt

@@ -1,6 +1,6 @@
 package
 
-public interface Foo {
+public fun interface Foo {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public abstract fun invoke(): kotlin.Unit

compiler/testData/diagnostics/tests/funInterface/basicFunInterfaceConversion.txt

@@ -3,7 +3,7 @@ package
 public fun foo(/*0*/ f: Foo): kotlin.Unit
 public fun test(): kotlin.Unit
 
-public interface Foo {
+public fun interface Foo {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public abstract fun invoke(): kotlin.Unit

compiler/testData/diagnostics/tests/funInterface/basicFunInterfaceDisabled.txt

@@ -1,6 +1,6 @@
 package
 
-public interface Foo {
+public fun interface Foo {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public abstract fun invoke(): kotlin.Unit

compiler/testData/diagnostics/tests/funInterface/funInterfaceSyntheticConstructors.txt

@@ -3,7 +3,7 @@ package
 public fun foo(/*0*/ f: KRunnable): kotlin.Unit
 public fun test(): kotlin.Unit
 
-public interface KRunnable {
+public fun interface KRunnable {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public abstract fun invoke(): kotlin.Unit

compiler/testData/diagnostics/tests/funInterface/genericSubstitutionForFunInterface.txt

@@ -2,7 +2,7 @@ package
 
 public fun test(/*0*/ k: K<kotlin.String>, /*1*/ f_string: F<kotlin.String>, /*2*/ f_int: F<kotlin.Int>, /*3*/ f_pr: F<PR<kotlin.String, kotlin.Int>>): kotlin.Unit
 
-public interface F</*0*/ S> {
+public fun interface F</*0*/ S> {
     public abstract fun apply(/*0*/ s: S): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/testData/diagnostics/tests/funInterface/severalConversionsForFunInterface.txt

@@ -11,7 +11,7 @@ public interface J {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-public interface KRunnable {
+public fun interface KRunnable {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public abstract fun run(): kotlin.Unit

compiler/testData/diagnostics/tests/funInterface/suspendFunInterfaceConversion.txt

@@ -4,7 +4,7 @@ public suspend fun bar(): kotlin.Unit
 public fun run(/*0*/ r: SuspendRunnable): kotlin.Unit
 public fun test(): kotlin.Unit
 
-public interface SuspendRunnable {
+public fun interface SuspendRunnable {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public abstract suspend fun invoke(): kotlin.Unit

core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRenderer.kt

@@ -303,6 +303,7 @@ enum class DescriptorRendererModifier(val includeByDefault: Boolean) {
     ACTUAL(true),
     CONST(true),
     LATEINIT(true),
+    FUN(true)
     ;
 
     companion object {

core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt

@@ -979,6 +979,7 @@ internal class DescriptorRendererImpl(
             renderModifier(builder, DescriptorRendererModifier.INNER in modifiers && klass.isInner, "inner")
             renderModifier(builder, DescriptorRendererModifier.DATA in modifiers && klass.isData, "data")
             renderModifier(builder, DescriptorRendererModifier.INLINE in modifiers && klass.isInline, "inline")
+            renderModifier(builder, DescriptorRendererModifier.FUN in modifiers && klass.isFun, "fun")
             renderClassKindPrefix(klass, builder)
         }