FIR: Make FIR rendering more kotlin-styled

compiler/fir/resolve/testData/enhancement/jsr305/NonNullNever.fir.txt

@@ -1,10 +1,10 @@
 @R|java/lang/annotation/Documented|() @R|javax/annotation/meta/TypeQualifierNickname|() @R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.NEVER|()) @R|java/lang/annotation/Retention|(R|java/lang/annotation/RetentionPolicy.RUNTIME|()) public abstract annotation class MyNullable : R|java/lang/annotation/Annotation| {
 }
 public open class NonNullNever : R|java/lang/Object| {
-    @R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.NEVER|()) public open property field(var): R|kotlin/String|?
+    @R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.NEVER|()) public open var field: R|kotlin/String|?
         public get(): R|kotlin/String|?
         public set(value: R|kotlin/String|?): kotlin/Unit
 
-    @R|MyNullable|() public open operator function foo(@R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.NEVER|()) x: R|kotlin/String|?, @R|MyNullable|() y: R|kotlin/CharSequence|?): R|kotlin/String|?
+    @R|MyNullable|() public open operator fun foo(@R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.NEVER|()) x: R|kotlin/String|?, @R|MyNullable|() y: R|kotlin/CharSequence|?): R|kotlin/String|?
 
 }

compiler/fir/resolve/testData/enhancement/jsr305/Simple.fir.txt

@@ -1,10 +1,10 @@
 public open class Simple : R|java/lang/Object| {
-    @R|javax/annotation/Nullable|() public open property field(var): R|kotlin/String|?
+    @R|javax/annotation/Nullable|() public open var field: R|kotlin/String|?
         public get(): R|kotlin/String|?
         public set(value: R|kotlin/String|?): kotlin/Unit
 
-    @R|javax/annotation/Nullable|() public open operator function foo(@R|javax/annotation/Nonnull|() x: R|kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence|?): R|kotlin/String|?
+    @R|javax/annotation/Nullable|() public open operator fun foo(@R|javax/annotation/Nonnull|() x: R|kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence|?): R|kotlin/String|?
 
-    @R|javax/annotation/Nonnull|() public open operator function bar(): R|kotlin/String|
+    @R|javax/annotation/Nonnull|() public open operator fun bar(): R|kotlin/String|
 
 }

compiler/fir/resolve/testData/enhancement/jsr305/Strange.fir.txt

@@ -1,10 +1,10 @@
 public open class Strange : R|java/lang/Object| {
-    @R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.UNKNOWN|()) public open property field(var): R|ft<kotlin/String, kotlin/String?>|!
+    @R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.UNKNOWN|()) public open var field: 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
 
-    @R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.MAYBE|()) public open operator function foo(@R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.ALWAYS|()) x: R|kotlin/String|, @R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.NEVER|()) y: R|kotlin/CharSequence|?): R|kotlin/String|?
+    @R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.MAYBE|()) public open operator fun foo(@R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.ALWAYS|()) x: R|kotlin/String|, @R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.NEVER|()) y: R|kotlin/CharSequence|?): R|kotlin/String|?
 
-    @R|javax/annotation/Nonnull|() public open operator function bar(): R|kotlin/String|
+    @R|javax/annotation/Nonnull|() public open operator fun bar(): R|kotlin/String|
 
 }

compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/FieldsAreNullable.fir.txt

