diff --git a/plugins/fir/fir-plugin-prototype/testData/diagnostics/memberGen/classWithGeneratedMembersAndNestedClass.fir.txt b/plugins/fir/fir-plugin-prototype/testData/diagnostics/memberGen/classWithGeneratedMembersAndNestedClass.fir.txt index 9f0ac73d4c4..4084263d735 100644 --- a/plugins/fir/fir-plugin-prototype/testData/diagnostics/memberGen/classWithGeneratedMembersAndNestedClass.fir.txt +++ b/plugins/fir/fir-plugin-prototype/testData/diagnostics/memberGen/classWithGeneratedMembersAndNestedClass.fir.txt @@ -14,6 +14,8 @@ FILE: classWithGeneratedMembersAndNestedClass.kt public final fun materialize(): R|Foo| public final class Nested : R|kotlin/Any| { + public constructor(): R|Foo.Nested| + } } diff --git a/plugins/fir/fir-plugin-prototype/testData/diagnostics/memberGen/generatedClassWithMembersAndNestedClasses.fir.txt b/plugins/fir/fir-plugin-prototype/testData/diagnostics/memberGen/generatedClassWithMembersAndNestedClasses.fir.txt index 39cda0f2c06..4c1dca0ee5a 100644 --- a/plugins/fir/fir-plugin-prototype/testData/diagnostics/memberGen/generatedClassWithMembersAndNestedClasses.fir.txt +++ b/plugins/fir/fir-plugin-prototype/testData/diagnostics/memberGen/generatedClassWithMembersAndNestedClasses.fir.txt @@ -28,18 +28,24 @@ FILE: generatedClassWithMembersAndNestedClasses.kt lval nestedBar: R|foo/AllOpenGenerated.NestedBar| = Q|foo/AllOpenGenerated|.R|foo/AllOpenGenerated.NestedBar|() R|/nestedBar|.R|foo/AllOpenGenerated.NestedBar.materialize|().R|bar/Bar.bar|() } -FILE: ### GENERATED DECLARATIONS ### +FILE: __GENERATED DECLARATIONS__.kt package foo public final class AllOpenGenerated : R|kotlin/Any| { + public constructor(): R|foo/AllOpenGenerated| + public final class NestedFoo : R|kotlin/Any| { public final fun materialize(): R|bar/Foo| + public constructor(): R|foo/AllOpenGenerated.NestedFoo| + } public final class NestedBar : R|kotlin/Any| { public final fun materialize(): R|bar/Bar| + public constructor(): R|foo/AllOpenGenerated.NestedBar| + } } diff --git a/plugins/fir/fir-plugin-prototype/testData/diagnostics/memberGen/topLevelCallables.fir.txt b/plugins/fir/fir-plugin-prototype/testData/diagnostics/memberGen/topLevelCallables.fir.txt index b3cddfe51ba..e4cc92bf4ec 100644 --- a/plugins/fir/fir-plugin-prototype/testData/diagnostics/memberGen/topLevelCallables.fir.txt +++ b/plugins/fir/fir-plugin-prototype/testData/diagnostics/memberGen/topLevelCallables.fir.txt @@ -14,7 +14,7 @@ FILE: topLevelCallables.kt } public final fun takeString(s: R|kotlin/String|): R|kotlin/Unit| { } -FILE: ### GENERATED DECLARATIONS ### +FILE: __GENERATED DECLARATIONS__.kt package foo public final fun dummyMySuperClass(value: R|foo/MySuperClass|): R|kotlin/String| diff --git a/plugins/fir/fir-plugin-prototype/testData/fir2ir/memberGen/generatedClassWithMembersAndNestedClasses.fir.ir.txt b/plugins/fir/fir-plugin-prototype/testData/fir2ir/memberGen/generatedClassWithMembersAndNestedClasses.fir.ir.txt index ea848a62563..e6ac8079e59 100644 --- a/plugins/fir/fir-plugin-prototype/testData/fir2ir/memberGen/generatedClassWithMembersAndNestedClasses.fir.ir.txt +++ b/plugins/fir/fir-plugin-prototype/testData/fir2ir/memberGen/generatedClassWithMembersAndNestedClasses.fir.ir.txt @@ -67,11 +67,20 @@ FILE fqName:foo fileName:__GENERATED DECLARATIONS__.kt CLASS GENERATED[AllOpenClassGeneratorKey] CLASS name:AllOpenGenerated modality:FINAL visibility:public superTypes:[kotlin.Any] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:foo.AllOpenGenerated CONSTRUCTOR GENERATED[AllOpenClassGeneratorKey] visibility:public <> () returnType:foo.AllOpenGenerated [primary] + BLOCK_BODY + DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' + INSTANCE_INITIALIZER_CALL classDescriptor='CLASS GENERATED[AllOpenClassGeneratorKey] CLASS name:AllOpenGenerated modality:FINAL visibility:public superTypes:[kotlin.Any]' CLASS GENERATED[AllOpenClassGeneratorKey] CLASS name:NestedFoo modality:FINAL visibility:public superTypes:[kotlin.Any] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:foo.AllOpenGenerated.NestedFoo CONSTRUCTOR GENERATED[AllOpenClassGeneratorKey] visibility:public <> () returnType:foo.AllOpenGenerated.NestedFoo [primary] + BLOCK_BODY + DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' + INSTANCE_INITIALIZER_CALL classDescriptor='CLASS GENERATED[AllOpenClassGeneratorKey] CLASS name:NestedFoo modality:FINAL visibility:public superTypes:[kotlin.Any]' FUN GENERATED[AllOpenClassGeneratorKey] name:materialize visibility:public modality:FINAL <> ($this:foo.AllOpenGenerated.NestedFoo) returnType:bar.Foo $this: VALUE_PARAMETER name: type:foo.AllOpenGenerated.NestedFoo + BLOCK_BODY + RETURN type=kotlin.Nothing from='public final fun materialize (): bar.Foo declared in foo.AllOpenGenerated.NestedFoo' + CONSTRUCTOR_CALL 'public constructor () [primary] declared in bar.Foo' type=bar.Foo origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] overridden: public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any @@ -88,8 +97,14 @@ FILE fqName:foo fileName:__GENERATED DECLARATIONS__.kt CLASS GENERATED[AllOpenClassGeneratorKey] CLASS name:NestedBar modality:FINAL visibility:public superTypes:[kotlin.Any] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:foo.AllOpenGenerated.NestedBar CONSTRUCTOR GENERATED[AllOpenClassGeneratorKey] visibility:public <> () returnType:foo.AllOpenGenerated.NestedBar [primary] + BLOCK_BODY + DELEGATING_CONSTRUCTOR_CALL 'public constructor () [primary] declared in kotlin.Any' + INSTANCE_INITIALIZER_CALL classDescriptor='CLASS GENERATED[AllOpenClassGeneratorKey] CLASS name:NestedBar modality:FINAL visibility:public superTypes:[kotlin.Any]' FUN GENERATED[AllOpenClassGeneratorKey] name:materialize visibility:public modality:FINAL <> ($this:foo.AllOpenGenerated.NestedBar) returnType:bar.Bar $this: VALUE_PARAMETER name: type:foo.AllOpenGenerated.NestedBar + BLOCK_BODY + RETURN type=kotlin.Nothing from='public final fun materialize (): bar.Bar declared in foo.AllOpenGenerated.NestedBar' + CONSTRUCTOR_CALL 'public constructor () [primary] declared in bar.Bar' type=bar.Bar origin=null FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] overridden: public open fun equals (other: kotlin.Any?): kotlin.Boolean [operator] declared in kotlin.Any