From 498fb94c375ea1786b0a9e7516e0a0ab17b377ad Mon Sep 17 00:00:00 2001 From: Simon Ogorodnik Date: Mon, 11 Mar 2019 16:58:14 +0300 Subject: [PATCH] FIR: Make FIR rendering more kotlin-styled --- .../rawBuilder/declarations/complexTypes.txt | 2 +- .../rawBuilder/declarations/derivedClass.txt | 6 +- .../rawBuilder/declarations/enums.txt | 16 ++--- .../rawBuilder/declarations/enums2.txt | 12 ++-- .../rawBuilder/declarations/expectActual.txt | 10 +-- .../rawBuilder/declarations/functionTypes.txt | 10 +-- .../declarations/genericFunctions.txt | 6 +- .../rawBuilder/declarations/nestedClass.txt | 2 +- .../declarations/noPrimaryConstructor.txt | 2 +- .../rawBuilder/declarations/simpleClass.txt | 16 ++--- .../rawBuilder/declarations/simpleFun.txt | 4 +- .../declarations/typeParameterVsNested.txt | 8 +-- .../declarations/typeParameters.txt | 12 ++-- .../rawBuilder/expressions/annotated.txt | 16 ++--- .../rawBuilder/expressions/arrayAccess.txt | 12 ++-- .../expressions/arrayAssignment.txt | 12 ++-- .../rawBuilder/expressions/branches.txt | 20 +++--- .../expressions/callableReferences.txt | 22 +++---- .../testData/rawBuilder/expressions/calls.txt | 30 ++++----- .../rawBuilder/expressions/classReference.txt | 2 +- .../expressions/collectionLiterals.txt | 6 +- .../rawBuilder/expressions/destructuring.txt | 18 +++--- .../testData/rawBuilder/expressions/for.txt | 38 +++++------ .../rawBuilder/expressions/genericCalls.txt | 12 ++-- .../testData/rawBuilder/expressions/init.txt | 2 +- .../rawBuilder/expressions/lambda.txt | 56 ++++++++-------- .../rawBuilder/expressions/locals.txt | 24 +++---- .../rawBuilder/expressions/modifications.txt | 10 +-- .../rawBuilder/expressions/namedArgument.txt | 4 +- .../rawBuilder/expressions/nullability.txt | 8 +-- .../rawBuilder/expressions/simpleReturns.txt | 8 +-- .../testData/rawBuilder/expressions/super.txt | 10 +-- .../testData/rawBuilder/expressions/these.txt | 26 ++++---- .../testData/rawBuilder/expressions/try.txt | 2 +- .../rawBuilder/expressions/typeOperators.txt | 16 ++--- .../testData/rawBuilder/expressions/unary.txt | 64 +++++++++---------- .../rawBuilder/expressions/variables.txt | 12 ++-- .../testData/rawBuilder/expressions/while.txt | 14 ++-- .../enhancement/jsr305/NonNullNever.fir.txt | 4 +- .../enhancement/jsr305/Simple.fir.txt | 6 +- .../enhancement/jsr305/Strange.fir.txt | 6 +- .../FieldsAreNullable.fir.txt | 8 +-- .../ForceFlexibility.fir.txt | 4 +- .../ForceFlexibleOverOverrides.fir.txt | 16 ++--- .../NullabilityFromOverridden.fir.txt | 42 ++++++------ .../OverridingDefaultQualifier.fir.txt | 10 +-- .../ParametersAreNonnullByDefault.fir.txt | 6 +- ...rametersAreNonnullByDefaultPackage.fir.txt | 12 ++-- .../SpringNullable.fir.txt | 8 +-- .../SpringNullablePackage.fir.txt | 8 +-- .../signatureAnnotations/DefaultEnum.fir.txt | 16 ++--- .../DefaultLongLiteral.fir.txt | 16 ++--- .../signatureAnnotations/DefaultNull.fir.txt | 6 +- .../DefaultNullAndParameter.fir.txt | 18 +++--- .../DefaultParameter.fir.txt | 10 +-- .../EmptyParameterName.fir.txt | 6 +- .../ReorderedParameterNames.fir.txt | 2 +- .../SameParameterName.fir.txt | 2 +- .../SpecialCharsParameterName.fir.txt | 4 +- .../StaticMethodWithDefaultValue.fir.txt | 2 +- .../testData/resolve/builtins/lists.txt | 8 +-- .../resolve/testData/resolve/companion.txt | 4 +- .../resolve/testData/resolve/derivedClass.txt | 6 +- .../fir/resolve/testData/resolve/enum.txt | 12 ++-- .../testData/resolve/expresssions/access.txt | 56 ++++++++-------- .../expresssions/invoke/explicitReceiver.txt | 12 ++-- .../expresssions/invoke/explicitReceiver2.txt | 16 ++--- .../resolve/expresssions/invoke/extension.txt | 12 ++-- .../invoke/farInvokeExtension.txt | 12 ++-- .../expresssions/invoke/threeReceivers.txt | 10 +-- .../testData/resolve/expresssions/simple.txt | 10 +-- .../testData/resolve/expresssions/this.txt | 16 ++--- .../testData/resolve/expresssions/when.txt | 4 +- .../resolve/fromBuilder/complexTypes.txt | 2 +- .../testData/resolve/fromBuilder/enums.txt | 16 ++--- .../fromBuilder/noPrimaryConstructor.txt | 2 +- .../resolve/fromBuilder/simpleClass.txt | 16 ++--- .../resolve/fromBuilder/typeParameters.txt | 12 ++-- .../testData/resolve/functionTypes.txt | 10 +-- .../testData/resolve/genericFunctions.txt | 6 +- .../resolve/multifile/Annotations.txt | 12 ++-- .../testData/resolve/multifile/ByteArray.txt | 2 +- .../resolve/multifile/sealedStarImport.txt | 6 +- .../resolve/multifile/simpleStarImport.txt | 2 +- .../resolve/testData/resolve/nestedClass.txt | 2 +- .../testData/resolve/overrides/simple.txt | 26 ++++---- .../resolve/overrides/simpleFakeOverride.txt | 6 +- .../testData/resolve/overrides/three.txt | 8 +-- .../testData/resolve/references/simple.txt | 8 +-- .../resolve/references/superMember.txt | 4 +- .../resolve/testData/resolve/simpleClass.txt | 16 ++--- .../testData/resolve/stdlib/concurrent.txt | 4 +- .../resolve/stdlib/reflectionClass.txt | 4 +- .../fir/resolve/testData/resolve/treeSet.txt | 2 +- .../typeParameterInPropertyReceiver.txt | 4 +- .../resolve/typeParameterVsNested.txt | 8 +-- .../org/jetbrains/kotlin/fir/FirRenderer.kt | 46 ++++++------- .../compiledJava/ArrayTypeVariance.fir.txt | 2 +- .../compiledJava/ClassWithConstVal.fir.txt | 4 +- .../loadJava/compiledJava/FieldAsVar.fir.txt | 2 +- .../compiledJava/FieldOfArrayType.fir.txt | 2 +- .../compiledJava/FinalFieldAsVal.fir.txt | 2 +- .../InnerClassTypeMultipleGeneric.fir.txt | 2 +- .../IntrinsicCompanionObject.fir.txt | 10 +-- .../MethodTypePOneUpperBound.fir.txt | 2 +- .../MethodTypePTwoUpperBounds.fir.txt | 2 +- .../compiledJava/MethodWithTypeP.fir.txt | 2 +- .../compiledJava/MethodWithTypePP.fir.txt | 2 +- .../MethodWithTypePRefClassP.fir.txt | 2 +- .../compiledJava/MethosWithPRefTP.fir.txt | 2 +- .../loadJava/compiledJava/MyException.fir.txt | 2 +- .../PackageLocalVisibility.fir.txt | 6 +- .../compiledJava/PrivateMembers.fir.txt | 10 +-- .../RemoveRedundantProjectionKind.fir.txt | 4 +- .../loadJava/compiledJava/Simple.fir.txt | 2 +- .../compiledJava/TopLevel$Class.fir.txt | 2 +- .../loadJava/compiledJava/TwoFields.fir.txt | 4 +- .../compiledJava/UnboundWildcard.fir.txt | 4 +- .../compiledJava/WildcardBounds.fir.txt | 2 +- .../annotations/AnnotatedConstructor.fir.txt | 2 +- .../annotations/AnnotatedEnumEntry.fir.txt | 6 +- .../annotations/AnnotatedField.fir.txt | 4 +- .../annotations/AnnotatedMethod.fir.txt | 2 +- .../annotations/AnnotatedTypeInFun.fir.txt | 2 +- .../AnnotatedValueParameter.fir.txt | 2 +- .../EnumArgumentWithCustomToString.fir.txt | 2 +- .../EnumConstructorParameter.fir.txt | 6 +- .../annotations/JavaDocDeprecated.fir.txt | 2 +- .../annotations/NestedEnumArgument.fir.txt | 2 +- .../annotations/StringConstantInParam.fir.txt | 2 +- .../ConstructorGenericDeep.fir.txt | 2 +- .../ConstructorGenericSimple.fir.txt | 2 +- .../ConstructorGenericUpperBound.fir.txt | 2 +- .../compiledJava/enum/EnumMembers.fir.txt | 10 +-- .../enum/EnumWithSpecializedEntry.fir.txt | 4 +- .../compiledJava/enum/JavaEnum.fir.txt | 4 +- .../javaBean/DifferentGetterAndSetter.fir.txt | 4 +- .../javaBean/JavaBeanAbstractGetter.fir.txt | 4 +- .../compiledJava/javaBean/JavaBeanVal.fir.txt | 2 +- .../compiledJava/javaBean/JavaBeanVar.fir.txt | 4 +- .../javaBean/JavaBeanVarOfGenericType.fir.txt | 4 +- .../compiledJava/javaBean/TwoSetters.fir.txt | 4 +- .../kotlinSignature/AllBoundsInWhen.fir.txt | 2 +- .../kotlinSignature/ArrayType.fir.txt | 2 +- .../ConstructorWithNewTypeParams.fir.txt | 2 +- .../ConstructorWithParentTypeParams.fir.txt | 2 +- .../ConstructorWithSeveralParams.fir.txt | 2 +- .../ConstructorWithoutParams.fir.txt | 2 +- .../CustomProjectionKind.fir.txt | 2 +- .../MethodWithFunctionTypes.fir.txt | 2 +- .../MethodWithGenerics.fir.txt | 2 +- .../MethodWithMappedClasses.fir.txt | 4 +- .../MethodWithTypeParameters.fir.txt | 2 +- .../kotlinSignature/MethodWithVararg.fir.txt | 2 +- .../PropertyArrayTypes.fir.txt | 6 +- .../PropertyComplexTypes.fir.txt | 8 +-- .../PropertySimpleType.fir.txt | 4 +- .../kotlinSignature/StarProjection.fir.txt | 2 +- .../error/WrongProjectionKind.fir.txt | 2 +- .../error/WrongReturnTypeStructure.fir.txt | 2 +- .../WrongTypeParameterBoundStructure1.fir.txt | 2 +- .../WrongValueParameterStructure1.fir.txt | 2 +- .../return/SubclassOfCollection.fir.txt | 2 +- .../return/SubclassOfMapEntry.fir.txt | 4 +- .../compiledJava/library/LoadIterable.fir.txt | 4 +- .../compiledJava/library/LoadIterator.fir.txt | 4 +- .../loadJava/compiledJava/library/Max.fir.txt | 2 +- .../modality/ModalityOfFakeOverrides.fir.txt | 4 +- .../mutability/LoadIterable.fir.txt | 8 +-- .../LoadIterableWithConflict.fir.txt | 4 +- .../LoadIterableWithNullability.fir.txt | 8 +-- .../ReadOnlyExtendsWildcard.fir.txt | 4 +- .../compiledJava/notNull/NotNullField.fir.txt | 2 +- .../notNull/NotNullIntArray.fir.txt | 2 +- .../notNull/NotNullMethod.fir.txt | 2 +- .../notNull/NotNullObjectArray.fir.txt | 2 +- .../notNull/NotNullParameter.fir.txt | 2 +- .../ProtectedPackageFun.fir.txt | 2 +- .../ProtectedPackageProperty.fir.txt | 2 +- .../compiledJava/sam/Comparator.fir.txt | 4 +- .../compiledJava/sam/FilenameFilter.fir.txt | 2 +- ...ricInterfaceParameterWithSelfBound.fir.txt | 2 +- ...nericInterfaceParametersWithBounds.fir.txt | 2 +- .../sam/GenericMethodParameters.fir.txt | 2 +- .../sam/InterfaceWithObjectMethod.fir.txt | 2 +- .../compiledJava/sam/Runnable.fir.txt | 2 +- .../sam/SamSubinterfaceOverridding.fir.txt | 2 +- .../compiledJava/sam/VarargParameter.fir.txt | 2 +- .../sam/adapters/AmbiguousAdapters.fir.txt | 4 +- .../compiledJava/sam/adapters/Basic.fir.txt | 4 +- .../sam/adapters/Constructor.fir.txt | 2 +- .../ConstructorWithAnnotations.fir.txt | 2 +- .../adapters/NonTrivialFunctionType.fir.txt | 8 +-- .../sam/adapters/PrivateSamAdapter.fir.txt | 2 +- .../sam/adapters/SelfAsParameter.fir.txt | 2 +- .../sam/adapters/SeveralSamParameters.fir.txt | 2 +- .../sam/adapters/TypeParameterOfClass.fir.txt | 2 +- .../adapters/TypeParameterOfMethod.fir.txt | 6 +- .../signatureAnnotations/StableName.fir.txt | 2 +- ...perclassesInconsistentGenericTypes.fir.txt | 4 +- .../loadJava/compiledJava/static/Enum.fir.txt | 6 +- .../compiledJava/static/Simple.fir.txt | 4 +- .../compiledJava/static/StaticFinal.fir.txt | 12 ++-- .../static/StaticMembersInEnum.fir.txt | 14 ++-- .../compiledJava/vararg/VarargInt.fir.txt | 2 +- .../compiledJava/vararg/VarargString.fir.txt | 2 +- 206 files changed, 758 insertions(+), 768 deletions(-) diff --git a/compiler/fir/psi2fir/testData/rawBuilder/declarations/complexTypes.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/complexTypes.txt index cd9c74a4eae..342eec2a11d 100644 --- a/compiler/fir/psi2fir/testData/rawBuilder/declarations/complexTypes.txt +++ b/compiler/fir/psi2fir/testData/rawBuilder/declarations/complexTypes.txt @@ -9,7 +9,7 @@ FILE: complexTypes.kt } public? final? interface Test { - public? final? property x(val): a.b.C.D, *> + public? final? val x: a.b.C.D, *> public? get(): a.b.C.D, *> } diff --git a/compiler/fir/psi2fir/testData/rawBuilder/declarations/derivedClass.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/derivedClass.txt index 1587403c5ab..f5aeac35b1e 100644 --- a/compiler/fir/psi2fir/testData/rawBuilder/declarations/derivedClass.txt +++ b/compiler/fir/psi2fir/testData/rawBuilder/declarations/derivedClass.txt @@ -2,7 +2,7 @@ FILE: derivedClass.kt public? open class Base { public? constructor(x: T): super() - public? final? property x(val): T + public? final? val x: T public? get(): T } @@ -10,6 +10,6 @@ FILE: derivedClass.kt public? constructor(x: T): super>(x#) } - public? final? function create(x: T): Derived { - return@@@create Derived#(x#) + public? final? fun create(x: T): Derived { + ^create Derived#(x#) } diff --git a/compiler/fir/psi2fir/testData/rawBuilder/declarations/enums.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/enums.txt index 19126854cc6..5aba7c39e44 100644 --- a/compiler/fir/psi2fir/testData/rawBuilder/declarations/enums.txt +++ b/compiler/fir/psi2fir/testData/rawBuilder/declarations/enums.txt @@ -21,16 +21,16 @@ FILE: enums.kt public? final? enum class Planet { public? constructor(m: Double, r: Double): super() - public? final? property m(val): Double + public? final? val m: Double public? get(): Double - internal final? property r(val): Double + internal final? val r: Double internal get(): Double public? final enum entry MERCURY : Planet { public? constructor(): super(Double(1.0), Double(2.0)) - public? open? override function sayHello(): kotlin/Unit { + public? open? override fun sayHello(): kotlin/Unit { println#(String(Hello!!!)) } @@ -39,7 +39,7 @@ FILE: enums.kt public? final enum entry VENERA : Planet { public? constructor(): super(Double(3.0), Double(4.0)) - public? open? override function sayHello(): kotlin/Unit { + public? open? override fun sayHello(): kotlin/Unit { println#(String(Ola!!!)) } @@ -48,21 +48,21 @@ FILE: enums.kt public? final enum entry EARTH : Planet { public? constructor(): super(Double(5.0), Double(6.0)) - public? open? override function sayHello(): kotlin/Unit { + public? open? override fun sayHello(): kotlin/Unit { println#(String(Privet!!!)) } } - public? final? property g(val): Double = div#(times#(G#, m#), times#(r#, r#)) + public? final? val g: Double = div#(times#(G#, m#), times#(r#, r#)) public? get(): Double - public? abstract function sayHello(): kotlin/Unit + public? abstract fun sayHello(): kotlin/Unit public? final? companion object Companion { public? constructor(): super() - public? final? const property G(val): = Double(6.67E-11) + public? final? const val G: = Double(6.67E-11) public? get(): } diff --git a/compiler/fir/psi2fir/testData/rawBuilder/declarations/enums2.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/enums2.txt index c29953c8a4a..c7ac75f2f2c 100644 --- a/compiler/fir/psi2fir/testData/rawBuilder/declarations/enums2.txt +++ b/compiler/fir/psi2fir/testData/rawBuilder/declarations/enums2.txt @@ -12,14 +12,14 @@ FILE: enums2.kt public? final? enum class SomeEnum { public? constructor(x: Some): super() - public? final? property x(val): Some + public? final? val x: Some public? get(): Some public? final enum entry FIRST : SomeEnum { public? constructor(): super(O1#) - public? open? override function check(y: Some): Boolean { - return@@@check Boolean(true) + public? open? override fun check(y: Some): Boolean { + ^check Boolean(true) } } @@ -27,12 +27,12 @@ FILE: enums2.kt public? final enum entry SECOND : SomeEnum { public? constructor(): super(O2#) - public? open? override function check(y: Some): Boolean { - return@@@check ==(y#, O2#) + public? open? override fun check(y: Some): Boolean { + ^check ==(y#, O2#) } } - public? abstract function check(y: Some): Boolean + public? abstract fun check(y: Some): Boolean } diff --git a/compiler/fir/psi2fir/testData/rawBuilder/declarations/expectActual.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/expectActual.txt index b8fca3f411a..b18361d5802 100644 --- a/compiler/fir/psi2fir/testData/rawBuilder/declarations/expectActual.txt +++ b/compiler/fir/psi2fir/testData/rawBuilder/declarations/expectActual.txt @@ -3,15 +3,15 @@ FILE: expectActual.kt public? constructor(): super() } - public? final? expect function foo(): String - public? final? expect property x(val): Int + public? final? expect fun foo(): String + public? final? expect val x: Int public? get(): Int public? final? actual class MyClass { public? constructor(): super() } - public? final? actual function foo(): { - return@@@foo String(Hello) + public? final? actual fun foo(): { + ^foo String(Hello) } - public? final? actual property x(val): = Int(42) + public? final? actual val x: = Int(42) public? get(): diff --git a/compiler/fir/psi2fir/testData/rawBuilder/declarations/functionTypes.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/functionTypes.txt index 2ad7c65a925..e8c0328ffb6 100644 --- a/compiler/fir/psi2fir/testData/rawBuilder/declarations/functionTypes.txt +++ b/compiler/fir/psi2fir/testData/rawBuilder/declarations/functionTypes.txt @@ -1,9 +1,9 @@ FILE: functionTypes.kt - public? final? function simpleRun(f: ( (T) -> Unit )): Unit { - return@@@simpleRun f#() + public? final? fun simpleRun(f: ( (T) -> Unit )): Unit { + ^simpleRun f#() } - public? final? function simpleMap List.(f: ( (T) -> R )): R { + public? final? fun List.simpleMap(f: ( (T) -> R )): R { } - public? final? function simpleWith(t: T, f: ( T.() -> Unit )): Unit { - return@@@simpleWith t#.f#() + public? final? fun simpleWith(t: T, f: ( T.() -> Unit )): Unit { + ^simpleWith t#.f#() } diff --git a/compiler/fir/psi2fir/testData/rawBuilder/declarations/genericFunctions.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/genericFunctions.txt index 4c82fd5ff45..0a7815734d1 100644 --- a/compiler/fir/psi2fir/testData/rawBuilder/declarations/genericFunctions.txt +++ b/compiler/fir/psi2fir/testData/rawBuilder/declarations/genericFunctions.txt @@ -1,12 +1,12 @@ FILE: genericFunctions.kt public? final? interface Any { } - public? final? inline function safeAs Any.(): T? { - return@@@safeAs as?/T(this#) + public? final? inline fun Any.safeAs(): T? { + ^safeAs as?/T(this#) } public? abstract class Summator { public? constructor(): super() - public? abstract function plus(first: T, second: T): T + public? abstract fun plus(first: T, second: T): T } diff --git a/compiler/fir/psi2fir/testData/rawBuilder/declarations/nestedClass.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/nestedClass.txt index e303bed36bf..6564b21606e 100644 --- a/compiler/fir/psi2fir/testData/rawBuilder/declarations/nestedClass.txt +++ b/compiler/fir/psi2fir/testData/rawBuilder/declarations/nestedClass.txt @@ -2,7 +2,7 @@ FILE: nestedClass.kt public? abstract class Base { public? constructor(s: String): super() - public? final? property s(val): String + public? final? val s: String public? get(): String } diff --git a/compiler/fir/psi2fir/testData/rawBuilder/declarations/noPrimaryConstructor.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/noPrimaryConstructor.txt index 2b77642a323..cff58d19951 100644 --- a/compiler/fir/psi2fir/testData/rawBuilder/declarations/noPrimaryConstructor.txt +++ b/compiler/fir/psi2fir/testData/rawBuilder/declarations/noPrimaryConstructor.txt @@ -1,6 +1,6 @@ FILE: noPrimaryConstructor.kt public? final? class NoPrimary { - public? final? property x(val): String + public? final? val x: String public? get(): String public? constructor(x: String): super() { diff --git a/compiler/fir/psi2fir/testData/rawBuilder/declarations/simpleClass.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/simpleClass.txt index 4f8d02c4d39..53dda3dd62b 100644 --- a/compiler/fir/psi2fir/testData/rawBuilder/declarations/simpleClass.txt +++ b/compiler/fir/psi2fir/testData/rawBuilder/declarations/simpleClass.txt @@ -1,29 +1,29 @@ FILE: simpleClass.kt public? final? interface SomeInterface { - public? final? function foo(x: Int, y: String): String + public? final? fun foo(x: Int, y: String): String - public? final? property bar(val): Boolean + public? final? val bar: Boolean public? get(): Boolean } public? final? class SomeClass : SomeInterface { public? constructor(): super() - private final? property baz(val): = Int(42) + private final? val baz: = Int(42) private get(): - public? open? override function foo(x: Int, y: String): String { - return@@@foo plus#(plus#(y#, x#), baz#) + public? open? override fun foo(x: Int, y: String): String { + ^foo plus#(plus#(y#, x#), baz#) } - public? open? override property bar(var): Boolean + public? open? override var bar: Boolean public? get(): Boolean { - return Boolean(true) + ^ Boolean(true) } public? set(value: Boolean): kotlin/Unit { } - public? final? lateinit property fau(var): Double + public? final? lateinit var fau: Double public? get(): Double public? set(value: Double): kotlin/Unit diff --git a/compiler/fir/psi2fir/testData/rawBuilder/declarations/simpleFun.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/simpleFun.txt index fec5b546c5f..215967222aa 100644 --- a/compiler/fir/psi2fir/testData/rawBuilder/declarations/simpleFun.txt +++ b/compiler/fir/psi2fir/testData/rawBuilder/declarations/simpleFun.txt @@ -1,5 +1,5 @@ FILE: simpleFun.kt - public? final? function foo(): kotlin/Unit { + public? final? fun foo(): kotlin/Unit { } - public? final? suspend function bar(): kotlin/Unit { + public? final? suspend fun bar(): kotlin/Unit { } diff --git a/compiler/fir/psi2fir/testData/rawBuilder/declarations/typeParameterVsNested.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/typeParameterVsNested.txt index 30d252fb2c9..64a8bb863b5 100644 --- a/compiler/fir/psi2fir/testData/rawBuilder/declarations/typeParameterVsNested.txt +++ b/compiler/fir/psi2fir/testData/rawBuilder/declarations/typeParameterVsNested.txt @@ -9,15 +9,15 @@ FILE: typeParameterVsNested.kt } - public? abstract property x(val): T + public? abstract val x: T public? get(): T - public? abstract function foo(arg: T): kotlin/Unit + public? abstract fun foo(arg: T): kotlin/Unit - public? abstract property y(val): My.T + public? abstract val y: My.T public? get(): My.T - public? abstract property z(val): test.My.T + public? abstract val z: test.My.T public? get(): test.My.T public? final? class Some : T { diff --git a/compiler/fir/psi2fir/testData/rawBuilder/declarations/typeParameters.txt b/compiler/fir/psi2fir/testData/rawBuilder/declarations/typeParameters.txt index 1e5839a93aa..c04c5c2d2db 100644 --- a/compiler/fir/psi2fir/testData/rawBuilder/declarations/typeParameters.txt +++ b/compiler/fir/psi2fir/testData/rawBuilder/declarations/typeParameters.txt @@ -1,8 +1,8 @@ FILE: typeParameters.kt public? final? interface List { - public? final? operator function get(index: Int): T + public? final? operator fun get(index: Int): T - public? final? infix function concat(other: List): List + public? final? infix fun concat(other: List): List } public? final typealias StringList = List @@ -14,12 +14,12 @@ FILE: typeParameters.kt public? final? class SomeList : AbstractList { public? constructor(): super>() - public? open? override function get(index: Int): Int { - return@@@get Int(42) + public? open? override fun get(index: Int): Int { + ^get Int(42) } - public? open? override function concat(other: List): List { - return@@@concat this# + public? open? override fun concat(other: List): List { + ^concat this# } } diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/annotated.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/annotated.txt index 5a788912f9b..fb4fcdc24d1 100644 --- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/annotated.txt +++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/annotated.txt @@ -3,10 +3,10 @@ FILE: annotated.kt public? constructor(): super() } - public? final? function foo(arg: Int): Int { + public? final? fun foo(arg: Int): Int { when () { ==(@Ann() arg#, Int(0)) -> { - @Ann() return@@@foo Int(1) + @Ann() ^foo Int(1) } else -> { } @@ -14,20 +14,20 @@ FILE: annotated.kt @Ann() when () { ==(arg#, Int(1)) -> { - return@@@foo @Ann() Int(1) + ^foo @Ann() Int(1) } else -> { } } - return@@@foo Int(42) + ^foo Int(42) } public? final? data class Two { public? constructor(x: Int, y: Int): super() } - public? final? function bar(two: Two): kotlin/Unit { - val : = two# - @Ann() val x: = component1(#) - @Ann() val y: = component2(#) + public? final? fun bar(two: Two): kotlin/Unit { + lval : = two# + @Ann() lval x: = component1(#) + @Ann() lval y: = component2(#) } diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/arrayAccess.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/arrayAccess.txt index 27c3214ea69..89d7e0442d5 100644 --- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/arrayAccess.txt +++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/arrayAccess.txt @@ -1,16 +1,16 @@ FILE: arrayAccess.kt - public? final? property p(val): = Int(0) + public? final? val p: = Int(0) public? get(): - public? final? function foo(): { - return@@@foo Int(1) + public? final? fun foo(): { + ^foo Int(1) } public? final? class Wrapper { public? constructor(v: IntArray): super() - public? final? property v(val): IntArray + public? final? val v: IntArray public? get(): IntArray } - public? final? function test(a: IntArray, w: Wrapper): { - return@@@test plus#(plus#(plus#(a#[Int(0)], a#[p#]), a#[foo#()]), w#.v#[Int(0)]) + public? final? fun test(a: IntArray, w: Wrapper): { + ^test plus#(plus#(plus#(a#[Int(0)], a#[p#]), a#[foo#()]), w#.v#[Int(0)]) } diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/arrayAssignment.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/arrayAssignment.txt index 55bdd7da62d..6aff521a17d 100644 --- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/arrayAssignment.txt +++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/arrayAssignment.txt @@ -1,12 +1,12 @@ FILE: arrayAssignment.kt - public? final? function test(): kotlin/Unit { - val x: = intArrayOf#(Int(1), Int(2), Int(3)) + public? final? fun test(): kotlin/Unit { + lval x: = intArrayOf#(Int(1), Int(2), Int(3)) x#[Int(1)] = Int(0) } - public? final? function foo(): { - return@@@foo Int(1) + public? final? fun foo(): { + ^foo Int(1) } - public? final? function test2(): kotlin/Unit { - val : = intArrayOf#(Int(1), Int(2), Int(3)) + public? final? fun test2(): kotlin/Unit { + lval : = intArrayOf#(Int(1), Int(2), Int(3)) #[foo#()] = Int(1) } diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/branches.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/branches.txt index fb222bb64a5..ce909762d37 100644 --- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/branches.txt +++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/branches.txt @@ -1,6 +1,6 @@ FILE: branches.kt - public? final? function foo(a: Int, b: Int): { - return@@@foo when () { + public? final? fun foo(a: Int, b: Int): { + ^foo when () { >(a#, b#) -> { a# } @@ -10,33 +10,33 @@ FILE: branches.kt } } - public? final? function bar(a: Double, b: Double): Double { + public? final? fun bar(a: Double, b: Double): Double { when () { >(a#, b#) -> { println#(a#) - return@@@bar a# + ^bar a# } else -> { println#(b#) - return@@@bar b# + ^bar b# } } } - public? final? function baz(a: Long, b: Long): Long { + public? final? fun baz(a: Long, b: Long): Long { when () { >(a#, b#) -> { println#(a#) - return@@@baz a# + ^baz a# } else -> { - return@@@baz b# + ^baz b# } } } - public? final? function grade(g: Int): String { - return@@@grade when (g#) { + public? final? fun grade(g: Int): String { + ^grade when (g#) { ||(==($subj$, Int(6)), ==($subj$, Int(7))) -> { String(Outstanding) } diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/callableReferences.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/callableReferences.txt index 0b72112dcfa..de77da4de59 100644 --- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/callableReferences.txt +++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/callableReferences.txt @@ -2,28 +2,28 @@ FILE: callableReferences.kt public? final? class A { public? constructor(): super() - public? final? function foo(): kotlin/Unit { + public? final? fun foo(): kotlin/Unit { } - public? final? property bar(val): = Int(0) + public? final? val bar: = Int(0) public? get(): } - public? final? function qux A.(): kotlin/Unit { + public? final? fun A.qux(): kotlin/Unit { } - public? final? function baz(): kotlin/Unit { + public? final? fun baz(): kotlin/Unit { } - public? final? property test1(val): = A#()::foo# + public? final? val test1: = A#()::foo# public? get(): - public? final? property test2(val): = A#()::bar# + public? final? val test2: = A#()::bar# public? get(): - public? final? property test3(val): = A#()::qux# + public? final? val test3: = A#()::qux# public? get(): - public? final? property test4(val): = A#::foo# + public? final? val test4: = A#::foo# public? get(): - public? final? property test5(val): = A#::bar# + public? final? val test5: = A#::bar# public? get(): - public? final? property test6(val): = A#::qux# + public? final? val test6: = A#::qux# public? get(): - public? final? property test7(val): = ::baz# + public? final? val test7: = ::baz# public? get(): diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/calls.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/calls.txt index 93d1ab8172c..72c4e25f810 100644 --- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/calls.txt +++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/calls.txt @@ -1,36 +1,36 @@ FILE: calls.kt - public? final? infix function distance(x: Int, y: Int): { - return@@@distance plus#(x#, y#) + public? final? infix fun distance(x: Int, y: Int): { + ^distance plus#(x#, y#) } - public? final? function test(): Int { - return@@@test distance#(Int(3), Int(4)) + public? final? fun test(): Int { + ^test distance#(Int(3), Int(4)) } - public? final? function testRegular(): Int { - return@@@testRegular distance#(Int(3), Int(4)) + public? final? fun testRegular(): Int { + ^testRegular distance#(Int(3), Int(4)) } public? final? class My { public? constructor(x: Int): super() - public? final? property x(var): Int + public? final? var x: Int public? get(): Int public? set(value: Int): kotlin/Unit - public? final? operator function invoke(): { - return@@@invoke x# + public? final? operator fun invoke(): { + ^invoke x# } - public? final? function foo(): kotlin/Unit { + public? final? fun foo(): kotlin/Unit { } - public? final? function copy(): { - return@@@copy My#(x#) + public? final? fun copy(): { + ^copy My#(x#) } } - public? final? function testInvoke(): Int { - return@@@testInvoke invoke#(My#(Int(13))) + public? final? fun testInvoke(): Int { + ^testInvoke invoke#(My#(Int(13))) } - public? final? function testQualified(first: My, second: My?): kotlin/Unit { + public? final? fun testQualified(first: My, second: My?): kotlin/Unit { println#(first#.x#) println#(second#?.x#) first#.foo#() diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/classReference.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/classReference.txt index 03bb7974ed9..c5d5184a522 100644 --- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/classReference.txt +++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/classReference.txt @@ -3,7 +3,7 @@ FILE: classReference.kt public? constructor(): super() } - public? final? function test(): kotlin/Unit { + public? final? fun test(): kotlin/Unit { (A#) (test#.A#) (A#()) diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/collectionLiterals.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/collectionLiterals.txt index 1b7d17f8b79..8328b1a0315 100644 --- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/collectionLiterals.txt +++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/collectionLiterals.txt @@ -2,21 +2,21 @@ FILE: collectionLiterals.kt public? final? annotation class Ann1 { public? constructor(arr: IntArray): super() - public? final? property arr(val): IntArray + public? final? val arr: IntArray public? get(): IntArray } public? final? annotation class Ann2 { public? constructor(arr: DoubleArray): super() - public? final? property arr(val): DoubleArray + public? final? val arr: DoubleArray public? get(): DoubleArray } public? final? annotation class Ann3 { public? constructor(arr: Array): super() - public? final? property arr(val): Array + public? final? val arr: Array public? get(): Array } diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/destructuring.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/destructuring.txt index 033cb40fe39..674f0903786 100644 --- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/destructuring.txt +++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/destructuring.txt @@ -2,22 +2,22 @@ FILE: destructuring.kt public? final? data class Some { public? constructor(first: Int, second: Double, third: String): super() - public? final? property first(val): Int + public? final? val first: Int public? get(): Int - public? final? property second(val): Double + public? final? val second: Double public? get(): Double - public? final? property third(val): String + public? final? val third: String public? get(): String } - public? final? function foo(some: Some): kotlin/Unit { - val : = some# - var x: = component1(#) - var y: = component2(#) - var z: String = component3(#) - val : = x# + public? final? fun foo(some: Some): kotlin/Unit { + lval : = some# + lvar x: = component1(#) + lvar y: = component2(#) + lvar z: String = component3(#) + lval : = x# x# = inc#(#) # y# *= Double(2.0) diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/for.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/for.txt index d4ccc574088..36277d65f15 100644 --- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/for.txt +++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/for.txt @@ -1,25 +1,25 @@ FILE: for.kt - public? final? function foo(): kotlin/Unit { - val : = rangeTo#(Int(1), Int(10)) - val : = #.iterator#() + public? final? fun foo(): kotlin/Unit { + lval : = rangeTo#(Int(1), Int(10)) + lval : = #.iterator#() while(#.hasNext#()) { - val i: = #.next#() + lval i: = #.next#() println#(i#) } } - public? final? function bar(list: List): kotlin/Unit { - val : = list#.subList#(Int(0), Int(10)) - val : = #.iterator#() + public? final? fun bar(list: List): kotlin/Unit { + lval : = list#.subList#(Int(0), Int(10)) + lval : = #.iterator#() while(#.hasNext#()) { - val element: = #.next#() + lval element: = #.next#() println#(element#) } - val : = list#.subList#(Int(10), Int(20)) - val : = #.iterator#() + lval : = list#.subList#(Int(10), Int(20)) + lval : = #.iterator#() while(#.hasNext#()) { - val element: = #.next#() + lval element: = #.next#() println#(element#) } @@ -27,20 +27,20 @@ FILE: for.kt public? final? data class Some { public? constructor(x: Int, y: Int): super() - public? final? property x(val): Int + public? final? val x: Int public? get(): Int - public? final? property y(val): Int + public? final? val y: Int public? get(): Int } - public? final? function baz(set: Set): kotlin/Unit { - val : = set# - val : = #.iterator#() + public? final? fun baz(set: Set): kotlin/Unit { + lval : = set# + lval : = #.iterator#() while(#.hasNext#()) { - val : = #.next#() - val x: = component1(#) - val y: = component2(#) + lval : = #.next#() + lval x: = component1(#) + lval y: = component2(#) println#(plus#(String(x = ), x#, String( y = ), y#)) } diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/genericCalls.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/genericCalls.txt index 6a9b9b37100..1d3f72fe9fb 100644 --- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/genericCalls.txt +++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/genericCalls.txt @@ -1,9 +1,9 @@ FILE: genericCalls.kt - public? final? function nullableValue(): T? { - return@@@nullableValue Null(null) + public? final? fun nullableValue(): T? { + ^nullableValue Null(null) } - public? final? function test(): kotlin/Unit { - val n: = nullableValue#() - val x: = nullableValue#() - val s: = nullableValue#() + public? final? fun test(): kotlin/Unit { + lval n: = nullableValue#() + lval x: = nullableValue#() + lval s: = nullableValue#() } diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/init.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/init.txt index 8ceecb98e17..440ed041a94 100644 --- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/init.txt +++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/init.txt @@ -2,7 +2,7 @@ FILE: init.kt public? final? class WithInit { public? constructor(x: Int): super() - public? final? property x(val): Int + public? final? val x: Int public? get(): Int init { diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/lambda.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/lambda.txt index 9fe23e82a3c..dd3266fc43d 100644 --- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/lambda.txt +++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/lambda.txt @@ -2,74 +2,74 @@ FILE: lambda.kt public? final? data class Tuple { public? constructor(x: Int, y: Int): super() - public? final? property x(val): Int + public? final? val x: Int public? get(): Int - public? final? property y(val): Int + public? final? val y: Int public? get(): Int } - public? final? inline function use(f: ( (Tuple) -> Int )): { - return@@@use f#(Tuple#(Int(1), Int(2))) + public? final? inline fun use(f: ( (Tuple) -> Int )): { + ^use f#(Tuple#(Int(1), Int(2))) } - public? final? function foo(): Int { - val l1: = function .(t: Tuple): { - return { - val x: = t#.x# - val y: = t#.y# + public? final? fun foo(): Int { + lval l1: = fun .(t: Tuple): { + ^ { + lval x: = t#.x# + lval y: = t#.y# plus#(x#, y#) } } - use#(use@function .(: ): { - return { - val x: = component1(#) - val y: = component2(#) + use#(use@fun .(: ): { + ^ { + lval x: = component1(#) + lval y: = component2(#) plus#(x#, y#) } } ) - return@@@foo use#(use@function .(): { - return { + ^foo use#(use@fun .(): { + ^ { when () { ==(it#.x#, Int(0)) -> { - return@@@foo Int(0) + ^foo Int(0) } else -> { } } - return@@@use it#.y# + ^@use it#.y# } } ) } - public? final? function bar(): Int { - return@@@bar use#(lambda@function .(): { - return { + public? final? fun bar(): Int { + ^bar use#(lambda@fun .(): { + ^ { when () { ==(it#.x#, Int(0)) -> { - return@@@bar Int(0) + ^bar Int(0) } else -> { } } - return@@@lambda it#.y# + ^@lambda it#.y# } } ) } - public? final? function test(list: List): kotlin/Unit { - val map: = mutableMapOf#() - list#.forEach#(forEach@function .(): { - return { - val : = map#.getOrPut#(it#, getOrPut@function .(): { - return { + public? final? fun test(list: List): kotlin/Unit { + lval map: = mutableMapOf#() + list#.forEach#(forEach@fun .(): { + ^ { + lval : = map#.getOrPut#(it#, getOrPut@fun .(): { + ^ { mutableListOf#() } diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/locals.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/locals.txt index 82fbfa164b0..9502fb11ae0 100644 --- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/locals.txt +++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/locals.txt @@ -1,33 +1,33 @@ FILE: locals.kt - public? final? function withLocals(p: Int): Int { + public? final? fun withLocals(p: Int): Int { public? final? class Local { public? constructor(pp: Int): super() - public? final? property pp(val): Int + public? final? val pp: Int public? get(): Int - public? final? function diff(): { - return@@@diff minus#(pp#, p#) + public? final? fun diff(): { + ^diff minus#(pp#, p#) } } - val x: = Local#(Int(42)).diff#() - public? final? function sum(y: Int, z: Int, f: ( (Int, Int) -> Int )): Int { - return@@@sum plus#(x#, f#(plus#(y#, z#))) + lval x: = Local#(Int(42)).diff#() + public? final? fun sum(y: Int, z: Int, f: ( (Int, Int) -> Int )): Int { + ^sum plus#(x#, f#(plus#(y#, z#))) } - val code: = object : Any { + lval code: = object : Any { public? constructor(): super() - public? final? function foo(): { - return@@@foo hashCode#() + public? final? fun foo(): { + ^foo hashCode#() } } .foo#() - return@@@withLocals sum#(code#, Local#(Int(1)).diff#(), function (x: Int, y: Int): { - return plus#(x#, y#) + ^withLocals sum#(code#, Local#(Int(1)).diff#(), fun (x: Int, y: Int): { + ^ plus#(x#, y#) } ) } diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/modifications.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/modifications.txt index 029c171e985..54c294cce51 100644 --- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/modifications.txt +++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/modifications.txt @@ -1,16 +1,16 @@ FILE: modifications.kt - public? final? function simple(): kotlin/Unit { - var x: = Int(10) + public? final? fun simple(): kotlin/Unit { + lvar x: = Int(10) x# += Int(20) x# -= Int(5) x# /= Int(5) x# *= Int(10) } - public? final? function modify List.(): kotlin/Unit { + public? final? fun List.modify(): kotlin/Unit { this# += String(Alpha) this# += String(Omega) } - public? final? function modify Any.(): kotlin/Unit { - val : = as/List(this#) + public? final? fun Any.modify(): kotlin/Unit { + lval : = as/List(this#) # += Int(42) } diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/namedArgument.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/namedArgument.txt index c1daa2382d0..52b73ba4065 100644 --- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/namedArgument.txt +++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/namedArgument.txt @@ -1,7 +1,7 @@ FILE: namedArgument.kt - public? final? function foo(first: String = String(), second: Boolean = Boolean(true), third: Double = Double(3.1415)): kotlin/Unit { + public? final? fun foo(first: String = String(), second: Boolean = Boolean(true), third: Double = Double(3.1415)): kotlin/Unit { } - public? final? function test(): kotlin/Unit { + public? final? fun test(): kotlin/Unit { foo#() foo#(String(Alpha), Boolean(false), Double(2.71)) foo#(first = String(Hello), second = Boolean(true)) diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/nullability.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/nullability.txt index bddfe4dc341..4f49359450f 100644 --- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/nullability.txt +++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/nullability.txt @@ -1,6 +1,6 @@ FILE: nullability.kt - public? final? function orFourtyTwo(arg: Int?): { - return@@@orFourtyTwo when (val : = arg#) { + public? final? fun orFourtyTwo(arg: Int?): { + ^orFourtyTwo when (lval : = arg#) { !=($subj$, Null(null)) -> { # } @@ -10,8 +10,8 @@ FILE: nullability.kt } } - public? final? function bang(arg: Int?): { - return@@@bang when (val : = arg#) { + public? final? fun bang(arg: Int?): { + ^bang when (lval : = arg#) { !=($subj$, Null(null)) -> { # } diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/simpleReturns.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/simpleReturns.txt index ef8a6d604e6..981a07ce8b1 100644 --- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/simpleReturns.txt +++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/simpleReturns.txt @@ -1,7 +1,7 @@ FILE: simpleReturns.kt - public? final? function foo(): kotlin/Unit { - return@@@foo Unit + public? final? fun foo(): kotlin/Unit { + ^foo Unit } - public? final? function bar(): String { - return@@@bar String(Hello) + public? final? fun bar(): String { + ^bar String(Hello) } diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/super.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/super.txt index 6ca97c23d8d..32de82f018c 100644 --- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/super.txt +++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/super.txt @@ -1,25 +1,25 @@ FILE: super.kt public? final? interface A { - public? final? function foo(): kotlin/Unit { + public? final? fun foo(): kotlin/Unit { } } public? final? interface B { - public? final? function foo(): kotlin/Unit { + public? final? fun foo(): kotlin/Unit { } - public? final? function bar(): kotlin/Unit { + public? final? fun bar(): kotlin/Unit { } } public? final? class C : A, B { public? constructor(): super() - public? open? override function bar(): kotlin/Unit { + public? open? override fun bar(): kotlin/Unit { super<>.bar#() } - public? open? override function foo(): kotlin/Unit { + public? open? override fun foo(): kotlin/Unit { super.foo#() super.foo#() } diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/these.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/these.txt index 2767a4a9000..0f3c480405d 100644 --- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/these.txt +++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/these.txt @@ -2,30 +2,30 @@ FILE: these.kt public? final? class Some { public? constructor(): super() - public? final? function foo(): Int { - return@@@foo Int(1) + public? final? fun foo(): Int { + ^foo Int(1) } - public? final? function bar(): Int { - return@@@bar this#.foo#() + public? final? fun bar(): Int { + ^bar this#.foo#() } - public? final? property instance(val): Some + public? final? val instance: Some public? get(): Some { - return this@Some + ^ this@Some } - public? final? function extension String.(): Int { - return@@@extension plus#(this@Some.bar#(), this#.length#) + public? final? fun String.extension(): Int { + ^extension plus#(this@Some.bar#(), this#.length#) } } - public? final? function extension Some.(): { - return@@@extension this#.bar#() + public? final? fun Some.extension(): { + ^extension this#.bar#() } - public? final? function test(some: Some): Int { - return@@@test with#(some#, with@function .(): { - return { + public? final? fun test(some: Some): Int { + ^test with#(some#, with@fun .(): { + ^ { plus#(this#.foo#(), this@with.extension#()) } diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/try.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/try.txt index 243226feea8..7e4630b960f 100644 --- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/try.txt +++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/try.txt @@ -1,5 +1,5 @@ FILE: try.kt - public? final? function some(): kotlin/Unit { + public? final? fun some(): kotlin/Unit { try { throw KotlinNullPointerException#() } diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/typeOperators.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/typeOperators.txt index 4c906bb586b..c577d0b795f 100644 --- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/typeOperators.txt +++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/typeOperators.txt @@ -1,15 +1,15 @@ FILE: typeOperators.kt public? final? interface IThing { } - public? final? function test1(x: Any): { - return@@@test1 is/IThing(x#) + public? final? fun test1(x: Any): { + ^test1 is/IThing(x#) } - public? final? function test2(x: Any): { - return@@@test2 !is/IThing(x#) + public? final? fun test2(x: Any): { + ^test2 !is/IThing(x#) } - public? final? function test3(x: Any): { - return@@@test3 as/IThing(x#) + public? final? fun test3(x: Any): { + ^test3 as/IThing(x#) } - public? final? function test4(x: Any): { - return@@@test4 as?/IThing(x#) + public? final? fun test4(x: Any): { + ^test4 as?/IThing(x#) } diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/unary.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/unary.txt index ea052534122..9146f599e6e 100644 --- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/unary.txt +++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/unary.txt @@ -1,26 +1,26 @@ FILE: unary.kt - public? final? function test(): kotlin/Unit { - var x: = Int(0) - val x1: = { - val : = x# + public? final? fun test(): kotlin/Unit { + lvar x: = Int(0) + lval x1: = { + lval : = x# x# = inc#(#) # } - val x2: = { - val : = x# + lval x2: = { + lval : = x# x# = inc#(#) x# } - val x3: = { - val : = x# + lval x3: = { + lval : = x# x# = dec#(#) x# } - val x4: = { - val : = x# + lval x4: = { + lval : = x# x# = dec#(#) # } @@ -37,35 +37,35 @@ FILE: unary.kt public? final? class X { public? constructor(i: Int): super() - public? final? property i(val): Int + public? final? val i: Int public? get(): Int } - public? final? function test2(x: X): kotlin/Unit { - val x1: = { - val : = x#.i# + public? final? fun test2(x: X): kotlin/Unit { + lval x1: = { + lval : = x#.i# x#.i# = inc#(#) # } - val x2: = { - val : = x#.i# - val : = inc#(#) + lval x2: = { + lval : = x#.i# + lval : = inc#(#) x#.i# = # # } } - public? final? function test3(arr: Array): kotlin/Unit { - val x1: = { - val : = arr#[Int(0)] + public? final? fun test3(arr: Array): kotlin/Unit { + lval x1: = { + lval : = arr#[Int(0)] arr#[Int(0)] = inc#(#) # } - val x2: = { - val : = arr#[Int(1)] - val : = inc#(#) + lval x2: = { + lval : = arr#[Int(1)] + lval : = inc#(#) arr#[Int(1)] = # # } @@ -74,22 +74,22 @@ FILE: unary.kt public? final? class Y { public? constructor(arr: Array): super() - public? final? property arr(val): Array + public? final? val arr: Array public? get(): Array } - public? final? function test4(y: Y): kotlin/Unit { - val x1: = { - val : = y#.arr#[Int(0)] - val : = y#.arr# + public? final? fun test4(y: Y): kotlin/Unit { + lval x1: = { + lval : = y#.arr#[Int(0)] + lval : = y#.arr# #[Int(0)] = inc#(#) # } - val x2: = { - val : = y#.arr#[Int(1)] - val : = inc#(#) - val : = y#.arr# + lval x2: = { + lval : = y#.arr#[Int(1)] + lval : = inc#(#) + lval : = y#.arr# #[Int(1)] = # # } diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/variables.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/variables.txt index 91e3872488d..28c17c4d02a 100644 --- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/variables.txt +++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/variables.txt @@ -1,9 +1,9 @@ FILE: variables.kt - public? final? function foo(): kotlin/Unit { - val x: = Int(1) - var y: = plus#(x#, Int(1)) - val z: = times#(y#, Int(2)) + public? final? fun foo(): kotlin/Unit { + lval x: = Int(1) + lvar y: = plus#(x#, Int(1)) + lval z: = times#(y#, Int(2)) y# = plus#(y#, z#) - val w: = minus#(y#, x#) - return@@@foo w# + lval w: = minus#(y#, x#) + ^foo w# } diff --git a/compiler/fir/psi2fir/testData/rawBuilder/expressions/while.txt b/compiler/fir/psi2fir/testData/rawBuilder/expressions/while.txt index f7d0355b198..e9bcc14c6f0 100644 --- a/compiler/fir/psi2fir/testData/rawBuilder/expressions/while.txt +++ b/compiler/fir/psi2fir/testData/rawBuilder/expressions/while.txt @@ -1,13 +1,13 @@ FILE: while.kt - public? final? function foo(limit: Int): kotlin/Unit { - var k: = Int(0) + public? final? fun foo(limit: Int): kotlin/Unit { + lvar k: = Int(0) some@while(<(k#, limit#)) { - val : = k# + lval : = k# k# = inc#(#) # println#(k#) while(==(k#, Int(13))) { - val : = k# + lval : = k# k# = inc#(#) # when () { @@ -31,10 +31,10 @@ FILE: while.kt } } - public? final? function bar(limit: Int): kotlin/Unit { - var k: = limit# + public? final? fun bar(limit: Int): kotlin/Unit { + lvar k: = limit# do { - val : = k# + lval : = k# k# = dec#(#) # println#(k#) diff --git a/compiler/fir/resolve/testData/enhancement/jsr305/NonNullNever.fir.txt b/compiler/fir/resolve/testData/enhancement/jsr305/NonNullNever.fir.txt index 5536372a661..152c5173a15 100644 --- a/compiler/fir/resolve/testData/enhancement/jsr305/NonNullNever.fir.txt +++ b/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|? } diff --git a/compiler/fir/resolve/testData/enhancement/jsr305/Simple.fir.txt b/compiler/fir/resolve/testData/enhancement/jsr305/Simple.fir.txt index 4f723766260..7f2dda86e45 100644 --- a/compiler/fir/resolve/testData/enhancement/jsr305/Simple.fir.txt +++ b/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| } diff --git a/compiler/fir/resolve/testData/enhancement/jsr305/Strange.fir.txt b/compiler/fir/resolve/testData/enhancement/jsr305/Strange.fir.txt index 5639f003b5a..fb748c65763 100644 --- a/compiler/fir/resolve/testData/enhancement/jsr305/Strange.fir.txt +++ b/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|! + @R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.UNKNOWN|()) public open var field: R|ft|! public get(): R|ft|! public set(value: R|ft|!): 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| } diff --git a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/FieldsAreNullable.fir.txt b/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/FieldsAreNullable.fir.txt index b0aa4d4618c..4ad5f926f70 100644 --- a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/FieldsAreNullable.fir.txt +++ b/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|!, @R|javax/annotation/Nonnull|() x: R|kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence|?): R|ft|! + public open operator fun foo(q: R|ft|!, @R|javax/annotation/Nonnull|() x: R|kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence|?): R|ft|! - @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|((R|java/lang/annotation/ElementType.FIELD|())) public abstract annotation class FieldsAreNullable : R|java/lang/annotation/Annotation| { diff --git a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ForceFlexibility.fir.txt b/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ForceFlexibility.fir.txt index e2dc984759d..dd667e611a8 100644 --- a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ForceFlexibility.fir.txt +++ b/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|!, @R|javax/annotation/Nonnull|() y: R|kotlin/CharSequence|): R|ft|! + @R|spr/ForceFlexibility|() public open operator fun bar(x: R|ft|!, @R|javax/annotation/Nonnull|() y: R|kotlin/CharSequence|): R|ft|! } @R|java/lang/annotation/Retention|(R|java/lang/annotation/RetentionPolicy.RUNTIME|()) @R|java/lang/annotation/Documented|() @R|spr/UnknownNullability|() @R|javax/annotation/meta/TypeQualifierDefault|((R|java/lang/annotation/ElementType.METHOD|(), R|java/lang/annotation/ElementType.PARAMETER|())) public abstract annotation class ForceFlexibility : R|java/lang/annotation/Annotation| { diff --git a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ForceFlexibleOverOverrides.fir.txt b/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ForceFlexibleOverOverrides.fir.txt index abbf1d2e732..ec339bb9ce8 100644 --- a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ForceFlexibleOverOverrides.fir.txt +++ b/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|!): R|kotlin/Unit| + public open operator fun foobar(@R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.UNKNOWN|()) x: R|ft|!): 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|((R|java/lang/annotation/ElementType.METHOD|(), R|java/lang/annotation/ElementType.PARAMETER|())) public abstract annotation class ForceFlexibility : R|java/lang/annotation/Annotation| { diff --git a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/NullabilityFromOverridden.fir.txt b/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/NullabilityFromOverridden.fir.txt index efd4d137b20..d3752cbdcdf 100644 --- a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/NullabilityFromOverridden.fir.txt +++ b/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|((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| { diff --git a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/OverridingDefaultQualifier.fir.txt b/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/OverridingDefaultQualifier.fir.txt index 9d13756061d..b65c0e4c841 100644 --- a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/OverridingDefaultQualifier.fir.txt +++ b/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/List>?>|? + @R|javax/annotation/Nullable|() public open operator fun baz(): R|ft>?, kotlin/collections/List>?>|? } @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|((R|java/lang/annotation/ElementType.FIELD|())) public abstract annotation class FieldsAreNullable : R|java/lang/annotation/Annotation| { diff --git a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ParametersAreNonnullByDefault.fir.txt b/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ParametersAreNonnullByDefault.fir.txt index 4484196c076..c8240b31ced 100644 --- a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ParametersAreNonnullByDefault.fir.txt +++ b/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|! + 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|! - @R|javax/annotation/Nonnull|() public open operator function bar(): R|kotlin/String| + @R|javax/annotation/Nonnull|() public open operator fun bar(): R|kotlin/String| } diff --git a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ParametersAreNonnullByDefaultPackage.fir.txt b/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ParametersAreNonnullByDefaultPackage.fir.txt index 8c6f36e64f7..016a202edcd 100644 --- a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ParametersAreNonnullByDefaultPackage.fir.txt +++ b/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|!, @R|javax/annotation/Nonnull|() x: R|kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence|?): R|ft|! + public open operator fun foo(q: R|ft|!, @R|javax/annotation/Nonnull|() x: R|kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence|?): R|ft|! - @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|!, @R|javax/annotation/Nonnull|() x: R|kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence|?): R|ft|! + public open operator fun foo(q: R|ft|!, @R|javax/annotation/Nonnull|() x: R|kotlin/String|, @R|javax/annotation/CheckForNull|() y: R|kotlin/CharSequence|?): R|ft|! - @R|javax/annotation/Nonnull|() public open operator function bar(): R|kotlin/String| + @R|javax/annotation/Nonnull|() public open operator fun bar(): R|kotlin/String| } diff --git a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/SpringNullable.fir.txt b/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/SpringNullable.fir.txt index 00528602866..aa79d9443ba 100644 --- a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/SpringNullable.fir.txt +++ b/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|! + public open var field: R|ft|! public get(): R|ft|! public set(value: R|ft|!): 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/List>?>|? + @R|spr/Nullable|() public open operator fun baz(): R|ft>?, kotlin/collections/List>?>|? } @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|((R|java/lang/annotation/ElementType.METHOD|(), R|java/lang/annotation/ElementType.PARAMETER|())) public abstract annotation class NonNullApi : R|java/lang/annotation/Annotation| { diff --git a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/SpringNullablePackage.fir.txt b/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/SpringNullablePackage.fir.txt index 00304c5a505..6ab974e348c 100644 --- a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/SpringNullablePackage.fir.txt +++ b/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|! + public open var field: R|ft|! public get(): R|ft|! public set(value: R|ft|!): kotlin/Unit - public open operator function foo(x: R|ft|!, @R|spr/Nullable|() y: R|kotlin/CharSequence|?): R|ft|! + public open operator fun foo(x: R|ft|!, @R|spr/Nullable|() y: R|kotlin/CharSequence|?): R|ft|! - public open operator function bar(): R|ft|! + public open operator fun bar(): R|ft|! - @R|spr/Nullable|() public open operator function baz(): R|ft>?, kotlin/collections/List>?>|? + @R|spr/Nullable|() public open operator fun baz(): R|ft>?, kotlin/collections/List>?>|? } @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|((R|java/lang/annotation/ElementType.METHOD|(), R|java/lang/annotation/ElementType.PARAMETER|())) public abstract annotation class NonNullApi : R|java/lang/annotation/Annotation| { diff --git a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultEnum.fir.txt b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultEnum.fir.txt index 335430aedf5..4ac43e17425 100644 --- a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultEnum.fir.txt +++ b/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|! = R|/Signs.HELLO|): R|ft|! + public open operator fun a(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(HELLO)) arg: R|ft|! = R|/Signs.HELLO|): R|ft|! - public open operator function bar(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(X)) arg: R|ft|! = R|/Signs.X|): R|ft|! + public open operator fun bar(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(X)) arg: R|ft|! = R|/Signs.X|): R|ft|! - public open operator function baz(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(NOT_ENTRY_EITHER)) arg: R|ft|!): R|ft|! + public open operator fun baz(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(NOT_ENTRY_EITHER)) arg: R|ft|!): R|ft|! - public open operator function bam(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(NOT_ENTRY_EITHER)) arg: R|ft|! = R|/Mixed.NOT_ENTRY_EITHER|): R|ft|! + public open operator fun bam(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(NOT_ENTRY_EITHER)) arg: R|ft|! = R|/Mixed.NOT_ENTRY_EITHER|): R|ft|! } public final enum class Mixed : R|java/lang/Enum| { - public final static property NOT_ENTRY_EITHER(val): R|ft|! + public final static val NOT_ENTRY_EITHER: R|ft|! public get(): R|ft|! } public final enum class Signs : R|java/lang/Enum| { - public final static property HELLO(val): R|ft|! + public final static val HELLO: R|ft|! public get(): R|ft|! - public final static property WORLD(val): R|ft|! + public final static val WORLD: R|ft|! public get(): R|ft|! - public final static property X(val): R|ft|! + public final static val X: R|ft|! public get(): R|ft|! } diff --git a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultLongLiteral.fir.txt b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultLongLiteral.fir.txt index d6dde5ab68f..43c1a999daa 100644 --- a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultLongLiteral.fir.txt +++ b/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|! = Long(31)): R|kotlin/Unit| + public open operator fun first(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0x1F)) value: R|ft|! = Long(31)): R|kotlin/Unit| - public open operator function second(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0X1F)) value: R|ft|! = Long(31)): R|kotlin/Unit| + public open operator fun second(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0X1F)) value: R|ft|! = Long(31)): R|kotlin/Unit| - public open operator function third(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0b1010)) value: R|ft|! = Long(10)): R|kotlin/Unit| + public open operator fun third(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0b1010)) value: R|ft|! = Long(10)): R|kotlin/Unit| - public open operator function fourth(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0B1010)) value: R|ft|! = Long(10)): R|kotlin/Unit| + public open operator fun fourth(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0B1010)) value: R|ft|! = 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|!): R|kotlin/Unit| + public open operator fun first(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0x)) value: R|ft|!): R|kotlin/Unit| - public open operator function second(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0xZZ)) value: R|ft|!): R|kotlin/Unit| + public open operator fun second(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0xZZ)) value: R|ft|!): R|kotlin/Unit| - public open operator function third(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0b)) value: R|ft|!): R|kotlin/Unit| + public open operator fun third(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0b)) value: R|ft|!): R|kotlin/Unit| - public open operator function fourth(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0B1234)) value: R|ft|!): R|kotlin/Unit| + public open operator fun fourth(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0B1234)) value: R|ft|!): R|kotlin/Unit| } diff --git a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultNull.fir.txt b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultNull.fir.txt index b4e2bff58e7..fe016112d77 100644 --- a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultNull.fir.txt +++ b/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|! = Null(null)): R|kotlin/Unit| + public open operator fun foo(@R|kotlin/annotations/jvm/internal/DefaultNull|() x: R|ft|! = 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| } public open class B : R|java/lang/Object| { - public open operator function foo(@R|kotlin/annotations/jvm/internal/DefaultNull|() t: R|ft|! = Null(null)): R|kotlin/Unit| + public open operator fun foo(@R|kotlin/annotations/jvm/internal/DefaultNull|() t: R|ft|! = Null(null)): R|kotlin/Unit| } diff --git a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultNullAndParameter.fir.txt b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultNullAndParameter.fir.txt index 9cf4b2bf429..c2131c64ad3 100644 --- a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultNullAndParameter.fir.txt +++ b/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|! = Null(null)): R|kotlin/Unit| + public open operator fun foo(@R|kotlin/annotations/jvm/internal/DefaultNull|() i: R|ft|! = Null(null)): R|kotlin/Unit| - public open operator function bar(@R|kotlin/annotations/jvm/internal/DefaultNull|() a: R|ft|! = Null(null)): R|kotlin/Unit| + public open operator fun bar(@R|kotlin/annotations/jvm/internal/DefaultNull|() a: R|ft|! = Null(null)): R|kotlin/Unit| - public open operator function bam(@R|kotlin/annotations/jvm/internal/DefaultNull|() a: R|ft|! = Null(null)): R|kotlin/Unit| + public open operator fun bam(@R|kotlin/annotations/jvm/internal/DefaultNull|() a: R|ft|! = Null(null)): R|kotlin/Unit| - public open operator function baz(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(42)) a: R|ft|! = Int(42)): R|kotlin/Unit| + public open operator fun baz(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(42)) a: R|ft|! = 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|! = Int(42)): R|kotlin/Unit| + public abstract operator fun foo(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(42)) i: R|ft|! = Int(42)): R|kotlin/Unit| - public abstract operator function bar(@R|kotlin/annotations/jvm/internal/DefaultNull|() a: R|ft|! = Null(null)): R|kotlin/Unit| + public abstract operator fun bar(@R|kotlin/annotations/jvm/internal/DefaultNull|() a: R|ft|! = Null(null)): R|kotlin/Unit| } public open class B : R|A| { - public open operator function foo(i: R|ft|!): R|kotlin/Unit| + public open operator fun foo(i: R|ft|!): R|kotlin/Unit| - public open operator function bar(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(42)) a: R|ft|! = Int(42)): R|kotlin/Unit| + public open operator fun bar(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(42)) a: R|ft|! = 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|! = 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|! = Int(42)): R|kotlin/Unit| } public open class C : R|A|, R|AInt| { diff --git a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultParameter.fir.txt b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultParameter.fir.txt index c714b41ccef..bf85a289e62 100644 --- a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultParameter.fir.txt +++ b/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|! = String(hello)): R|kotlin/Unit| + public open operator fun first(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(hello)) value: R|ft|! = String(hello)): R|kotlin/Unit| - public open operator function second(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(first)) a: R|ft|! = String(first), @R|kotlin/annotations/jvm/internal/DefaultValue|(String(second)) b: R|ft|! = String(second)): R|kotlin/Unit| + public open operator fun second(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(first)) a: R|ft|! = String(first), @R|kotlin/annotations/jvm/internal/DefaultValue|(String(second)) b: R|ft|! = String(second)): R|kotlin/Unit| - public open operator function third(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(first)) a: R|ft|! = String(first), b: R|ft|!): R|kotlin/Unit| + public open operator fun third(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(first)) a: R|ft|! = String(first), b: R|ft|!): R|kotlin/Unit| - public open operator function fourth(first: R|ft|!, @R|kotlin/annotations/jvm/internal/DefaultValue|(String(second)) second: R|ft|! = String(second)): R|kotlin/Unit| + public open operator fun fourth(first: R|ft|!, @R|kotlin/annotations/jvm/internal/DefaultValue|(String(second)) second: R|ft|! = String(second)): R|kotlin/Unit| - public open operator function wrong(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(hello)) i: R|ft|!): R|kotlin/Unit| + public open operator fun wrong(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(hello)) i: R|ft|!): R|kotlin/Unit| } diff --git a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/EmptyParameterName.fir.txt b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/EmptyParameterName.fir.txt index a3bd371afb0..15d462735ae 100644 --- a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/EmptyParameterName.fir.txt +++ b/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|!, @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|!, @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|!): R|kotlin/Unit| + public open operator fun missingName(@R|kotlin/annotations/jvm/internal/ParameterName|() first: R|ft|!): R|kotlin/Unit| - public open operator function numberName(@R|kotlin/annotations/jvm/internal/ParameterName|(Int(42)) first: R|ft|!): R|kotlin/Unit| + public open operator fun numberName(@R|kotlin/annotations/jvm/internal/ParameterName|(Int(42)) first: R|ft|!): R|kotlin/Unit| } diff --git a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/ReorderedParameterNames.fir.txt b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/ReorderedParameterNames.fir.txt index 11b07f99b0b..0786ed0601f 100644 --- a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/ReorderedParameterNames.fir.txt +++ b/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|!, @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|!, @R|kotlin/annotations/jvm/internal/ParameterName|(String(port)) port: R|kotlin/Int|): R|kotlin/Unit| } diff --git a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/SameParameterName.fir.txt b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/SameParameterName.fir.txt index 7308f1fcffa..de7c6534213 100644 --- a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/SameParameterName.fir.txt +++ b/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|!, @R|kotlin/annotations/jvm/internal/ParameterName|(String(ok)) second: R|ft|!): R|kotlin/Unit| + public open operator fun same(@R|kotlin/annotations/jvm/internal/ParameterName|(String(ok)) first: R|ft|!, @R|kotlin/annotations/jvm/internal/ParameterName|(String(ok)) second: R|ft|!): R|kotlin/Unit| } diff --git a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/SpecialCharsParameterName.fir.txt b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/SpecialCharsParameterName.fir.txt index e77c281e6b5..b963beb8e9c 100644 --- a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/SpecialCharsParameterName.fir.txt +++ b/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|!): R|kotlin/Unit| + public open operator fun dollarName(@R|kotlin/annotations/jvm/internal/ParameterName|(String($)) host: R|ft|!): R|kotlin/Unit| - public open operator function numberName(@R|kotlin/annotations/jvm/internal/ParameterName|(String(42)) field: R|ft|!): R|kotlin/Unit| + public open operator fun numberName(@R|kotlin/annotations/jvm/internal/ParameterName|(String(42)) field: R|ft|!): R|kotlin/Unit| } diff --git a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/StaticMethodWithDefaultValue.fir.txt b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/StaticMethodWithDefaultValue.fir.txt index c98350c4cea..49eae522f26 100644 --- a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/StaticMethodWithDefaultValue.fir.txt +++ b/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|! = String(OK)): R|ft|! + public open static operator fun withDefault(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(OK)) arg: R|ft|! = String(OK)): R|ft|! } diff --git a/compiler/fir/resolve/testData/resolve/builtins/lists.txt b/compiler/fir/resolve/testData/resolve/builtins/lists.txt index 18a4ad595d2..223f64a802a 100644 --- a/compiler/fir/resolve/testData/resolve/builtins/lists.txt +++ b/compiler/fir/resolve/testData/resolve/builtins/lists.txt @@ -7,9 +7,9 @@ FILE: lists.kt public constructor(): super() } - public final function convert R|kotlin/collections/List|.(): R|MyStringList| { - return@@@convert as/R|MyStringList|(this#) + public final fun R|kotlin/collections/List|.convert(): R|MyStringList| { + ^convert as/R|MyStringList|(this#) } - public final function ret(l: R|kotlin/collections/MutableList|): R|MyMutableStringList| { - return@@@ret as/R|MyMutableStringList|(this#) + public final fun ret(l: R|kotlin/collections/MutableList|): R|MyMutableStringList| { + ^ret as/R|MyMutableStringList|(this#) } diff --git a/compiler/fir/resolve/testData/resolve/companion.txt b/compiler/fir/resolve/testData/resolve/companion.txt index 920e02396ec..61f18c243f3 100644 --- a/compiler/fir/resolve/testData/resolve/companion.txt +++ b/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| } diff --git a/compiler/fir/resolve/testData/resolve/derivedClass.txt b/compiler/fir/resolve/testData/resolve/derivedClass.txt index d609c1939a7..52bf8a4e48b 100644 --- a/compiler/fir/resolve/testData/resolve/derivedClass.txt +++ b/compiler/fir/resolve/testData/resolve/derivedClass.txt @@ -2,7 +2,7 @@ FILE: derivedClass.kt public open class Base { public constructor(x: R|T|): super() - 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|/x|) } - public final function create(x: R|T|): R|Derived| { - return@@@create R|/Derived.Derived|(R|/x|) + public final fun create(x: R|T|): R|Derived| { + ^create R|/Derived.Derived|(R|/x|) } diff --git a/compiler/fir/resolve/testData/resolve/enum.txt b/compiler/fir/resolve/testData/resolve/enum.txt index b67d8d91846..0d6889009f7 100644 --- a/compiler/fir/resolve/testData/resolve/enum.txt +++ b/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() - 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(#) - 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(#) - public final override function check(y: R|Some|): R|kotlin/Boolean| { - return@@@check ==(R|/y|, #) + public final override fun check(y: R|Some|): R|kotlin/Boolean| { + ^check ==(R|/y|, #) } } - public abstract function check(y: R|Some|): R|kotlin/Boolean| + public abstract fun check(y: R|Some|): R|kotlin/Boolean| } diff --git a/compiler/fir/resolve/testData/resolve/expresssions/access.txt b/compiler/fir/resolve/testData/resolve/expresssions/access.txt index 55a6bd8cdb2..c6ad45b3822 100644 --- a/compiler/fir/resolve/testData/resolve/expresssions/access.txt +++ b/compiler/fir/resolve/testData/resolve/expresssions/access.txt @@ -2,63 +2,63 @@ FILE: access.kt public final class Foo { public constructor(): super() - public final property x(val): R|kotlin/Int| = Int(1) + public final val x: R|kotlin/Int| = Int(1) public get(): - 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() - public final property x(val): R|kotlin/String| = String() + public final val x: R|kotlin/String| = String() public get(): - 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|/a| - val d: R|kotlin/String| = String() - val c: = # + public final fun f(): R|kotlin/Unit| { + lval a: R|kotlin/Int| = Int(10) + lval b: R|kotlin/Int| = R|/a| + lval d: R|kotlin/String| = String() + lval c: = # #() - 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|/d| - val b: R|kotlin/String| = R|/a| + public final fun abc(): R|kotlin/Unit| { + lval a: R|kotlin/String| = R|/d| + lval b: R|kotlin/String| = R|/a| R|/bcd|() - public final function dcb(): R|kotlin/Unit| { + public final fun dcb(): R|kotlin/Unit| { } R|/dcb|() diff --git a/compiler/fir/resolve/testData/resolve/expresssions/invoke/explicitReceiver.txt b/compiler/fir/resolve/testData/resolve/expresssions/invoke/explicitReceiver.txt index 777f74db961..b5891520308 100644 --- a/compiler/fir/resolve/testData/resolve/expresssions/invoke/explicitReceiver.txt +++ b/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() - 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|() } } diff --git a/compiler/fir/resolve/testData/resolve/expresssions/invoke/explicitReceiver2.txt b/compiler/fir/resolve/testData/resolve/expresssions/invoke/explicitReceiver2.txt index 7e4cf4127c1..8e7f39f1a16 100644 --- a/compiler/fir/resolve/testData/resolve/expresssions/invoke/explicitReceiver2.txt +++ b/compiler/fir/resolve/testData/resolve/expresssions/invoke/explicitReceiver2.txt @@ -2,25 +2,25 @@ FILE: explicitReceiver2.kt public final class Bar { public constructor(): super() - 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() - 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|() } } diff --git a/compiler/fir/resolve/testData/resolve/expresssions/invoke/extension.txt b/compiler/fir/resolve/testData/resolve/expresssions/invoke/extension.txt index c3fc324e010..287ec2f2f23 100644 --- a/compiler/fir/resolve/testData/resolve/expresssions/invoke/extension.txt +++ b/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() - 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(): - 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|() } } diff --git a/compiler/fir/resolve/testData/resolve/expresssions/invoke/farInvokeExtension.txt b/compiler/fir/resolve/testData/resolve/expresssions/invoke/farInvokeExtension.txt index e476a04e556..9648b4fc0e8 100644 --- a/compiler/fir/resolve/testData/resolve/expresssions/invoke/farInvokeExtension.txt +++ b/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() - public final property x(val): R|kotlin/Int| = Int(0) + public final val x: R|kotlin/Int| = Int(0) public get(): - public final function foo(): R|kotlin/Unit| { - return@@@foo R|/x|() + public final fun foo(): R|kotlin/Unit| { + ^foo R|/x|() } } diff --git a/compiler/fir/resolve/testData/resolve/expresssions/invoke/threeReceivers.txt b/compiler/fir/resolve/testData/resolve/expresssions/invoke/threeReceivers.txt index a70508c9c5f..62c2468e8dd 100644 --- a/compiler/fir/resolve/testData/resolve/expresssions/invoke/threeReceivers.txt +++ b/compiler/fir/resolve/testData/resolve/expresssions/invoke/threeReceivers.txt @@ -2,8 +2,8 @@ FILE: threeReceivers.kt public final class Bar { public constructor(): super() - 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() - 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|/buz|.R|/Foo.foobar|.R|/Bar.invoke|() } diff --git a/compiler/fir/resolve/testData/resolve/expresssions/simple.txt b/compiler/fir/resolve/testData/resolve/expresssions/simple.txt index e68c8994699..9be18d8d815 100644 --- a/compiler/fir/resolve/testData/resolve/expresssions/simple.txt +++ b/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(): - public final property n(val): R|kotlin/Nothing|? = Null(null) + public final val n: R|kotlin/Nothing|? = Null(null) public get(): - public final property g(val): R|kotlin/String|? = Null(null) + public final val g: R|kotlin/String|? = Null(null) public get(): R|kotlin/String|? diff --git a/compiler/fir/resolve/testData/resolve/expresssions/this.txt b/compiler/fir/resolve/testData/resolve/expresssions/this.txt index 5368ff92f25..79b6791e30e 100644 --- a/compiler/fir/resolve/testData/resolve/expresssions/this.txt +++ b/compiler/fir/resolve/testData/resolve/expresssions/this.txt @@ -6,20 +6,20 @@ FILE: this.kt public final class Foo { public constructor(): super() - 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 } } diff --git a/compiler/fir/resolve/testData/resolve/expresssions/when.txt b/compiler/fir/resolve/testData/resolve/expresssions/when.txt index a96cf5b3a74..b748e6e7c5c 100644 --- a/compiler/fir/resolve/testData/resolve/expresssions/when.txt +++ b/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) } diff --git a/compiler/fir/resolve/testData/resolve/fromBuilder/complexTypes.txt b/compiler/fir/resolve/testData/resolve/fromBuilder/complexTypes.txt index 662c68dda4f..869e41ad156 100644 --- a/compiler/fir/resolve/testData/resolve/fromBuilder/complexTypes.txt +++ b/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, *>| + public abstract val x: R|a/b/C.D, *>| public get(): R|a/b/C.D, *>| } diff --git a/compiler/fir/resolve/testData/resolve/fromBuilder/enums.txt b/compiler/fir/resolve/testData/resolve/fromBuilder/enums.txt index 89666052ce2..92f42c7183a 100644 --- a/compiler/fir/resolve/testData/resolve/fromBuilder/enums.txt +++ b/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() - 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(Double(1.0), Double(2.0)) - public final override function sayHello(): R|kotlin/Unit| { + public final override fun sayHello(): R|kotlin/Unit| { #(String(Hello!!!)) } @@ -39,7 +39,7 @@ FILE: enums.kt public final enum entry VENERA : R|Planet| { public constructor(): super(Double(3.0), Double(4.0)) - public final override function sayHello(): R|kotlin/Unit| { + public final override fun sayHello(): R|kotlin/Unit| { #(String(Ola!!!)) } @@ -48,21 +48,21 @@ FILE: enums.kt public final enum entry EARTH : R|Planet| { public constructor(): super(Double(5.0), Double(6.0)) - public final override function sayHello(): R|kotlin/Unit| { + public final override fun sayHello(): R|kotlin/Unit| { #(String(Privet!!!)) } } - public final property g(val): R|kotlin/Double| = #(#(#, R|/Planet.m|), #(R|/Planet.r|, R|/Planet.r|)) + public final val g: R|kotlin/Double| = #(#(#, R|/Planet.m|), #(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() - 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(): } diff --git a/compiler/fir/resolve/testData/resolve/fromBuilder/noPrimaryConstructor.txt b/compiler/fir/resolve/testData/resolve/fromBuilder/noPrimaryConstructor.txt index 9709132cbe6..a08e0adf8ae 100644 --- a/compiler/fir/resolve/testData/resolve/fromBuilder/noPrimaryConstructor.txt +++ b/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() { diff --git a/compiler/fir/resolve/testData/resolve/fromBuilder/simpleClass.txt b/compiler/fir/resolve/testData/resolve/fromBuilder/simpleClass.txt index d1bfe44d6be..3072b3f7b38 100644 --- a/compiler/fir/resolve/testData/resolve/fromBuilder/simpleClass.txt +++ b/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() - private final property baz(val): R|kotlin/Int| = Int(42) + private final val baz: R|kotlin/Int| = Int(42) private get(): - public final override function foo(x: R|kotlin/Int|, y: R|kotlin/String|): R|kotlin/String| { - return@@@foo #(#(R|/y|, R|/x|), R|/SomeClass.baz|) + public final override fun foo(x: R|kotlin/Int|, y: R|kotlin/String|): R|kotlin/String| { + ^foo #(#(R|/y|, R|/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| diff --git a/compiler/fir/resolve/testData/resolve/fromBuilder/typeParameters.txt b/compiler/fir/resolve/testData/resolve/fromBuilder/typeParameters.txt index 02e32ec85a1..8cb0c57d390 100644 --- a/compiler/fir/resolve/testData/resolve/fromBuilder/typeParameters.txt +++ b/compiler/fir/resolve/testData/resolve/fromBuilder/typeParameters.txt @@ -1,8 +1,8 @@ FILE: typeParameters.kt 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|): R|List| + public abstract infix fun concat(other: R|List|): R|List| } public final typealias StringList = R|List| @@ -14,12 +14,12 @@ FILE: typeParameters.kt public final class SomeList : R|AbstractList| { public constructor(): super|>() - 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|): R|List| { - return@@@concat this# + public final override fun concat(other: R|List|): R|List| { + ^concat this# } } diff --git a/compiler/fir/resolve/testData/resolve/functionTypes.txt b/compiler/fir/resolve/testData/resolve/functionTypes.txt index 38fa42d50d1..079f101eee2 100644 --- a/compiler/fir/resolve/testData/resolve/functionTypes.txt +++ b/compiler/fir/resolve/testData/resolve/functionTypes.txt @@ -1,11 +1,11 @@ FILE: functionTypes.kt - public final function simpleRun(f: R|kotlin/Function1|): R|kotlin/Unit| { - return@@@simpleRun #() + public final fun simpleRun(f: R|kotlin/Function1|): R|kotlin/Unit| { + ^simpleRun #() } - public final function simpleMap R|kotlin/collections/List|.(f: R|kotlin/Function1|): R|R| { + public final fun R|kotlin/collections/List|.simpleMap(f: R|kotlin/Function1|): R|R| { } - public final function simpleWith(t: R|T|, f: R|kotlin/Function1|): R|kotlin/Unit| { - return@@@simpleWith R|/t|.#() + public final fun simpleWith(t: R|T|, f: R|kotlin/Function1|): R|kotlin/Unit| { + ^simpleWith R|/t|.#() } public abstract interface KMutableProperty1 : R|KProperty1|, R|KMutableProperty| { } diff --git a/compiler/fir/resolve/testData/resolve/genericFunctions.txt b/compiler/fir/resolve/testData/resolve/genericFunctions.txt index a9235a5f4d2..f8462f3e785 100644 --- a/compiler/fir/resolve/testData/resolve/genericFunctions.txt +++ b/compiler/fir/resolve/testData/resolve/genericFunctions.txt @@ -1,12 +1,12 @@ FILE: genericFunctions.kt public abstract interface Any { } - public final inline function safeAs R|Any|.(): R|T|? { - return@@@safeAs as?/R|T|(this#) + public final inline fun R|Any|.safeAs(): R|T|? { + ^safeAs as?/R|T|(this#) } public abstract class Summator { public constructor(): super() - public abstract function plus(first: R|T|, second: R|T|): R|T| + public abstract fun plus(first: R|T|, second: R|T|): R|T| } diff --git a/compiler/fir/resolve/testData/resolve/multifile/Annotations.txt b/compiler/fir/resolve/testData/resolve/multifile/Annotations.txt index 5bc4b29f4a4..76b3c5b67e8 100644 --- a/compiler/fir/resolve/testData/resolve/multifile/Annotations.txt +++ b/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|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|(#(Int(7)), #(String())) public abstract property v(val): R|kotlin/String| + @R|annotations/Complex|(#(Int(7)), #(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(Char( diff --git a/compiler/fir/resolve/testData/resolve/multifile/ByteArray.txt b/compiler/fir/resolve/testData/resolve/multifile/ByteArray.txt index 7910ff182f9..0399097c945 100644 --- a/compiler/fir/resolve/testData/resolve/multifile/ByteArray.txt +++ b/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| } diff --git a/compiler/fir/resolve/testData/resolve/multifile/sealedStarImport.txt b/compiler/fir/resolve/testData/resolve/multifile/sealedStarImport.txt index 13dcbd6ca26..6c7da9207b0 100644 --- a/compiler/fir/resolve/testData/resolve/multifile/sealedStarImport.txt +++ b/compiler/fir/resolve/testData/resolve/multifile/sealedStarImport.txt @@ -2,10 +2,10 @@ FILE: sealedStarImport.kt public abstract class Factory { public constructor(): super() - 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| } diff --git a/compiler/fir/resolve/testData/resolve/multifile/simpleStarImport.txt b/compiler/fir/resolve/testData/resolve/multifile/simpleStarImport.txt index 726d271253d..94efde2536c 100644 --- a/compiler/fir/resolve/testData/resolve/multifile/simpleStarImport.txt +++ b/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| diff --git a/compiler/fir/resolve/testData/resolve/nestedClass.txt b/compiler/fir/resolve/testData/resolve/nestedClass.txt index 129d6bb68f5..3eb6abace2f 100644 --- a/compiler/fir/resolve/testData/resolve/nestedClass.txt +++ b/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() - public final property s(val): R|kotlin/String| + public final val s: R|kotlin/String| public get(): R|kotlin/String| } diff --git a/compiler/fir/resolve/testData/resolve/overrides/simple.txt b/compiler/fir/resolve/testData/resolve/overrides/simple.txt index b6f7da53fea..f5c66e3af67 100644 --- a/compiler/fir/resolve/testData/resolve/overrides/simple.txt +++ b/compiler/fir/resolve/testData/resolve/overrides/simple.txt @@ -2,35 +2,35 @@ FILE: simple.kt public open class A { public constructor(): super() - 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() - 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|() #() diff --git a/compiler/fir/resolve/testData/resolve/overrides/simpleFakeOverride.txt b/compiler/fir/resolve/testData/resolve/overrides/simpleFakeOverride.txt index 897024092bc..623bba7b82e 100644 --- a/compiler/fir/resolve/testData/resolve/overrides/simpleFakeOverride.txt +++ b/compiler/fir/resolve/testData/resolve/overrides/simpleFakeOverride.txt @@ -2,8 +2,8 @@ FILE: simpleFakeOverride.kt public open class A { public constructor(): super() - public final function foo(t: R|T|): R|T| { - return@@@foo R|/t| + public final fun foo(t: R|T|): R|T| { + ^foo R|/t| } } @@ -14,7 +14,7 @@ FILE: simpleFakeOverride.kt public final class B : R|A| { public constructor(): super|>() - public final function test(): R|kotlin/Unit| { + public final fun test(): R|kotlin/Unit| { R|FakeOverride|(R|/Some.Some|()) } diff --git a/compiler/fir/resolve/testData/resolve/overrides/three.txt b/compiler/fir/resolve/testData/resolve/overrides/three.txt index 12b0e163daa..25ddd42c862 100644 --- a/compiler/fir/resolve/testData/resolve/overrides/three.txt +++ b/compiler/fir/resolve/testData/resolve/overrides/three.txt @@ -2,19 +2,19 @@ FILE: three.kt public abstract class A { public constructor(): super() - 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() - 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() - public final function test(): R|kotlin/Unit| { + public final fun test(): R|kotlin/Unit| { R|/A.foo|() R|/B.bar|() R|/Y.baz|() diff --git a/compiler/fir/resolve/testData/resolve/references/simple.txt b/compiler/fir/resolve/testData/resolve/references/simple.txt index bb1da56d8a7..d890bb1b495 100644 --- a/compiler/fir/resolve/testData/resolve/references/simple.txt +++ b/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|() } diff --git a/compiler/fir/resolve/testData/resolve/references/superMember.txt b/compiler/fir/resolve/testData/resolve/references/superMember.txt index adc8ff99fba..26114fff8ae 100644 --- a/compiler/fir/resolve/testData/resolve/references/superMember.txt +++ b/compiler/fir/resolve/testData/resolve/references/superMember.txt @@ -2,14 +2,14 @@ FILE: superMember.kt public open class A { public constructor(): super() - public open function foo(): R|kotlin/Unit| { + public open fun foo(): R|kotlin/Unit| { } } public final class B : R|A| { public constructor(): super() - public final function bar(): R|kotlin/Unit| { + public final fun bar(): R|kotlin/Unit| { R|/A.foo|() } diff --git a/compiler/fir/resolve/testData/resolve/simpleClass.txt b/compiler/fir/resolve/testData/resolve/simpleClass.txt index 29519300d51..66b957e4b60 100644 --- a/compiler/fir/resolve/testData/resolve/simpleClass.txt +++ b/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() - private final property baz(val): R|kotlin/Int| = Int(42) + private final val baz: R|kotlin/Int| = Int(42) private get(): - public final override function foo(x: R|kotlin/Int|, y: R|kotlin/String|): R|kotlin/String| { - return@@@foo #(#(R|/y|, R|/x|), R|/SomeClass.baz|) + public final override fun foo(x: R|kotlin/Int|, y: R|kotlin/String|): R|kotlin/String| { + ^foo #(#(R|/y|, R|/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| diff --git a/compiler/fir/resolve/testData/resolve/stdlib/concurrent.txt b/compiler/fir/resolve/testData/resolve/stdlib/concurrent.txt index b4060c0773c..3ede227b95e 100644 --- a/compiler/fir/resolve/testData/resolve/stdlib/concurrent.txt +++ b/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| { } diff --git a/compiler/fir/resolve/testData/resolve/stdlib/reflectionClass.txt b/compiler/fir/resolve/testData/resolve/stdlib/reflectionClass.txt index 2fe60cc7758..6d675a5df74 100644 --- a/compiler/fir/resolve/testData/resolve/stdlib/reflectionClass.txt +++ b/compiler/fir/resolve/testData/resolve/stdlib/reflectionClass.txt @@ -1,5 +1,5 @@ FILE: reflectionClass.kt - public final property javaClass(val): R|java/lang/Class| = (#).# + public final val javaClass: R|java/lang/Class| = (#).# public get(): R|java/lang/Class| - public final property kotlinClass(val): R|kotlin/reflect/KClass| = (#) + public final val kotlinClass: R|kotlin/reflect/KClass| = (#) public get(): R|kotlin/reflect/KClass| diff --git a/compiler/fir/resolve/testData/resolve/treeSet.txt b/compiler/fir/resolve/testData/resolve/treeSet.txt index eaf495832a7..777f9e981bf 100644 --- a/compiler/fir/resolve/testData/resolve/treeSet.txt +++ b/compiler/fir/resolve/testData/resolve/treeSet.txt @@ -1,3 +1,3 @@ FILE: treeSet.kt - public final property x(val): R|java/util/SortedSet| = #() + public final val x: R|java/util/SortedSet| = #() public get(): R|java/util/SortedSet| diff --git a/compiler/fir/resolve/testData/resolve/typeParameterInPropertyReceiver.txt b/compiler/fir/resolve/testData/resolve/typeParameterInPropertyReceiver.txt index 894f1b524a4..9845fee0458 100644 --- a/compiler/fir/resolve/testData/resolve/typeParameterInPropertyReceiver.txt +++ b/compiler/fir/resolve/testData/resolve/typeParameterInPropertyReceiver.txt @@ -1,5 +1,5 @@ FILE: typeParameterInPropertyReceiver.kt - public final property self R|T|.(val): R|T| + public final val R|T|.self: R|T| public get(): R|T| { - return this# + ^ this# } diff --git a/compiler/fir/resolve/testData/resolve/typeParameterVsNested.txt b/compiler/fir/resolve/testData/resolve/typeParameterVsNested.txt index 78ff0442ff2..19c727bc209 100644 --- a/compiler/fir/resolve/testData/resolve/typeParameterVsNested.txt +++ b/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| { diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt index 405135d69e5..93a18d91aec 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt @@ -105,18 +105,21 @@ class FirRenderer(builder: StringBuilder) : FirVisitorVoid() { if (callableDeclaration is FirMemberDeclaration) { visitMemberDeclaration(callableDeclaration) } else { + callableDeclaration.annotations.renderAnnotations() visitTypedDeclaration(callableDeclaration) } val receiverType = callableDeclaration.receiverTypeRef + print(" ") if (receiverType != null) { - print(" ") receiverType.accept(this) print(".") } + if (callableDeclaration is FirNamedDeclaration) { + print(callableDeclaration.name) + } + if (callableDeclaration is FirFunction) { callableDeclaration.valueParameters.renderParameters() - } else if (callableDeclaration is FirProperty) { - print(if (callableDeclaration.isVar) "(var)" else "(val)") } print(": ") callableDeclaration.returnTypeRef.accept(this) @@ -206,7 +209,9 @@ class FirRenderer(builder: StringBuilder) : FirVisitorVoid() { override fun visitNamedDeclaration(namedDeclaration: FirNamedDeclaration) { visitDeclaration(namedDeclaration) - print(" " + namedDeclaration.name) + if (namedDeclaration !is FirCallableDeclaration) { // Handled by visitCallableDeclaration + print(" " + namedDeclaration.name) + } } override fun visitDeclaration(declaration: FirDeclaration) { @@ -214,9 +219,9 @@ class FirRenderer(builder: StringBuilder) : FirVisitorVoid() { when (declaration) { is FirRegularClass -> declaration.classKind.name.toLowerCase().replace("_", " ") is FirTypeAlias -> "typealias" - is FirNamedFunction -> "function" - is FirProperty -> "property" - is FirVariable -> if (declaration.isVal) "val" else "var" + is FirNamedFunction -> "fun" + is FirProperty -> if (declaration.isVal) "val" else "var" + is FirVariable -> if (declaration.isVal) "lval" else "lvar" else -> "unknown" } ) @@ -264,10 +269,7 @@ class FirRenderer(builder: StringBuilder) : FirVisitorVoid() { } override fun visitVariable(variable: FirVariable) { - variable.annotations.renderAnnotations() - visitNamedDeclaration(variable) - print(": ") - variable.returnTypeRef.accept(this) + visitCallableDeclaration(variable) variable.initializer?.let { print(" = ") it.accept(this) @@ -279,17 +281,9 @@ class FirRenderer(builder: StringBuilder) : FirVisitorVoid() { } override fun visitProperty(property: FirProperty) { - visitCallableDeclaration(property) - property.initializer?.let { - print(" = ") - it.accept(this) - } - pushIndent() - property.delegate?.let { - print("by ") - it.accept(this) - } + visitVariable(property) println() + pushIndent() property.getter.accept(this) if (property.getter.body == null) { println() @@ -338,10 +332,9 @@ class FirRenderer(builder: StringBuilder) : FirVisitorVoid() { if (label != null) { print("${label.name}@") } - print("function ") + print("fun ") val receiverType = anonymousFunction.receiverTypeRef if (receiverType != null) { - print(" ") receiverType.accept(this) print(".") } @@ -432,17 +425,14 @@ class FirRenderer(builder: StringBuilder) : FirVisitorVoid() { override fun visitReturnExpression(returnExpression: FirReturnExpression) { returnExpression.annotations.renderAnnotations() - print("return") + print("^") val target = returnExpression.target val labeledElement = target.labeledElement if (labeledElement is FirNamedFunction) { - print("@@@${labeledElement.name}") + print("${labeledElement.name}") } else { val labelName = target.labelName if (labelName != null) { - if (labeledElement is FirAnonymousFunction) { - print("@@") - } print("@$labelName") } } diff --git a/compiler/testData/loadJava/compiledJava/ArrayTypeVariance.fir.txt b/compiler/testData/loadJava/compiledJava/ArrayTypeVariance.fir.txt index 3f06f2fa02b..4a2697c3526 100644 --- a/compiler/testData/loadJava/compiledJava/ArrayTypeVariance.fir.txt +++ b/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>|): R|kotlin/Array>| + public final operator fun toArray(p0: R|kotlin/Array>|): R|kotlin/Array>| } diff --git a/compiler/testData/loadJava/compiledJava/ClassWithConstVal.fir.txt b/compiler/testData/loadJava/compiledJava/ClassWithConstVal.fir.txt index 061c8e350f8..06a8c3bc3f5 100644 --- a/compiler/testData/loadJava/compiledJava/ClassWithConstVal.fir.txt +++ b/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| } diff --git a/compiler/testData/loadJava/compiledJava/FieldAsVar.fir.txt b/compiler/testData/loadJava/compiledJava/FieldAsVar.fir.txt index dd3bc907efd..0b2c139b27c 100644 --- a/compiler/testData/loadJava/compiledJava/FieldAsVar.fir.txt +++ b/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 diff --git a/compiler/testData/loadJava/compiledJava/FieldOfArrayType.fir.txt b/compiler/testData/loadJava/compiledJava/FieldOfArrayType.fir.txt index 43033bb0ced..0feeadb141c 100644 --- a/compiler/testData/loadJava/compiledJava/FieldOfArrayType.fir.txt +++ b/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>| + public open var files: R|kotlin/Array>| public get(): R|kotlin/Array>| public set(value: R|kotlin/Array>|): kotlin/Unit diff --git a/compiler/testData/loadJava/compiledJava/FinalFieldAsVal.fir.txt b/compiler/testData/loadJava/compiledJava/FinalFieldAsVal.fir.txt index 8aff444a211..f53771fd0ea 100644 --- a/compiler/testData/loadJava/compiledJava/FinalFieldAsVal.fir.txt +++ b/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| } diff --git a/compiler/testData/loadJava/compiledJava/InnerClassTypeMultipleGeneric.fir.txt b/compiler/testData/loadJava/compiledJava/InnerClassTypeMultipleGeneric.fir.txt index 7deb45fb6fd..87bc25d175e 100644 --- a/compiler/testData/loadJava/compiledJava/InnerClassTypeMultipleGeneric.fir.txt +++ b/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, ft, ft>, test/InnerClassTypeMultipleGeneric.Outer.Inner, ft, ft>?>|! + public open operator fun staticType(): R|ft, ft, ft>, test/InnerClassTypeMultipleGeneric.Outer.Inner, ft, ft>?>|! } diff --git a/compiler/testData/loadJava/compiledJava/IntrinsicCompanionObject.fir.txt b/compiler/testData/loadJava/compiledJava/IntrinsicCompanionObject.fir.txt index 84ca211b9a2..529663eb76e 100644 --- a/compiler/testData/loadJava/compiledJava/IntrinsicCompanionObject.fir.txt +++ b/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|!): R|kotlin/Unit| + public abstract operator fun testInt(i: R|ft|!): R|kotlin/Unit| - public abstract operator function testChar(c: R|ft|!): R|kotlin/Unit| + public abstract operator fun testChar(c: R|ft|!): R|kotlin/Unit| - public abstract operator function testString(s: R|ft|!): R|kotlin/Unit| + public abstract operator fun testString(s: R|ft|!): R|kotlin/Unit| - public abstract operator function testBoolean(b: R|ft|!): R|kotlin/Unit| + public abstract operator fun testBoolean(b: R|ft|!): R|kotlin/Unit| - public abstract operator function testEnum(e: R|ft|!): R|kotlin/Unit| + public abstract operator fun testEnum(e: R|ft|!): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/MethodTypePOneUpperBound.fir.txt b/compiler/testData/loadJava/compiledJava/MethodTypePOneUpperBound.fir.txt index 87503c41478..db67f4bb303 100644 --- a/compiler/testData/loadJava/compiledJava/MethodTypePOneUpperBound.fir.txt +++ b/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| } diff --git a/compiler/testData/loadJava/compiledJava/MethodTypePTwoUpperBounds.fir.txt b/compiler/testData/loadJava/compiledJava/MethodTypePTwoUpperBounds.fir.txt index cd9910853ba..c3493a910ce 100644 --- a/compiler/testData/loadJava/compiledJava/MethodTypePTwoUpperBounds.fir.txt +++ b/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| } diff --git a/compiler/testData/loadJava/compiledJava/MethodWithTypeP.fir.txt b/compiler/testData/loadJava/compiledJava/MethodWithTypeP.fir.txt index afd3b43199a..667a6d440d0 100644 --- a/compiler/testData/loadJava/compiledJava/MethodWithTypeP.fir.txt +++ b/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| } diff --git a/compiler/testData/loadJava/compiledJava/MethodWithTypePP.fir.txt b/compiler/testData/loadJava/compiledJava/MethodWithTypePP.fir.txt index c16b163c520..b03c621124e 100644 --- a/compiler/testData/loadJava/compiledJava/MethodWithTypePP.fir.txt +++ b/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| } diff --git a/compiler/testData/loadJava/compiledJava/MethodWithTypePRefClassP.fir.txt b/compiler/testData/loadJava/compiledJava/MethodWithTypePRefClassP.fir.txt index 76dabbab430..4331a9f8531 100644 --- a/compiler/testData/loadJava/compiledJava/MethodWithTypePRefClassP.fir.txt +++ b/compiler/testData/loadJava/compiledJava/MethodWithTypePRefClassP.fir.txt @@ -1,4 +1,4 @@

public open class MethodWithTypePRefClassP : R|java/lang/Object| { - public final operator function f(): R|kotlin/Unit| + public final operator fun f(): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/MethosWithPRefTP.fir.txt b/compiler/testData/loadJava/compiledJava/MethosWithPRefTP.fir.txt index 617d5f92a6f..eb03083182d 100644 --- a/compiler/testData/loadJava/compiledJava/MethosWithPRefTP.fir.txt +++ b/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|!): R|kotlin/Unit| + public final operator fun f(p: R|ft|!): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/MyException.fir.txt b/compiler/testData/loadJava/compiledJava/MyException.fir.txt index 86bd6633c4e..8058776e41c 100644 --- a/compiler/testData/loadJava/compiledJava/MyException.fir.txt +++ b/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|!, cause: R|ft|!): R|test/MyException| + public final fun MyException(message: R|ft|!, cause: R|ft|!): R|test/MyException| } diff --git a/compiler/testData/loadJava/compiledJava/PackageLocalVisibility.fir.txt b/compiler/testData/loadJava/compiledJava/PackageLocalVisibility.fir.txt index e05600b74ca..36961e14b1f 100644 --- a/compiler/testData/loadJava/compiledJava/PackageLocalVisibility.fir.txt +++ b/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|! + public/*package*/ open var accessibleContext: R|ft|! public/*package*/ get(): R|ft|! public/*package*/ set(value: R|ft|!): kotlin/Unit } public open class JFrame : R|awt/Frame| { - protected/*protected and package*/ open property accessibleContext(var): R|ft|! + protected/*protected and package*/ open var accessibleContext: R|ft|! protected/*protected and package*/ get(): R|ft|! protected/*protected and package*/ set(value: R|ft|!): kotlin/Unit - public final function JFrame(): R|test/JFrame| + public final fun JFrame(): R|test/JFrame| } diff --git a/compiler/testData/loadJava/compiledJava/PrivateMembers.fir.txt b/compiler/testData/loadJava/compiledJava/PrivateMembers.fir.txt index a0e498f503b..2719bf13eed 100644 --- a/compiler/testData/loadJava/compiledJava/PrivateMembers.fir.txt +++ b/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| } diff --git a/compiler/testData/loadJava/compiledJava/RemoveRedundantProjectionKind.fir.txt b/compiler/testData/loadJava/compiledJava/RemoveRedundantProjectionKind.fir.txt index ee32ccd14d9..6db28f3854d 100644 --- a/compiler/testData/loadJava/compiledJava/RemoveRedundantProjectionKind.fir.txt +++ b/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/Collection?>|!): R|kotlin/Unit| + public abstract operator fun f(collection: R|ft, kotlin/collections/Collection?>|!): R|kotlin/Unit| - public abstract operator function f(comparator: R|ft, kotlin/Comparable?>|!): R|kotlin/Unit| + public abstract operator fun f(comparator: R|ft, kotlin/Comparable?>|!): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/Simple.fir.txt b/compiler/testData/loadJava/compiledJava/Simple.fir.txt index ad642fd2ec3..b289a07f658 100644 --- a/compiler/testData/loadJava/compiledJava/Simple.fir.txt +++ b/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| } diff --git a/compiler/testData/loadJava/compiledJava/TopLevel$Class.fir.txt b/compiler/testData/loadJava/compiledJava/TopLevel$Class.fir.txt index 0f83ab8892d..1b75245eb59 100644 --- a/compiler/testData/loadJava/compiledJava/TopLevel$Class.fir.txt +++ b/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|!): R|kotlin/Unit| + public open operator fun foo(other: R|ft|!): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/TwoFields.fir.txt b/compiler/testData/loadJava/compiledJava/TwoFields.fir.txt index be979cd0d0c..f459b614d06 100644 --- a/compiler/testData/loadJava/compiledJava/TwoFields.fir.txt +++ b/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 diff --git a/compiler/testData/loadJava/compiledJava/UnboundWildcard.fir.txt b/compiler/testData/loadJava/compiledJava/UnboundWildcard.fir.txt index e6b0a3b340f..d382d40077b 100644 --- a/compiler/testData/loadJava/compiledJava/UnboundWildcard.fir.txt +++ b/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<*>?>|! + public final operator fun foo(): R|ft, test/UnboundWildcard.MyClass<*>?>|! - public final operator function collection(): R|ft, kotlin/collections/Collection<*>?>|! + public final operator fun collection(): R|ft, kotlin/collections/Collection<*>?>|! } diff --git a/compiler/testData/loadJava/compiledJava/WildcardBounds.fir.txt b/compiler/testData/loadJava/compiledJava/WildcardBounds.fir.txt index 53034b36d9d..de6edb9a8f3 100644 --- a/compiler/testData/loadJava/compiledJava/WildcardBounds.fir.txt +++ b/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?>|!, y: R|ft, test/WildcardBounds.A?>|!): R|kotlin/Unit| + public/*package*/ open operator fun foo(x: R|ft, test/WildcardBounds.A?>|!, y: R|ft, test/WildcardBounds.A?>|!): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedConstructor.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedConstructor.fir.txt index 207cdf12e35..06424b6536a 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedConstructor.fir.txt +++ b/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| } diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedEnumEntry.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedEnumEntry.fir.txt index 868d4c860f8..554ab7039f2 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedEnumEntry.fir.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedEnumEntry.fir.txt @@ -1,11 +1,11 @@ public final enum class AnnotatedEnumEntry : R|java/lang/Enum| { - @R|test/AnnotatedEnumEntry.Anno|(String(a)) public final static property E1(val): R|ft|! + @R|test/AnnotatedEnumEntry.Anno|(String(a)) public final static val E1: R|ft|! public get(): R|ft|! - @R|test/AnnotatedEnumEntry.Anno|(String(b)) @R|test/AnnotatedEnumEntry.Anno2|() public final static property E2(val): R|ft|! + @R|test/AnnotatedEnumEntry.Anno|(String(b)) @R|test/AnnotatedEnumEntry.Anno2|() public final static val E2: R|ft|! public get(): R|ft|! - public final static property E3(val): R|ft|! + public final static val E3: R|ft|! public get(): R|ft|! } diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedField.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedField.fir.txt index 17d6387c19e..59f6a9eed55 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedField.fir.txt +++ b/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| } diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedMethod.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedMethod.fir.txt index 81908ce12ae..55eca670b77 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedMethod.fir.txt +++ b/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| } diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedTypeInFun.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedTypeInFun.fir.txt index 3587b0d51c8..f48560f6397 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedTypeInFun.fir.txt +++ b/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|!, @R|test/AnnotatedTypeInFun.Anno|(String(b)) b: @R|test/AnnotatedTypeInFun.Anno|(String(b)) R|ft|!): R|kotlin/Unit| + public/*package*/ open operator fun foo(@R|test/AnnotatedTypeInFun.Anno|(String(a)) a: @R|test/AnnotatedTypeInFun.Anno|(String(a)) R|ft|!, @R|test/AnnotatedTypeInFun.Anno|(String(b)) b: @R|test/AnnotatedTypeInFun.Anno|(String(b)) R|ft|!): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedValueParameter.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedValueParameter.fir.txt index 671f86eb6f2..61c9cc0ea38 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedValueParameter.fir.txt +++ b/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/List>?>|!): R|kotlin/Unit| + public open operator fun f(@R|test/AnnotatedValueParameter.Anno|(String(non-empty)) parameter: R|ft>, kotlin/collections/List>?>|!): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/annotations/EnumArgumentWithCustomToString.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/EnumArgumentWithCustomToString.fir.txt index d94fa225a8e..4fff793a4d2 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/EnumArgumentWithCustomToString.fir.txt +++ b/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|((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|((R|test/EnumArgumentWithCustomToString.E.CAKE|(), R|test/EnumArgumentWithCustomToString.E.CAKE|())) public/*package*/ open operator fun annotated(): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/annotations/EnumConstructorParameter.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/EnumConstructorParameter.fir.txt index ddae0ded99c..a59a52a745b 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/EnumConstructorParameter.fir.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/EnumConstructorParameter.fir.txt @@ -1,9 +1,9 @@ public final enum class EnumConstructorParameter : R|java/lang/Enum| { - public final static property INSTANCE(val): R|ft|! + public final static val INSTANCE: R|ft|! public get(): R|ft|! - private final function EnumConstructorParameter(@R|test/EnumConstructorParameter.Anno|(String(string)) s: R|ft|!): R|test/EnumConstructorParameter| + private final fun EnumConstructorParameter(@R|test/EnumConstructorParameter.Anno|(String(string)) s: R|ft|!): 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| } diff --git a/compiler/testData/loadJava/compiledJava/annotations/JavaDocDeprecated.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/JavaDocDeprecated.fir.txt index 61d897a87a6..7eba5c5b3a9 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/JavaDocDeprecated.fir.txt +++ b/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|!): R|ft|! + public open operator fun getFoo(text: R|ft|!): R|ft|! } diff --git a/compiler/testData/loadJava/compiledJava/annotations/NestedEnumArgument.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/NestedEnumArgument.fir.txt index 80571c569e0..9a1db9d6e38 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/NestedEnumArgument.fir.txt +++ b/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| } diff --git a/compiler/testData/loadJava/compiledJava/annotations/StringConstantInParam.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/StringConstantInParam.fir.txt index 16d6610dfeb..3a692f3433b 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/StringConstantInParam.fir.txt +++ b/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|! + public final static val HEL: R|ft|! public get(): R|ft|! } diff --git a/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericDeep.fir.txt b/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericDeep.fir.txt index 35aca64b919..0f9f5c57d4c 100644 --- a/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericDeep.fir.txt +++ b/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>?>|!): R|test/ConstructorGenericDeep| + public final fun ConstructorGenericDeep(cl: R|ft>, java/lang/Class>?>|!): R|test/ConstructorGenericDeep| } diff --git a/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericSimple.fir.txt b/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericSimple.fir.txt index 9cb492cd422..e65781f9d8a 100644 --- a/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericSimple.fir.txt +++ b/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|!): R|test/ConstructorGenericSimple| + public final fun ConstructorGenericSimple(p: R|ft|!): R|test/ConstructorGenericSimple| } diff --git a/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericUpperBound.fir.txt b/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericUpperBound.fir.txt index 311cf389ac7..b4beab6c732 100644 --- a/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericUpperBound.fir.txt +++ b/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|!): R|test/ConstructorGenericUpperBound| + public final fun ConstructorGenericUpperBound(p: R|ft|!): R|test/ConstructorGenericUpperBound| } diff --git a/compiler/testData/loadJava/compiledJava/enum/EnumMembers.fir.txt b/compiler/testData/loadJava/compiledJava/enum/EnumMembers.fir.txt index 24ed9c8f925..d7f69e15fe1 100644 --- a/compiler/testData/loadJava/compiledJava/enum/EnumMembers.fir.txt +++ b/compiler/testData/loadJava/compiledJava/enum/EnumMembers.fir.txt @@ -1,15 +1,15 @@ public final enum class EnumMembers : R|java/lang/Enum| { - public final static property FIRST(val): R|ft|! + public final static val FIRST: R|ft|! public get(): R|ft|! - public final static property SECOND(val): R|ft|! + public final static val SECOND: R|ft|! public get(): R|ft|! - 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| } diff --git a/compiler/testData/loadJava/compiledJava/enum/EnumWithSpecializedEntry.fir.txt b/compiler/testData/loadJava/compiledJava/enum/EnumWithSpecializedEntry.fir.txt index c89cfb2bac0..8c5b617be28 100644 --- a/compiler/testData/loadJava/compiledJava/enum/EnumWithSpecializedEntry.fir.txt +++ b/compiler/testData/loadJava/compiledJava/enum/EnumWithSpecializedEntry.fir.txt @@ -1,8 +1,8 @@ public open enum class EnumWithSpecializedEntry : R|java/lang/Enum| { - public final static property E1(val): R|ft|! + public final static val E1: R|ft|! public get(): R|ft|! - public final static property E2(val): R|ft|! + public final static val E2: R|ft|! public get(): R|ft|! } diff --git a/compiler/testData/loadJava/compiledJava/enum/JavaEnum.fir.txt b/compiler/testData/loadJava/compiledJava/enum/JavaEnum.fir.txt index 39dacafe3c5..f25d65cf28a 100644 --- a/compiler/testData/loadJava/compiledJava/enum/JavaEnum.fir.txt +++ b/compiler/testData/loadJava/compiledJava/enum/JavaEnum.fir.txt @@ -1,8 +1,8 @@ public final enum class JavaEnum : R|java/lang/Enum| { - public final static property ENTRY(val): R|ft|! + public final static val ENTRY: R|ft|! public get(): R|ft|! - public final static property ANOTHER(val): R|ft|! + public final static val ANOTHER: R|ft|! public get(): R|ft|! } diff --git a/compiler/testData/loadJava/compiledJava/javaBean/DifferentGetterAndSetter.fir.txt b/compiler/testData/loadJava/compiledJava/javaBean/DifferentGetterAndSetter.fir.txt index 352f111edb4..ca590977079 100644 --- a/compiler/testData/loadJava/compiledJava/javaBean/DifferentGetterAndSetter.fir.txt +++ b/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|!): R|kotlin/Unit| + public open operator fun setSomething(color: R|ft|!): R|kotlin/Unit| - public open operator function getSomething(): R|kotlin/Int| + public open operator fun getSomething(): R|kotlin/Int| } diff --git a/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanAbstractGetter.fir.txt b/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanAbstractGetter.fir.txt index 5b4ac41570b..4b5f639ea48 100644 --- a/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanAbstractGetter.fir.txt +++ b/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| } diff --git a/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVal.fir.txt b/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVal.fir.txt index 1bbf0a935b4..bdf97debbca 100644 --- a/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVal.fir.txt +++ b/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|! + public open operator fun getColor(): R|ft|! } diff --git a/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVar.fir.txt b/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVar.fir.txt index 95289bd7e4a..4e31f68a3f1 100644 --- a/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVar.fir.txt +++ b/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|! + public open operator fun getColor(): R|ft|! - public open operator function setColor(string: R|ft|!): R|kotlin/Unit| + public open operator fun setColor(string: R|ft|!): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVarOfGenericType.fir.txt b/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVarOfGenericType.fir.txt index 3a36277e70e..a8eef834a1e 100644 --- a/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVarOfGenericType.fir.txt +++ b/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVarOfGenericType.fir.txt @@ -1,6 +1,6 @@