@@ -1,15 +1,15 @@
 @R|FieldsAreNullable|() public open class A : R|java/lang/Object| {
-    public open property field(var): R|kotlin/String|?
+    public open var field: R|kotlin/String|?
         public get(): R|kotlin/String|?
         public set(value: R|kotlin/String|?): kotlin/Unit
 
-    @R|javax/annotation/Nonnull|() public open property nonNullField(var): R|kotlin/String|
+    @R|javax/annotation/Nonnull|() public open var nonNullField: R|kotlin/String|
         public get(): R|kotlin/String|
         public set(value: R|kotlin/String|): kotlin/Unit
 
-    public open operator function foo(q: R|ft<kotlin/String, kotlin/String?>|!, @R|javax/annotation/Nonnull|() x: R|kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence|?): R|ft<kotlin/String, kotlin/String?>|!
+    public open operator fun foo(q: R|ft<kotlin/String, kotlin/String?>|!, @R|javax/annotation/Nonnull|() x: R|kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence|?): R|ft<kotlin/String, kotlin/String?>|!
 
-    @R|javax/annotation/Nonnull|() public open operator function bar(): R|kotlin/String|
+    @R|javax/annotation/Nonnull|() public open operator fun bar(): R|kotlin/String|
 
 }
 @R|java/lang/annotation/Retention|(R|java/lang/annotation/RetentionPolicy.RUNTIME|()) @R|java/lang/annotation/Documented|() @R|javax/annotation/CheckForNull|() @R|javax/annotation/meta/TypeQualifierDefault|(<implicitArrayOf>(R|java/lang/annotation/ElementType.FIELD|())) public abstract annotation class FieldsAreNullable : R|java/lang/annotation/Annotation| {

compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ForceFlexibility.fir.txt

@@ -1,7 +1,7 @@
 @R|spr/NonNullApi|() public open class A : R|java/lang/Object| {
-    public open operator function foo(x: R|kotlin/String|, @R|spr/Nullable|() y: R|kotlin/CharSequence|?): R|kotlin/String|
+    public open operator fun foo(x: R|kotlin/String|, @R|spr/Nullable|() y: R|kotlin/CharSequence|?): R|kotlin/String|
 
-    @R|spr/ForceFlexibility|() public open operator function bar(x: R|ft<kotlin/String, kotlin/String?>|!, @R|javax/annotation/Nonnull|() y: R|kotlin/CharSequence|): R|ft<kotlin/String, kotlin/String?>|!
+    @R|spr/ForceFlexibility|() public open operator fun bar(x: R|ft<kotlin/String, kotlin/String?>|!, @R|javax/annotation/Nonnull|() y: R|kotlin/CharSequence|): R|ft<kotlin/String, kotlin/String?>|!
 
 }
 @R|java/lang/annotation/Retention|(R|java/lang/annotation/RetentionPolicy.RUNTIME|()) @R|java/lang/annotation/Documented|() @R|spr/UnknownNullability|() @R|javax/annotation/meta/TypeQualifierDefault|(<implicitArrayOf>(R|java/lang/annotation/ElementType.METHOD|(), R|java/lang/annotation/ElementType.PARAMETER|())) public abstract annotation class ForceFlexibility : R|java/lang/annotation/Annotation| {

compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ForceFlexibleOverOverrides.fir.txt

@@ -1,21 +1,21 @@
 @R|spr/NonNullApi|() public open class A : R|java/lang/Object|, R|B| {
-    @R|spr/ForceFlexibility|() public open operator function foo(x: R|kotlin/String|): R|kotlin/Unit|
+    @R|spr/ForceFlexibility|() public open operator fun foo(x: R|kotlin/String|): R|kotlin/Unit|
 
-    public open operator function bar(@R|spr/ForceFlexibility|() x: R|kotlin/String|): R|kotlin/Unit|
+    public open operator fun bar(@R|spr/ForceFlexibility|() x: R|kotlin/String|): R|kotlin/Unit|
 
-    public open operator function baz(@R|spr/UnknownNullability|() x: R|kotlin/String|): R|kotlin/Unit|
+    public open operator fun baz(@R|spr/UnknownNullability|() x: R|kotlin/String|): R|kotlin/Unit|
 
-    public open operator function foobar(@R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.UNKNOWN|()) x: R|ft<kotlin/String, kotlin/String?>|!): R|kotlin/Unit|
+    public open operator fun foobar(@R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.UNKNOWN|()) x: R|ft<kotlin/String, kotlin/String?>|!): R|kotlin/Unit|
 
 }
 public abstract interface B : R|java/lang/Object| {
-    public abstract operator function foo(@R|javax/annotation/Nonnull|() x: R|kotlin/String|): R|kotlin/Unit|
+    public abstract operator fun foo(@R|javax/annotation/Nonnull|() x: R|kotlin/String|): R|kotlin/Unit|
 
-    public abstract operator function bar(@R|javax/annotation/Nonnull|() x: R|kotlin/String|): R|kotlin/Unit|
+    public abstract operator fun bar(@R|javax/annotation/Nonnull|() x: R|kotlin/String|): R|kotlin/Unit|
 
-    public abstract operator function baz(@R|javax/annotation/Nonnull|() x: R|kotlin/String|): R|kotlin/Unit|
+    public abstract operator fun baz(@R|javax/annotation/Nonnull|() x: R|kotlin/String|): R|kotlin/Unit|
 
-    public abstract operator function foobar(@R|javax/annotation/Nonnull|() x: R|kotlin/String|): R|kotlin/Unit|
+    public abstract operator fun foobar(@R|javax/annotation/Nonnull|() x: R|kotlin/String|): R|kotlin/Unit|
 
 }
 @R|java/lang/annotation/Retention|(R|java/lang/annotation/RetentionPolicy.RUNTIME|()) @R|java/lang/annotation/Documented|() @R|spr/UnknownNullability|() @R|javax/annotation/meta/TypeQualifierDefault|(<implicitArrayOf>(R|java/lang/annotation/ElementType.METHOD|(), R|java/lang/annotation/ElementType.PARAMETER|())) public abstract annotation class ForceFlexibility : R|java/lang/annotation/Annotation| {

compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/NullabilityFromOverridden.fir.txt

@@ -1,51 +1,51 @@
 @R|NonNullApi|() public open class A : R|java/lang/Object| {
-    public open operator function foo1(x: R|kotlin/String|): R|kotlin/String|
+    public open operator fun foo1(x: R|kotlin/String|): R|kotlin/String|
 
-    public open operator function foo2(x: R|kotlin/String|): R|kotlin/String|
+    public open operator fun foo2(x: R|kotlin/String|): R|kotlin/String|
 
-    public open operator function foo3(x: R|kotlin/String|): R|kotlin/String|
+    public open operator fun foo3(x: R|kotlin/String|): R|kotlin/String|
 
-    @R|javax/annotation/Nullable|() public open operator function bar1(@R|javax/annotation/Nullable|() x: R|kotlin/String|?): R|kotlin/String|?
+    @R|javax/annotation/Nullable|() public open operator fun bar1(@R|javax/annotation/Nullable|() x: R|kotlin/String|?): R|kotlin/String|?
 
-    @R|javax/annotation/Nullable|() public open operator function bar2(@R|javax/annotation/Nullable|() x: R|kotlin/String|?): R|kotlin/String|?
+    @R|javax/annotation/Nullable|() public open operator fun bar2(@R|javax/annotation/Nullable|() x: R|kotlin/String|?): R|kotlin/String|?
 
-    public open operator function baz(@R|javax/annotation/Nonnull|() x: R|kotlin/String|): R|kotlin/String|
+    public open operator fun baz(@R|javax/annotation/Nonnull|() x: R|kotlin/String|): R|kotlin/String|
 
 }
 @R|NonNullApi|() public abstract interface AInt : R|java/lang/Object| {
-    public abstract operator function foo1(x: R|kotlin/String|): R|kotlin/CharSequence|
+    public abstract operator fun foo1(x: R|kotlin/String|): R|kotlin/CharSequence|
 
-    public abstract operator function foo2(x: R|kotlin/String|): R|kotlin/CharSequence|
+    public abstract operator fun foo2(x: R|kotlin/String|): R|kotlin/CharSequence|
 
-    public abstract operator function foo3(x: R|kotlin/String|): R|kotlin/CharSequence|
+    public abstract operator fun foo3(x: R|kotlin/String|): R|kotlin/CharSequence|
 
-    @R|javax/annotation/Nullable|() public abstract operator function bar1(@R|javax/annotation/Nullable|() x: R|kotlin/String|?): R|kotlin/CharSequence|?
+    @R|javax/annotation/Nullable|() public abstract operator fun bar1(@R|javax/annotation/Nullable|() x: R|kotlin/String|?): R|kotlin/CharSequence|?
 
-    @R|javax/annotation/Nullable|() public abstract operator function bar2(@R|javax/annotation/Nullable|() x: R|kotlin/String|?): R|kotlin/CharSequence|?
+    @R|javax/annotation/Nullable|() public abstract operator fun bar2(@R|javax/annotation/Nullable|() x: R|kotlin/String|?): R|kotlin/CharSequence|?
 
-    public abstract operator function baz(@R|javax/annotation/Nonnull|() x: R|kotlin/String|): R|kotlin/CharSequence|
+    public abstract operator fun baz(@R|javax/annotation/Nonnull|() x: R|kotlin/String|): R|kotlin/CharSequence|
 
 }
 @R|NullableApi|() public open class B : R|A|, R|AInt| {
-    public open operator function foo1(x: R|kotlin/String|): R|kotlin/String|
+    public open operator fun foo1(x: R|kotlin/String|): R|kotlin/String|
 
-    @R|javax/annotation/Nonnull|() public open operator function foo2(@R|javax/annotation/Nonnull|() x: R|kotlin/String|): R|kotlin/String|
+    @R|javax/annotation/Nonnull|() public open operator fun foo2(@R|javax/annotation/Nonnull|() x: R|kotlin/String|): R|kotlin/String|
 
-    public open operator function bar1(x: R|kotlin/String|?): R|kotlin/String|?
+    public open operator fun bar1(x: R|kotlin/String|?): R|kotlin/String|?
 
-    public open operator function baz(x: R|kotlin/String|): R|kotlin/String|
+    public open operator fun baz(x: R|kotlin/String|): R|kotlin/String|
 
 }
 @R|NonNullApi|() public open class C : R|A|, R|AInt| {
-    public open operator function foo1(x: R|kotlin/String|): R|kotlin/String|
+    public open operator fun foo1(x: R|kotlin/String|): R|kotlin/String|
 
-    public open operator function foo2(@R|javax/annotation/Nonnull|() x: R|kotlin/String|): R|kotlin/String|
+    public open operator fun foo2(@R|javax/annotation/Nonnull|() x: R|kotlin/String|): R|kotlin/String|
 
-    public open operator function bar1(x: R|kotlin/String|?): R|kotlin/String|?
+    public open operator fun bar1(x: R|kotlin/String|?): R|kotlin/String|?
 
-    @R|javax/annotation/Nullable|() public open operator function bar2(@R|javax/annotation/Nullable|() x: R|kotlin/String|?): R|kotlin/String|?
+    @R|javax/annotation/Nullable|() public open operator fun bar2(@R|javax/annotation/Nullable|() x: R|kotlin/String|?): R|kotlin/String|?
 
-    public open operator function baz(x: R|kotlin/String|): R|kotlin/String|
+    public open operator fun baz(x: R|kotlin/String|): R|kotlin/String|
 
 }
 @R|java/lang/annotation/Target|(R|java/lang/annotation/ElementType.TYPE|()) @R|java/lang/annotation/Retention|(R|java/lang/annotation/RetentionPolicy.RUNTIME|()) @R|java/lang/annotation/Documented|() @R|javax/annotation/Nonnull|() @R|javax/annotation/meta/TypeQualifierDefault|(<implicitArrayOf>(R|java/lang/annotation/ElementType.METHOD|(), R|java/lang/annotation/ElementType.PARAMETER|(), R|java/lang/annotation/ElementType.FIELD|())) public abstract annotation class NonNullApi : R|java/lang/annotation/Annotation| {

compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/OverridingDefaultQualifier.fir.txt

@@ -1,15 +1,15 @@
 @R|NonNullApi|() public open class A : R|java/lang/Object| {
-    public open property field(var): R|kotlin/String|
+    public open var field: R|kotlin/String|
         public get(): R|kotlin/String|
         public set(value: R|kotlin/String|): kotlin/Unit
 
-    public open operator function foo(x: R|kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence|?): R|kotlin/String|
+    public open operator fun foo(x: R|kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence|?): R|kotlin/String|
 
-    @R|NullableApi|() public open operator function foobar(x: R|kotlin/String|?, @R|NonNullApi|() y: R|kotlin/CharSequence|): R|kotlin/String|?
+    @R|NullableApi|() public open operator fun foobar(x: R|kotlin/String|?, @R|NonNullApi|() y: R|kotlin/CharSequence|): R|kotlin/String|?
 
-    public open operator function bar(): R|kotlin/String|
+    public open operator fun bar(): R|kotlin/String|
 
-    @R|javax/annotation/Nullable|() public open operator function baz(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>?, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|?
+    @R|javax/annotation/Nullable|() public open operator fun baz(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>?, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|?
 
 }
 @R|java/lang/annotation/Retention|(R|java/lang/annotation/RetentionPolicy.RUNTIME|()) @R|java/lang/annotation/Documented|() @R|javax/annotation/CheckForNull|() @R|javax/annotation/meta/TypeQualifierDefault|(<implicitArrayOf>(R|java/lang/annotation/ElementType.FIELD|())) public abstract annotation class FieldsAreNullable : R|java/lang/annotation/Annotation| {

compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ParametersAreNonnullByDefault.fir.txt

@@ -1,10 +1,10 @@
 @R|javax/annotation/ParametersAreNonnullByDefault|() public open class A : R|java/lang/Object| {
-    @R|javax/annotation/Nullable|() public open property field(var): R|kotlin/String|?
+    @R|javax/annotation/Nullable|() public open var field: R|kotlin/String|?
         public get(): R|kotlin/String|?
         public set(value: R|kotlin/String|?): kotlin/Unit
 
-    public open operator function foo(q: R|kotlin/String|, @R|javax/annotation/Nonnull|() x: R|kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence|?): R|ft<kotlin/String, kotlin/String?>|!
+    public open operator fun foo(q: R|kotlin/String|, @R|javax/annotation/Nonnull|() x: R|kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence|?): R|ft<kotlin/String, kotlin/String?>|!
 
-    @R|javax/annotation/Nonnull|() public open operator function bar(): R|kotlin/String|
+    @R|javax/annotation/Nonnull|() public open operator fun bar(): R|kotlin/String|
 
 }

compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ParametersAreNonnullByDefaultPackage.fir.txt

@@ -1,20 +1,20 @@
 public open class A : R|java/lang/Object| {
-    @R|javax/annotation/Nullable|() public open property field(var): R|kotlin/String|?
+    @R|javax/annotation/Nullable|() public open var field: R|kotlin/String|?
         public get(): R|kotlin/String|?
         public set(value: R|kotlin/String|?): kotlin/Unit
 
-    public open operator function foo(q: R|ft<kotlin/String, kotlin/String?>|!, @R|javax/annotation/Nonnull|() x: R|kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence|?): R|ft<kotlin/String, kotlin/String?>|!
+    public open operator fun foo(q: R|ft<kotlin/String, kotlin/String?>|!, @R|javax/annotation/Nonnull|() x: R|kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence|?): R|ft<kotlin/String, kotlin/String?>|!
 
-    @R|javax/annotation/Nonnull|() public open operator function bar(): R|kotlin/String|
+    @R|javax/annotation/Nonnull|() public open operator fun bar(): R|kotlin/String|
 
 }
 public open class A2 : R|java/lang/Object| {
-    @R|javax/annotation/Nullable|() public open property field(var): R|kotlin/String|?
+    @R|javax/annotation/Nullable|() public open var field: R|kotlin/String|?
         public get(): R|kotlin/String|?
         public set(value: R|kotlin/String|?): kotlin/Unit
 
-    public open operator function foo(q: R|ft<kotlin/String, kotlin/String?>|!, @R|javax/annotation/Nonnull|() x: R|kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence|?): R|ft<kotlin/String, kotlin/String?>|!
+    public open operator fun foo(q: R|ft<kotlin/String, kotlin/String?>|!, @R|javax/annotation/Nonnull|() x: R|kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence|?): R|ft<kotlin/String, kotlin/String?>|!
 
-    @R|javax/annotation/Nonnull|() public open operator function bar(): R|kotlin/String|
+    @R|javax/annotation/Nonnull|() public open operator fun bar(): R|kotlin/String|
 
 }

compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/SpringNullable.fir.txt

@@ -1,13 +1,13 @@
 @R|spr/NonNullApi|() public open class A : R|java/lang/Object| {
-    public open property field(var): R|ft<kotlin/String, kotlin/String?>|!
+    public open var field: 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 operator function foo(x: R|kotlin/String|, @R|spr/Nullable|() y: R|kotlin/CharSequence|?): R|kotlin/String|
+    public open operator fun foo(x: R|kotlin/String|, @R|spr/Nullable|() y: R|kotlin/CharSequence|?): R|kotlin/String|
 
-    public open operator function bar(): R|kotlin/String|
+    public open operator fun bar(): R|kotlin/String|
 
-    @R|spr/Nullable|() public open operator function baz(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>?, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|?
+    @R|spr/Nullable|() public open operator fun baz(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>?, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|?
 
 }
 @R|java/lang/annotation/Target|(R|java/lang/annotation/ElementType.TYPE|()) @R|java/lang/annotation/Retention|(R|java/lang/annotation/RetentionPolicy.RUNTIME|()) @R|java/lang/annotation/Documented|() @R|javax/annotation/Nonnull|() @R|javax/annotation/meta/TypeQualifierDefault|(<implicitArrayOf>(R|java/lang/annotation/ElementType.METHOD|(), R|java/lang/annotation/ElementType.PARAMETER|())) public abstract annotation class NonNullApi : R|java/lang/annotation/Annotation| {

compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/SpringNullablePackage.fir.txt

@@ -1,13 +1,13 @@
 public open class A : R|java/lang/Object| {
-    public open property field(var): R|ft<kotlin/String, kotlin/String?>|!
+    public open var field: 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 operator function foo(x: R|ft<kotlin/String, kotlin/String?>|!, @R|spr/Nullable|() y: R|kotlin/CharSequence|?): R|ft<kotlin/String, kotlin/String?>|!
+    public open operator fun foo(x: R|ft<kotlin/String, kotlin/String?>|!, @R|spr/Nullable|() y: R|kotlin/CharSequence|?): R|ft<kotlin/String, kotlin/String?>|!
 
-    public open operator function bar(): R|ft<kotlin/String, kotlin/String?>|!
+    public open operator fun bar(): R|ft<kotlin/String, kotlin/String?>|!
 
-    @R|spr/Nullable|() public open operator function baz(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>?, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|?
+    @R|spr/Nullable|() public open operator fun baz(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>?, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|?
 
 }
 @R|java/lang/annotation/Target|(R|java/lang/annotation/ElementType.PACKAGE|()) @R|java/lang/annotation/Retention|(R|java/lang/annotation/RetentionPolicy.RUNTIME|()) @R|java/lang/annotation/Documented|() @R|javax/annotation/Nonnull|() @R|javax/annotation/meta/TypeQualifierDefault|(<implicitArrayOf>(R|java/lang/annotation/ElementType.METHOD|(), R|java/lang/annotation/ElementType.PARAMETER|())) public abstract annotation class NonNullApi : R|java/lang/annotation/Annotation| {

compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultEnum.fir.txt

@@ -1,26 +1,26 @@
 public/*package*/ open class A : R|java/lang/Object| {
-    public open operator function a(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(HELLO)) arg: R|ft<Signs, Signs?>|! = R|/Signs.HELLO|): R|ft<Signs, Signs?>|!
+    public open operator fun a(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(HELLO)) arg: R|ft<Signs, Signs?>|! = R|/Signs.HELLO|): R|ft<Signs, Signs?>|!
 
-    public open operator function bar(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(X)) arg: R|ft<Signs, Signs?>|! = R|/Signs.X|): R|ft<Signs, Signs?>|!
+    public open operator fun bar(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(X)) arg: R|ft<Signs, Signs?>|! = R|/Signs.X|): R|ft<Signs, Signs?>|!
 
-    public open operator function baz(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(NOT_ENTRY_EITHER)) arg: R|ft<Signs, Signs?>|!): R|ft<Signs, Signs?>|!
+    public open operator fun baz(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(NOT_ENTRY_EITHER)) arg: R|ft<Signs, Signs?>|!): R|ft<Signs, Signs?>|!
 
-    public open operator function bam(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(NOT_ENTRY_EITHER)) arg: R|ft<Mixed, Mixed?>|! = R|/Mixed.NOT_ENTRY_EITHER|): R|ft<Mixed, Mixed?>|!
+    public open operator fun bam(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(NOT_ENTRY_EITHER)) arg: R|ft<Mixed, Mixed?>|! = R|/Mixed.NOT_ENTRY_EITHER|): R|ft<Mixed, Mixed?>|!
 
 }
 public final enum class Mixed : R|java/lang/Enum<Mixed>| {
-    public final static property NOT_ENTRY_EITHER(val): R|ft<Mixed, Mixed?>|!
+    public final static val NOT_ENTRY_EITHER: R|ft<Mixed, Mixed?>|!
         public get(): R|ft<Mixed, Mixed?>|!
 
 }
 public final enum class Signs : R|java/lang/Enum<Signs>| {
-    public final static property HELLO(val): R|ft<Signs, Signs?>|!
+    public final static val HELLO: R|ft<Signs, Signs?>|!
         public get(): R|ft<Signs, Signs?>|!
 
-    public final static property WORLD(val): R|ft<Signs, Signs?>|!
+    public final static val WORLD: R|ft<Signs, Signs?>|!
         public get(): R|ft<Signs, Signs?>|!
 
-    public final static property X(val): R|ft<Signs, Signs?>|!
+    public final static val X: R|ft<Signs, Signs?>|!
         public get(): R|ft<Signs, Signs?>|!
 
 }

compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultLongLiteral.fir.txt

@@ -1,20 +1,20 @@
 public open class A : R|java/lang/Object| {
-    public open operator function first(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0x1F)) value: R|ft<kotlin/Long, kotlin/Long?>|! = Long(31)): R|kotlin/Unit|
+    public open operator fun first(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0x1F)) value: R|ft<kotlin/Long, kotlin/Long?>|! = Long(31)): R|kotlin/Unit|
 
