FIR: Make FIR rendering more kotlin-styled

compiler/testData/loadJava/compiledJava/ArrayTypeVariance.fir.txt

@@ -1,4 +1,4 @@
 public final class ArrayTypeVariance : R|java/lang/Object| {
-    public final operator function toArray(p0: R|kotlin/Array<ft<java/lang/Object, java/lang/Object?>>|): R|kotlin/Array<ft<java/lang/Object, java/lang/Object?>>|
+    public final operator fun toArray(p0: R|kotlin/Array<ft<java/lang/Object, java/lang/Object?>>|): R|kotlin/Array<ft<java/lang/Object, java/lang/Object?>>|
 
 }

compiler/testData/loadJava/compiledJava/ClassWithConstVal.fir.txt

@@ -1,8 +1,8 @@
 public final class ClassWithConstVal : R|java/lang/Object| {
-    public final property f(val): R|kotlin/Int|
+    public final val f: R|kotlin/Int|
         public get(): R|kotlin/Int|
 
-    public final property f2(val): R|kotlin/Int|
+    public final val f2: R|kotlin/Int|
         public get(): R|kotlin/Int|
 
 }

compiler/testData/loadJava/compiledJava/FieldAsVar.fir.txt

@@ -1,5 +1,5 @@
 public final class FieldAsVar : R|java/lang/Object| {
-    public open property f(var): R|kotlin/Int|
+    public open var f: R|kotlin/Int|
         public get(): R|kotlin/Int|
         public set(value: R|kotlin/Int|): kotlin/Unit
 

compiler/testData/loadJava/compiledJava/FieldOfArrayType.fir.txt

@@ -1,5 +1,5 @@
 public open class FieldOfArrayType : R|java/lang/Object| {
-    public open property files(var): R|kotlin/Array<ft<java/io/File, java/io/File?>>|
+    public open var files: R|kotlin/Array<ft<java/io/File, java/io/File?>>|
         public get(): R|kotlin/Array<ft<java/io/File, java/io/File?>>|
         public set(value: R|kotlin/Array<ft<java/io/File, java/io/File?>>|): kotlin/Unit
 

compiler/testData/loadJava/compiledJava/FinalFieldAsVal.fir.txt

@@ -1,5 +1,5 @@
 public final class FinalFieldAsVal : R|java/lang/Object| {
-    public final property f(val): R|kotlin/Int|
+    public final val f: R|kotlin/Int|
         public get(): R|kotlin/Int|
 
 }

compiler/testData/loadJava/compiledJava/InnerClassTypeMultipleGeneric.fir.txt

@@ -1,4 +1,4 @@
 public open class InnerClassTypeMultipleGeneric : R|java/lang/Object| {
-    public open operator function staticType(): R|ft<test/InnerClassTypeMultipleGeneric.Outer.Inner<ft<kotlin/Byte, kotlin/Byte?>, ft<kotlin/Char, kotlin/Char?>, ft<kotlin/Boolean, kotlin/Boolean?>>, test/InnerClassTypeMultipleGeneric.Outer.Inner<ft<kotlin/Byte, kotlin/Byte?>, ft<kotlin/Char, kotlin/Char?>, ft<kotlin/Boolean, kotlin/Boolean?>>?>|!
+    public open operator fun staticType(): R|ft<test/InnerClassTypeMultipleGeneric.Outer.Inner<ft<kotlin/Byte, kotlin/Byte?>, ft<kotlin/Char, kotlin/Char?>, ft<kotlin/Boolean, kotlin/Boolean?>>, test/InnerClassTypeMultipleGeneric.Outer.Inner<ft<kotlin/Byte, kotlin/Byte?>, ft<kotlin/Char, kotlin/Char?>, ft<kotlin/Boolean, kotlin/Boolean?>>?>|!
 
 }

compiler/testData/loadJava/compiledJava/IntrinsicCompanionObject.fir.txt

@@ -1,12 +1,12 @@
 public abstract interface IntrinsicCompanionObject : R|java/lang/Object| {
-    public abstract operator function testInt(i: R|ft<kotlin/Int.Companion, kotlin/Int.Companion?>|!): R|kotlin/Unit|
+    public abstract operator fun testInt(i: R|ft<kotlin/Int.Companion, kotlin/Int.Companion?>|!): R|kotlin/Unit|
 
-    public abstract operator function testChar(c: R|ft<kotlin/Char.Companion, kotlin/Char.Companion?>|!): R|kotlin/Unit|
+    public abstract operator fun testChar(c: R|ft<kotlin/Char.Companion, kotlin/Char.Companion?>|!): R|kotlin/Unit|
 
-    public abstract operator function testString(s: R|ft<kotlin/String.Companion, kotlin/String.Companion?>|!): R|kotlin/Unit|
+    public abstract operator fun testString(s: R|ft<kotlin/String.Companion, kotlin/String.Companion?>|!): R|kotlin/Unit|
 
-    public abstract operator function testBoolean(b: R|ft<kotlin/Boolean.Companion, kotlin/Boolean.Companion?>|!): R|kotlin/Unit|
+    public abstract operator fun testBoolean(b: R|ft<kotlin/Boolean.Companion, kotlin/Boolean.Companion?>|!): R|kotlin/Unit|
 
-    public abstract operator function testEnum(e: R|ft<kotlin/Enum.Companion, kotlin/Enum.Companion?>|!): R|kotlin/Unit|
+    public abstract operator fun testEnum(e: R|ft<kotlin/Enum.Companion, kotlin/Enum.Companion?>|!): R|kotlin/Unit|
 
 }

compiler/testData/loadJava/compiledJava/MethodTypePOneUpperBound.fir.txt

@@ -1,4 +1,4 @@
 public open class MethodTypePOneUpperBound : R|java/lang/Object| {
-    public open operator function bar(): R|kotlin/Unit|
+    public open operator fun bar(): R|kotlin/Unit|
 
 }

compiler/testData/loadJava/compiledJava/MethodTypePTwoUpperBounds.fir.txt

@@ -1,4 +1,4 @@
 public open class MethodTypePTwoUpperBounds : R|java/lang/Object| {
-    public open operator function foo(): R|kotlin/Unit|
+    public open operator fun foo(): R|kotlin/Unit|
 
 }

compiler/testData/loadJava/compiledJava/MethodWithTypeP.fir.txt

@@ -1,4 +1,4 @@
 public final class MethodWithTypeP : R|java/lang/Object| {
-    public final operator function f(): R|kotlin/Unit|
+    public final operator fun f(): R|kotlin/Unit|
 
 }

compiler/testData/loadJava/compiledJava/MethodWithTypePP.fir.txt

@@ -1,4 +1,4 @@
 public final class MethodWithTypePP : R|java/lang/Object| {
-    public final operator function f(): R|kotlin/Unit|
+    public final operator fun f(): R|kotlin/Unit|
 
 }

compiler/testData/loadJava/compiledJava/MethodWithTypePRefClassP.fir.txt

@@ -1,4 +1,4 @@
 <P> public open class MethodWithTypePRefClassP : R|java/lang/Object| {
-    public final operator function f(): R|kotlin/Unit|
+    public final operator fun f(): R|kotlin/Unit|
 
 }

compiler/testData/loadJava/compiledJava/MethosWithPRefTP.fir.txt

@@ -1,4 +1,4 @@
 public final class MethosWithPRefTP : R|java/lang/Object| {
-    public final operator function f(p: R|ft<P, P?>|!): R|kotlin/Unit|
+    public final operator fun f(p: R|ft<P, P?>|!): R|kotlin/Unit|
 
 }

compiler/testData/loadJava/compiledJava/MyException.fir.txt

@@ -1,4 +1,4 @@
 public open class MyException : R|java/lang/Object| {
-    public final function MyException(message: R|ft<kotlin/String, kotlin/String?>|!, cause: R|ft<kotlin/Throwable, kotlin/Throwable?>|!): R|test/MyException|
+    public final fun MyException(message: R|ft<kotlin/String, kotlin/String?>|!, cause: R|ft<kotlin/Throwable, kotlin/Throwable?>|!): R|test/MyException|
 
 }

compiler/testData/loadJava/compiledJava/PackageLocalVisibility.fir.txt

@@ -1,14 +1,14 @@
 public open class Frame : R|java/lang/Object| {
-    public/*package*/ open property accessibleContext(var): R|ft<kotlin/String, kotlin/String?>|!
+    public/*package*/ open var accessibleContext: R|ft<kotlin/String, kotlin/String?>|!
         public/*package*/ get(): R|ft<kotlin/String, kotlin/String?>|!
         public/*package*/ set(value: R|ft<kotlin/String, kotlin/String?>|!): kotlin/Unit
 
 }
 public open class JFrame : R|awt/Frame| {
-    protected/*protected and package*/ open property accessibleContext(var): R|ft<kotlin/String, kotlin/String?>|!
+    protected/*protected and package*/ open var accessibleContext: R|ft<kotlin/String, kotlin/String?>|!
         protected/*protected and package*/ get(): R|ft<kotlin/String, kotlin/String?>|!
         protected/*protected and package*/ set(value: R|ft<kotlin/String, kotlin/String?>|!): kotlin/Unit
 
-    public final function JFrame(): R|test/JFrame|
+    public final fun JFrame(): R|test/JFrame|
 
 }

compiler/testData/loadJava/compiledJava/PrivateMembers.fir.txt

@@ -1,16 +1,16 @@
 public open class PrivateMembers : R|java/lang/Object| {
-    private open property field(var): R|kotlin/Int|
+    private open var field: R|kotlin/Int|
         private get(): R|kotlin/Int|
         private set(value: R|kotlin/Int|): kotlin/Unit
 
-    private open static property staticField(var): R|kotlin/Int|
+    private open static var staticField: R|kotlin/Int|
         private get(): R|kotlin/Int|
         private set(value: R|kotlin/Int|): kotlin/Unit
 
-    private open operator function method(): R|kotlin/Unit|
+    private open operator fun method(): R|kotlin/Unit|
 
-    private open static operator function staticMethod(): R|kotlin/Unit|
+    private open static operator fun staticMethod(): R|kotlin/Unit|
 
-    private final function PrivateMembers(): R|test/PrivateMembers|
+    private final fun PrivateMembers(): R|test/PrivateMembers|
 
 }

compiler/testData/loadJava/compiledJava/RemoveRedundantProjectionKind.fir.txt

@@ -1,6 +1,6 @@
 public abstract interface RemoveRedundantProjectionKind : R|java/lang/Object| {
-    public abstract operator function f(collection: R|ft<kotlin/collections/MutableCollection<out java/lang/CharSequence>, kotlin/collections/Collection<out java/lang/CharSequence>?>|!): R|kotlin/Unit|
+    public abstract operator fun f(collection: R|ft<kotlin/collections/MutableCollection<out java/lang/CharSequence>, kotlin/collections/Collection<out java/lang/CharSequence>?>|!): R|kotlin/Unit|
 
-    public abstract operator function f(comparator: R|ft<kotlin/Comparable<in java/lang/CharSequence>, kotlin/Comparable<in java/lang/CharSequence>?>|!): R|kotlin/Unit|
+    public abstract operator fun f(comparator: R|ft<kotlin/Comparable<in java/lang/CharSequence>, kotlin/Comparable<in java/lang/CharSequence>?>|!): R|kotlin/Unit|
 
 }

compiler/testData/loadJava/compiledJava/Simple.fir.txt

@@ -1,4 +1,4 @@
 public final class Simple : R|java/lang/Object| {
-    public final function Simple(): R|test/Simple|
+    public final fun Simple(): R|test/Simple|
 
 }

compiler/testData/loadJava/compiledJava/TopLevel$Class.fir.txt

@@ -1,4 +1,4 @@
 public open class TopLevel$Class : R|java/lang/Object| {
-    public open operator function foo(other: R|ft<test/TopLevel$Class, test/TopLevel$Class?>|!): R|kotlin/Unit|
+    public open operator fun foo(other: R|ft<test/TopLevel$Class, test/TopLevel$Class?>|!): R|kotlin/Unit|
 
 }

compiler/testData/loadJava/compiledJava/TwoFields.fir.txt

@@ -1,9 +1,9 @@
 public final class TwoFields : R|java/lang/Object| {
-    public open property a(var): R|kotlin/Int|
+    public open var a: R|kotlin/Int|
         public get(): R|kotlin/Int|
         public set(value: R|kotlin/Int|): kotlin/Unit
 
-    public open property b(var): R|kotlin/Short|
+    public open var b: R|kotlin/Short|
         public get(): R|kotlin/Short|
         public set(value: R|kotlin/Short|): kotlin/Unit
 

compiler/testData/loadJava/compiledJava/UnboundWildcard.fir.txt

@@ -1,6 +1,6 @@
 public final class UnboundWildcard : R|java/lang/Object| {
-    public final operator function foo(): R|ft<test/UnboundWildcard.MyClass<*>, test/UnboundWildcard.MyClass<*>?>|!
+    public final operator fun foo(): R|ft<test/UnboundWildcard.MyClass<*>, test/UnboundWildcard.MyClass<*>?>|!
 
-    public final operator function collection(): R|ft<kotlin/collections/MutableCollection<*>, kotlin/collections/Collection<*>?>|!
+    public final operator fun collection(): R|ft<kotlin/collections/MutableCollection<*>, kotlin/collections/Collection<*>?>|!
 
 }

compiler/testData/loadJava/compiledJava/WildcardBounds.fir.txt

@@ -1,4 +1,4 @@
 public open class WildcardBounds : R|java/lang/Object| {
-    public/*package*/ open operator function foo(x: R|ft<test/WildcardBounds.A<out java/lang/CharSequence>, test/WildcardBounds.A<out java/lang/CharSequence>?>|!, y: R|ft<test/WildcardBounds.A<in java/lang/String>, test/WildcardBounds.A<in java/lang/String>?>|!): R|kotlin/Unit|
+    public/*package*/ open operator fun foo(x: R|ft<test/WildcardBounds.A<out java/lang/CharSequence>, test/WildcardBounds.A<out java/lang/CharSequence>?>|!, y: R|ft<test/WildcardBounds.A<in java/lang/String>, test/WildcardBounds.A<in java/lang/String>?>|!): R|kotlin/Unit|
 
 }

compiler/testData/loadJava/compiledJava/annotations/AnnotatedConstructor.fir.txt

@@ -1,4 +1,4 @@
 public open class AnnotatedConstructor : R|java/lang/Object| {
-    @R|test/AnnotatedConstructor.Anno|(String(constructor)) public final function AnnotatedConstructor(): R|test/AnnotatedConstructor|
+    @R|test/AnnotatedConstructor.Anno|(String(constructor)) public final fun AnnotatedConstructor(): R|test/AnnotatedConstructor|
 
 }

compiler/testData/loadJava/compiledJava/annotations/AnnotatedEnumEntry.fir.txt

@@ -1,11 +1,11 @@
 public final enum class AnnotatedEnumEntry : R|java/lang/Enum<test/AnnotatedEnumEntry>| {
-    @R|test/AnnotatedEnumEntry.Anno|(String(a)) public final static property E1(val): R|ft<test/AnnotatedEnumEntry, test/AnnotatedEnumEntry?>|!
+    @R|test/AnnotatedEnumEntry.Anno|(String(a)) public final static val E1: R|ft<test/AnnotatedEnumEntry, test/AnnotatedEnumEntry?>|!
         public get(): R|ft<test/AnnotatedEnumEntry, test/AnnotatedEnumEntry?>|!
 
-    @R|test/AnnotatedEnumEntry.Anno|(String(b)) @R|test/AnnotatedEnumEntry.Anno2|() public final static property E2(val): R|ft<test/AnnotatedEnumEntry, test/AnnotatedEnumEntry?>|!
+    @R|test/AnnotatedEnumEntry.Anno|(String(b)) @R|test/AnnotatedEnumEntry.Anno2|() public final static val E2: R|ft<test/AnnotatedEnumEntry, test/AnnotatedEnumEntry?>|!
         public get(): R|ft<test/AnnotatedEnumEntry, test/AnnotatedEnumEntry?>|!
 
-    public final static property E3(val): R|ft<test/AnnotatedEnumEntry, test/AnnotatedEnumEntry?>|!
+    public final static val E3: R|ft<test/AnnotatedEnumEntry, test/AnnotatedEnumEntry?>|!
         public get(): R|ft<test/AnnotatedEnumEntry, test/AnnotatedEnumEntry?>|!
 
 }

compiler/testData/loadJava/compiledJava/annotations/AnnotatedField.fir.txt

@@ -1,8 +1,8 @@
 public open class AnnotatedField : R|java/lang/Object| {
-    @R|test/AnnotatedField.Anno|(String(static)) public final static property x(val): R|kotlin/Int|
+    @R|test/AnnotatedField.Anno|(String(static)) public final static val x: R|kotlin/Int|
         public get(): R|kotlin/Int|
 
-    @R|test/AnnotatedField.Anno|(String(member)) public final property y(val): R|kotlin/Int|
+    @R|test/AnnotatedField.Anno|(String(member)) public final val y: R|kotlin/Int|
         public get(): R|kotlin/Int|
 
 }

compiler/testData/loadJava/compiledJava/annotations/AnnotatedMethod.fir.txt

@@ -1,4 +1,4 @@
 public open class AnnotatedMethod : R|java/lang/Object| {
-    @R|test/AnnotatedMethod.Anno|(Int(42)) public open operator function f(): R|kotlin/Unit|
+    @R|test/AnnotatedMethod.Anno|(Int(42)) public open operator fun f(): R|kotlin/Unit|
 
 }

compiler/testData/loadJava/compiledJava/annotations/AnnotatedTypeInFun.fir.txt

@@ -1,4 +1,4 @@
 public/*package*/ open class AnnotatedTypeInFun : R|java/lang/Object| {
-    public/*package*/ open operator function foo(@R|test/AnnotatedTypeInFun.Anno|(String(a)) a: @R|test/AnnotatedTypeInFun.Anno|(String(a)) R|ft<kotlin/String, kotlin/String?>|!, @R|test/AnnotatedTypeInFun.Anno|(String(b)) b: @R|test/AnnotatedTypeInFun.Anno|(String(b)) R|ft<kotlin/String, kotlin/String?>|!): R|kotlin/Unit|
+    public/*package*/ open operator fun foo(@R|test/AnnotatedTypeInFun.Anno|(String(a)) a: @R|test/AnnotatedTypeInFun.Anno|(String(a)) R|ft<kotlin/String, kotlin/String?>|!, @R|test/AnnotatedTypeInFun.Anno|(String(b)) b: @R|test/AnnotatedTypeInFun.Anno|(String(b)) R|ft<kotlin/String, kotlin/String?>|!): R|kotlin/Unit|
 
 }

compiler/testData/loadJava/compiledJava/annotations/AnnotatedValueParameter.fir.txt

@@ -1,4 +1,4 @@
 public open class AnnotatedValueParameter : R|java/lang/Object| {
-    public open operator function f(@R|test/AnnotatedValueParameter.Anno|(String(non-empty)) parameter: R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|!): R|kotlin/Unit|
+    public open operator fun f(@R|test/AnnotatedValueParameter.Anno|(String(non-empty)) parameter: R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|!): R|kotlin/Unit|
 
 }

compiler/testData/loadJava/compiledJava/annotations/EnumArgumentWithCustomToString.fir.txt

@@ -1,4 +1,4 @@
 public open class EnumArgumentWithCustomToString : R|java/lang/Object| {
-    @R|test/EnumArgumentWithCustomToString.EnumAnno|(R|test/EnumArgumentWithCustomToString.E.CAKE|()) @R|test/EnumArgumentWithCustomToString.EnumArrayAnno|(<implicitArrayOf>(R|test/EnumArgumentWithCustomToString.E.CAKE|(), R|test/EnumArgumentWithCustomToString.E.CAKE|())) public/*package*/ open operator function annotated(): R|kotlin/Unit|
+    @R|test/EnumArgumentWithCustomToString.EnumAnno|(R|test/EnumArgumentWithCustomToString.E.CAKE|()) @R|test/EnumArgumentWithCustomToString.EnumArrayAnno|(<implicitArrayOf>(R|test/EnumArgumentWithCustomToString.E.CAKE|(), R|test/EnumArgumentWithCustomToString.E.CAKE|())) public/*package*/ open operator fun annotated(): R|kotlin/Unit|
 
 }

compiler/testData/loadJava/compiledJava/annotations/EnumConstructorParameter.fir.txt

@@ -1,9 +1,9 @@
 public final enum class EnumConstructorParameter : R|java/lang/Enum<test/EnumConstructorParameter>| {
-    public final static property INSTANCE(val): R|ft<test/EnumConstructorParameter, test/EnumConstructorParameter?>|!
+    public final static val INSTANCE: R|ft<test/EnumConstructorParameter, test/EnumConstructorParameter?>|!
         public get(): R|ft<test/EnumConstructorParameter, test/EnumConstructorParameter?>|!
 
-    private final function EnumConstructorParameter(@R|test/EnumConstructorParameter.Anno|(String(string)) s: R|ft<kotlin/String, kotlin/String?>|!): R|test/EnumConstructorParameter|
+    private final fun EnumConstructorParameter(@R|test/EnumConstructorParameter.Anno|(String(string)) s: R|ft<kotlin/String, kotlin/String?>|!): R|test/EnumConstructorParameter|
 
-    private final function EnumConstructorParameter(x: R|kotlin/Int|): R|test/EnumConstructorParameter|
+    private final fun EnumConstructorParameter(x: R|kotlin/Int|): R|test/EnumConstructorParameter|
 
 }

compiler/testData/loadJava/compiledJava/annotations/JavaDocDeprecated.fir.txt

@@ -1,4 +1,4 @@
 public open class JavaDocDeprecated : R|java/lang/Object| {
-    public open operator function getFoo(text: R|ft<kotlin/String, kotlin/String?>|!): R|ft<kotlin/String, kotlin/String?>|!
+    public open operator fun getFoo(text: R|ft<kotlin/String, kotlin/String?>|!): R|ft<kotlin/String, kotlin/String?>|!
 
 }

compiler/testData/loadJava/compiledJava/annotations/NestedEnumArgument.fir.txt

@@ -1,4 +1,4 @@
 public open class NestedEnumArgument : R|java/lang/Object| {
-    @R|test/NestedEnumArgument.Anno|(R|test/NestedEnumArgument.E.FIRST|()) public/*package*/ open operator function foo(): R|kotlin/Unit|
+    @R|test/NestedEnumArgument.Anno|(R|test/NestedEnumArgument.E.FIRST|()) public/*package*/ open operator fun foo(): R|kotlin/Unit|
 
 }

compiler/testData/loadJava/compiledJava/annotations/StringConstantInParam.fir.txt

@@ -1,5 +1,5 @@
 public abstract interface StringConstantInParam : R|java/lang/Object| {
-    public final static property HEL(val): R|ft<kotlin/String, kotlin/String?>|!
+    public final static val HEL: R|ft<kotlin/String, kotlin/String?>|!
         public get(): R|ft<kotlin/String, kotlin/String?>|!
 
 }

compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericDeep.fir.txt

@@ -1,4 +1,4 @@
 public open class ConstructorGenericDeep : R|java/lang/Object| {
-    public final function ConstructorGenericDeep(cl: R|ft<java/lang/Class<ft<P, P?>>, java/lang/Class<ft<P, P?>>?>|!): R|test/ConstructorGenericDeep|
+    public final fun ConstructorGenericDeep(cl: R|ft<java/lang/Class<ft<P, P?>>, java/lang/Class<ft<P, P?>>?>|!): R|test/ConstructorGenericDeep|
 
 }

compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericSimple.fir.txt

@@ -1,4 +1,4 @@
 public open class ConstructorGenericSimple : R|java/lang/Object| {
-    public final function ConstructorGenericSimple(p: R|ft<P, P?>|!): R|test/ConstructorGenericSimple|
+    public final fun ConstructorGenericSimple(p: R|ft<P, P?>|!): R|test/ConstructorGenericSimple|
 
 }

compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericUpperBound.fir.txt

@@ -1,4 +1,4 @@
 public open class ConstructorGenericUpperBound : R|java/lang/Object| {
-    public final function ConstructorGenericUpperBound(p: R|ft<P, P?>|!): R|test/ConstructorGenericUpperBound|
+    public final fun ConstructorGenericUpperBound(p: R|ft<P, P?>|!): R|test/ConstructorGenericUpperBound|
 
 }

compiler/testData/loadJava/compiledJava/enum/EnumMembers.fir.txt

@@ -1,15 +1,15 @@
 public final enum class EnumMembers : R|java/lang/Enum<test/EnumMembers>| {
-    public final static property FIRST(val): R|ft<test/EnumMembers, test/EnumMembers?>|!
+    public final static val FIRST: R|ft<test/EnumMembers, test/EnumMembers?>|!
         public get(): R|ft<test/EnumMembers, test/EnumMembers?>|!
 
-    public final static property SECOND(val): R|ft<test/EnumMembers, test/EnumMembers?>|!
+    public final static val SECOND: R|ft<test/EnumMembers, test/EnumMembers?>|!
         public get(): R|ft<test/EnumMembers, test/EnumMembers?>|!
 
-    public final property isFirst(val): R|kotlin/Boolean|
+    public final val isFirst: R|kotlin/Boolean|
         public get(): R|kotlin/Boolean|
 
-    public open operator function first(): R|kotlin/Boolean|
+    public open operator fun first(): R|kotlin/Boolean|
 
-    private final function EnumMembers(isFirst: R|kotlin/Boolean|): R|test/EnumMembers|
+    private final fun EnumMembers(isFirst: R|kotlin/Boolean|): R|test/EnumMembers|
 
 }

compiler/testData/loadJava/compiledJava/enum/EnumWithSpecializedEntry.fir.txt

@@ -1,8 +1,8 @@
 public open enum class EnumWithSpecializedEntry : R|java/lang/Enum<test/EnumWithSpecializedEntry>| {
-    public final static property E1(val): R|ft<test/EnumWithSpecializedEntry, test/EnumWithSpecializedEntry?>|!
+    public final static val E1: R|ft<test/EnumWithSpecializedEntry, test/EnumWithSpecializedEntry?>|!
         public get(): R|ft<test/EnumWithSpecializedEntry, test/EnumWithSpecializedEntry?>|!
 
-    public final static property E2(val): R|ft<test/EnumWithSpecializedEntry, test/EnumWithSpecializedEntry?>|!
+    public final static val E2: R|ft<test/EnumWithSpecializedEntry, test/EnumWithSpecializedEntry?>|!
         public get(): R|ft<test/EnumWithSpecializedEntry, test/EnumWithSpecializedEntry?>|!
 
 }

compiler/testData/loadJava/compiledJava/enum/JavaEnum.fir.txt

@@ -1,8 +1,8 @@
 public final enum class JavaEnum : R|java/lang/Enum<test/JavaEnum>| {
-    public final static property ENTRY(val): R|ft<test/JavaEnum, test/JavaEnum?>|!
+    public final static val ENTRY: R|ft<test/JavaEnum, test/JavaEnum?>|!
         public get(): R|ft<test/JavaEnum, test/JavaEnum?>|!
 
-    public final static property ANOTHER(val): R|ft<test/JavaEnum, test/JavaEnum?>|!
+    public final static val ANOTHER: R|ft<test/JavaEnum, test/JavaEnum?>|!
         public get(): R|ft<test/JavaEnum, test/JavaEnum?>|!
 
 }

compiler/testData/loadJava/compiledJava/javaBean/DifferentGetterAndSetter.fir.txt

@@ -1,6 +1,6 @@
 public open class DifferentGetterAndSetter : R|java/lang/Object| {
-    public open operator function setSomething(color: R|ft<kotlin/String, kotlin/String?>|!): R|kotlin/Unit|
+    public open operator fun setSomething(color: R|ft<kotlin/String, kotlin/String?>|!): R|kotlin/Unit|
 
-    public open operator function getSomething(): R|kotlin/Int|
+    public open operator fun getSomething(): R|kotlin/Int|
 
 }

compiler/testData/loadJava/compiledJava/javaBean/JavaBeanAbstractGetter.fir.txt

@@ -1,6 +1,6 @@
 public abstract interface JavaBeanAbstractGetter : R|java/lang/Object| {
-    public abstract operator function getRed(): R|kotlin/Int|
+    public abstract operator fun getRed(): R|kotlin/Int|
 
-    public abstract operator function getBlue(): R|kotlin/Int|
+    public abstract operator fun getBlue(): R|kotlin/Int|
 
 }

compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVal.fir.txt

@@ -1,4 +1,4 @@
 public open class JavaBeanVal : R|java/lang/Object| {
-    public open operator function getColor(): R|ft<kotlin/String, kotlin/String?>|!
+    public open operator fun getColor(): R|ft<kotlin/String, kotlin/String?>|!
 
 }

compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVar.fir.txt

@@ -1,6 +1,6 @@
 public open class JavaBeanVar : R|java/lang/Object| {
-    public open operator function getColor(): R|ft<kotlin/String, kotlin/String?>|!
+    public open operator fun getColor(): R|ft<kotlin/String, kotlin/String?>|!
 
-    public open operator function setColor(string: R|ft<kotlin/String, kotlin/String?>|!): R|kotlin/Unit|
+    public open operator fun setColor(string: R|ft<kotlin/String, kotlin/String?>|!): R|kotlin/Unit|
 
 }

compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVarOfGenericType.fir.txt

@@ -1,6 +1,6 @@
 <P> public open class JavaBeanVarOfGenericType : R|java/lang/Object| {
-    public open operator function getCharacters(): R|ft<java/util/ArrayList<ft<P, P?>>, java/util/ArrayList<ft<P, P?>>?>|!
+    public open operator fun getCharacters(): R|ft<java/util/ArrayList<ft<P, P?>>, java/util/ArrayList<ft<P, P?>>?>|!
 
-    public open operator function setCharacters(characters: R|ft<java/util/ArrayList<ft<P, P?>>, java/util/ArrayList<ft<P, P?>>?>|!): R|kotlin/Unit|
+    public open operator fun setCharacters(characters: R|ft<java/util/ArrayList<ft<P, P?>>, java/util/ArrayList<ft<P, P?>>?>|!): R|kotlin/Unit|
 
 }

compiler/testData/loadJava/compiledJava/javaBean/TwoSetters.fir.txt

@@ -1,6 +1,6 @@
 public open class TwoSetters : R|java/lang/Object| {
-    public open operator function setSize(size: R|ft<kotlin/String, kotlin/String?>|!): R|kotlin/Unit|
+    public open operator fun setSize(size: R|ft<kotlin/String, kotlin/String?>|!): R|kotlin/Unit|
 
-    public open operator function setSize(size: R|kotlin/Int|): R|kotlin/Unit|
+    public open operator fun setSize(size: R|kotlin/Int|): R|kotlin/Unit|
 
 }

compiler/testData/loadJava/compiledJava/kotlinSignature/AllBoundsInWhen.fir.txt

@@ -1,4 +1,4 @@
 public open class AllBoundsInWhen : R|java/lang/Object| {
-    public open operator function foo(): R|kotlin/Unit|
+    public open operator fun foo(): R|kotlin/Unit|
 
 }

compiler/testData/loadJava/compiledJava/kotlinSignature/ArrayType.fir.txt

@@ -1,4 +1,4 @@
 public open class ArrayType : R|java/lang/Object| {
-    public open operator function foo(): R|kotlin/Array<ft<java/lang/String, java/lang/String?>>|
+    public open operator fun foo(): R|kotlin/Array<ft<java/lang/String, java/lang/String?>>|
 
 }

compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithNewTypeParams.fir.txt

@@ -1,4 +1,4 @@
 <T> public open class ConstructorWithNewTypeParams : R|java/lang/Object| {
-    public final function ConstructorWithNewTypeParams(first: R|ft<U, U?>|!): R|test/ConstructorWithNewTypeParams|
+    public final fun ConstructorWithNewTypeParams(first: R|ft<U, U?>|!): R|test/ConstructorWithNewTypeParams|
 
 }

compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithParentTypeParams.fir.txt

@@ -1,4 +1,4 @@
 <T> public open class ConstructorWithParentTypeParams : R|java/lang/Object| {
-    public final function ConstructorWithParentTypeParams(first: R|ft<T, T?>|!): R|test/ConstructorWithParentTypeParams|
+    public final fun ConstructorWithParentTypeParams(first: R|ft<T, T?>|!): R|test/ConstructorWithParentTypeParams|
 
 }

compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithSeveralParams.fir.txt

@@ -1,4 +1,4 @@
 public open class ConstructorWithSeveralParams : R|java/lang/Object| {
-    public final function ConstructorWithSeveralParams(integer: R|ft<kotlin/Int, kotlin/Int?>|!, intBasic: R|kotlin/Int|, collection: R|ft<java/util/ArrayList<ft<kotlin/String, kotlin/String?>>, java/util/ArrayList<ft<kotlin/String, kotlin/String?>>?>|!): R|test/ConstructorWithSeveralParams|
+    public final fun ConstructorWithSeveralParams(integer: R|ft<kotlin/Int, kotlin/Int?>|!, intBasic: R|kotlin/Int|, collection: R|ft<java/util/ArrayList<ft<kotlin/String, kotlin/String?>>, java/util/ArrayList<ft<kotlin/String, kotlin/String?>>?>|!): R|test/ConstructorWithSeveralParams|
 
 }

compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithoutParams.fir.txt

@@ -1,4 +1,4 @@
 public open class ConstructorWithoutParams : R|java/lang/Object| {
-    public final function ConstructorWithoutParams(): R|test/ConstructorWithoutParams|
+    public final fun ConstructorWithoutParams(): R|test/ConstructorWithoutParams|
 
 }

compiler/testData/loadJava/compiledJava/kotlinSignature/CustomProjectionKind.fir.txt

@@ -1,4 +1,4 @@
 public open class CustomProjectionKind : R|java/lang/Object| {
-    public open operator function foo(): R|ft<kotlin/collections/MutableList<ft<kotlin/Number, kotlin/Number?>>, kotlin/collections/List<ft<kotlin/Number, kotlin/Number?>>?>|!
+    public open operator fun foo(): R|ft<kotlin/collections/MutableList<ft<kotlin/Number, kotlin/Number?>>, kotlin/collections/List<ft<kotlin/Number, kotlin/Number?>>?>|!
 
 }

compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithFunctionTypes.fir.txt

@@ -1,4 +1,4 @@
 public open class MethodWithFunctionTypes : R|java/lang/Object| {
-    public open operator function foo(f: R|ft<kotlin/Function1<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>, kotlin/Function1<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>?>|!): R|ft<kotlin/Function0<ft<kotlin/String, kotlin/String?>>, kotlin/Function0<ft<kotlin/String, kotlin/String?>>?>|!
+    public open operator fun foo(f: R|ft<kotlin/Function1<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>, kotlin/Function1<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>?>|!): R|ft<kotlin/Function0<ft<kotlin/String, kotlin/String?>>, kotlin/Function0<ft<kotlin/String, kotlin/String?>>?>|!
 
 }

compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithGenerics.fir.txt

@@ -1,4 +1,4 @@
 public open class MethodWithGenerics : R|java/lang/Object| {
-    public open operator function foo(a: R|ft<kotlin/String, kotlin/String?>|!, b: R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableMap.MutableEntry<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>, kotlin/collections/Map.Entry<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>?>>, kotlin/collections/List<ft<kotlin/collections/MutableMap.MutableEntry<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>, kotlin/collections/Map.Entry<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>?>>?>|!): R|ft<kotlin/String, kotlin/String?>|!
+    public open operator fun foo(a: R|ft<kotlin/String, kotlin/String?>|!, b: R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableMap.MutableEntry<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>, kotlin/collections/Map.Entry<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>?>>, kotlin/collections/List<ft<kotlin/collections/MutableMap.MutableEntry<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>, kotlin/collections/Map.Entry<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>?>>?>|!): R|ft<kotlin/String, kotlin/String?>|!
 
 }

compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithMappedClasses.fir.txt

@@ -1,6 +1,6 @@
 public open class MethodWithMappedClasses : R|java/lang/Object| {
-    public open operator function copy(dest: R|ft<kotlin/collections/MutableList<in T>, kotlin/collections/List<in T>?>|!, src: R|ft<kotlin/collections/MutableList<ft<T, T?>>, kotlin/collections/List<ft<T, T?>>?>|!): R|kotlin/Unit|
+    public open operator fun copy(dest: R|ft<kotlin/collections/MutableList<in T>, kotlin/collections/List<in T>?>|!, src: R|ft<kotlin/collections/MutableList<ft<T, T?>>, kotlin/collections/List<ft<T, T?>>?>|!): R|kotlin/Unit|
 
-    public open operator function copyMap(dest: R|ft<kotlin/collections/MutableMap<ft<kotlin/String, kotlin/String?>, in T>, kotlin/collections/Map<ft<kotlin/String, kotlin/String?>, in T>?>|!, src: R|ft<kotlin/collections/MutableMap<ft<kotlin/String, kotlin/String?>, ft<T, T?>>, kotlin/collections/Map<ft<kotlin/String, kotlin/String?>, ft<T, T?>>?>|!): R|kotlin/Unit|
+    public open operator fun copyMap(dest: R|ft<kotlin/collections/MutableMap<ft<kotlin/String, kotlin/String?>, in T>, kotlin/collections/Map<ft<kotlin/String, kotlin/String?>, in T>?>|!, src: R|ft<kotlin/collections/MutableMap<ft<kotlin/String, kotlin/String?>, ft<T, T?>>, kotlin/collections/Map<ft<kotlin/String, kotlin/String?>, ft<T, T?>>?>|!): R|kotlin/Unit|
 
 }

compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithTypeParameters.fir.txt

@@ -1,4 +1,4 @@
 public open class MethodWithTypeParameters : R|java/lang/Object| {
-    public open operator function foo(a: R|ft<A, A?>|!, b: R|ft<kotlin/collections/MutableList<out B>, kotlin/collections/List<out B>?>|!, list: R|ft<kotlin/collections/MutableList<in java/lang/String>, kotlin/collections/List<in java/lang/String>?>|!): R|kotlin/Unit|
+    public open operator fun foo(a: R|ft<A, A?>|!, b: R|ft<kotlin/collections/MutableList<out B>, kotlin/collections/List<out B>?>|!, list: R|ft<kotlin/collections/MutableList<in java/lang/String>, kotlin/collections/List<in java/lang/String>?>|!): R|kotlin/Unit|
 
 }

compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithVararg.fir.txt

@@ -1,4 +1,4 @@
 public open class MethodWithVararg : R|java/lang/Object| {
-    public open operator function foo(vararg s: R|kotlin/Array<ft<java/lang/String, java/lang/String?>>|): R|kotlin/Unit|
+    public open operator fun foo(vararg s: R|kotlin/Array<ft<java/lang/String, java/lang/String?>>|): R|kotlin/Unit|
 
 }

compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyArrayTypes.fir.txt

@@ -1,13 +1,13 @@
 <T> public open class PropertyArrayTypes : R|java/lang/Object| {
-    public open property arrayOfArrays(var): R|kotlin/Array<ft<kotlin/Array<ft<java/lang/String, java/lang/String?>>, kotlin/Array<ft<java/lang/String, java/lang/String?>>?>>|
+    public open var arrayOfArrays: R|kotlin/Array<ft<kotlin/Array<ft<java/lang/String, java/lang/String?>>, kotlin/Array<ft<java/lang/String, java/lang/String?>>?>>|
         public get(): R|kotlin/Array<ft<kotlin/Array<ft<java/lang/String, java/lang/String?>>, kotlin/Array<ft<java/lang/String, java/lang/String?>>?>>|
         public set(value: R|kotlin/Array<ft<kotlin/Array<ft<java/lang/String, java/lang/String?>>, kotlin/Array<ft<java/lang/String, java/lang/String?>>?>>|): kotlin/Unit
 
-    public open property array(var): R|kotlin/Array<ft<java/lang/String, java/lang/String?>>|
+    public open var array: R|kotlin/Array<ft<java/lang/String, java/lang/String?>>|
         public get(): R|kotlin/Array<ft<java/lang/String, java/lang/String?>>|
         public set(value: R|kotlin/Array<ft<java/lang/String, java/lang/String?>>|): kotlin/Unit
 
-    public open property genericArray(var): R|kotlin/Array<ft<T, T?>>|
+    public open var genericArray: R|kotlin/Array<ft<T, T?>>|
         public get(): R|kotlin/Array<ft<T, T?>>|
         public set(value: R|kotlin/Array<ft<T, T?>>|): kotlin/Unit
 

compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyComplexTypes.fir.txt

@@ -1,17 +1,17 @@
 <T> public open class PropertyComplexTypes : R|java/lang/Object| {
-    public open property genericType(var): R|ft<T, T?>|!
+    public open var genericType: R|ft<T, T?>|!
         public get(): R|ft<T, T?>|!
         public set(value: R|ft<T, T?>|!): kotlin/Unit
 
-    public open property listDefinedGeneric(var): R|ft<java/util/ArrayList<ft<kotlin/String, kotlin/String?>>, java/util/ArrayList<ft<kotlin/String, kotlin/String?>>?>|!
+    public open var listDefinedGeneric: R|ft<java/util/ArrayList<ft<kotlin/String, kotlin/String?>>, java/util/ArrayList<ft<kotlin/String, kotlin/String?>>?>|!
         public get(): R|ft<java/util/ArrayList<ft<kotlin/String, kotlin/String?>>, java/util/ArrayList<ft<kotlin/String, kotlin/String?>>?>|!
         public set(value: R|ft<java/util/ArrayList<ft<kotlin/String, kotlin/String?>>, java/util/ArrayList<ft<kotlin/String, kotlin/String?>>?>|!): kotlin/Unit
 
-    public open property listGeneric(var): R|ft<java/util/ArrayList<ft<T, T?>>, java/util/ArrayList<ft<T, T?>>?>|!
+    public open var listGeneric: R|ft<java/util/ArrayList<ft<T, T?>>, java/util/ArrayList<ft<T, T?>>?>|!
         public get(): R|ft<java/util/ArrayList<ft<T, T?>>, java/util/ArrayList<ft<T, T?>>?>|!
         public set(value: R|ft<java/util/ArrayList<ft<T, T?>>, java/util/ArrayList<ft<T, T?>>?>|!): kotlin/Unit
 
-    public open property listOfGenericList(var): R|ft<java/util/ArrayList<ft<java/util/ArrayList<ft<T, T?>>, java/util/ArrayList<ft<T, T?>>?>>, java/util/ArrayList<ft<java/util/ArrayList<ft<T, T?>>, java/util/ArrayList<ft<T, T?>>?>>?>|!
+    public open var listOfGenericList: R|ft<java/util/ArrayList<ft<java/util/ArrayList<ft<T, T?>>, java/util/ArrayList<ft<T, T?>>?>>, java/util/ArrayList<ft<java/util/ArrayList<ft<T, T?>>, java/util/ArrayList<ft<T, T?>>?>>?>|!
         public get(): R|ft<java/util/ArrayList<ft<java/util/ArrayList<ft<T, T?>>, java/util/ArrayList<ft<T, T?>>?>>, java/util/ArrayList<ft<java/util/ArrayList<ft<T, T?>>, java/util/ArrayList<ft<T, T?>>?>>?>|!
         public set(value: R|ft<java/util/ArrayList<ft<java/util/ArrayList<ft<T, T?>>, java/util/ArrayList<ft<T, T?>>?>>, java/util/ArrayList<ft<java/util/ArrayList<ft<T, T?>>, java/util/ArrayList<ft<T, T?>>?>>?>|!): kotlin/Unit
 

compiler/testData/loadJava/compiledJava/kotlinSignature/PropertySimpleType.fir.txt

@@ -1,9 +1,9 @@
 public open class PropertySimpleType : R|java/lang/Object| {
-    public open property fieldOne(var): R|ft<kotlin/String, kotlin/String?>|!
+    public open var fieldOne: R|ft<kotlin/String, kotlin/String?>|!
         public get(): R|ft<kotlin/String, kotlin/String?>|!
         public set(value: R|ft<kotlin/String, kotlin/String?>|!): kotlin/Unit
 
-    public open property fieldTwo(var): R|ft<kotlin/String, kotlin/String?>|!
+    public open var fieldTwo: R|ft<kotlin/String, kotlin/String?>|!
         public get(): R|ft<kotlin/String, kotlin/String?>|!
         public set(value: R|ft<kotlin/String, kotlin/String?>|!): kotlin/Unit
 

compiler/testData/loadJava/compiledJava/kotlinSignature/StarProjection.fir.txt

@@ -1,4 +1,4 @@
 public final class StarProjection : R|java/lang/Object| {
-    public final operator function foo(): R|ft<test/StarProjection.MyClass<*>, test/StarProjection.MyClass<*>?>|!
+    public final operator fun foo(): R|ft<test/StarProjection.MyClass<*>, test/StarProjection.MyClass<*>?>|!
 
 }

compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongProjectionKind.fir.txt

@@ -1,4 +1,4 @@
 public open class WrongProjectionKind : R|java/lang/Object| {
-    public open operator function copy(from: R|kotlin/Array<ft<java/lang/Number, java/lang/Number?>>|, to: R|kotlin/Array<ft<java/lang/Number, java/lang/Number?>>|): R|ft<kotlin/collections/MutableList<ft<kotlin/Number, kotlin/Number?>>, kotlin/collections/List<ft<kotlin/Number, kotlin/Number?>>?>|!
+    public open operator fun copy(from: R|kotlin/Array<ft<java/lang/Number, java/lang/Number?>>|, to: R|kotlin/Array<ft<java/lang/Number, java/lang/Number?>>|): R|ft<kotlin/collections/MutableList<ft<kotlin/Number, kotlin/Number?>>, kotlin/collections/List<ft<kotlin/Number, kotlin/Number?>>?>|!
 
 }

compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongReturnTypeStructure.fir.txt

@@ -1,4 +1,4 @@
 public open class WrongReturnTypeStructure : R|java/lang/Object| {
-    public open operator function foo(a: R|ft<kotlin/String, kotlin/String?>|!, b: R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableMap.MutableEntry<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>, kotlin/collections/Map.Entry<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>?>>, kotlin/collections/List<ft<kotlin/collections/MutableMap.MutableEntry<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>, kotlin/collections/Map.Entry<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>?>>?>|!): R|ft<kotlin/String, kotlin/String?>|!
+    public open operator fun foo(a: R|ft<kotlin/String, kotlin/String?>|!, b: R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableMap.MutableEntry<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>, kotlin/collections/Map.Entry<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>?>>, kotlin/collections/List<ft<kotlin/collections/MutableMap.MutableEntry<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>, kotlin/collections/Map.Entry<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>?>>?>|!): R|ft<kotlin/String, kotlin/String?>|!
 
 }

compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.fir.txt

@@ -1,4 +1,4 @@
 public open class WrongTypeParameterBoundStructure1 : R|java/lang/Object| {
-    public open operator function foo(a: R|ft<A, A?>|!, b: R|ft<kotlin/collections/MutableList<out B>, kotlin/collections/List<out B>?>|!): R|kotlin/Unit|
+    public open operator fun foo(a: R|ft<A, A?>|!, b: R|ft<kotlin/collections/MutableList<out B>, kotlin/collections/List<out B>?>|!): R|kotlin/Unit|
 
 }

compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure1.fir.txt

@@ -1,4 +1,4 @@
 public open class WrongValueParameterStructure1 : R|java/lang/Object| {
-    public open operator function foo(a: R|ft<kotlin/String, kotlin/String?>|!, b: R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableMap.MutableEntry<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>, kotlin/collections/Map.Entry<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>?>>, kotlin/collections/List<ft<kotlin/collections/MutableMap.MutableEntry<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>, kotlin/collections/Map.Entry<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>?>>?>|!): R|ft<kotlin/String, kotlin/String?>|!
+    public open operator fun foo(a: R|ft<kotlin/String, kotlin/String?>|!, b: R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableMap.MutableEntry<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>, kotlin/collections/Map.Entry<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>?>>, kotlin/collections/List<ft<kotlin/collections/MutableMap.MutableEntry<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>, kotlin/collections/Map.Entry<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>?>>?>|!): R|ft<kotlin/String, kotlin/String?>|!
 
 }

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfCollection.fir.txt

@@ -1,4 +1,4 @@
 <E> public abstract interface SubclassOfCollection : R|java/util/Collection<E>| {
-    public abstract operator function iterator(): R|ft<kotlin/collections/MutableIterator<ft<E, E?>>, kotlin/collections/Iterator<ft<E, E?>>?>|!
+    public abstract operator fun iterator(): R|ft<kotlin/collections/MutableIterator<ft<E, E?>>, kotlin/collections/Iterator<ft<E, E?>>?>|!
 
 }

compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfMapEntry.fir.txt

@@ -1,6 +1,6 @@
 <K, V> public abstract interface SubclassOfMapEntry : R|java/util/Map.Entry<K, V>| {
-    public abstract operator function setValue(value: R|ft<V, V?>|!): R|ft<V, V?>|!
+    public abstract operator fun setValue(value: R|ft<V, V?>|!): R|ft<V, V?>|!
 
-    public abstract operator function setValue(<anonymous Java parameter>: R|ft<V, V?>|!): R|ft<V, V?>|!
+    public abstract operator fun setValue(<anonymous Java parameter>: R|ft<V, V?>|!): R|ft<V, V?>|!
 
 }

compiler/testData/loadJava/compiledJava/library/LoadIterable.fir.txt

@@ -1,6 +1,6 @@
 <T> public abstract interface LoadIterable : R|java/lang/Object| {
-    public abstract operator function getIterable(): R|ft<kotlin/collections/MutableIterable<ft<T, T?>>, kotlin/collections/Iterable<ft<T, T?>>?>|!
+    public abstract operator fun getIterable(): R|ft<kotlin/collections/MutableIterable<ft<T, T?>>, kotlin/collections/Iterable<ft<T, T?>>?>|!
 
-    public abstract operator function setIterable(Iterable: R|ft<kotlin/collections/MutableIterable<ft<T, T?>>, kotlin/collections/Iterable<ft<T, T?>>?>|!): R|kotlin/Unit|
+    public abstract operator fun setIterable(Iterable: R|ft<kotlin/collections/MutableIterable<ft<T, T?>>, kotlin/collections/Iterable<ft<T, T?>>?>|!): R|kotlin/Unit|
 
 }

compiler/testData/loadJava/compiledJava/library/LoadIterator.fir.txt

@@ -1,6 +1,6 @@
 <T> public abstract interface LoadIterator : R|java/lang/Object| {
-    public abstract operator function getIterator(): R|ft<kotlin/collections/MutableIterator<ft<T, T?>>, kotlin/collections/Iterator<ft<T, T?>>?>|!
+    public abstract operator fun getIterator(): R|ft<kotlin/collections/MutableIterator<ft<T, T?>>, kotlin/collections/Iterator<ft<T, T?>>?>|!
 
-    public abstract operator function setIterator(iterator: R|ft<kotlin/collections/MutableIterator<ft<T, T?>>, kotlin/collections/Iterator<ft<T, T?>>?>|!): R|kotlin/Unit|
+    public abstract operator fun setIterator(iterator: R|ft<kotlin/collections/MutableIterator<ft<T, T?>>, kotlin/collections/Iterator<ft<T, T?>>?>|!): R|kotlin/Unit|
 
 }

compiler/testData/loadJava/compiledJava/library/Max.fir.txt

@@ -1,4 +1,4 @@
 public open class Max : R|java/lang/Object| {
-    public open operator function max(coll: R|ft<kotlin/collections/MutableCollection<out T>, kotlin/collections/Collection<out T>?>|!): R|ft<T, T?>|!
+    public open operator fun max(coll: R|ft<kotlin/collections/MutableCollection<out T>, kotlin/collections/Collection<out T>?>|!): R|ft<T, T?>|!
 
 }

compiler/testData/loadJava/compiledJava/modality/ModalityOfFakeOverrides.fir.txt

@@ -1,6 +1,6 @@
 public open class ModalityOfFakeOverrides : R|java/util/AbstractList<java/lang/String>| {
-    @R|java/lang/Override|() @R|org/jetbrains/annotations/NotNull|() public open operator function get(index: R|kotlin/Int|): R|kotlin/String|
+    @R|java/lang/Override|() @R|org/jetbrains/annotations/NotNull|() public open operator fun get(index: R|kotlin/Int|): R|kotlin/String|
 
-    @R|java/lang/Override|() public open operator function size(): R|kotlin/Int|
+    @R|java/lang/Override|() public open operator fun size(): R|kotlin/Int|
 
 }

compiler/testData/loadJava/compiledJava/mutability/LoadIterable.fir.txt

@@ -1,10 +1,10 @@
 <T> public abstract interface LoadIterable : R|java/lang/Object| {
-    @R|kotlin/annotations/jvm/Mutable|() public abstract operator function getIterable(): R|ft<kotlin/collections/MutableIterable<ft<T, T?>>, kotlin/collections/MutableIterable<ft<T, T?>>?>|!
+    @R|kotlin/annotations/jvm/Mutable|() public abstract operator fun getIterable(): R|ft<kotlin/collections/MutableIterable<ft<T, T?>>, kotlin/collections/MutableIterable<ft<T, T?>>?>|!
 
-    public abstract operator function setIterable(@R|kotlin/annotations/jvm/Mutable|() Iterable: R|ft<kotlin/collections/MutableIterable<ft<T, T?>>, kotlin/collections/MutableIterable<ft<T, T?>>?>|!): R|kotlin/Unit|
+    public abstract operator fun setIterable(@R|kotlin/annotations/jvm/Mutable|() Iterable: R|ft<kotlin/collections/MutableIterable<ft<T, T?>>, kotlin/collections/MutableIterable<ft<T, T?>>?>|!): R|kotlin/Unit|
 
-    @R|kotlin/annotations/jvm/ReadOnly|() public abstract operator function getReadOnlyIterable(): R|ft<kotlin/collections/Iterable<ft<T, T?>>, kotlin/collections/Iterable<ft<T, T?>>?>|!
+    @R|kotlin/annotations/jvm/ReadOnly|() public abstract operator fun getReadOnlyIterable(): R|ft<kotlin/collections/Iterable<ft<T, T?>>, kotlin/collections/Iterable<ft<T, T?>>?>|!
 
-    public abstract operator function setReadOnlyIterable(@R|kotlin/annotations/jvm/ReadOnly|() Iterable: R|ft<kotlin/collections/Iterable<ft<T, T?>>, kotlin/collections/Iterable<ft<T, T?>>?>|!): R|kotlin/Unit|
+    public abstract operator fun setReadOnlyIterable(@R|kotlin/annotations/jvm/ReadOnly|() Iterable: R|ft<kotlin/collections/Iterable<ft<T, T?>>, kotlin/collections/Iterable<ft<T, T?>>?>|!): R|kotlin/Unit|
 
 }

compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithConflict.fir.txt

@@ -1,6 +1,6 @@
 <T> public abstract interface LoadIterableWithConflict : R|java/lang/Object| {
-    @R|kotlin/annotations/jvm/ReadOnly|() @R|kotlin/annotations/jvm/Mutable|() public abstract operator function getIterable(): R|ft<kotlin/collections/MutableIterable<ft<T, T?>>, kotlin/collections/Iterable<ft<T, T?>>?>|!
+    @R|kotlin/annotations/jvm/ReadOnly|() @R|kotlin/annotations/jvm/Mutable|() public abstract operator fun getIterable(): R|ft<kotlin/collections/MutableIterable<ft<T, T?>>, kotlin/collections/Iterable<ft<T, T?>>?>|!
 
-    public abstract operator function setIterable(@R|kotlin/annotations/jvm/ReadOnly|() @R|kotlin/annotations/jvm/Mutable|() Iterable: R|ft<kotlin/collections/MutableIterable<ft<T, T?>>, kotlin/collections/Iterable<ft<T, T?>>?>|!): R|kotlin/Unit|
+    public abstract operator fun setIterable(@R|kotlin/annotations/jvm/ReadOnly|() @R|kotlin/annotations/jvm/Mutable|() Iterable: R|ft<kotlin/collections/MutableIterable<ft<T, T?>>, kotlin/collections/Iterable<ft<T, T?>>?>|!): R|kotlin/Unit|
 
 }

compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithNullability.fir.txt

@@ -1,10 +1,10 @@
 <T> public abstract interface LoadIterableWithNullability : R|java/lang/Object| {
-    @R|org/jetbrains/annotations/NotNull|() @R|kotlin/annotations/jvm/Mutable|() public abstract operator function getIterable(): R|ft<kotlin/collections/MutableIterable<ft<T, T?>>, kotlin/collections/MutableIterable<ft<T, T?>>>|
+    @R|org/jetbrains/annotations/NotNull|() @R|kotlin/annotations/jvm/Mutable|() public abstract operator fun getIterable(): R|ft<kotlin/collections/MutableIterable<ft<T, T?>>, kotlin/collections/MutableIterable<ft<T, T?>>>|
 
-    public abstract operator function setIterable(@R|kotlin/annotations/jvm/Mutable|() @R|org/jetbrains/annotations/NotNull|() Iterable: R|ft<kotlin/collections/MutableIterable<ft<T, T?>>, kotlin/collections/MutableIterable<ft<T, T?>>>|): R|kotlin/Unit|
+    public abstract operator fun setIterable(@R|kotlin/annotations/jvm/Mutable|() @R|org/jetbrains/annotations/NotNull|() Iterable: R|ft<kotlin/collections/MutableIterable<ft<T, T?>>, kotlin/collections/MutableIterable<ft<T, T?>>>|): R|kotlin/Unit|
 
-    @R|org/jetbrains/annotations/NotNull|() @R|kotlin/annotations/jvm/ReadOnly|() public abstract operator function getReadOnlyIterable(): R|ft<kotlin/collections/Iterable<ft<T, T?>>, kotlin/collections/Iterable<ft<T, T?>>>|
+    @R|org/jetbrains/annotations/NotNull|() @R|kotlin/annotations/jvm/ReadOnly|() public abstract operator fun getReadOnlyIterable(): R|ft<kotlin/collections/Iterable<ft<T, T?>>, kotlin/collections/Iterable<ft<T, T?>>>|
 
-    public abstract operator function setReadOnlyIterable(@R|kotlin/annotations/jvm/ReadOnly|() @R|org/jetbrains/annotations/NotNull|() Iterable: R|ft<kotlin/collections/Iterable<ft<T, T?>>, kotlin/collections/Iterable<ft<T, T?>>>|): R|kotlin/Unit|
+    public abstract operator fun setReadOnlyIterable(@R|kotlin/annotations/jvm/ReadOnly|() @R|org/jetbrains/annotations/NotNull|() Iterable: R|ft<kotlin/collections/Iterable<ft<T, T?>>, kotlin/collections/Iterable<ft<T, T?>>>|): R|kotlin/Unit|
 
 }

compiler/testData/loadJava/compiledJava/mutability/ReadOnlyExtendsWildcard.fir.txt

@@ -1,6 +1,6 @@
 public abstract interface ReadOnlyExtendsWildcard : R|java/lang/Object| {
-    public abstract operator function bar(): R|kotlin/Unit|
+    public abstract operator fun bar(): R|kotlin/Unit|
 
-    public abstract operator function foo(@R|kotlin/annotations/jvm/ReadOnly|() x: R|ft<kotlin/collections/List<out java/lang/CharSequence>, kotlin/collections/List<out java/lang/CharSequence>?>|!, @R|org/jetbrains/annotations/NotNull|() y: R|kotlin/Comparable<in java/lang/String>|): R|kotlin/Unit|
+    public abstract operator fun foo(@R|kotlin/annotations/jvm/ReadOnly|() x: R|ft<kotlin/collections/List<out java/lang/CharSequence>, kotlin/collections/List<out java/lang/CharSequence>?>|!, @R|org/jetbrains/annotations/NotNull|() y: R|kotlin/Comparable<in java/lang/String>|): R|kotlin/Unit|
 
 }

compiler/testData/loadJava/compiledJava/notNull/NotNullField.fir.txt

@@ -1,5 +1,5 @@
 public open class NotNullField : R|java/lang/Object| {
-    @R|org/jetbrains/annotations/NotNull|() public open property hi(var): R|kotlin/String|
+    @R|org/jetbrains/annotations/NotNull|() public open var hi: R|kotlin/String|
         public get(): R|kotlin/String|
         public set(value: R|kotlin/String|): kotlin/Unit
 

compiler/testData/loadJava/compiledJava/notNull/NotNullIntArray.fir.txt

@@ -1,4 +1,4 @@
 public open class NotNullIntArray : R|java/lang/Object| {
-    @R|org/jetbrains/annotations/NotNull|() public open operator function hi(): R|kotlin/IntArray|
+    @R|org/jetbrains/annotations/NotNull|() public open operator fun hi(): R|kotlin/IntArray|
 
 }

compiler/testData/loadJava/compiledJava/notNull/NotNullMethod.fir.txt

@@ -1,4 +1,4 @@
 public open class NotNullMethod : R|java/lang/Object| {
-    @R|org/jetbrains/annotations/NotNull|() public open operator function hi(): R|kotlin/String|
+    @R|org/jetbrains/annotations/NotNull|() public open operator fun hi(): R|kotlin/String|
 
 }

compiler/testData/loadJava/compiledJava/notNull/NotNullObjectArray.fir.txt

@@ -1,4 +1,4 @@
 public open class NotNullObjectArray : R|java/lang/Object| {
-    @R|org/jetbrains/annotations/NotNull|() public open operator function hi(): R|kotlin/Array<ft<java/lang/Object, java/lang/Object?>>|
+    @R|org/jetbrains/annotations/NotNull|() public open operator fun hi(): R|kotlin/Array<ft<java/lang/Object, java/lang/Object?>>|
 
 }

compiler/testData/loadJava/compiledJava/notNull/NotNullParameter.fir.txt

@@ -1,4 +1,4 @@
 public open class NotNullParameter : R|java/lang/Object| {
-    public open operator function hi(@R|org/jetbrains/annotations/NotNull|() param: R|kotlin/String|): R|kotlin/Unit|
+    public open operator fun hi(@R|org/jetbrains/annotations/NotNull|() param: R|kotlin/String|): R|kotlin/Unit|
 
 }

compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageFun.fir.txt

@@ -1,4 +1,4 @@
 public open class ProtectedPackageFun : R|java/lang/Object| {
-    protected/*protected and package*/ open operator function foo(): R|kotlin/Unit|
+    protected/*protected and package*/ open operator fun foo(): R|kotlin/Unit|
 
 }

compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageProperty.fir.txt

@@ -1,5 +1,5 @@
 public open class ProtectedPackageProperty : R|java/lang/Object| {
-    protected/*protected and package*/ open property foo(var): R|kotlin/Int|
+    protected/*protected and package*/ open var foo: R|kotlin/Int|
         protected/*protected and package*/ get(): R|kotlin/Int|
         protected/*protected and package*/ set(value: R|kotlin/Int|): kotlin/Unit
 

compiler/testData/loadJava/compiledJava/sam/Comparator.fir.txt

@@ -1,6 +1,6 @@
 <T> public abstract interface Comparator : R|java/lang/Object| {
-    public abstract operator function compare(o1: R|ft<T, T?>|!, o2: R|ft<T, T?>|!): R|kotlin/Int|
+    public abstract operator fun compare(o1: R|ft<T, T?>|!, o2: R|ft<T, T?>|!): R|kotlin/Int|
 
-    public abstract operator function equals(obj: R|ft<kotlin/Any, kotlin/Any?>|!): R|kotlin/Boolean|
+    public abstract operator fun equals(obj: R|ft<kotlin/Any, kotlin/Any?>|!): R|kotlin/Boolean|
 
 }

compiler/testData/loadJava/compiledJava/sam/FilenameFilter.fir.txt

@@ -1,4 +1,4 @@
 public abstract interface FilenameFilter : R|java/lang/Object| {
-    public abstract operator function accept(dir: R|ft<java/io/File, java/io/File?>|!, name: R|ft<kotlin/String, kotlin/String?>|!): R|kotlin/Boolean|
+    public abstract operator fun accept(dir: R|ft<java/io/File, java/io/File?>|!, name: R|ft<kotlin/String, kotlin/String?>|!): R|kotlin/Boolean|
 
 }

compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParameterWithSelfBound.fir.txt

@@ -1,4 +1,4 @@
 <T> public abstract interface GenericInterfaceParameterWithSelfBound : R|java/lang/Object| {
-    public abstract operator function method(t: R|ft<T, T?>|!): R|ft<T, T?>|!
+    public abstract operator fun method(t: R|ft<T, T?>|!): R|ft<T, T?>|!
 
 }

compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParametersWithBounds.fir.txt

@@ -1,4 +1,4 @@
 <A, B> public abstract interface GenericInterfaceParametersWithBounds : R|java/lang/Object| {
-    public abstract operator function method(a: R|kotlin/Array<ft<A, A?>>|, b: R|ft<B, B?>|!): R|kotlin/Unit|
+    public abstract operator fun method(a: R|kotlin/Array<ft<A, A?>>|, b: R|ft<B, B?>|!): R|kotlin/Unit|
 
 }

compiler/testData/loadJava/compiledJava/sam/GenericMethodParameters.fir.txt

@@ -1,4 +1,4 @@
 public abstract interface GenericMethodParameters : R|java/lang/Object| {
-    public abstract operator function method(a: R|kotlin/Array<ft<A, A?>>|, b: R|ft<B, B?>|!): R|kotlin/Unit|
+    public abstract operator fun method(a: R|kotlin/Array<ft<A, A?>>|, b: R|ft<B, B?>|!): R|kotlin/Unit|
 
 }

compiler/testData/loadJava/compiledJava/sam/InterfaceWithObjectMethod.fir.txt

@@ -1,4 +1,4 @@
 public abstract interface InterfaceWithObjectMethod : R|java/lang/Object| {
-    public abstract operator function toString(): R|ft<kotlin/String, kotlin/String?>|!
+    public abstract operator fun toString(): R|ft<kotlin/String, kotlin/String?>|!
 
 }

compiler/testData/loadJava/compiledJava/sam/Runnable.fir.txt

@@ -1,4 +1,4 @@
 public abstract interface Runnable : R|java/lang/Object| {
-    public abstract operator function run(): R|kotlin/Unit|
+    public abstract operator fun run(): R|kotlin/Unit|
 
 }

compiler/testData/loadJava/compiledJava/sam/SamSubinterfaceOverridding.fir.txt

@@ -1,4 +1,4 @@
 public abstract interface SamSubinterfaceOverridding : R|java/lang/Runnable| {
-    public abstract operator function run(): R|kotlin/Unit|
+    public abstract operator fun run(): R|kotlin/Unit|
 
 }

compiler/testData/loadJava/compiledJava/sam/VarargParameter.fir.txt

@@ -1,4 +1,4 @@
 public abstract interface VarargParameter : R|java/lang/Object| {
-    public abstract operator function f(vararg strings: R|kotlin/Array<ft<java/lang/String, java/lang/String?>>|): R|kotlin/Unit|
+    public abstract operator fun f(vararg strings: R|kotlin/Array<ft<java/lang/String, java/lang/String?>>|): R|kotlin/Unit|
 
 }

compiler/testData/loadJava/compiledJava/sam/adapters/AmbiguousAdapters.fir.txt

@@ -1,6 +1,6 @@
 public open class AmbiguousAdapters : R|java/lang/Object| {
-    public open operator function foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|!): R|kotlin/Unit|
+    public open operator fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|!): R|kotlin/Unit|
 
-    public open operator function foo(c: R|ft<java/io/Closeable, java/io/Closeable?>|!): R|kotlin/Unit|
+    public open operator fun foo(c: R|ft<java/io/Closeable, java/io/Closeable?>|!): R|kotlin/Unit|
 
 }

compiler/testData/loadJava/compiledJava/sam/adapters/Basic.fir.txt

@@ -1,6 +1,6 @@
 public open class Basic : R|java/lang/Object| {
-    public open operator function foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|!): R|kotlin/Unit|
+    public open operator fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|!): R|kotlin/Unit|
 
-    public open static operator function bar(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|!): R|kotlin/Unit|
+    public open static operator fun bar(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|!): R|kotlin/Unit|
 
 }

compiler/testData/loadJava/compiledJava/sam/adapters/Constructor.fir.txt

@@ -1,4 +1,4 @@
 public open class Constructor : R|java/lang/Object| {
-    public final function Constructor(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|!): R|test/Constructor|
+    public final fun Constructor(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|!): R|test/Constructor|
 
 }

compiler/testData/loadJava/compiledJava/sam/adapters/ConstructorWithAnnotations.fir.txt

@@ -1,4 +1,4 @@
 public open class ConstructorWithAnnotations : R|java/lang/Object| {
-    public final function ConstructorWithAnnotations(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|!, @R|org/jetbrains/annotations/NotNull|() s: R|kotlin/String|): R|test/ConstructorWithAnnotations|
+    public final fun ConstructorWithAnnotations(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|!, @R|org/jetbrains/annotations/NotNull|() s: R|kotlin/String|): R|test/ConstructorWithAnnotations|
 
 }

compiler/testData/loadJava/compiledJava/sam/adapters/NonTrivialFunctionType.fir.txt

@@ -1,10 +1,10 @@
 public open class NonTrivialFunctionType : R|java/lang/Object| {
-    public open operator function foo(filenameFilter: R|ft<java/io/FilenameFilter, java/io/FilenameFilter?>|!): R|kotlin/Unit|
+    public open operator fun foo(filenameFilter: R|ft<java/io/FilenameFilter, java/io/FilenameFilter?>|!): R|kotlin/Unit|
 
-    public open operator function foo(comparator: R|ft<java/util/Comparator<ft<kotlin/String, kotlin/String?>>, java/util/Comparator<ft<kotlin/String, kotlin/String?>>?>|!): R|kotlin/Unit|
+    public open operator fun foo(comparator: R|ft<java/util/Comparator<ft<kotlin/String, kotlin/String?>>, java/util/Comparator<ft<kotlin/String, kotlin/String?>>?>|!): R|kotlin/Unit|
 
-    public open operator function wildcardUnbound(comparator: R|ft<java/util/Comparator<*>, java/util/Comparator<*>?>|!): R|kotlin/Unit|
+    public open operator fun wildcardUnbound(comparator: R|ft<java/util/Comparator<*>, java/util/Comparator<*>?>|!): R|kotlin/Unit|
 
-    public open operator function wildcardBound(comparator: R|ft<java/util/Comparator<in java/lang/CharSequence>, java/util/Comparator<in java/lang/CharSequence>?>|!): R|kotlin/Unit|
+    public open operator fun wildcardBound(comparator: R|ft<java/util/Comparator<in java/lang/CharSequence>, java/util/Comparator<in java/lang/CharSequence>?>|!): R|kotlin/Unit|
 
 }

compiler/testData/loadJava/compiledJava/sam/adapters/PrivateSamAdapter.fir.txt

@@ -1,4 +1,4 @@
 public open class PrivateSamAdapter : R|java/lang/Object| {
-    private open operator function samAdapter(r: R|ft<test/PrivateSamAdapter.SamInterface, test/PrivateSamAdapter.SamInterface?>|!): R|kotlin/Unit|
+    private open operator fun samAdapter(r: R|ft<test/PrivateSamAdapter.SamInterface, test/PrivateSamAdapter.SamInterface?>|!): R|kotlin/Unit|
 
 }

compiler/testData/loadJava/compiledJava/sam/adapters/SelfAsParameter.fir.txt

@@ -1,4 +1,4 @@
 public abstract interface SelfAsParameter : R|java/lang/Object| {
-    public abstract operator function foo(p: R|ft<test/SelfAsParameter, test/SelfAsParameter?>|!): R|kotlin/Unit|
+    public abstract operator fun foo(p: R|ft<test/SelfAsParameter, test/SelfAsParameter?>|!): R|kotlin/Unit|
 
 }

compiler/testData/loadJava/compiledJava/sam/adapters/SeveralSamParameters.fir.txt

@@ -1,4 +1,4 @@
 public open class SeveralSamParameters : R|java/lang/Object| {
-    public open static operator function findMaxAndInvokeCallback(comparator: R|ft<java/util/Comparator<ft<kotlin/String, kotlin/String?>>, java/util/Comparator<ft<kotlin/String, kotlin/String?>>?>|!, a: R|ft<kotlin/String, kotlin/String?>|!, b: R|ft<kotlin/String, kotlin/String?>|!, afterRunnable: R|ft<java/lang/Runnable, java/lang/Runnable?>|!): R|ft<kotlin/String, kotlin/String?>|!
+    public open static operator fun findMaxAndInvokeCallback(comparator: R|ft<java/util/Comparator<ft<kotlin/String, kotlin/String?>>, java/util/Comparator<ft<kotlin/String, kotlin/String?>>?>|!, a: R|ft<kotlin/String, kotlin/String?>|!, b: R|ft<kotlin/String, kotlin/String?>|!, afterRunnable: R|ft<java/lang/Runnable, java/lang/Runnable?>|!): R|ft<kotlin/String, kotlin/String?>|!
 
 }

compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfClass.fir.txt

@@ -1,4 +1,4 @@
 <T> public open class TypeParameterOfClass : R|java/lang/Object| {
-    public open operator function foo(comparator: R|ft<java/util/Comparator<ft<T, T?>>, java/util/Comparator<ft<T, T?>>?>|!): R|kotlin/Unit|
+    public open operator fun foo(comparator: R|ft<java/util/Comparator<ft<T, T?>>, java/util/Comparator<ft<T, T?>>?>|!): R|kotlin/Unit|
 
 }