public open class JavaBeanVarOfGenericType : R|java/lang/Object| { - public open operator function getCharacters(): R|ft>, java/util/ArrayList>?>|! + public open operator fun getCharacters(): R|ft>, java/util/ArrayList>?>|! - public open operator function setCharacters(characters: R|ft>, java/util/ArrayList>?>|!): R|kotlin/Unit| + public open operator fun setCharacters(characters: R|ft>, java/util/ArrayList>?>|!): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/javaBean/TwoSetters.fir.txt b/compiler/testData/loadJava/compiledJava/javaBean/TwoSetters.fir.txt index 1d6bd4e6443..61f3e85ae89 100644 --- a/compiler/testData/loadJava/compiledJava/javaBean/TwoSetters.fir.txt +++ b/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|!): R|kotlin/Unit| + public open operator fun setSize(size: R|ft|!): 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| } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/AllBoundsInWhen.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/AllBoundsInWhen.fir.txt index e8ba59d7c91..18ac18b4f86 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/AllBoundsInWhen.fir.txt +++ b/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| } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/ArrayType.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/ArrayType.fir.txt index e18fc904d74..6e5631e8427 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/ArrayType.fir.txt +++ b/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>| + public open operator fun foo(): R|kotlin/Array>| } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithNewTypeParams.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithNewTypeParams.fir.txt index cf343621db0..b264659f020 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithNewTypeParams.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithNewTypeParams.fir.txt @@ -1,4 +1,4 @@ public open class ConstructorWithNewTypeParams : R|java/lang/Object| { - public final function ConstructorWithNewTypeParams(first: R|ft|!): R|test/ConstructorWithNewTypeParams| + public final fun ConstructorWithNewTypeParams(first: R|ft|!): R|test/ConstructorWithNewTypeParams| } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithParentTypeParams.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithParentTypeParams.fir.txt index 5e4dae958cb..eaf186a81f3 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithParentTypeParams.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithParentTypeParams.fir.txt @@ -1,4 +1,4 @@ public open class ConstructorWithParentTypeParams : R|java/lang/Object| { - public final function ConstructorWithParentTypeParams(first: R|ft|!): R|test/ConstructorWithParentTypeParams| + public final fun ConstructorWithParentTypeParams(first: R|ft|!): R|test/ConstructorWithParentTypeParams| } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithSeveralParams.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithSeveralParams.fir.txt index 0c5478c8abd..003df708068 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithSeveralParams.fir.txt +++ b/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|!, intBasic: R|kotlin/Int|, collection: R|ft>, java/util/ArrayList>?>|!): R|test/ConstructorWithSeveralParams| + public final fun ConstructorWithSeveralParams(integer: R|ft|!, intBasic: R|kotlin/Int|, collection: R|ft>, java/util/ArrayList>?>|!): R|test/ConstructorWithSeveralParams| } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithoutParams.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithoutParams.fir.txt index 28683b57d7a..08491c09a2a 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithoutParams.fir.txt +++ b/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| } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/CustomProjectionKind.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/CustomProjectionKind.fir.txt index 5cd02c33563..8639ae3b52b 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/CustomProjectionKind.fir.txt +++ b/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/List>?>|! + public open operator fun foo(): R|ft>, kotlin/collections/List>?>|! } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithFunctionTypes.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithFunctionTypes.fir.txt index 98f95044dcf..759c3ad1a15 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithFunctionTypes.fir.txt +++ b/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, ft>, kotlin/Function1, ft>?>|!): R|ft>, kotlin/Function0>?>|! + public open operator fun foo(f: R|ft, ft>, kotlin/Function1, ft>?>|!): R|ft>, kotlin/Function0>?>|! } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithGenerics.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithGenerics.fir.txt index 20b19f6ddfa..5cc2dd17910 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithGenerics.fir.txt +++ b/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|!, b: R|ft, ft>, kotlin/collections/Map.Entry, ft>?>>, kotlin/collections/List, ft>, kotlin/collections/Map.Entry, ft>?>>?>|!): R|ft|! + public open operator fun foo(a: R|ft|!, b: R|ft, ft>, kotlin/collections/Map.Entry, ft>?>>, kotlin/collections/List, ft>, kotlin/collections/Map.Entry, ft>?>>?>|!): R|ft|! } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithMappedClasses.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithMappedClasses.fir.txt index 4f53285a6b4..29c33ee9d4a 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithMappedClasses.fir.txt +++ b/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/List?>|!, src: R|ft>, kotlin/collections/List>?>|!): R|kotlin/Unit| + public open operator fun copy(dest: R|ft, kotlin/collections/List?>|!, src: R|ft>, kotlin/collections/List>?>|!): R|kotlin/Unit| - public open operator function copyMap(dest: R|ft, in T>, kotlin/collections/Map, in T>?>|!, src: R|ft, ft>, kotlin/collections/Map, ft>?>|!): R|kotlin/Unit| + public open operator fun copyMap(dest: R|ft, in T>, kotlin/collections/Map, in T>?>|!, src: R|ft, ft>, kotlin/collections/Map, ft>?>|!): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithTypeParameters.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithTypeParameters.fir.txt index 30b1fc8b700..2f908fd04cc 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithTypeParameters.fir.txt +++ b/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|!, b: R|ft, kotlin/collections/List?>|!, list: R|ft, kotlin/collections/List?>|!): R|kotlin/Unit| + public open operator fun foo(a: R|ft|!, b: R|ft, kotlin/collections/List?>|!, list: R|ft, kotlin/collections/List?>|!): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithVararg.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithVararg.fir.txt index 25b0be367b8..b967f460009 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithVararg.fir.txt +++ b/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>|): R|kotlin/Unit| + public open operator fun foo(vararg s: R|kotlin/Array>|): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyArrayTypes.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyArrayTypes.fir.txt index 488e4d6a984..15a770b2973 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyArrayTypes.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyArrayTypes.fir.txt @@ -1,13 +1,13 @@ public open class PropertyArrayTypes : R|java/lang/Object| { - public open property arrayOfArrays(var): R|kotlin/Array>, kotlin/Array>?>>| + public open var arrayOfArrays: R|kotlin/Array>, kotlin/Array>?>>| public get(): R|kotlin/Array>, kotlin/Array>?>>| public set(value: R|kotlin/Array>, kotlin/Array>?>>|): kotlin/Unit - public open property array(var): R|kotlin/Array>| + public open var array: R|kotlin/Array>| public get(): R|kotlin/Array>| public set(value: R|kotlin/Array>|): kotlin/Unit - public open property genericArray(var): R|kotlin/Array>| + public open var genericArray: R|kotlin/Array>| public get(): R|kotlin/Array>| public set(value: R|kotlin/Array>|): kotlin/Unit diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyComplexTypes.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyComplexTypes.fir.txt index f01ebd7a40b..47e330e4034 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyComplexTypes.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyComplexTypes.fir.txt @@ -1,17 +1,17 @@ public open class PropertyComplexTypes : R|java/lang/Object| { - public open property genericType(var): R|ft|! + public open var genericType: R|ft|! public get(): R|ft|! public set(value: R|ft|!): kotlin/Unit - public open property listDefinedGeneric(var): R|ft>, java/util/ArrayList>?>|! + public open var listDefinedGeneric: R|ft>, java/util/ArrayList>?>|! public get(): R|ft>, java/util/ArrayList>?>|! public set(value: R|ft>, java/util/ArrayList>?>|!): kotlin/Unit - public open property listGeneric(var): R|ft>, java/util/ArrayList>?>|! + public open var listGeneric: R|ft>, java/util/ArrayList>?>|! public get(): R|ft>, java/util/ArrayList>?>|! public set(value: R|ft>, java/util/ArrayList>?>|!): kotlin/Unit - public open property listOfGenericList(var): R|ft>, java/util/ArrayList>?>>, java/util/ArrayList>, java/util/ArrayList>?>>?>|! + public open var listOfGenericList: R|ft>, java/util/ArrayList>?>>, java/util/ArrayList>, java/util/ArrayList>?>>?>|! public get(): R|ft>, java/util/ArrayList>?>>, java/util/ArrayList>, java/util/ArrayList>?>>?>|! public set(value: R|ft>, java/util/ArrayList>?>>, java/util/ArrayList>, java/util/ArrayList>?>>?>|!): kotlin/Unit diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertySimpleType.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertySimpleType.fir.txt index 5bf195201b7..9f8004741dc 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertySimpleType.fir.txt +++ b/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|! + public open var fieldOne: R|ft|! public get(): R|ft|! public set(value: R|ft|!): kotlin/Unit - public open property fieldTwo(var): R|ft|! + public open var fieldTwo: R|ft|! public get(): R|ft|! public set(value: R|ft|!): kotlin/Unit diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/StarProjection.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/StarProjection.fir.txt index e509784fc88..24e1484edcc 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/StarProjection.fir.txt +++ b/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<*>?>|! + public final operator fun foo(): R|ft, test/StarProjection.MyClass<*>?>|! } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongProjectionKind.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongProjectionKind.fir.txt index 0bcdcd66f6d..4cdb83a1cf3 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongProjectionKind.fir.txt +++ b/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>|, to: R|kotlin/Array>|): R|ft>, kotlin/collections/List>?>|! + public open operator fun copy(from: R|kotlin/Array>|, to: R|kotlin/Array>|): R|ft>, kotlin/collections/List>?>|! } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongReturnTypeStructure.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongReturnTypeStructure.fir.txt index 01281c03d5b..6619a14b8fb 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongReturnTypeStructure.fir.txt +++ b/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|!, b: R|ft, ft>, kotlin/collections/Map.Entry, ft>?>>, kotlin/collections/List, ft>, kotlin/collections/Map.Entry, ft>?>>?>|!): R|ft|! + public open operator fun foo(a: R|ft|!, b: R|ft, ft>, kotlin/collections/Map.Entry, ft>?>>, kotlin/collections/List, ft>, kotlin/collections/Map.Entry, ft>?>>?>|!): R|ft|! } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.fir.txt index 954b4b3738a..933ed5e3d56 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.fir.txt +++ b/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|!, b: R|ft, kotlin/collections/List?>|!): R|kotlin/Unit| + public open operator fun foo(a: R|ft|!, b: R|ft, kotlin/collections/List?>|!): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure1.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure1.fir.txt index d32c9b7de5a..ffa80c61b59 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure1.fir.txt +++ b/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|!, b: R|ft, ft>, kotlin/collections/Map.Entry, ft>?>>, kotlin/collections/List, ft>, kotlin/collections/Map.Entry, ft>?>>?>|!): R|ft|! + public open operator fun foo(a: R|ft|!, b: R|ft, ft>, kotlin/collections/Map.Entry, ft>?>>, kotlin/collections/List, ft>, kotlin/collections/Map.Entry, ft>?>>?>|!): R|ft|! } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfCollection.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfCollection.fir.txt index dcdd8d93a37..af25d53ba3a 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfCollection.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfCollection.fir.txt @@ -1,4 +1,4 @@ public abstract interface SubclassOfCollection : R|java/util/Collection| { - public abstract operator function iterator(): R|ft>, kotlin/collections/Iterator>?>|! + public abstract operator fun iterator(): R|ft>, kotlin/collections/Iterator>?>|! } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfMapEntry.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfMapEntry.fir.txt index ac40fe16abb..32253031d13 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfMapEntry.fir.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfMapEntry.fir.txt @@ -1,6 +1,6 @@ public abstract interface SubclassOfMapEntry : R|java/util/Map.Entry| { - public abstract operator function setValue(value: R|ft|!): R|ft|! + public abstract operator fun setValue(value: R|ft|!): R|ft|! - public abstract operator function setValue(: R|ft|!): R|ft|! + public abstract operator fun setValue(: R|ft|!): R|ft|! } diff --git a/compiler/testData/loadJava/compiledJava/library/LoadIterable.fir.txt b/compiler/testData/loadJava/compiledJava/library/LoadIterable.fir.txt index 0324860d473..f7c6cb7a6bd 100644 --- a/compiler/testData/loadJava/compiledJava/library/LoadIterable.fir.txt +++ b/compiler/testData/loadJava/compiledJava/library/LoadIterable.fir.txt @@ -1,6 +1,6 @@ public abstract interface LoadIterable : R|java/lang/Object| { - public abstract operator function getIterable(): R|ft>, kotlin/collections/Iterable>?>|! + public abstract operator fun getIterable(): R|ft>, kotlin/collections/Iterable>?>|! - public abstract operator function setIterable(Iterable: R|ft>, kotlin/collections/Iterable>?>|!): R|kotlin/Unit| + public abstract operator fun setIterable(Iterable: R|ft>, kotlin/collections/Iterable>?>|!): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/library/LoadIterator.fir.txt b/compiler/testData/loadJava/compiledJava/library/LoadIterator.fir.txt index 438f38a31f4..e7c5d5431e5 100644 --- a/compiler/testData/loadJava/compiledJava/library/LoadIterator.fir.txt +++ b/compiler/testData/loadJava/compiledJava/library/LoadIterator.fir.txt @@ -1,6 +1,6 @@ public abstract interface LoadIterator : R|java/lang/Object| { - public abstract operator function getIterator(): R|ft>, kotlin/collections/Iterator>?>|! + public abstract operator fun getIterator(): R|ft>, kotlin/collections/Iterator>?>|! - public abstract operator function setIterator(iterator: R|ft>, kotlin/collections/Iterator>?>|!): R|kotlin/Unit| + public abstract operator fun setIterator(iterator: R|ft>, kotlin/collections/Iterator>?>|!): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/library/Max.fir.txt b/compiler/testData/loadJava/compiledJava/library/Max.fir.txt index ebee027e1be..2387d915c3c 100644 --- a/compiler/testData/loadJava/compiledJava/library/Max.fir.txt +++ b/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/Collection?>|!): R|ft|! + public open operator fun max(coll: R|ft, kotlin/collections/Collection?>|!): R|ft|! } diff --git a/compiler/testData/loadJava/compiledJava/modality/ModalityOfFakeOverrides.fir.txt b/compiler/testData/loadJava/compiledJava/modality/ModalityOfFakeOverrides.fir.txt index ae3c6863b06..056de4668b3 100644 --- a/compiler/testData/loadJava/compiledJava/modality/ModalityOfFakeOverrides.fir.txt +++ b/compiler/testData/loadJava/compiledJava/modality/ModalityOfFakeOverrides.fir.txt @@ -1,6 +1,6 @@ public open class ModalityOfFakeOverrides : R|java/util/AbstractList| { - @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| } diff --git a/compiler/testData/loadJava/compiledJava/mutability/LoadIterable.fir.txt b/compiler/testData/loadJava/compiledJava/mutability/LoadIterable.fir.txt index 0c1544dc197..786df58ab8e 100644 --- a/compiler/testData/loadJava/compiledJava/mutability/LoadIterable.fir.txt +++ b/compiler/testData/loadJava/compiledJava/mutability/LoadIterable.fir.txt @@ -1,10 +1,10 @@ public abstract interface LoadIterable : R|java/lang/Object| { - @R|kotlin/annotations/jvm/Mutable|() public abstract operator function getIterable(): R|ft>, kotlin/collections/MutableIterable>?>|! + @R|kotlin/annotations/jvm/Mutable|() public abstract operator fun getIterable(): R|ft>, kotlin/collections/MutableIterable>?>|! - public abstract operator function setIterable(@R|kotlin/annotations/jvm/Mutable|() Iterable: R|ft>, kotlin/collections/MutableIterable>?>|!): R|kotlin/Unit| + public abstract operator fun setIterable(@R|kotlin/annotations/jvm/Mutable|() Iterable: R|ft>, kotlin/collections/MutableIterable>?>|!): R|kotlin/Unit| - @R|kotlin/annotations/jvm/ReadOnly|() public abstract operator function getReadOnlyIterable(): R|ft>, kotlin/collections/Iterable>?>|! + @R|kotlin/annotations/jvm/ReadOnly|() public abstract operator fun getReadOnlyIterable(): R|ft>, kotlin/collections/Iterable>?>|! - public abstract operator function setReadOnlyIterable(@R|kotlin/annotations/jvm/ReadOnly|() Iterable: R|ft>, kotlin/collections/Iterable>?>|!): R|kotlin/Unit| + public abstract operator fun setReadOnlyIterable(@R|kotlin/annotations/jvm/ReadOnly|() Iterable: R|ft>, kotlin/collections/Iterable>?>|!): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithConflict.fir.txt b/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithConflict.fir.txt index 404c3a17994..78d2cf30b9f 100644 --- a/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithConflict.fir.txt +++ b/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithConflict.fir.txt @@ -1,6 +1,6 @@ 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/Iterable>?>|! + @R|kotlin/annotations/jvm/ReadOnly|() @R|kotlin/annotations/jvm/Mutable|() public abstract operator fun getIterable(): R|ft>, kotlin/collections/Iterable>?>|! - public abstract operator function setIterable(@R|kotlin/annotations/jvm/ReadOnly|() @R|kotlin/annotations/jvm/Mutable|() Iterable: R|ft>, kotlin/collections/Iterable>?>|!): R|kotlin/Unit| + public abstract operator fun setIterable(@R|kotlin/annotations/jvm/ReadOnly|() @R|kotlin/annotations/jvm/Mutable|() Iterable: R|ft>, kotlin/collections/Iterable>?>|!): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithNullability.fir.txt b/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithNullability.fir.txt index f9f3a729804..ae02b854c46 100644 --- a/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithNullability.fir.txt +++ b/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithNullability.fir.txt @@ -1,10 +1,10 @@ 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>>| + @R|org/jetbrains/annotations/NotNull|() @R|kotlin/annotations/jvm/Mutable|() public abstract operator fun getIterable(): R|ft>, kotlin/collections/MutableIterable>>| - public abstract operator function setIterable(@R|kotlin/annotations/jvm/Mutable|() @R|org/jetbrains/annotations/NotNull|() Iterable: R|ft>, kotlin/collections/MutableIterable>>|): R|kotlin/Unit| + public abstract operator fun setIterable(@R|kotlin/annotations/jvm/Mutable|() @R|org/jetbrains/annotations/NotNull|() Iterable: R|ft>, kotlin/collections/MutableIterable>>|): R|kotlin/Unit| - @R|org/jetbrains/annotations/NotNull|() @R|kotlin/annotations/jvm/ReadOnly|() public abstract operator function getReadOnlyIterable(): R|ft>, kotlin/collections/Iterable>>| + @R|org/jetbrains/annotations/NotNull|() @R|kotlin/annotations/jvm/ReadOnly|() public abstract operator fun getReadOnlyIterable(): R|ft>, kotlin/collections/Iterable>>| - public abstract operator function setReadOnlyIterable(@R|kotlin/annotations/jvm/ReadOnly|() @R|org/jetbrains/annotations/NotNull|() Iterable: R|ft>, kotlin/collections/Iterable>>|): R|kotlin/Unit| + public abstract operator fun setReadOnlyIterable(@R|kotlin/annotations/jvm/ReadOnly|() @R|org/jetbrains/annotations/NotNull|() Iterable: R|ft>, kotlin/collections/Iterable>>|): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/mutability/ReadOnlyExtendsWildcard.fir.txt b/compiler/testData/loadJava/compiledJava/mutability/ReadOnlyExtendsWildcard.fir.txt index a748dad1590..39a5bd4ff40 100644 --- a/compiler/testData/loadJava/compiledJava/mutability/ReadOnlyExtendsWildcard.fir.txt +++ b/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?>|!, @R|org/jetbrains/annotations/NotNull|() y: R|kotlin/Comparable|): R|kotlin/Unit| + public abstract operator fun foo(@R|kotlin/annotations/jvm/ReadOnly|() x: R|ft, kotlin/collections/List?>|!, @R|org/jetbrains/annotations/NotNull|() y: R|kotlin/Comparable|): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/notNull/NotNullField.fir.txt b/compiler/testData/loadJava/compiledJava/notNull/NotNullField.fir.txt index 2d566727761..da5dd26962b 100644 --- a/compiler/testData/loadJava/compiledJava/notNull/NotNullField.fir.txt +++ b/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 diff --git a/compiler/testData/loadJava/compiledJava/notNull/NotNullIntArray.fir.txt b/compiler/testData/loadJava/compiledJava/notNull/NotNullIntArray.fir.txt index 3ddf763ef6c..8fa79169f07 100644 --- a/compiler/testData/loadJava/compiledJava/notNull/NotNullIntArray.fir.txt +++ b/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| } diff --git a/compiler/testData/loadJava/compiledJava/notNull/NotNullMethod.fir.txt b/compiler/testData/loadJava/compiledJava/notNull/NotNullMethod.fir.txt index 673174f4d74..7698a8e0705 100644 --- a/compiler/testData/loadJava/compiledJava/notNull/NotNullMethod.fir.txt +++ b/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| } diff --git a/compiler/testData/loadJava/compiledJava/notNull/NotNullObjectArray.fir.txt b/compiler/testData/loadJava/compiledJava/notNull/NotNullObjectArray.fir.txt index 9e4ba72cf48..34da1335b03 100644 --- a/compiler/testData/loadJava/compiledJava/notNull/NotNullObjectArray.fir.txt +++ b/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>| + @R|org/jetbrains/annotations/NotNull|() public open operator fun hi(): R|kotlin/Array>| } diff --git a/compiler/testData/loadJava/compiledJava/notNull/NotNullParameter.fir.txt b/compiler/testData/loadJava/compiledJava/notNull/NotNullParameter.fir.txt index c5953a721d2..e9ca56b3ce1 100644 --- a/compiler/testData/loadJava/compiledJava/notNull/NotNullParameter.fir.txt +++ b/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| } diff --git a/compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageFun.fir.txt b/compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageFun.fir.txt index 2276eab56f2..94753899f9a 100644 --- a/compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageFun.fir.txt +++ b/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| } diff --git a/compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageProperty.fir.txt b/compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageProperty.fir.txt index bdf40286177..588a5a7674d 100644 --- a/compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageProperty.fir.txt +++ b/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 diff --git a/compiler/testData/loadJava/compiledJava/sam/Comparator.fir.txt b/compiler/testData/loadJava/compiledJava/sam/Comparator.fir.txt index 3ee6ef09654..44509a03588 100644 --- a/compiler/testData/loadJava/compiledJava/sam/Comparator.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/Comparator.fir.txt @@ -1,6 +1,6 @@ public abstract interface Comparator : R|java/lang/Object| { - public abstract operator function compare(o1: R|ft|!, o2: R|ft|!): R|kotlin/Int| + public abstract operator fun compare(o1: R|ft|!, o2: R|ft|!): R|kotlin/Int| - public abstract operator function equals(obj: R|ft|!): R|kotlin/Boolean| + public abstract operator fun equals(obj: R|ft|!): R|kotlin/Boolean| } diff --git a/compiler/testData/loadJava/compiledJava/sam/FilenameFilter.fir.txt b/compiler/testData/loadJava/compiledJava/sam/FilenameFilter.fir.txt index 5623aeb78de..1d17616a22f 100644 --- a/compiler/testData/loadJava/compiledJava/sam/FilenameFilter.fir.txt +++ b/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|!, name: R|ft|!): R|kotlin/Boolean| + public abstract operator fun accept(dir: R|ft|!, name: R|ft|!): R|kotlin/Boolean| } diff --git a/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParameterWithSelfBound.fir.txt b/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParameterWithSelfBound.fir.txt index d99fdc43d01..0a407ac6af4 100644 --- a/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParameterWithSelfBound.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParameterWithSelfBound.fir.txt @@ -1,4 +1,4 @@ public abstract interface GenericInterfaceParameterWithSelfBound : R|java/lang/Object| { - public abstract operator function method(t: R|ft|!): R|ft|! + public abstract operator fun method(t: R|ft|!): R|ft|! } diff --git a/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParametersWithBounds.fir.txt b/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParametersWithBounds.fir.txt index ab5bb565dff..716184e051a 100644 --- a/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParametersWithBounds.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParametersWithBounds.fir.txt @@ -1,4 +1,4 @@ public abstract interface GenericInterfaceParametersWithBounds : R|java/lang/Object| { - public abstract operator function method(a: R|kotlin/Array>|, b: R|ft|!): R|kotlin/Unit| + public abstract operator fun method(a: R|kotlin/Array>|, b: R|ft|!): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/sam/GenericMethodParameters.fir.txt b/compiler/testData/loadJava/compiledJava/sam/GenericMethodParameters.fir.txt index 9d662430283..0e6a640c569 100644 --- a/compiler/testData/loadJava/compiledJava/sam/GenericMethodParameters.fir.txt +++ b/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>|, b: R|ft|!): R|kotlin/Unit| + public abstract operator fun method(a: R|kotlin/Array>|, b: R|ft|!): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/sam/InterfaceWithObjectMethod.fir.txt b/compiler/testData/loadJava/compiledJava/sam/InterfaceWithObjectMethod.fir.txt index e71864751ce..82d1743b887 100644 --- a/compiler/testData/loadJava/compiledJava/sam/InterfaceWithObjectMethod.fir.txt +++ b/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|! + public abstract operator fun toString(): R|ft|! } diff --git a/compiler/testData/loadJava/compiledJava/sam/Runnable.fir.txt b/compiler/testData/loadJava/compiledJava/sam/Runnable.fir.txt index c7851f11e7b..d1b02238299 100644 --- a/compiler/testData/loadJava/compiledJava/sam/Runnable.fir.txt +++ b/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| } diff --git a/compiler/testData/loadJava/compiledJava/sam/SamSubinterfaceOverridding.fir.txt b/compiler/testData/loadJava/compiledJava/sam/SamSubinterfaceOverridding.fir.txt index 157bb5c4ce2..ecfb0f810ef 100644 --- a/compiler/testData/loadJava/compiledJava/sam/SamSubinterfaceOverridding.fir.txt +++ b/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| } diff --git a/compiler/testData/loadJava/compiledJava/sam/VarargParameter.fir.txt b/compiler/testData/loadJava/compiledJava/sam/VarargParameter.fir.txt index 8f97358274b..c92ec06e5ae 100644 --- a/compiler/testData/loadJava/compiledJava/sam/VarargParameter.fir.txt +++ b/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>|): R|kotlin/Unit| + public abstract operator fun f(vararg strings: R|kotlin/Array>|): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/AmbiguousAdapters.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/AmbiguousAdapters.fir.txt index c8e1b11fe8a..4d6cbdc0b6f 100644 --- a/compiler/testData/loadJava/compiledJava/sam/adapters/AmbiguousAdapters.fir.txt +++ b/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|!): R|kotlin/Unit| + public open operator fun foo(r: R|ft|!): R|kotlin/Unit| - public open operator function foo(c: R|ft|!): R|kotlin/Unit| + public open operator fun foo(c: R|ft|!): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/Basic.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/Basic.fir.txt index 48d598471fd..2514b49b9cc 100644 --- a/compiler/testData/loadJava/compiledJava/sam/adapters/Basic.fir.txt +++ b/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|!): R|kotlin/Unit| + public open operator fun foo(r: R|ft|!): R|kotlin/Unit| - public open static operator function bar(r: R|ft|!): R|kotlin/Unit| + public open static operator fun bar(r: R|ft|!): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/Constructor.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/Constructor.fir.txt index df442abb42e..be9914f37d4 100644 --- a/compiler/testData/loadJava/compiledJava/sam/adapters/Constructor.fir.txt +++ b/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|!): R|test/Constructor| + public final fun Constructor(r: R|ft|!): R|test/Constructor| } diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/ConstructorWithAnnotations.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/ConstructorWithAnnotations.fir.txt index f35eb186238..7f4d384fc7a 100644 --- a/compiler/testData/loadJava/compiledJava/sam/adapters/ConstructorWithAnnotations.fir.txt +++ b/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|!, @R|org/jetbrains/annotations/NotNull|() s: R|kotlin/String|): R|test/ConstructorWithAnnotations| + public final fun ConstructorWithAnnotations(r: R|ft|!, @R|org/jetbrains/annotations/NotNull|() s: R|kotlin/String|): R|test/ConstructorWithAnnotations| } diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/NonTrivialFunctionType.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/NonTrivialFunctionType.fir.txt index 91702d2a9f2..6c3d4adb4c1 100644 --- a/compiler/testData/loadJava/compiledJava/sam/adapters/NonTrivialFunctionType.fir.txt +++ b/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|!): R|kotlin/Unit| + public open operator fun foo(filenameFilter: R|ft|!): R|kotlin/Unit| - public open operator function foo(comparator: R|ft>, java/util/Comparator>?>|!): R|kotlin/Unit| + public open operator fun foo(comparator: R|ft>, java/util/Comparator>?>|!): R|kotlin/Unit| - public open operator function wildcardUnbound(comparator: R|ft, java/util/Comparator<*>?>|!): R|kotlin/Unit| + public open operator fun wildcardUnbound(comparator: R|ft, java/util/Comparator<*>?>|!): R|kotlin/Unit| - public open operator function wildcardBound(comparator: R|ft, java/util/Comparator?>|!): R|kotlin/Unit| + public open operator fun wildcardBound(comparator: R|ft, java/util/Comparator?>|!): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/PrivateSamAdapter.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/PrivateSamAdapter.fir.txt index 41bdba8e17c..e263495c2fa 100644 --- a/compiler/testData/loadJava/compiledJava/sam/adapters/PrivateSamAdapter.fir.txt +++ b/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|!): R|kotlin/Unit| + private open operator fun samAdapter(r: R|ft|!): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/SelfAsParameter.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/SelfAsParameter.fir.txt index 60bdb91e153..69d6ca60512 100644 --- a/compiler/testData/loadJava/compiledJava/sam/adapters/SelfAsParameter.fir.txt +++ b/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|!): R|kotlin/Unit| + public abstract operator fun foo(p: R|ft|!): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/SeveralSamParameters.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/SeveralSamParameters.fir.txt index 9ef7f3255d3..5bd4a5bd188 100644 --- a/compiler/testData/loadJava/compiledJava/sam/adapters/SeveralSamParameters.fir.txt +++ b/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>?>|!, a: R|ft|!, b: R|ft|!, afterRunnable: R|ft|!): R|ft|! + public open static operator fun findMaxAndInvokeCallback(comparator: R|ft>, java/util/Comparator>?>|!, a: R|ft|!, b: R|ft|!, afterRunnable: R|ft|!): R|ft|! } diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfClass.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfClass.fir.txt index a42ff7e43d9..fa6d4992071 100644 --- a/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfClass.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfClass.fir.txt @@ -1,4 +1,4 @@ public open class TypeParameterOfClass : R|java/lang/Object| { - public open operator function foo(comparator: R|ft>, java/util/Comparator>?>|!): R|kotlin/Unit| + public open operator fun foo(comparator: R|ft>, java/util/Comparator>?>|!): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfMethod.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfMethod.fir.txt index 87d29d9af2e..aec8ef078bc 100644 --- a/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfMethod.fir.txt +++ b/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfMethod.fir.txt @@ -1,8 +1,8 @@ public open class TypeParameterOfMethod : R|java/lang/Object| { - public open static operator function max(comparator: R|ft>, java/util/Comparator>?>|!, value1: R|ft|!, value2: R|ft|!): R|ft|! + public open static operator fun max(comparator: R|ft>, java/util/Comparator>?>|!, value1: R|ft|!, value2: R|ft|!): R|ft|! - public open static operator function max2(comparator: R|ft>, java/util/Comparator>?>|!, value1: R|ft|!, value2: R|ft|!): R|ft|! + public open static operator fun max2(comparator: R|ft>, java/util/Comparator>?>|!, value1: R|ft|!, value2: R|ft|!): R|ft|! - public open static operator function method(a: R|ft>, java/util/Comparator>?>|!, b: R|ft|!): R|kotlin/Unit| + public open static operator fun method(a: R|ft>, java/util/Comparator>?>|!, b: R|ft|!): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/signatureAnnotations/StableName.fir.txt b/compiler/testData/loadJava/compiledJava/signatureAnnotations/StableName.fir.txt index 40b46cc76d3..0670d73e2c7 100644 --- a/compiler/testData/loadJava/compiledJava/signatureAnnotations/StableName.fir.txt +++ b/compiler/testData/loadJava/compiledJava/signatureAnnotations/StableName.fir.txt @@ -1,4 +1,4 @@ public open class StableName : R|java/lang/Object| { - public open operator function connect(@R|kotlin/annotations/jvm/internal/ParameterName|(String(host)) host: R|ft|!): R|kotlin/Unit| + public open operator fun connect(@R|kotlin/annotations/jvm/internal/ParameterName|(String(host)) host: R|ft|!): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.fir.txt b/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.fir.txt index e0e07e18480..0c5eb06a22e 100644 --- a/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.fir.txt +++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.fir.txt @@ -1,6 +1,6 @@ public abstract interface TwoSuperclassesInconsistentGenericTypes : R|java/lang/Object| { - public abstract operator function foo(): R|ft>, kotlin/collections/List>?>|! + public abstract operator fun foo(): R|ft>, kotlin/collections/List>?>|! - public abstract operator function dummy(): R|kotlin/Unit| + public abstract operator fun dummy(): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/static/Enum.fir.txt b/compiler/testData/loadJava/compiledJava/static/Enum.fir.txt index e313c7c5552..e6d8b565465 100644 --- a/compiler/testData/loadJava/compiledJava/static/Enum.fir.txt +++ b/compiler/testData/loadJava/compiledJava/static/Enum.fir.txt @@ -1,11 +1,11 @@ public final enum class Enum : R|java/lang/Enum| { - public final static property A(val): R|ft|! + public final static val A: R|ft|! public get(): R|ft|! - public final static property B(val): R|ft|! + public final static val B: R|ft|! public get(): R|ft|! - public final static property C(val): R|ft|! + public final static val C: R|ft|! public get(): R|ft|! } diff --git a/compiler/testData/loadJava/compiledJava/static/Simple.fir.txt b/compiler/testData/loadJava/compiledJava/static/Simple.fir.txt index cdd0b75ad25..e451f4160e5 100644 --- a/compiler/testData/loadJava/compiledJava/static/Simple.fir.txt +++ b/compiler/testData/loadJava/compiledJava/static/Simple.fir.txt @@ -1,6 +1,6 @@ public open class Simple : R|java/lang/Object| { - public open static operator function bar(): R|kotlin/Unit| + public open static operator fun bar(): R|kotlin/Unit| - public open operator function foo(): R|kotlin/Unit| + public open operator fun foo(): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/static/StaticFinal.fir.txt b/compiler/testData/loadJava/compiledJava/static/StaticFinal.fir.txt index a204e82720d..cc4d1596b0e 100644 --- a/compiler/testData/loadJava/compiledJava/static/StaticFinal.fir.txt +++ b/compiler/testData/loadJava/compiledJava/static/StaticFinal.fir.txt @@ -1,20 +1,20 @@ public open class StaticFinal : R|java/lang/Object| { - public final static property publicNonNull(val): R|ft|! + public final static val publicNonNull: R|ft|! public get(): R|ft|! - public final static property publicNull(val): R|ft|! + public final static val publicNull: R|ft|! public get(): R|ft|! - public/*package*/ final static property packageNonNull(val): R|ft|! + public/*package*/ final static val packageNonNull: R|ft|! public/*package*/ get(): R|ft|! - public/*package*/ final static property packageNull(val): R|ft|! + public/*package*/ final static val packageNull: R|ft|! public/*package*/ get(): R|ft|! - private final static property privateNonNull(val): R|ft|! + private final static val privateNonNull: R|ft|! private get(): R|ft|! - private final static property privateNull(val): R|ft|! + private final static val privateNull: R|ft|! private get(): R|ft|! } diff --git a/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.fir.txt b/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.fir.txt index 4cc2add9046..af7d2f8c1a4 100644 --- a/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.fir.txt +++ b/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.fir.txt @@ -1,20 +1,20 @@ public final enum class StaticMembersInEnum : R|java/lang/Enum| { - public final static property ENTRY(val): R|ft|! + public final static val ENTRY: R|ft|! public get(): R|ft|! - public open static property STATIC_FIELD(var): R|kotlin/Int| + public open static var STATIC_FIELD: R|kotlin/Int| public get(): R|kotlin/Int| public set(value: R|kotlin/Int|): kotlin/Unit - public final static property CONSTANT(val): R|ft|! + public final static val CONSTANT: R|ft|! public get(): R|ft|! - public open static operator function foo(): R|kotlin/Unit| + public open static operator fun foo(): R|kotlin/Unit| - public open static operator function values(x: R|kotlin/Int|): R|kotlin/Unit| + public open static operator fun values(x: R|kotlin/Int|): R|kotlin/Unit| - public open static operator function valueOf(x: R|kotlin/Int|): R|kotlin/Unit| + public open static operator fun valueOf(x: R|kotlin/Int|): R|kotlin/Unit| - public open static operator function valueOf(: R|ft>, java/lang/Class>?>|!, : R|ft|!): R|ft|! + public open static operator fun valueOf(: R|ft>, java/lang/Class>?>|!, : R|ft|!): R|ft|! } diff --git a/compiler/testData/loadJava/compiledJava/vararg/VarargInt.fir.txt b/compiler/testData/loadJava/compiledJava/vararg/VarargInt.fir.txt index 902a4830538..b45f2f2978d 100644 --- a/compiler/testData/loadJava/compiledJava/vararg/VarargInt.fir.txt +++ b/compiler/testData/loadJava/compiledJava/vararg/VarargInt.fir.txt @@ -1,4 +1,4 @@ public open class VarargInt : R|java/lang/Object| { - public open operator function vararg(vararg p: R|kotlin/IntArray|): R|kotlin/Unit| + public open operator fun vararg(vararg p: R|kotlin/IntArray|): R|kotlin/Unit| } diff --git a/compiler/testData/loadJava/compiledJava/vararg/VarargString.fir.txt b/compiler/testData/loadJava/compiledJava/vararg/VarargString.fir.txt index 4a23fab171e..27b9717567b 100644 --- a/compiler/testData/loadJava/compiledJava/vararg/VarargString.fir.txt +++ b/compiler/testData/loadJava/compiledJava/vararg/VarargString.fir.txt @@ -1,4 +1,4 @@ public open class VarargString : R|java/lang/Object| { - public open operator function vararg(vararg strings: R|kotlin/Array>|): R|kotlin/Unit| + public open operator fun vararg(vararg strings: R|kotlin/Array>|): R|kotlin/Unit| }