-    public open operator function second(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0X1F)) value: R|ft<kotlin/Long, kotlin/Long?>|! = Long(31)): R|kotlin/Unit|
+    public open operator fun second(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0X1F)) value: R|ft<kotlin/Long, kotlin/Long?>|! = Long(31)): R|kotlin/Unit|
 
-    public open operator function third(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0b1010)) value: R|ft<kotlin/Long, kotlin/Long?>|! = Long(10)): R|kotlin/Unit|
+    public open operator fun third(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0b1010)) value: R|ft<kotlin/Long, kotlin/Long?>|! = Long(10)): R|kotlin/Unit|
 
-    public open operator function fourth(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0B1010)) value: R|ft<kotlin/Long, kotlin/Long?>|! = Long(10)): R|kotlin/Unit|
+    public open operator fun fourth(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0B1010)) value: R|ft<kotlin/Long, kotlin/Long?>|! = Long(10)): R|kotlin/Unit|
 
 }
 public open class B : R|java/lang/Object| {
-    public open operator function first(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0x)) value: R|ft<kotlin/Long, kotlin/Long?>|!): R|kotlin/Unit|
+    public open operator fun first(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0x)) value: R|ft<kotlin/Long, kotlin/Long?>|!): R|kotlin/Unit|
 
-    public open operator function second(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0xZZ)) value: R|ft<kotlin/Long, kotlin/Long?>|!): R|kotlin/Unit|
+    public open operator fun second(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0xZZ)) value: R|ft<kotlin/Long, kotlin/Long?>|!): R|kotlin/Unit|
 
-    public open operator function third(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0b)) value: R|ft<kotlin/Long, kotlin/Long?>|!): R|kotlin/Unit|
+    public open operator fun third(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0b)) value: R|ft<kotlin/Long, kotlin/Long?>|!): R|kotlin/Unit|
 
-    public open operator function fourth(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0B1234)) value: R|ft<kotlin/Long, kotlin/Long?>|!): R|kotlin/Unit|
+    public open operator fun fourth(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0B1234)) value: R|ft<kotlin/Long, kotlin/Long?>|!): R|kotlin/Unit|
 
 }

compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultNull.fir.txt

@@ -1,10 +1,10 @@
 public open class A : R|java/lang/Object| {
-    public open operator function foo(@R|kotlin/annotations/jvm/internal/DefaultNull|() x: R|ft<kotlin/Int, kotlin/Int?>|! = Null(null)): R|kotlin/Unit|
+    public open operator fun foo(@R|kotlin/annotations/jvm/internal/DefaultNull|() x: R|ft<kotlin/Int, kotlin/Int?>|! = Null(null)): R|kotlin/Unit|
 
-    public open operator function bar(@R|kotlin/annotations/jvm/internal/DefaultNull|() x: R|kotlin/Int| = Null(null)): R|kotlin/Unit|
+    public open operator fun bar(@R|kotlin/annotations/jvm/internal/DefaultNull|() x: R|kotlin/Int| = Null(null)): R|kotlin/Unit|
 
 }
 <T> public open class B : R|java/lang/Object| {
-    public open operator function foo(@R|kotlin/annotations/jvm/internal/DefaultNull|() t: R|ft<T, T?>|! = Null(null)): R|kotlin/Unit|
+    public open operator fun foo(@R|kotlin/annotations/jvm/internal/DefaultNull|() t: R|ft<T, T?>|! = Null(null)): R|kotlin/Unit|
 
 }

compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultNullAndParameter.fir.txt

@@ -1,25 +1,25 @@
 public open class A : R|java/lang/Object| {
-    public open operator function foo(@R|kotlin/annotations/jvm/internal/DefaultNull|() i: R|ft<kotlin/Int, kotlin/Int?>|! = Null(null)): R|kotlin/Unit|
+    public open operator fun foo(@R|kotlin/annotations/jvm/internal/DefaultNull|() i: R|ft<kotlin/Int, kotlin/Int?>|! = Null(null)): R|kotlin/Unit|
 
-    public open operator function bar(@R|kotlin/annotations/jvm/internal/DefaultNull|() a: R|ft<kotlin/Int, kotlin/Int?>|! = Null(null)): R|kotlin/Unit|
+    public open operator fun bar(@R|kotlin/annotations/jvm/internal/DefaultNull|() a: R|ft<kotlin/Int, kotlin/Int?>|! = Null(null)): R|kotlin/Unit|
 
-    public open operator function bam(@R|kotlin/annotations/jvm/internal/DefaultNull|() a: R|ft<kotlin/Int, kotlin/Int?>|! = Null(null)): R|kotlin/Unit|
+    public open operator fun bam(@R|kotlin/annotations/jvm/internal/DefaultNull|() a: R|ft<kotlin/Int, kotlin/Int?>|! = Null(null)): R|kotlin/Unit|
 
-    public open operator function baz(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(42)) a: R|ft<kotlin/Int, kotlin/Int?>|! = Int(42)): R|kotlin/Unit|
+    public open operator fun baz(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(42)) a: R|ft<kotlin/Int, kotlin/Int?>|! = Int(42)): R|kotlin/Unit|
 
 }
 public abstract interface AInt : R|java/lang/Object| {
-    public abstract operator function foo(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(42)) i: R|ft<kotlin/Int, kotlin/Int?>|! = Int(42)): R|kotlin/Unit|
+    public abstract operator fun foo(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(42)) i: R|ft<kotlin/Int, kotlin/Int?>|! = Int(42)): R|kotlin/Unit|
 
-    public abstract operator function bar(@R|kotlin/annotations/jvm/internal/DefaultNull|() a: R|ft<kotlin/Int, kotlin/Int?>|! = Null(null)): R|kotlin/Unit|
+    public abstract operator fun bar(@R|kotlin/annotations/jvm/internal/DefaultNull|() a: R|ft<kotlin/Int, kotlin/Int?>|! = Null(null)): R|kotlin/Unit|
 
 }
 public open class B : R|A| {
-    public open operator function foo(i: R|ft<kotlin/Int, kotlin/Int?>|!): R|kotlin/Unit|
+    public open operator fun foo(i: R|ft<kotlin/Int, kotlin/Int?>|!): R|kotlin/Unit|
 
-    public open operator function bar(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(42)) a: R|ft<kotlin/Int, kotlin/Int?>|! = Int(42)): R|kotlin/Unit|
+    public open operator fun bar(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(42)) a: R|ft<kotlin/Int, kotlin/Int?>|! = Int(42)): R|kotlin/Unit|
 
-    public open operator function bam(@R|kotlin/annotations/jvm/internal/DefaultNull|() @R|kotlin/annotations/jvm/internal/DefaultValue|(String(42)) a: R|ft<kotlin/Int, kotlin/Int?>|! = Int(42)): R|kotlin/Unit|
+    public open operator fun bam(@R|kotlin/annotations/jvm/internal/DefaultNull|() @R|kotlin/annotations/jvm/internal/DefaultValue|(String(42)) a: R|ft<kotlin/Int, kotlin/Int?>|! = Int(42)): R|kotlin/Unit|
 
 }
 public open class C : R|A|, R|AInt| {

compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultParameter.fir.txt

@@ -1,12 +1,12 @@
 public/*package*/ open class A : R|java/lang/Object| {
-    public open operator function first(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(hello)) value: R|ft<kotlin/String, kotlin/String?>|! = String(hello)): R|kotlin/Unit|
+    public open operator fun first(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(hello)) value: R|ft<kotlin/String, kotlin/String?>|! = String(hello)): R|kotlin/Unit|
 
-    public open operator function second(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(first)) a: R|ft<kotlin/String, kotlin/String?>|! = String(first), @R|kotlin/annotations/jvm/internal/DefaultValue|(String(second)) b: R|ft<kotlin/String, kotlin/String?>|! = String(second)): R|kotlin/Unit|
+    public open operator fun second(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(first)) a: R|ft<kotlin/String, kotlin/String?>|! = String(first), @R|kotlin/annotations/jvm/internal/DefaultValue|(String(second)) b: R|ft<kotlin/String, kotlin/String?>|! = String(second)): R|kotlin/Unit|
 
-    public open operator function third(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(first)) a: R|ft<kotlin/String, kotlin/String?>|! = String(first), b: R|ft<kotlin/String, kotlin/String?>|!): R|kotlin/Unit|
+    public open operator fun third(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(first)) a: R|ft<kotlin/String, kotlin/String?>|! = String(first), b: R|ft<kotlin/String, kotlin/String?>|!): R|kotlin/Unit|
 
-    public open operator function fourth(first: R|ft<kotlin/String, kotlin/String?>|!, @R|kotlin/annotations/jvm/internal/DefaultValue|(String(second)) second: R|ft<kotlin/String, kotlin/String?>|! = String(second)): R|kotlin/Unit|
+    public open operator fun fourth(first: R|ft<kotlin/String, kotlin/String?>|!, @R|kotlin/annotations/jvm/internal/DefaultValue|(String(second)) second: R|ft<kotlin/String, kotlin/String?>|! = String(second)): R|kotlin/Unit|
 
-    public open operator function wrong(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(hello)) i: R|ft<kotlin/Int, kotlin/Int?>|!): R|kotlin/Unit|
+    public open operator fun wrong(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(hello)) i: R|ft<kotlin/Int, kotlin/Int?>|!): R|kotlin/Unit|
 
 }

compiler/fir/resolve/testData/enhancement/signatureAnnotations/EmptyParameterName.fir.txt

@@ -1,8 +1,8 @@
 public/*package*/ open class A : R|java/lang/Object| {
-    public open operator function emptyName(@R|kotlin/annotations/jvm/internal/ParameterName|(String()) first: R|ft<kotlin/String, kotlin/String?>|!, @R|kotlin/annotations/jvm/internal/ParameterName|(String(ok)) second: R|kotlin/Int|): R|kotlin/Unit|
+    public open operator fun emptyName(@R|kotlin/annotations/jvm/internal/ParameterName|(String()) first: R|ft<kotlin/String, kotlin/String?>|!, @R|kotlin/annotations/jvm/internal/ParameterName|(String(ok)) second: R|kotlin/Int|): R|kotlin/Unit|
 
-    public open operator function missingName(@R|kotlin/annotations/jvm/internal/ParameterName|() first: R|ft<kotlin/String, kotlin/String?>|!): R|kotlin/Unit|
+    public open operator fun missingName(@R|kotlin/annotations/jvm/internal/ParameterName|() first: R|ft<kotlin/String, kotlin/String?>|!): R|kotlin/Unit|
 
-    public open operator function numberName(@R|kotlin/annotations/jvm/internal/ParameterName|(Int(42)) first: R|ft<kotlin/String, kotlin/String?>|!): R|kotlin/Unit|
+    public open operator fun numberName(@R|kotlin/annotations/jvm/internal/ParameterName|(Int(42)) first: R|ft<kotlin/String, kotlin/String?>|!): R|kotlin/Unit|
 
 }

compiler/fir/resolve/testData/enhancement/signatureAnnotations/ReorderedParameterNames.fir.txt

@@ -1,4 +1,4 @@
 public open class A : R|java/lang/Object| {
-    public open operator function connect(@R|kotlin/annotations/jvm/internal/ParameterName|(String(host)) host: R|ft<kotlin/String, kotlin/String?>|!, @R|kotlin/annotations/jvm/internal/ParameterName|(String(port)) port: R|kotlin/Int|): R|kotlin/Unit|
+    public open operator fun connect(@R|kotlin/annotations/jvm/internal/ParameterName|(String(host)) host: R|ft<kotlin/String, kotlin/String?>|!, @R|kotlin/annotations/jvm/internal/ParameterName|(String(port)) port: R|kotlin/Int|): R|kotlin/Unit|
 
 }

compiler/fir/resolve/testData/enhancement/signatureAnnotations/SameParameterName.fir.txt

@@ -1,4 +1,4 @@
 public open class A : R|java/lang/Object| {
-    public open operator function same(@R|kotlin/annotations/jvm/internal/ParameterName|(String(ok)) first: R|ft<kotlin/String, kotlin/String?>|!, @R|kotlin/annotations/jvm/internal/ParameterName|(String(ok)) second: R|ft<kotlin/String, kotlin/String?>|!): R|kotlin/Unit|
+    public open operator fun same(@R|kotlin/annotations/jvm/internal/ParameterName|(String(ok)) first: R|ft<kotlin/String, kotlin/String?>|!, @R|kotlin/annotations/jvm/internal/ParameterName|(String(ok)) second: R|ft<kotlin/String, kotlin/String?>|!): R|kotlin/Unit|
 
 }

compiler/fir/resolve/testData/enhancement/signatureAnnotations/SpecialCharsParameterName.fir.txt

@@ -1,6 +1,6 @@
 public open class A : R|java/lang/Object| {
-    public open operator function dollarName(@R|kotlin/annotations/jvm/internal/ParameterName|(String($)) host: R|ft<kotlin/String, kotlin/String?>|!): R|kotlin/Unit|
+    public open operator fun dollarName(@R|kotlin/annotations/jvm/internal/ParameterName|(String($)) host: R|ft<kotlin/String, kotlin/String?>|!): R|kotlin/Unit|
 
-    public open operator function numberName(@R|kotlin/annotations/jvm/internal/ParameterName|(String(42)) field: R|ft<kotlin/String, kotlin/String?>|!): R|kotlin/Unit|
+    public open operator fun numberName(@R|kotlin/annotations/jvm/internal/ParameterName|(String(42)) field: R|ft<kotlin/String, kotlin/String?>|!): R|kotlin/Unit|
 
 }

compiler/fir/resolve/testData/enhancement/signatureAnnotations/StaticMethodWithDefaultValue.fir.txt

@@ -1,4 +1,4 @@
 public/*package*/ open class A : R|java/lang/Object| {
-    public open static operator function withDefault(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(OK)) arg: R|ft<kotlin/String, kotlin/String?>|! = String(OK)): R|ft<kotlin/String, kotlin/String?>|!
+    public open static operator fun withDefault(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(OK)) arg: R|ft<kotlin/String, kotlin/String?>|! = String(OK)): R|ft<kotlin/String, kotlin/String?>|!
 
 }

compiler/fir/resolve/testData/resolve/builtins/lists.txt

@@ -7,9 +7,9 @@ FILE: lists.kt
         public constructor(): super<R|kotlin/Any|>()
 
     }
-    public final function convert R|kotlin/collections/List<kotlin/String>|.(): R|MyStringList| {
-        return@@@convert as/R|MyStringList|(this#)
+    public final fun R|kotlin/collections/List<kotlin/String>|.convert(): R|MyStringList| {
+        ^convert as/R|MyStringList|(this#)
     }
-    public final function ret(l: R|kotlin/collections/MutableList<kotlin/String>|): R|MyMutableStringList| {
-        return@@@ret as/R|MyMutableStringList|(this#)
+    public final fun ret(l: R|kotlin/collections/MutableList<kotlin/String>|): R|MyMutableStringList| {
+        ^ret as/R|MyMutableStringList|(this#)
     }

compiler/fir/resolve/testData/resolve/companion.txt

@@ -12,7 +12,7 @@ FILE: companion.kt
 
         }
 
-        public abstract property x(val): R|test/Some.Companion.InCompanion|
+        public abstract val x: R|test/Some.Companion.InCompanion|
             public get(): R|test/Some.Companion.InCompanion|
 
     }
@@ -29,7 +29,7 @@ FILE: companion.kt
 
         }
 
-        public abstract property x(val): R|test/Another.NamedCompanion.InCompanion|
+        public abstract val x: R|test/Another.NamedCompanion.InCompanion|
             public get(): R|test/Another.NamedCompanion.InCompanion|
 
     }

compiler/fir/resolve/testData/resolve/derivedClass.txt

@@ -2,7 +2,7 @@ FILE: derivedClass.kt
     <T> public open class Base {
         public constructor(x: R|T|): super<R|kotlin/Any|>()
 
-        public final property x(val): R|T|
+        public final val x: R|T|
             public get(): R|T|
 
     }
@@ -10,6 +10,6 @@ FILE: derivedClass.kt
         public constructor(x: R|T|): super<R|Base<T>|>(R|<local>/x|)
 
     }
-    <T : R|kotlin/Any|> public final function create(x: R|T|): R|Derived<T>| {
-        return@@@create R|/Derived.Derived|(R|<local>/x|)
+    <T : R|kotlin/Any|> public final fun create(x: R|T|): R|Derived<T>| {
+        ^create R|/Derived.Derived|(R|<local>/x|)
     }

compiler/fir/resolve/testData/resolve/enum.txt

@@ -12,14 +12,14 @@ FILE: enum.kt
     public final enum class SomeEnum {
         private constructor(x: R|Some|): super<R|kotlin/Enum|>()
 
-        public final property x(val): R|Some|
+        public final val x: R|Some|
             public get(): R|Some|
 
         public final enum entry FIRST : R|SomeEnum| {
             public constructor(): super<R|SomeEnum|>(<Unresolved name: O1>#)
 
-            public final override function check(y: R|Some|): R|kotlin/Boolean| {
-                return@@@check Boolean(true)
+            public final override fun check(y: R|Some|): R|kotlin/Boolean| {
+                ^check Boolean(true)
             }
 
         }
@@ -27,12 +27,12 @@ FILE: enum.kt
         public final enum entry SECOND : R|SomeEnum| {
             public constructor(): super<R|SomeEnum|>(<Unresolved name: O2>#)
 
-            public final override function check(y: R|Some|): R|kotlin/Boolean| {
-                return@@@check ==(R|<local>/y|, <Unresolved name: O2>#)
+            public final override fun check(y: R|Some|): R|kotlin/Boolean| {
+                ^check ==(R|<local>/y|, <Unresolved name: O2>#)
             }
 
         }
 
-        public abstract function check(y: R|Some|): R|kotlin/Boolean|
+        public abstract fun check(y: R|Some|): R|kotlin/Boolean|
 
     }

compiler/fir/resolve/testData/resolve/expresssions/access.txt

@@ -2,63 +2,63 @@ FILE: access.kt
     public final class Foo {
         public constructor(): super<R|kotlin/Any|>()
 
-        public final property x(val): R|kotlin/Int| = Int(1)
+        public final val x: R|kotlin/Int| = Int(1)
             public get(): <implicit>
 
-        public final function abc(): R|kotlin/Int| {
-            return@@@abc R|/Foo.x|
+        public final fun abc(): R|kotlin/Int| {
+            ^abc R|/Foo.x|
         }
 
-        public final function cba(): R|kotlin/Int| {
-            return@@@cba R|/Foo.abc|()
+        public final fun cba(): R|kotlin/Int| {
+            ^cba R|/Foo.abc|()
         }
 
     }
     public final class Bar {
         public constructor(): super<R|kotlin/Any|>()
 
-        public final property x(val): R|kotlin/String| = String()
+        public final val x: R|kotlin/String| = String()
             public get(): <implicit>
 
-        public final function abc R|Foo|.(): R|kotlin/Int| {
-            return@@@abc R|/Foo.x|
+        public final fun R|Foo|.abc(): R|kotlin/Int| {
+            ^abc R|/Foo.x|
         }
 
-        public final function bar(): R|Bar| {
-            return@@@bar this#
+        public final fun bar(): R|Bar| {
+            ^bar this#
         }
 
-        public final operator function plus R|kotlin/String|.(bar: R|Bar|): R|kotlin/String| {
-            return@@@plus String()
+        public final operator fun R|kotlin/String|.plus(bar: R|Bar|): R|kotlin/String| {
+            ^plus String()
         }
 
-        public final function check R|Foo|.(): R|kotlin/String| {
-            return@@@check R|/Bar.plus|(R|/Foo.abc|(), R|/Bar.bar|())
+        public final fun R|Foo|.check(): R|kotlin/String| {
+            ^check R|/Bar.plus|(R|/Foo.abc|(), R|/Bar.bar|())
         }
 
     }
-    public final function ext R|Foo|.(): R|kotlin/Int| {
-        return@@@ext R|/Foo.x|
+    public final fun R|Foo|.ext(): R|kotlin/Int| {
+        ^ext R|/Foo.x|
     }
-    public final function bar(): R|kotlin/Unit| {
+    public final fun bar(): R|kotlin/Unit| {
     }
-    public final function buz(): R|kotlin/Unit| {
+    public final fun buz(): R|kotlin/Unit| {
         R|/bar|()
     }
-    public final function f(): R|kotlin/Unit| {
-        val a: R|kotlin/Int| = Int(10)
-        val b: R|kotlin/Int| = R|<local>/a|
-        val d: R|kotlin/String| = String()
-        val c: <ERROR TYPE: Unresolved name: c> = <Unresolved name: c>#
+    public final fun f(): R|kotlin/Unit| {
+        lval a: R|kotlin/Int| = Int(10)
+        lval b: R|kotlin/Int| = R|<local>/a|
+        lval d: R|kotlin/String| = String()
+        lval c: <ERROR TYPE: Unresolved name: c> = <Unresolved name: c>#
         <Unresolved name: abc>#()
-        public final function bcd(): R|kotlin/Unit| {
+        public final fun bcd(): R|kotlin/Unit| {
         }
 
-        public final function abc(): R|kotlin/Unit| {
-            val a: R|kotlin/String| = R|<local>/d|
-            val b: R|kotlin/String| = R|<local>/a|
+        public final fun abc(): R|kotlin/Unit| {
+            lval a: R|kotlin/String| = R|<local>/d|
+            lval b: R|kotlin/String| = R|<local>/a|
             R|<local>/bcd|()
-            public final function dcb(): R|kotlin/Unit| {
+            public final fun dcb(): R|kotlin/Unit| {
             }
 
             R|<local>/dcb|()

compiler/fir/resolve/testData/resolve/expresssions/invoke/explicitReceiver.txt

@@ -1,18 +1,18 @@
 FILE: explicitReceiver.kt
-    public final function x(): R|kotlin/Unit| {
+    public final fun x(): R|kotlin/Unit| {
     }
     public final class Foo {
         public constructor(): super<R|kotlin/Any|>()
 
-        public final property x(val): R|Foo| = R|/Foo.Foo|()
+        public final val x: R|Foo| = R|/Foo.Foo|()
             public get(): R|Foo|
 
-        public final operator function invoke(): R|Foo| {
-            return@@@invoke this#
+        public final operator fun invoke(): R|Foo| {
+            ^invoke this#
         }
 
-        public final function bar(): R|Foo| {
-            return@@@bar R|/Foo.x|.R|/Foo.invoke|()
+        public final fun bar(): R|Foo| {
+            ^bar R|/Foo.x|.R|/Foo.invoke|()
         }
 
     }

compiler/fir/resolve/testData/resolve/expresssions/invoke/explicitReceiver2.txt

@@ -2,25 +2,25 @@ FILE: explicitReceiver2.kt
     public final class Bar {
         public constructor(): super<R|kotlin/Any|>()
 
-        public final operator function invoke(): R|Foo| {
-            return@@@invoke this#
+        public final operator fun invoke(): R|Foo| {
+            ^invoke this#
         }
 
     }
-    public final function x(): R|kotlin/Unit| {
+    public final fun x(): R|kotlin/Unit| {
     }
     public final class Foo {
         public constructor(): super<R|kotlin/Any|>()
 
-        public final operator function invoke R|Bar|.(): R|Foo| {
-            return@@@invoke this#
+        public final operator fun R|Bar|.invoke(): R|Foo| {
+            ^invoke this#
         }
 
-        public final property x(val): R|Bar| = R|/Bar.Bar|()
+        public final val x: R|Bar| = R|/Bar.Bar|()
             public get(): R|Bar|
 
-        public final function bar(): R|Foo| {
-            return@@@bar R|/Foo.x|.R|/Bar.invoke|()
+        public final fun bar(): R|Foo| {
+            ^bar R|/Foo.x|.R|/Bar.invoke|()
         }
 
     }

compiler/fir/resolve/testData/resolve/expresssions/invoke/extension.txt

@@ -1,18 +1,18 @@
 FILE: extension.kt
-    public final function x(): R|kotlin/Unit| {
+    public final fun x(): R|kotlin/Unit| {
     }
     public final class Foo {
         public constructor(): super<R|kotlin/Any|>()
 
-        public final operator function invoke R|kotlin/Int|.(): R|Foo| {
-            return@@@invoke this@Foo
+        public final operator fun R|kotlin/Int|.invoke(): R|Foo| {
+            ^invoke this@Foo
         }
 
-        public final property x(val): R|kotlin/Int| = Int(0)
+        public final val x: R|kotlin/Int| = Int(0)
             public get(): <implicit>
 
-        public final function foo(): R|Foo| {
-            return@@@foo R|/Foo.x|.R|/Foo.invoke|()
+        public final fun foo(): R|Foo| {
+            ^foo R|/Foo.x|.R|/Foo.invoke|()
         }
 
     }

compiler/fir/resolve/testData/resolve/expresssions/invoke/farInvokeExtension.txt

@@ -1,17 +1,17 @@
 FILE: farInvokeExtension.kt
-    public final function x(): R|kotlin/Unit| {
+    public final fun x(): R|kotlin/Unit| {
     }
-    public final operator function invoke R|kotlin/Int|.(): R|Foo| {
-        return@@@invoke this@Foo
+    public final operator fun R|kotlin/Int|.invoke(): R|Foo| {
+        ^invoke this@Foo
     }
     public final class Foo {
         public constructor(): super<R|kotlin/Any|>()
 
-        public final property x(val): R|kotlin/Int| = Int(0)
+        public final val x: R|kotlin/Int| = Int(0)
             public get(): <implicit>
 
-        public final function foo(): R|kotlin/Unit| {
-            return@@@foo R|/x|()
+        public final fun foo(): R|kotlin/Unit| {
+            ^foo R|/x|()
         }
 
     }

compiler/fir/resolve/testData/resolve/expresssions/invoke/threeReceivers.txt

@@ -2,8 +2,8 @@ FILE: threeReceivers.kt
     public final class Bar {
         public constructor(): super<R|kotlin/Any|>()
 
-        public final function invoke R|FooBar|.(): R|Bar| {
-            return@@@invoke this#
+        public final fun R|FooBar|.invoke(): R|Bar| {
+            ^invoke this#
         }
 
     }
@@ -18,12 +18,12 @@ FILE: threeReceivers.kt
     public final class Foo {
         public constructor(): super<R|kotlin/Any|>()
 
-        public final property foobar R|Buz|.(val): R|Bar|
+        public final val R|Buz|.foobar: R|Bar|
             public get(): R|Bar| {
-                return R|/Bar.Bar|()
+                ^ R|/Bar.Bar|()
             }
 
-        public final function chk R|FooBar|.(buz: R|Buz|): R|kotlin/Unit| {
+        public final fun R|FooBar|.chk(buz: R|Buz|): R|kotlin/Unit| {
             R|<local>/buz|.R|/Foo.foobar|.R|/Bar.invoke|()
         }
 

compiler/fir/resolve/testData/resolve/expresssions/simple.txt

@@ -1,10 +1,10 @@
 FILE: simple.kt
-    public final function foo(): R|kotlin/Unit| {
-        val x: R|kotlin/Int| = Int(1)
+    public final fun foo(): R|kotlin/Unit| {
+        lval x: R|kotlin/Int| = Int(1)
     }
-    public final property bar(val): R|kotlin/String| = String()
+    public final val bar: R|kotlin/String| = String()
         public get(): <implicit>
-    public final property n(val): R|kotlin/Nothing|? = Null(null)
+    public final val n: R|kotlin/Nothing|? = Null(null)
         public get(): <implicit>
-    public final property g(val): R|kotlin/String|? = Null(null)
+    public final val g: R|kotlin/String|? = Null(null)
         public get(): R|kotlin/String|?

compiler/fir/resolve/testData/resolve/expresssions/this.txt

@@ -6,20 +6,20 @@ FILE: this.kt
     public final class Foo {
         public constructor(): super<R|kotlin/Any|>()
 
-        public final function bar(): R|Foo| {
-            return@@@bar this#
+        public final fun bar(): R|Foo| {
+            ^bar this#
         }
 
-        public final function buz R|Bar|.(): R|Bar| {
-            return@@@buz this#
+        public final fun R|Bar|.buz(): R|Bar| {
+            ^buz this#
         }
 
-        public final function foo R|Bar|.(): R|Foo| {
-            return@@@foo this@Foo
+        public final fun R|Bar|.foo(): R|Foo| {
+            ^foo this@Foo
         }
 
-        public final function foobar R|Bar|.(): R|Bar| {
-            return@@@foobar this@foobar
+        public final fun R|Bar|.foobar(): R|Bar| {
+            ^foobar this@foobar
         }
 
     }

compiler/fir/resolve/testData/resolve/expresssions/when.txt

@@ -1,6 +1,6 @@
 FILE: when.kt
-    public final function foo(): R|kotlin/Int| {
-        return@@@foo when () {
+    public final fun foo(): R|kotlin/Int| {
+        ^foo when () {
             Boolean(true) ->  {
                 Int(1)
             }

compiler/fir/resolve/testData/resolve/fromBuilder/complexTypes.txt

@@ -9,7 +9,7 @@ FILE: complexTypes.kt
 
     }
     public abstract interface Test {
-        public abstract property x(val): R|a/b/C.D<out kotlin/CharSequence, *, in kotlin/collections/List<*>, *>|
+        public abstract val x: R|a/b/C.D<out kotlin/CharSequence, *, in kotlin/collections/List<*>, *>|
             public get(): R|a/b/C.D<out kotlin/CharSequence, *, in kotlin/collections/List<*>, *>|
 
     }

compiler/fir/resolve/testData/resolve/fromBuilder/enums.txt

@@ -21,16 +21,16 @@ FILE: enums.kt
     public final enum class Planet {
         private constructor(m: R|kotlin/Double|, r: R|kotlin/Double|): super<R|kotlin/Enum|>()
 
-        public final property m(val): R|kotlin/Double|
+        public final val m: R|kotlin/Double|
             public get(): R|kotlin/Double|
 
-        internal final property r(val): R|kotlin/Double|
+        internal final val r: R|kotlin/Double|
             internal get(): R|kotlin/Double|
 
         public final enum entry MERCURY : R|Planet| {
             public constructor(): super<R|Planet|>(Double(1.0), Double(2.0))
 
-            public final override function sayHello(): R|kotlin/Unit| {
+            public final override fun sayHello(): R|kotlin/Unit| {
                 <Unresolved name: println>#(String(Hello!!!))
             }
 
@@ -39,7 +39,7 @@ FILE: enums.kt
         public final enum entry VENERA : R|Planet| {
             public constructor(): super<R|Planet|>(Double(3.0), Double(4.0))
 
-            public final override function sayHello(): R|kotlin/Unit| {
+            public final override fun sayHello(): R|kotlin/Unit| {
                 <Unresolved name: println>#(String(Ola!!!))
             }
 
@@ -48,21 +48,21 @@ FILE: enums.kt
         public final enum entry EARTH : R|Planet| {
             public constructor(): super<R|Planet|>(Double(5.0), Double(6.0))
 
-            public final override function sayHello(): R|kotlin/Unit| {
+            public final override fun sayHello(): R|kotlin/Unit| {
                 <Unresolved name: println>#(String(Privet!!!))
             }
 
         }
 
-        public final property g(val): R|kotlin/Double| = <Unresolved name: div>#(<Unresolved name: times>#(<Unresolved name: G>#, R|/Planet.m|), <Unresolved name: times>#(R|/Planet.r|, R|/Planet.r|))
+        public final val g: R|kotlin/Double| = <Unresolved name: div>#(<Unresolved name: times>#(<Unresolved name: G>#, R|/Planet.m|), <Unresolved name: times>#(R|/Planet.r|, R|/Planet.r|))
             public get(): R|kotlin/Double|
 
-        public abstract function sayHello(): R|kotlin/Unit|
+        public abstract fun sayHello(): R|kotlin/Unit|
 
         public final companion object Companion {
             public constructor(): super<R|kotlin/Any|>()
 
-            public final const property G(val): R|kotlin/Double| = Double(6.67E-11)
+            public final const val G: R|kotlin/Double| = Double(6.67E-11)
                 public get(): <implicit>
 
         }

compiler/fir/resolve/testData/resolve/fromBuilder/noPrimaryConstructor.txt

@@ -1,6 +1,6 @@
 FILE: noPrimaryConstructor.kt
     public final class NoPrimary {
-        public final property x(val): R|kotlin/String|
+        public final val x: R|kotlin/String|
             public get(): R|kotlin/String|
 
         public constructor(x: R|kotlin/String|): super<R|kotlin/Any|>() {

compiler/fir/resolve/testData/resolve/fromBuilder/simpleClass.txt

@@ -1,29 +1,29 @@
 FILE: simpleClass.kt
     public abstract interface SomeInterface {
-        public abstract function foo(x: R|kotlin/Int|, y: R|kotlin/String|): R|kotlin/String|
+        public abstract fun foo(x: R|kotlin/Int|, y: R|kotlin/String|): R|kotlin/String|
 
-        public abstract property bar(val): R|kotlin/Boolean|
+        public abstract val bar: R|kotlin/Boolean|
             public get(): R|kotlin/Boolean|
 
     }
     public final class SomeClass : R|SomeInterface| {
         public constructor(): super<R|kotlin/Any|>()
 
-        private final property baz(val): R|kotlin/Int| = Int(42)
+        private final val baz: R|kotlin/Int| = Int(42)
             private get(): <implicit>
 
-        public final override function foo(x: R|kotlin/Int|, y: R|kotlin/String|): R|kotlin/String| {
-            return@@@foo <Unresolved name: plus>#(<Unresolved name: plus>#(R|<local>/y|, R|<local>/x|), R|/SomeClass.baz|)
+        public final override fun foo(x: R|kotlin/Int|, y: R|kotlin/String|): R|kotlin/String| {
+            ^foo <Unresolved name: plus>#(<Unresolved name: plus>#(R|<local>/y|, R|<local>/x|), R|/SomeClass.baz|)
         }
 
-        public final override property bar(var): R|kotlin/Boolean|
+        public final override var bar: R|kotlin/Boolean|
             public get(): R|kotlin/Boolean| {
-                return Boolean(true)
+                ^ Boolean(true)
             }
             public set(value: R|kotlin/Boolean|): R|kotlin/Unit| {
             }
 
-        public final lateinit property fau(var): R|kotlin/Double|
+        public final lateinit var fau: R|kotlin/Double|
             public get(): R|kotlin/Double|
             public set(value: R|kotlin/Double|): R|kotlin/Unit|
 

compiler/fir/resolve/testData/resolve/fromBuilder/typeParameters.txt

@@ -1,8 +1,8 @@
 FILE: typeParameters.kt
     <out T : R|kotlin/Any|> public abstract interface List {
-        public abstract operator function get(index: R|kotlin/Int|): R|T|
+        public abstract operator fun get(index: R|kotlin/Int|): R|T|
 
-        public abstract infix function concat(other: R|List<T>|): R|List<T>|
+        public abstract infix fun concat(other: R|List<T>|): R|List<T>|
 
     }
     public final typealias StringList = R|List<out kotlin/String>|
@@ -14,12 +14,12 @@ FILE: typeParameters.kt
     public final class SomeList : R|AbstractList<kotlin/Int>| {
         public constructor(): super<R|AbstractList<kotlin/Int>|>()
 
-        public final override function get(index: R|kotlin/Int|): R|kotlin/Int| {
-            return@@@get Int(42)
+        public final override fun get(index: R|kotlin/Int|): R|kotlin/Int| {
+            ^get Int(42)
         }
 
-        public final override function concat(other: R|List<kotlin/Int>|): R|List<kotlin/Int>| {
-            return@@@concat this#
+        public final override fun concat(other: R|List<kotlin/Int>|): R|List<kotlin/Int>| {
+            ^concat this#
         }
 
     }

compiler/fir/resolve/testData/resolve/functionTypes.txt

@@ -1,11 +1,11 @@
 FILE: functionTypes.kt
-    <T> public final function simpleRun(f: R|kotlin/Function1|): R|kotlin/Unit| {
-        return@@@simpleRun <Unresolved name: f>#()
+    <T> public final fun simpleRun(f: R|kotlin/Function1|): R|kotlin/Unit| {
+        ^simpleRun <Unresolved name: f>#()
     }
-    <T, R> public final function simpleMap R|kotlin/collections/List<T>|.(f: R|kotlin/Function1|): R|R| {
+    <T, R> public final fun R|kotlin/collections/List<T>|.simpleMap(f: R|kotlin/Function1|): R|R| {
     }
-    <T> public final function simpleWith(t: R|T|, f: R|kotlin/Function1|): R|kotlin/Unit| {
-        return@@@simpleWith R|<local>/t|.<Unresolved name: f>#()
+    <T> public final fun simpleWith(t: R|T|, f: R|kotlin/Function1|): R|kotlin/Unit| {
+        ^simpleWith R|<local>/t|.<Unresolved name: f>#()
     }
     <T, R> public abstract interface KMutableProperty1 : R|KProperty1<T, R>|, R|KMutableProperty<R>| {
     }

compiler/fir/resolve/testData/resolve/genericFunctions.txt

@@ -1,12 +1,12 @@
 FILE: genericFunctions.kt
     public abstract interface Any {
     }
-    <reified T : R|Any|> public final inline function safeAs R|Any|.(): R|T|? {
-        return@@@safeAs as?/R|T|(this#)
+    <reified T : R|Any|> public final inline fun R|Any|.safeAs(): R|T|? {
+        ^safeAs as?/R|T|(this#)
     }
     public abstract class Summator {
         public constructor(): super<R|kotlin/Any|>()
 
-        <T> public abstract function plus(first: R|T|, second: R|T|): R|T|
+        <T> public abstract fun plus(first: R|T|, second: R|T|): R|T|
 
     }

compiler/fir/resolve/testData/resolve/multifile/Annotations.txt

@@ -3,24 +3,24 @@ FILE: Annotations.kt
     @R|annotations/WithInt|(Int(42)) public abstract class First {
         public constructor(): super<R|kotlin/Any|>()
 
-        @R|annotations/Simple|() public abstract function foo(@R|annotations/WithString|(String(abc)) arg: @R|annotations/Simple|() R|kotlin/Double|): R|kotlin/Unit|
+        @R|annotations/Simple|() public abstract fun foo(@R|annotations/WithString|(String(abc)) arg: @R|annotations/Simple|() R|kotlin/Double|): R|kotlin/Unit|
 
-        @R|annotations/Complex|(<Unresolved name: WithInt>#(Int(7)), <Unresolved name: WithString>#(String())) public abstract property v(val): R|kotlin/String|
+        @R|annotations/Complex|(<Unresolved name: WithInt>#(Int(7)), <Unresolved name: WithString>#(String())) public abstract val v: R|kotlin/String|
             public get(): R|kotlin/String|
 
     }
     @R|annotations/WithString|(String(xyz)) public final class Second : @R|annotations/WithInt|(Int(0)) R|test/First| {
         public constructor(y: R|kotlin/Char|): super<@R|annotations/WithInt|(Int(0)) R|test/First|>()
 
-        public final property y(val): R|kotlin/Char|
+        public final val y: R|kotlin/Char|
             public get(): R|kotlin/Char|
 
-        public final override function foo(arg: R|kotlin/Double|): R|kotlin/Unit| {
+        public final override fun foo(arg: R|kotlin/Double|): R|kotlin/Unit| {
         }
 
-        public final override property v(val): R|kotlin/String|
+        public final override val v: R|kotlin/String|
             @R|annotations/Simple|() public get(): R|kotlin/String| {
-                return String()
+                ^ String()
             }
 
         @R|annotations/WithString|(String(constructor)) public constructor(): this<R|test/Second|>(Char(

compiler/fir/resolve/testData/resolve/multifile/ByteArray.txt

@@ -1,6 +1,6 @@
 FILE: ByteArray.kt
     public abstract interface My {
-        public abstract property array(val): R|kotlin/ByteArray|
+        public abstract val array: R|kotlin/ByteArray|
             public get(): R|kotlin/ByteArray|
 
     }

compiler/fir/resolve/testData/resolve/multifile/sealedStarImport.txt

@@ -2,10 +2,10 @@ FILE: sealedStarImport.kt
     public abstract class Factory {
         public constructor(): super<R|kotlin/Any|>()
 
-        public abstract function createTest(): R|error: Symbol not found, for `Test`|
+        public abstract fun createTest(): R|error: Symbol not found, for `Test`|
 
-        public abstract function createObj(): R|test/Test.O|
+        public abstract fun createObj(): R|test/Test.O|
 
-        public abstract function createExtra(): R|test/Test.Extra|
+        public abstract fun createExtra(): R|test/Test.Extra|
 
     }

compiler/fir/resolve/testData/resolve/multifile/simpleStarImport.txt

@@ -1,2 +1,2 @@
 FILE: simpleStarImport.kt
-    public final function foo(arg: R|b/d/Other|): R|b/d/Another|
+    public final fun foo(arg: R|b/d/Other|): R|b/d/Another|

compiler/fir/resolve/testData/resolve/nestedClass.txt

@@ -2,7 +2,7 @@ FILE: nestedClass.kt
     public abstract class Base {
         public constructor(s: R|kotlin/String|): super<R|kotlin/Any|>()
 
-        public final property s(val): R|kotlin/String|
+        public final val s: R|kotlin/String|
             public get(): R|kotlin/String|
 
     }

compiler/fir/resolve/testData/resolve/overrides/simple.txt

@@ -2,35 +2,35 @@ FILE: simple.kt
     public open class A {
         public constructor(): super<R|kotlin/Any|>()
 
-        public open function foo(): R|A| {
-            return@@@foo this#
+        public open fun foo(): R|A| {
+            ^foo this#
         }
 
-        public open function bar(): R|A| {
-            return@@@bar this#
+        public open fun bar(): R|A| {
+            ^bar this#
         }
 
-        public open function buz(p: R|A|): R|A| {
-            return@@@buz this#
+        public open fun buz(p: R|A|): R|A| {
+            ^buz this#
         }
 
     }
     public final class B : R|A| {
         public constructor(): super<R|A|>()
 
-        public final override function foo(): R|B| {
-            return@@@foo this#
+        public final override fun foo(): R|B| {
+            ^foo this#
         }
 
-        public final function bar(): R|B| {
-            return@@@bar this#
+        public final fun bar(): R|B| {
+            ^bar this#
         }
 
-        public final override function buz(p: R|B|): R|B| {
-            return@@@buz this#
+        public final override fun buz(p: R|B|): R|B| {
+            ^buz this#
         }
 
-        public final function test(): R|kotlin/Unit| {
+        public final fun test(): R|kotlin/Unit| {
             R|/B.foo|()
             R|/B.bar|()
             <Ambiguity: buz, [/B.buz, /A.buz]>#()

compiler/fir/resolve/testData/resolve/overrides/simpleFakeOverride.txt

@@ -2,8 +2,8 @@ FILE: simpleFakeOverride.kt
     <T> public open class A {
         public constructor(): super<R|kotlin/Any|>()
 
-        public final function foo(t: R|T|): R|T| {
-            return@@@foo R|<local>/t|
+        public final fun foo(t: R|T|): R|T| {
+            ^foo R|<local>/t|
         }
 
     }
@@ -14,7 +14,7 @@ FILE: simpleFakeOverride.kt
     public final class B : R|A<Some>| {
         public constructor(): super<R|A<Some>|>()
 
-        public final function test(): R|kotlin/Unit| {
+        public final fun test(): R|kotlin/Unit| {
             R|FakeOverride</A.foo: R|Some|>|(R|/Some.Some|())
         }
 

compiler/fir/resolve/testData/resolve/overrides/three.txt

@@ -2,19 +2,19 @@ FILE: three.kt
     public abstract class A {
         public constructor(): super<R|kotlin/Any|>()
 
-        public final function foo(): R|kotlin/Unit| {
+        public final fun foo(): R|kotlin/Unit| {
         }
 
     }
     public abstract interface Y {
-        public open function baz(): R|kotlin/Unit| {
+        public open fun baz(): R|kotlin/Unit| {
         }
 
     }
     public open class B : R|A|, R|Y| {
         public constructor(): super<R|A|>()
 
-        public final function bar(): R|kotlin/Unit| {
+        public final fun bar(): R|kotlin/Unit| {
             R|/A.foo|()
             R|/Y.baz|()
         }
@@ -23,7 +23,7 @@ FILE: three.kt
     public final class C : R|B| {
         public constructor(): super<R|B|>()
 
-        public final function test(): R|kotlin/Unit| {
+        public final fun test(): R|kotlin/Unit| {
             R|/A.foo|()
             R|/B.bar|()
             R|/Y.baz|()

compiler/fir/resolve/testData/resolve/references/simple.txt

@@ -1,7 +1,7 @@
 FILE: simple.kt
-    public final function foo(): R|kotlin/Int| {
-        return@@@foo Int(1)
+    public final fun foo(): R|kotlin/Int| {
+        ^foo Int(1)
     }
-    public final function bar(): R|kotlin/Int| {
-        return@@@bar R|/foo|()
+    public final fun bar(): R|kotlin/Int| {
+        ^bar R|/foo|()
     }

compiler/fir/resolve/testData/resolve/references/superMember.txt

@@ -2,14 +2,14 @@ FILE: superMember.kt
     public open class A {
         public constructor(): super<R|kotlin/Any|>()
 
-        public open function foo(): R|kotlin/Unit| {
+        public open fun foo(): R|kotlin/Unit| {
         }
 
     }
     public final class B : R|A| {
         public constructor(): super<R|A|>()
 
-        public final function bar(): R|kotlin/Unit| {
+        public final fun bar(): R|kotlin/Unit| {
             R|/A.foo|()
         }
 

compiler/fir/resolve/testData/resolve/simpleClass.txt

@@ -1,29 +1,29 @@
 FILE: simpleClass.kt
     public abstract interface SomeInterface {
-        public abstract function foo(x: R|kotlin/Int|, y: R|kotlin/String|): R|kotlin/String|
+        public abstract fun foo(x: R|kotlin/Int|, y: R|kotlin/String|): R|kotlin/String|
 
-        public abstract property bar(val): R|kotlin/Boolean|
+        public abstract val bar: R|kotlin/Boolean|
             public get(): R|kotlin/Boolean|
 
     }
     public final class SomeClass : R|SomeInterface| {
         public constructor(): super<R|kotlin/Any|>()
 
-        private final property baz(val): R|kotlin/Int| = Int(42)
+        private final val baz: R|kotlin/Int| = Int(42)
             private get(): <implicit>
 
-        public final override function foo(x: R|kotlin/Int|, y: R|kotlin/String|): R|kotlin/String| {
-            return@@@foo <Unresolved name: plus>#(<Unresolved name: plus>#(R|<local>/y|, R|<local>/x|), R|/SomeClass.baz|)
+        public final override fun foo(x: R|kotlin/Int|, y: R|kotlin/String|): R|kotlin/String| {
+            ^foo <Unresolved name: plus>#(<Unresolved name: plus>#(R|<local>/y|, R|<local>/x|), R|/SomeClass.baz|)
         }
 
-        public final override property bar(var): R|kotlin/Boolean|
+        public final override var bar: R|kotlin/Boolean|
             public get(): R|kotlin/Boolean| {
-                return Boolean(true)
+                ^ Boolean(true)
             }
             public set(value: R|kotlin/Boolean|): R|kotlin/Unit| {
             }
 
-        public final property fau(var): R|kotlin/Double|
+        public final var fau: R|kotlin/Double|
             public get(): R|kotlin/Double|
             public set(value: R|kotlin/Double|): R|kotlin/Unit|
 

compiler/fir/resolve/testData/resolve/stdlib/concurrent.txt

@@ -1,6 +1,6 @@
 FILE: concurrent.kt
-    @R|kotlin/jvm/Volatile|() public final property xx(var): R|kotlin/Int| = Int(2)
+    @R|kotlin/jvm/Volatile|() public final var xx: R|kotlin/Int| = Int(2)
         public get(): R|kotlin/Int|
         public set(value: R|kotlin/Int|): R|kotlin/Unit|
-    @R|kotlin/jvm/Synchronized|() public final function foo(): R|kotlin/Unit| {
+    @R|kotlin/jvm/Synchronized|() public final fun foo(): R|kotlin/Unit| {
     }

compiler/fir/resolve/testData/resolve/stdlib/reflectionClass.txt

@@ -1,5 +1,5 @@
 FILE: reflectionClass.kt
-    public final property javaClass(val): R|java/lang/Class<kotlin/String>| = <getClass>(<Unresolved name: String>#).<Unresolved name: java>#
+    public final val javaClass: R|java/lang/Class<kotlin/String>| = <getClass>(<Unresolved name: String>#).<Unresolved name: java>#
         public get(): R|java/lang/Class<kotlin/String>|
-    public final property kotlinClass(val): R|kotlin/reflect/KClass<kotlin/String>| = <getClass>(<Unresolved name: String>#)
+    public final val kotlinClass: R|kotlin/reflect/KClass<kotlin/String>| = <getClass>(<Unresolved name: String>#)
         public get(): R|kotlin/reflect/KClass<kotlin/String>|

compiler/fir/resolve/testData/resolve/treeSet.txt

@@ -1,3 +1,3 @@
 FILE: treeSet.kt
-    public final property x(val): R|java/util/SortedSet<kotlin/Int>| = <Unresolved name: TreeSet>#()
+    public final val x: R|java/util/SortedSet<kotlin/Int>| = <Unresolved name: TreeSet>#()
         public get(): R|java/util/SortedSet<kotlin/Int>|

compiler/fir/resolve/testData/resolve/typeParameterInPropertyReceiver.txt

@@ -1,5 +1,5 @@
 FILE: typeParameterInPropertyReceiver.kt
-    <T : R|kotlin/Any|> public final property self R|T|.(val): R|T|
+    <T : R|kotlin/Any|> public final val R|T|.self: R|T|
         public get(): R|T| {
-            return this#
+            ^ this#
         }

compiler/fir/resolve/testData/resolve/typeParameterVsNested.txt

@@ -9,15 +9,15 @@ FILE: typeParameterVsNested.kt
 
         }
 
-        public abstract property x(val): R|T|
+        public abstract val x: R|T|
             public get(): R|T|
 
-        public abstract function foo(arg: R|T|): R|kotlin/Unit|
+        public abstract fun foo(arg: R|T|): R|kotlin/Unit|
 
-        public abstract property y(val): R|test/My.T|
+        public abstract val y: R|test/My.T|
             public get(): R|test/My.T|
 
-        public abstract property z(val): R|test/My.T|
+        public abstract val z: R|test/My.T|
             public get(): R|test/My.T|
 
         public final class Some : R|test/My.T| {