From 96888659532365c1fc8844f36793392b75213afd Mon Sep 17 00:00:00 2001 From: Nikolay Lunyak Date: Fri, 2 Feb 2024 08:15:54 +0000 Subject: [PATCH] [FIR] Check the presence of delegated constructor call via stubs After `4b8b7aaa` external classes' secondary constructors should not have a delegated call, so we don't create a call if there's no explicit call. But we need to check if there is. The failing tests were muted in `8fcf91d8`, and are now unmuted back. Those are the ones in the `testData/rawBuilder/declarations` folder. These tests fail because they supply PSI stubs for the secondary constructors, so arbitrary operations (like reading .text of the delegated constructor call) are not allowed for them. This commit modifies secondary constructor stubs to include the required information. ^KT-65268 Fixed Merge-request: KT-MR-13982 Merged-by: Nikolay Lunyak --- .../AnnotatedFlexibleTypes.k2.txt | 4 +- .../AnnotatedFlexibleTypes.txt | 2 +- .../AnnotationValues/AnnotationValues.k2.txt | 18 ++++----- .../AnnotationValues/AnnotationValues.txt | 16 ++++---- .../Contracts/Contracts.k2.txt | 2 +- .../OuterClassesWithFlexibleArgs.k2.txt | 4 +- .../OuterClassesWithFlexibleArgs.txt | 2 +- .../ParameterName/ParameterName.k2.txt | 39 ------------------- .../ParameterName/ParameterName.kt | 1 + .../ParameterName/ParameterName.txt | 2 +- .../PropertyInitializer.k2.txt | 8 ++-- .../PropertyInitializer.txt | 4 +- .../TypeParametersInFlexibleTypes.k2.txt | 4 +- .../TypeParametersInFlexibleTypes.txt | 2 +- .../AnnotatedFlexibleTypes.k2.txt | 2 +- .../AnnotatedFlexibleTypes.txt | 2 +- ...AnnotatedParameterInEnumConstructor.k2.txt | 2 +- .../AnnotatedParameterInEnumConstructor.txt | 2 +- ...tedParameterInInnerClassConstructor.k2.txt | 6 +-- ...otatedParameterInInnerClassConstructor.txt | 6 +-- .../AnnotationClass/AnnotationClass.k2.txt | 2 +- .../AnnotationClass/AnnotationClass.txt | 2 +- .../AnnotationValues/AnnotationValues.k2.txt | 16 ++++---- .../AnnotationValues/AnnotationValues.txt | 16 ++++---- .../Annotations/Annotations.k2.txt | 8 ++-- .../Annotations/Annotations.txt | 8 ++-- .../AnnotationsOnNullableTypes.k2.txt | 2 +- .../AnnotationsOnNullableTypes.txt | 2 +- .../AnnotationsOnParenthesizedTypes.k2.txt | 2 +- .../AnnotationsOnParenthesizedTypes.txt | 2 +- .../AnonymousReturnWithGenericType.k2.txt | 2 +- .../AnonymousReturnWithGenericType.txt | 2 +- .../ClassMembers/ClassMembers.k2.txt | 2 +- .../ClassMembers/ClassMembers.txt | 2 +- .../ClassObject/ClassObject.k2.txt | 16 ++++---- .../ClassObject/ClassObject.txt | 16 ++++---- .../ContextReceiversCallableMembers.k2.txt | 2 +- .../ContextReceiversCallableMembers.txt | 2 +- .../ContextReceiversOnClass.k2.txt | 2 +- .../ContextReceiversOnClass.txt | 2 +- .../DataClass/DataClass.k2.txt | 2 +- .../DataClass/DataClass.txt | 2 +- .../DefinitelyNotNullTypes.k2.txt | 2 +- .../DefinitelyNotNullTypes.txt | 2 +- .../Delegation/Delegation.k2.txt | 2 +- .../Delegation/Delegation.txt | 2 +- .../DependencyOnNestedClasses.k2.txt | 2 +- .../DependencyOnNestedClasses.txt | 2 +- .../clsFileStubBuilder/Enum/Enum.k2.txt | 2 +- .../testData/clsFileStubBuilder/Enum/Enum.txt | 2 +- .../FunInterfaceDeclaration.k2.txt | 2 +- .../FunInterfaceDeclaration.txt | 2 +- .../InheritingClasses.k2.txt | 24 ++++++------ .../InheritingClasses/InheritingClasses.txt | 24 ++++++------ .../InnerClassEnumEntry.k2.txt | 2 +- .../InnerClassEnumEntry.txt | 2 +- .../InnerTypes/InnerTypes.k2.txt | 8 ++-- .../InnerTypes/InnerTypes.txt | 8 ++-- .../LocalClass/LocalClass.k2.txt | 2 +- .../LocalClass/LocalClass.txt | 2 +- .../Modifiers/Modifiers.k2.txt | 4 +- .../Modifiers/Modifiers.txt | 4 +- .../NamedCompanionObject.k2.txt | 16 ++++---- .../NamedCompanionObject.txt | 16 ++++---- .../NestedClasses/NestedClasses.k2.txt | 12 +++--- .../NestedClasses/NestedClasses.txt | 12 +++--- .../clsFileStubBuilder/Objects/Objects.k2.txt | 2 +- .../clsFileStubBuilder/Objects/Objects.txt | 2 +- .../PrivateConstField.k2.txt | 2 +- .../PrivateConstField/PrivateConstField.txt | 2 +- .../PrivateToThis/PrivateToThis.k2.txt | 2 +- .../PrivateToThis/PrivateToThis.txt | 2 +- .../clsFileStubBuilder/Sealed/Sealed.k2.txt | 4 +- .../clsFileStubBuilder/Sealed/Sealed.txt | 4 +- .../SealedInterface/SealedInterface.txt | 2 +- .../SecondaryConstructors.k2.txt | 12 +++--- .../SecondaryConstructors.txt | 12 +++--- .../TypeBoundsAndDelegationSpecifiers.k2.txt | 2 +- .../TypeBoundsAndDelegationSpecifiers.txt | 2 +- .../TypeModifiers/TypeModifiers.k2.txt | 2 +- .../TypeModifiers/TypeModifiers.txt | 2 +- .../TypeParams/TypeParams.k2.txt | 2 +- .../TypeParams/TypeParams.txt | 2 +- .../clsFileStubBuilder/Types/Types.k2.txt | 2 +- .../clsFileStubBuilder/Types/Types.txt | 2 +- .../UnderscoreParameterName.txt | 2 +- .../decompiler/stub/CallableClsStubBuilder.kt | 12 +++++- .../kotlin/fir/builder/PsiRawFirBuilder.kt | 6 +-- .../rawBuilder/declarations/annotation.kt | 1 - .../declarations/classWithWrongSuperCall.kt | 1 - .../declarations/constructorInObject.kt | 1 - .../constructorWithAnnotations.kt | 1 - .../constructorWithLocalDeclarations.kt | 1 - ...noParameterTypRefInSecondaryConstructor.kt | 1 - .../declarations/noPrimaryConstructor.kt | 1 - .../declarations/secondaryConstructor.kt | 1 - .../org/jetbrains/kotlin/psi/KtConstructor.kt | 9 +++++ .../kotlin/psi/stubs/KotlinStubVersions.kt | 4 +- .../kotlin/psi/stubs/StubInterfaces.kt | 1 + .../elements/KtConstructorElementType.kt | 11 ++++-- .../KtPrimaryConstructorElementType.kt | 5 ++- .../KtSecondaryConstructorElementType.kt | 5 ++- .../stubs/impl/KotlinConstructorStubImpl.kt | 2 + 103 files changed, 253 insertions(+), 270 deletions(-) delete mode 100644 analysis/decompiled/decompiler-to-file-stubs/testData/additionalClsStubInfo/ParameterName/ParameterName.k2.txt diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/additionalClsStubInfo/AnnotatedFlexibleTypes/AnnotatedFlexibleTypes.k2.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/additionalClsStubInfo/AnnotatedFlexibleTypes/AnnotatedFlexibleTypes.k2.txt index 76b15bf41b9..31e8b106442 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/additionalClsStubInfo/AnnotatedFlexibleTypes/AnnotatedFlexibleTypes.k2.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/additionalClsStubInfo/AnnotatedFlexibleTypes/AnnotatedFlexibleTypes.k2.txt @@ -4,7 +4,7 @@ KotlinStub$PACKAGE_DIRECTIVE KotlinStub$IMPORT_LIST KotlinStub$CLASS[classId=test/AnnotatedFlexibleTypes, fqName=test.AnnotatedFlexibleTypes, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=AnnotatedFlexibleTypes, superNames=[]] KotlinStub$MODIFIER_LIST[public final] - KotlinStub$PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=AnnotatedFlexibleTypes] + KotlinStub$PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=AnnotatedFlexibleTypes] KotlinStub$MODIFIER_LIST[public] KotlinStub$VALUE_PARAMETER_LIST KotlinStub$VALUE_PARAMETER[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=javaClass] @@ -69,4 +69,4 @@ KotlinStub$CLASS[classId=test/AnnotatedFlexibleTypes, fqName=test.AnnotatedFlexi KotlinStub$USER_TYPE ft: kotlin.Int? KotlinStub$USER_TYPE KotlinStub$REFERENCE_EXPRESSION[referencedName=kotlin] - KotlinStub$REFERENCE_EXPRESSION[referencedName=Int] + KotlinStub$REFERENCE_EXPRESSION[referencedName=Int] \ No newline at end of file diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/additionalClsStubInfo/AnnotatedFlexibleTypes/AnnotatedFlexibleTypes.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/additionalClsStubInfo/AnnotatedFlexibleTypes/AnnotatedFlexibleTypes.txt index f5fbe8347e9..46d9e29e137 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/additionalClsStubInfo/AnnotatedFlexibleTypes/AnnotatedFlexibleTypes.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/additionalClsStubInfo/AnnotatedFlexibleTypes/AnnotatedFlexibleTypes.txt @@ -4,7 +4,7 @@ KotlinStub$PACKAGE_DIRECTIVE KotlinStub$IMPORT_LIST KotlinStub$CLASS[classId=test/AnnotatedFlexibleTypes, fqName=test.AnnotatedFlexibleTypes, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=AnnotatedFlexibleTypes, superNames=[]] KotlinStub$MODIFIER_LIST[public final] - KotlinStub$PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=AnnotatedFlexibleTypes] + KotlinStub$PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=AnnotatedFlexibleTypes] KotlinStub$MODIFIER_LIST[public] KotlinStub$VALUE_PARAMETER_LIST KotlinStub$VALUE_PARAMETER[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=javaClass] diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/additionalClsStubInfo/AnnotationValues/AnnotationValues.k2.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/additionalClsStubInfo/AnnotationValues/AnnotationValues.k2.txt index e2468aba0fe..55b1b6aa88b 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/additionalClsStubInfo/AnnotationValues/AnnotationValues.k2.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/additionalClsStubInfo/AnnotationValues/AnnotationValues.k2.txt @@ -4,7 +4,7 @@ KotlinStub$PACKAGE_DIRECTIVE KotlinStub$IMPORT_LIST KotlinStub$CLASS[classId=test/AnnotationValues, fqName=test.AnnotationValues, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=AnnotationValues, superNames=[]] KotlinStub$MODIFIER_LIST[public final] - KotlinStub$PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=AnnotationValues] + KotlinStub$PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=AnnotationValues] KotlinStub$MODIFIER_LIST[public] KotlinStub$VALUE_PARAMETER_LIST KotlinStub$CLASS_BODY @@ -18,7 +18,7 @@ KotlinStub$CLASS[classId=test/AnnotationValues, fqName=test.AnnotationValues, is KotlinStub$USER_TYPE KotlinStub$REFERENCE_EXPRESSION[referencedName=test] KotlinStub$REFERENCE_EXPRESSION[referencedName=Simple] - KotlinStub$PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=WithSimple] + KotlinStub$PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=WithSimple] KotlinStub$MODIFIER_LIST[public] KotlinStub$VALUE_PARAMETER_LIST KotlinStub$CLASS_BODY @@ -32,7 +32,7 @@ KotlinStub$CLASS[classId=test/AnnotationValues, fqName=test.AnnotationValues, is KotlinStub$USER_TYPE KotlinStub$REFERENCE_EXPRESSION[referencedName=test] KotlinStub$REFERENCE_EXPRESSION[referencedName=StringLiteral] - KotlinStub$PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=WithStringLiteral] + KotlinStub$PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=WithStringLiteral] KotlinStub$MODIFIER_LIST[public] KotlinStub$VALUE_PARAMETER_LIST KotlinStub$CLASS_BODY @@ -46,7 +46,7 @@ KotlinStub$CLASS[classId=test/AnnotationValues, fqName=test.AnnotationValues, is KotlinStub$USER_TYPE KotlinStub$REFERENCE_EXPRESSION[referencedName=test] KotlinStub$REFERENCE_EXPRESSION[referencedName=EnumLiteral] - KotlinStub$PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=WithEnumLiteral] + KotlinStub$PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=WithEnumLiteral] KotlinStub$MODIFIER_LIST[public] KotlinStub$VALUE_PARAMETER_LIST KotlinStub$CLASS_BODY @@ -60,7 +60,7 @@ KotlinStub$CLASS[classId=test/AnnotationValues, fqName=test.AnnotationValues, is KotlinStub$USER_TYPE KotlinStub$REFERENCE_EXPRESSION[referencedName=test] KotlinStub$REFERENCE_EXPRESSION[referencedName=VarArg] - KotlinStub$PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=WithVarArg] + KotlinStub$PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=WithVarArg] KotlinStub$MODIFIER_LIST[public] KotlinStub$VALUE_PARAMETER_LIST KotlinStub$CLASS_BODY @@ -74,7 +74,7 @@ KotlinStub$CLASS[classId=test/AnnotationValues, fqName=test.AnnotationValues, is KotlinStub$USER_TYPE KotlinStub$REFERENCE_EXPRESSION[referencedName=test] KotlinStub$REFERENCE_EXPRESSION[referencedName=Arrays] - KotlinStub$PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=WithArrays] + KotlinStub$PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=WithArrays] KotlinStub$MODIFIER_LIST[public] KotlinStub$VALUE_PARAMETER_LIST KotlinStub$CLASS_BODY @@ -90,7 +90,7 @@ KotlinStub$CLASS[classId=test/AnnotationValues, fqName=test.AnnotationValues, is KotlinStub$REFERENCE_EXPRESSION[referencedName=ClassLiteral] KotlinStub$TYPE_PARAMETER_LIST KotlinStub$TYPE_PARAMETER[fqName=null, isInVariance=false, isOutVariance=false, name=T] - KotlinStub$PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=WithClassLiteral] + KotlinStub$PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=WithClassLiteral] KotlinStub$MODIFIER_LIST[public] KotlinStub$VALUE_PARAMETER_LIST KotlinStub$CLASS_BODY @@ -104,7 +104,7 @@ KotlinStub$CLASS[classId=test/AnnotationValues, fqName=test.AnnotationValues, is KotlinStub$USER_TYPE KotlinStub$REFERENCE_EXPRESSION[referencedName=test] KotlinStub$REFERENCE_EXPRESSION[referencedName=Outer] - KotlinStub$PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=WithNested] + KotlinStub$PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=WithNested] KotlinStub$MODIFIER_LIST[public] KotlinStub$VALUE_PARAMETER_LIST - KotlinStub$CLASS_BODY + KotlinStub$CLASS_BODY \ No newline at end of file diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/additionalClsStubInfo/AnnotationValues/AnnotationValues.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/additionalClsStubInfo/AnnotationValues/AnnotationValues.txt index 47d5d81a944..60299a90f96 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/additionalClsStubInfo/AnnotationValues/AnnotationValues.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/additionalClsStubInfo/AnnotationValues/AnnotationValues.txt @@ -4,7 +4,7 @@ KotlinStub$PACKAGE_DIRECTIVE KotlinStub$IMPORT_LIST KotlinStub$CLASS[classId=test/AnnotationValues, fqName=test.AnnotationValues, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=AnnotationValues, superNames=[]] KotlinStub$MODIFIER_LIST[public final] - KotlinStub$PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=AnnotationValues] + KotlinStub$PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=AnnotationValues] KotlinStub$MODIFIER_LIST[public] KotlinStub$VALUE_PARAMETER_LIST KotlinStub$CLASS_BODY @@ -18,7 +18,7 @@ KotlinStub$CLASS[classId=test/AnnotationValues, fqName=test.AnnotationValues, is KotlinStub$USER_TYPE KotlinStub$REFERENCE_EXPRESSION[referencedName=test] KotlinStub$REFERENCE_EXPRESSION[referencedName=Arrays] - KotlinStub$PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=WithArrays] + KotlinStub$PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=WithArrays] KotlinStub$MODIFIER_LIST[public] KotlinStub$VALUE_PARAMETER_LIST KotlinStub$CLASS_BODY @@ -34,7 +34,7 @@ KotlinStub$CLASS[classId=test/AnnotationValues, fqName=test.AnnotationValues, is KotlinStub$REFERENCE_EXPRESSION[referencedName=ClassLiteral] KotlinStub$TYPE_PARAMETER_LIST KotlinStub$TYPE_PARAMETER[fqName=null, isInVariance=false, isOutVariance=false, name=T] - KotlinStub$PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=WithClassLiteral] + KotlinStub$PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=WithClassLiteral] KotlinStub$MODIFIER_LIST[public] KotlinStub$VALUE_PARAMETER_LIST KotlinStub$CLASS_BODY @@ -48,7 +48,7 @@ KotlinStub$CLASS[classId=test/AnnotationValues, fqName=test.AnnotationValues, is KotlinStub$USER_TYPE KotlinStub$REFERENCE_EXPRESSION[referencedName=test] KotlinStub$REFERENCE_EXPRESSION[referencedName=EnumLiteral] - KotlinStub$PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=WithEnumLiteral] + KotlinStub$PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=WithEnumLiteral] KotlinStub$MODIFIER_LIST[public] KotlinStub$VALUE_PARAMETER_LIST KotlinStub$CLASS_BODY @@ -62,7 +62,7 @@ KotlinStub$CLASS[classId=test/AnnotationValues, fqName=test.AnnotationValues, is KotlinStub$USER_TYPE KotlinStub$REFERENCE_EXPRESSION[referencedName=test] KotlinStub$REFERENCE_EXPRESSION[referencedName=Outer] - KotlinStub$PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=WithNested] + KotlinStub$PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=WithNested] KotlinStub$MODIFIER_LIST[public] KotlinStub$VALUE_PARAMETER_LIST KotlinStub$CLASS_BODY @@ -76,7 +76,7 @@ KotlinStub$CLASS[classId=test/AnnotationValues, fqName=test.AnnotationValues, is KotlinStub$USER_TYPE KotlinStub$REFERENCE_EXPRESSION[referencedName=test] KotlinStub$REFERENCE_EXPRESSION[referencedName=Simple] - KotlinStub$PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=WithSimple] + KotlinStub$PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=WithSimple] KotlinStub$MODIFIER_LIST[public] KotlinStub$VALUE_PARAMETER_LIST KotlinStub$CLASS_BODY @@ -90,7 +90,7 @@ KotlinStub$CLASS[classId=test/AnnotationValues, fqName=test.AnnotationValues, is KotlinStub$USER_TYPE KotlinStub$REFERENCE_EXPRESSION[referencedName=test] KotlinStub$REFERENCE_EXPRESSION[referencedName=StringLiteral] - KotlinStub$PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=WithStringLiteral] + KotlinStub$PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=WithStringLiteral] KotlinStub$MODIFIER_LIST[public] KotlinStub$VALUE_PARAMETER_LIST KotlinStub$CLASS_BODY @@ -104,7 +104,7 @@ KotlinStub$CLASS[classId=test/AnnotationValues, fqName=test.AnnotationValues, is KotlinStub$USER_TYPE KotlinStub$REFERENCE_EXPRESSION[referencedName=test] KotlinStub$REFERENCE_EXPRESSION[referencedName=VarArg] - KotlinStub$PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=WithVarArg] + KotlinStub$PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=WithVarArg] KotlinStub$MODIFIER_LIST[public] KotlinStub$VALUE_PARAMETER_LIST KotlinStub$CLASS_BODY \ No newline at end of file diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/additionalClsStubInfo/Contracts/Contracts.k2.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/additionalClsStubInfo/Contracts/Contracts.k2.txt index 15b76508104..09ae3bcb564 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/additionalClsStubInfo/Contracts/Contracts.k2.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/additionalClsStubInfo/Contracts/Contracts.k2.txt @@ -170,4 +170,4 @@ KotlinStub$FUN[fqName=test.test0, hasBlockBody=true, hasBody=true, hasTypeParame KotlinStub$USER_TYPE KotlinStub$USER_TYPE KotlinStub$REFERENCE_EXPRESSION[referencedName=kotlin] - KotlinStub$REFERENCE_EXPRESSION[referencedName=Boolean] + KotlinStub$REFERENCE_EXPRESSION[referencedName=Boolean] \ No newline at end of file diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/additionalClsStubInfo/OuterClassesWithFlexibleArgs/OuterClassesWithFlexibleArgs.k2.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/additionalClsStubInfo/OuterClassesWithFlexibleArgs/OuterClassesWithFlexibleArgs.k2.txt index 228b315989d..895f6e26c7a 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/additionalClsStubInfo/OuterClassesWithFlexibleArgs/OuterClassesWithFlexibleArgs.k2.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/additionalClsStubInfo/OuterClassesWithFlexibleArgs/OuterClassesWithFlexibleArgs.k2.txt @@ -7,7 +7,7 @@ KotlinStub$CLASS[classId=test/OuterClassesWithFlexibleArgs, fqName=test.OuterCla KotlinStub$TYPE_PARAMETER_LIST KotlinStub$TYPE_PARAMETER[fqName=null, isInVariance=false, isOutVariance=false, name=K] KotlinStub$TYPE_PARAMETER[fqName=null, isInVariance=false, isOutVariance=false, name=L] - KotlinStub$PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=OuterClassesWithFlexibleArgs] + KotlinStub$PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=OuterClassesWithFlexibleArgs] KotlinStub$MODIFIER_LIST[public] KotlinStub$VALUE_PARAMETER_LIST KotlinStub$VALUE_PARAMETER[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=k] @@ -47,4 +47,4 @@ KotlinStub$CLASS[classId=test/OuterClassesWithFlexibleArgs, fqName=test.OuterCla KotlinStub$REFERENCE_EXPRESSION[referencedName=L] KotlinStub$TYPE_REFERENCE KotlinStub$USER_TYPE - KotlinStub$REFERENCE_EXPRESSION[referencedName=Any] + KotlinStub$REFERENCE_EXPRESSION[referencedName=Any] \ No newline at end of file diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/additionalClsStubInfo/OuterClassesWithFlexibleArgs/OuterClassesWithFlexibleArgs.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/additionalClsStubInfo/OuterClassesWithFlexibleArgs/OuterClassesWithFlexibleArgs.txt index f3e64210dc3..ad5adbc635d 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/additionalClsStubInfo/OuterClassesWithFlexibleArgs/OuterClassesWithFlexibleArgs.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/additionalClsStubInfo/OuterClassesWithFlexibleArgs/OuterClassesWithFlexibleArgs.txt @@ -7,7 +7,7 @@ KotlinStub$CLASS[classId=test/OuterClassesWithFlexibleArgs, fqName=test.OuterCla KotlinStub$TYPE_PARAMETER_LIST KotlinStub$TYPE_PARAMETER[fqName=null, isInVariance=false, isOutVariance=false, name=K] KotlinStub$TYPE_PARAMETER[fqName=null, isInVariance=false, isOutVariance=false, name=L] - KotlinStub$PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=OuterClassesWithFlexibleArgs] + KotlinStub$PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=OuterClassesWithFlexibleArgs] KotlinStub$MODIFIER_LIST[public] KotlinStub$VALUE_PARAMETER_LIST KotlinStub$VALUE_PARAMETER[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=k] diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/additionalClsStubInfo/ParameterName/ParameterName.k2.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/additionalClsStubInfo/ParameterName/ParameterName.k2.txt deleted file mode 100644 index 4004b8263a2..00000000000 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/additionalClsStubInfo/ParameterName/ParameterName.k2.txt +++ /dev/null @@ -1,39 +0,0 @@ -PsiJetFileStubImpl[package=test] -KotlinStub$PACKAGE_DIRECTIVE - KotlinStub$REFERENCE_EXPRESSION[referencedName=test] -KotlinStub$IMPORT_LIST -KotlinStub$CLASS[classId=test/ParameterName, fqName=test.ParameterName, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=ParameterName, superNames=[]] - KotlinStub$MODIFIER_LIST[public final] - KotlinStub$PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=ParameterName] - KotlinStub$MODIFIER_LIST[public] - KotlinStub$VALUE_PARAMETER_LIST - KotlinStub$CLASS_BODY - KotlinStub$FUN[fqName=test.ParameterName.foo, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=true, isExtension=false, isTopLevel=false, mayHaveContract=false, name=foo] - KotlinStub$MODIFIER_LIST[public final inline] - KotlinStub$TYPE_PARAMETER_LIST - KotlinStub$TYPE_PARAMETER[fqName=null, isInVariance=false, isOutVariance=false, name=A] - KotlinStub$TYPE_PARAMETER[fqName=null, isInVariance=false, isOutVariance=false, name=B] - KotlinStub$VALUE_PARAMETER_LIST - KotlinStub$VALUE_PARAMETER[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=block] - KotlinStub$MODIFIER_LIST[crossinline] - KotlinStub$TYPE_REFERENCE - KotlinStub$FUNCTION_TYPE - KotlinStub$VALUE_PARAMETER_LIST - KotlinStub$VALUE_PARAMETER[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=null] paramNameByAnnotation: input - KotlinStub$TYPE_REFERENCE - KotlinStub$USER_TYPE - KotlinStub$REFERENCE_EXPRESSION[referencedName=A] - KotlinStub$VALUE_PARAMETER[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=null] paramNameByAnnotation: state - KotlinStub$TYPE_REFERENCE - KotlinStub$USER_TYPE - KotlinStub$REFERENCE_EXPRESSION[referencedName=B] - KotlinStub$TYPE_REFERENCE - KotlinStub$USER_TYPE - KotlinStub$USER_TYPE - KotlinStub$REFERENCE_EXPRESSION[referencedName=kotlin] - KotlinStub$REFERENCE_EXPRESSION[referencedName=Unit] - KotlinStub$TYPE_REFERENCE - KotlinStub$USER_TYPE - KotlinStub$USER_TYPE - KotlinStub$REFERENCE_EXPRESSION[referencedName=kotlin] - KotlinStub$REFERENCE_EXPRESSION[referencedName=Unit] diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/additionalClsStubInfo/ParameterName/ParameterName.kt b/analysis/decompiled/decompiler-to-file-stubs/testData/additionalClsStubInfo/ParameterName/ParameterName.kt index b0c6666a6cc..354a90d3453 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/additionalClsStubInfo/ParameterName/ParameterName.kt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/additionalClsStubInfo/ParameterName/ParameterName.kt @@ -1,3 +1,4 @@ +// FIR_IDENTICAL package test class ParameterName { diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/additionalClsStubInfo/ParameterName/ParameterName.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/additionalClsStubInfo/ParameterName/ParameterName.txt index e464a2f4930..e8ad027a95e 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/additionalClsStubInfo/ParameterName/ParameterName.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/additionalClsStubInfo/ParameterName/ParameterName.txt @@ -4,7 +4,7 @@ KotlinStub$PACKAGE_DIRECTIVE KotlinStub$IMPORT_LIST KotlinStub$CLASS[classId=test/ParameterName, fqName=test.ParameterName, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=ParameterName, superNames=[]] KotlinStub$MODIFIER_LIST[public final] - KotlinStub$PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=ParameterName] + KotlinStub$PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=ParameterName] KotlinStub$MODIFIER_LIST[public] KotlinStub$VALUE_PARAMETER_LIST KotlinStub$CLASS_BODY diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/additionalClsStubInfo/PropertyInitializer/PropertyInitializer.k2.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/additionalClsStubInfo/PropertyInitializer/PropertyInitializer.k2.txt index 6e1037214f0..3349dbec7f2 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/additionalClsStubInfo/PropertyInitializer/PropertyInitializer.k2.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/additionalClsStubInfo/PropertyInitializer/PropertyInitializer.k2.txt @@ -4,7 +4,7 @@ KotlinStub$PACKAGE_DIRECTIVE KotlinStub$IMPORT_LIST KotlinStub$CLASS[classId=test/PropertyInitializer, fqName=test.PropertyInitializer, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=PropertyInitializer, superNames=[]] KotlinStub$MODIFIER_LIST[public final] - KotlinStub$PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=PropertyInitializer] + KotlinStub$PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=PropertyInitializer] KotlinStub$MODIFIER_LIST[public] KotlinStub$VALUE_PARAMETER_LIST KotlinStub$CLASS_BODY @@ -148,7 +148,7 @@ KotlinStub$CLASS[classId=test/PropertyInitializer, fqName=test.PropertyInitializ KotlinStub$REFERENCE_EXPRESSION[referencedName=COMPILED_CODE] KotlinStub$CLASS[classId=test/PropertyInitializer.Anno, fqName=test.PropertyInitializer.Anno, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=Anno, superNames=[Annotation]] KotlinStub$MODIFIER_LIST[public final annotation] - KotlinStub$PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=Anno] + KotlinStub$PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=Anno] KotlinStub$MODIFIER_LIST[public] KotlinStub$VALUE_PARAMETER_LIST KotlinStub$VALUE_PARAMETER[fqName=null, hasDefaultValue=true, hasValOrVar=false, isMutable=false, name=arrayWithDefault] @@ -418,7 +418,7 @@ KotlinStub$CLASS[classId=test/PropertyInitializer, fqName=test.PropertyInitializ KotlinStub$REFERENCE_EXPRESSION[referencedName=Double] KotlinStub$REFERENCE_EXPRESSION[referencedName=COMPILED_CODE] KotlinStub$PROPERTY[fqName=test.PropertyInitializer.Anno.char, hasDelegate=false, hasDelegateExpression=false, hasInitializer=true, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=char] - initializer: + initializer: KotlinStub$MODIFIER_LIST[public final] KotlinStub$TYPE_REFERENCE @@ -442,4 +442,4 @@ KotlinStub$CLASS[classId=test/PropertyInitializer, fqName=test.PropertyInitializ KotlinStub$USER_TYPE KotlinStub$USER_TYPE KotlinStub$REFERENCE_EXPRESSION[referencedName=kotlin] - KotlinStub$REFERENCE_EXPRESSION[referencedName=BooleanArray] + KotlinStub$REFERENCE_EXPRESSION[referencedName=BooleanArray] \ No newline at end of file diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/additionalClsStubInfo/PropertyInitializer/PropertyInitializer.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/additionalClsStubInfo/PropertyInitializer/PropertyInitializer.txt index 10bb1dccb2e..be0e64f0104 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/additionalClsStubInfo/PropertyInitializer/PropertyInitializer.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/additionalClsStubInfo/PropertyInitializer/PropertyInitializer.txt @@ -4,7 +4,7 @@ KotlinStub$PACKAGE_DIRECTIVE KotlinStub$IMPORT_LIST KotlinStub$CLASS[classId=test/PropertyInitializer, fqName=test.PropertyInitializer, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=PropertyInitializer, superNames=[]] KotlinStub$MODIFIER_LIST[public final] - KotlinStub$PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=PropertyInitializer] + KotlinStub$PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=PropertyInitializer] KotlinStub$MODIFIER_LIST[public] KotlinStub$VALUE_PARAMETER_LIST KotlinStub$CLASS_BODY @@ -148,7 +148,7 @@ KotlinStub$CLASS[classId=test/PropertyInitializer, fqName=test.PropertyInitializ KotlinStub$REFERENCE_EXPRESSION[referencedName=COMPILED_CODE] KotlinStub$CLASS[classId=test/PropertyInitializer.Anno, fqName=test.PropertyInitializer.Anno, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=Anno, superNames=[Annotation]] KotlinStub$MODIFIER_LIST[public final annotation] - KotlinStub$PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=Anno] + KotlinStub$PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=Anno] KotlinStub$MODIFIER_LIST[public] KotlinStub$VALUE_PARAMETER_LIST KotlinStub$VALUE_PARAMETER[fqName=null, hasDefaultValue=true, hasValOrVar=false, isMutable=false, name=arrayWithDefault] diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/additionalClsStubInfo/TypeParametersInFlexibleTypes/TypeParametersInFlexibleTypes.k2.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/additionalClsStubInfo/TypeParametersInFlexibleTypes/TypeParametersInFlexibleTypes.k2.txt index c5262c2d73f..31264b0abe9 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/additionalClsStubInfo/TypeParametersInFlexibleTypes/TypeParametersInFlexibleTypes.k2.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/additionalClsStubInfo/TypeParametersInFlexibleTypes/TypeParametersInFlexibleTypes.k2.txt @@ -7,7 +7,7 @@ KotlinStub$CLASS[classId=test/TypeParametersInFlexibleTypes, fqName=test.TypePar KotlinStub$TYPE_PARAMETER_LIST KotlinStub$TYPE_PARAMETER[fqName=null, isInVariance=false, isOutVariance=false, name=A] KotlinStub$TYPE_PARAMETER[fqName=null, isInVariance=false, isOutVariance=false, name=D] - KotlinStub$PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=TypeParametersInFlexibleTypes] + KotlinStub$PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=TypeParametersInFlexibleTypes] KotlinStub$MODIFIER_LIST[public] KotlinStub$VALUE_PARAMETER_LIST KotlinStub$VALUE_PARAMETER[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=javaClass] @@ -101,4 +101,4 @@ KotlinStub$CLASS[classId=test/TypeParametersInFlexibleTypes, fqName=test.TypePar KotlinStub$REFERENCE_EXPRESSION[referencedName=A] KotlinStub$TYPE_REFERENCE KotlinStub$USER_TYPE - KotlinStub$REFERENCE_EXPRESSION[referencedName=Any] + KotlinStub$REFERENCE_EXPRESSION[referencedName=Any] \ No newline at end of file diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/additionalClsStubInfo/TypeParametersInFlexibleTypes/TypeParametersInFlexibleTypes.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/additionalClsStubInfo/TypeParametersInFlexibleTypes/TypeParametersInFlexibleTypes.txt index 05f9985d6c2..5cd52c419b7 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/additionalClsStubInfo/TypeParametersInFlexibleTypes/TypeParametersInFlexibleTypes.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/additionalClsStubInfo/TypeParametersInFlexibleTypes/TypeParametersInFlexibleTypes.txt @@ -7,7 +7,7 @@ KotlinStub$CLASS[classId=test/TypeParametersInFlexibleTypes, fqName=test.TypePar KotlinStub$TYPE_PARAMETER_LIST KotlinStub$TYPE_PARAMETER[fqName=null, isInVariance=false, isOutVariance=false, name=A] KotlinStub$TYPE_PARAMETER[fqName=null, isInVariance=false, isOutVariance=false, name=D] - KotlinStub$PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=TypeParametersInFlexibleTypes] + KotlinStub$PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=TypeParametersInFlexibleTypes] KotlinStub$MODIFIER_LIST[public] KotlinStub$VALUE_PARAMETER_LIST KotlinStub$VALUE_PARAMETER[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=javaClass] diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotatedFlexibleTypes/AnnotatedFlexibleTypes.k2.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotatedFlexibleTypes/AnnotatedFlexibleTypes.k2.txt index c01f30fe142..74335100858 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotatedFlexibleTypes/AnnotatedFlexibleTypes.k2.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotatedFlexibleTypes/AnnotatedFlexibleTypes.k2.txt @@ -4,7 +4,7 @@ PsiJetFileStubImpl[package=test] IMPORT_LIST CLASS[classId=test/AnnotatedFlexibleTypes, fqName=test.AnnotatedFlexibleTypes, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=AnnotatedFlexibleTypes, superNames=[]] MODIFIER_LIST[public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=AnnotatedFlexibleTypes] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=AnnotatedFlexibleTypes] MODIFIER_LIST[public] VALUE_PARAMETER_LIST VALUE_PARAMETER[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=javaClass] diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotatedFlexibleTypes/AnnotatedFlexibleTypes.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotatedFlexibleTypes/AnnotatedFlexibleTypes.txt index 0d2c03bdc28..0d361c4aaf8 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotatedFlexibleTypes/AnnotatedFlexibleTypes.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotatedFlexibleTypes/AnnotatedFlexibleTypes.txt @@ -4,7 +4,7 @@ PsiJetFileStubImpl[package=test] IMPORT_LIST CLASS[classId=test/AnnotatedFlexibleTypes, fqName=test.AnnotatedFlexibleTypes, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=AnnotatedFlexibleTypes, superNames=[]] MODIFIER_LIST[public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=AnnotatedFlexibleTypes] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=AnnotatedFlexibleTypes] MODIFIER_LIST[public] VALUE_PARAMETER_LIST VALUE_PARAMETER[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=javaClass] diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotatedParameterInEnumConstructor/AnnotatedParameterInEnumConstructor.k2.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotatedParameterInEnumConstructor/AnnotatedParameterInEnumConstructor.k2.txt index f7c0c9ec4bb..99b1b27c5e6 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotatedParameterInEnumConstructor/AnnotatedParameterInEnumConstructor.k2.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotatedParameterInEnumConstructor/AnnotatedParameterInEnumConstructor.k2.txt @@ -4,7 +4,7 @@ PsiJetFileStubImpl[package=test] IMPORT_LIST CLASS[classId=test/AnnotatedParameterInEnumConstructor, fqName=test.AnnotatedParameterInEnumConstructor, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=AnnotatedParameterInEnumConstructor, superNames=[Enum]] MODIFIER_LIST[enum public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=AnnotatedParameterInEnumConstructor] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=AnnotatedParameterInEnumConstructor] MODIFIER_LIST[private] VALUE_PARAMETER_LIST VALUE_PARAMETER[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=a] diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotatedParameterInEnumConstructor/AnnotatedParameterInEnumConstructor.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotatedParameterInEnumConstructor/AnnotatedParameterInEnumConstructor.txt index f7c0c9ec4bb..99b1b27c5e6 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotatedParameterInEnumConstructor/AnnotatedParameterInEnumConstructor.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotatedParameterInEnumConstructor/AnnotatedParameterInEnumConstructor.txt @@ -4,7 +4,7 @@ PsiJetFileStubImpl[package=test] IMPORT_LIST CLASS[classId=test/AnnotatedParameterInEnumConstructor, fqName=test.AnnotatedParameterInEnumConstructor, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=AnnotatedParameterInEnumConstructor, superNames=[Enum]] MODIFIER_LIST[enum public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=AnnotatedParameterInEnumConstructor] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=AnnotatedParameterInEnumConstructor] MODIFIER_LIST[private] VALUE_PARAMETER_LIST VALUE_PARAMETER[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=a] diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotatedParameterInInnerClassConstructor/AnnotatedParameterInInnerClassConstructor.k2.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotatedParameterInInnerClassConstructor/AnnotatedParameterInInnerClassConstructor.k2.txt index 8574d41738b..3cb56a5d961 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotatedParameterInInnerClassConstructor/AnnotatedParameterInInnerClassConstructor.k2.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotatedParameterInInnerClassConstructor/AnnotatedParameterInInnerClassConstructor.k2.txt @@ -4,13 +4,13 @@ PsiJetFileStubImpl[package=test] IMPORT_LIST CLASS[classId=test/AnnotatedParameterInInnerClassConstructor, fqName=test.AnnotatedParameterInInnerClassConstructor, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=AnnotatedParameterInInnerClassConstructor, superNames=[]] MODIFIER_LIST[public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=AnnotatedParameterInInnerClassConstructor] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=AnnotatedParameterInInnerClassConstructor] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY CLASS[classId=test/AnnotatedParameterInInnerClassConstructor.Inner, fqName=test.AnnotatedParameterInInnerClassConstructor.Inner, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=Inner, superNames=[]] MODIFIER_LIST[inner public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=Inner] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=Inner] MODIFIER_LIST[public] VALUE_PARAMETER_LIST VALUE_PARAMETER[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=a] @@ -46,7 +46,7 @@ PsiJetFileStubImpl[package=test] MODIFIER_LIST[inner public final] TYPE_PARAMETER_LIST TYPE_PARAMETER[fqName=null, isInVariance=false, isOutVariance=false, name=T] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=InnerGeneric] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=InnerGeneric] MODIFIER_LIST[public] VALUE_PARAMETER_LIST VALUE_PARAMETER[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=a] diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotatedParameterInInnerClassConstructor/AnnotatedParameterInInnerClassConstructor.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotatedParameterInInnerClassConstructor/AnnotatedParameterInInnerClassConstructor.txt index 8574d41738b..3cb56a5d961 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotatedParameterInInnerClassConstructor/AnnotatedParameterInInnerClassConstructor.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotatedParameterInInnerClassConstructor/AnnotatedParameterInInnerClassConstructor.txt @@ -4,13 +4,13 @@ PsiJetFileStubImpl[package=test] IMPORT_LIST CLASS[classId=test/AnnotatedParameterInInnerClassConstructor, fqName=test.AnnotatedParameterInInnerClassConstructor, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=AnnotatedParameterInInnerClassConstructor, superNames=[]] MODIFIER_LIST[public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=AnnotatedParameterInInnerClassConstructor] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=AnnotatedParameterInInnerClassConstructor] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY CLASS[classId=test/AnnotatedParameterInInnerClassConstructor.Inner, fqName=test.AnnotatedParameterInInnerClassConstructor.Inner, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=Inner, superNames=[]] MODIFIER_LIST[inner public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=Inner] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=Inner] MODIFIER_LIST[public] VALUE_PARAMETER_LIST VALUE_PARAMETER[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=a] @@ -46,7 +46,7 @@ PsiJetFileStubImpl[package=test] MODIFIER_LIST[inner public final] TYPE_PARAMETER_LIST TYPE_PARAMETER[fqName=null, isInVariance=false, isOutVariance=false, name=T] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=InnerGeneric] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=InnerGeneric] MODIFIER_LIST[public] VALUE_PARAMETER_LIST VALUE_PARAMETER[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=a] diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotationClass/AnnotationClass.k2.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotationClass/AnnotationClass.k2.txt index ff4d66ec28d..bc26c6cb650 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotationClass/AnnotationClass.k2.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotationClass/AnnotationClass.k2.txt @@ -6,7 +6,7 @@ PsiJetFileStubImpl[package=test.a] IMPORT_LIST CLASS[classId=test/a/AnnotationClass, fqName=test.a.AnnotationClass, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=AnnotationClass, superNames=[Annotation]] MODIFIER_LIST[public final annotation] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=AnnotationClass] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=AnnotationClass] MODIFIER_LIST[public] VALUE_PARAMETER_LIST VALUE_PARAMETER[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=i] diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotationClass/AnnotationClass.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotationClass/AnnotationClass.txt index ff4d66ec28d..bc26c6cb650 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotationClass/AnnotationClass.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotationClass/AnnotationClass.txt @@ -6,7 +6,7 @@ PsiJetFileStubImpl[package=test.a] IMPORT_LIST CLASS[classId=test/a/AnnotationClass, fqName=test.a.AnnotationClass, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=AnnotationClass, superNames=[Annotation]] MODIFIER_LIST[public final annotation] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=AnnotationClass] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=AnnotationClass] MODIFIER_LIST[public] VALUE_PARAMETER_LIST VALUE_PARAMETER[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=i] diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotationValues/AnnotationValues.k2.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotationValues/AnnotationValues.k2.txt index c0be7f5e212..edd1e679a10 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotationValues/AnnotationValues.k2.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotationValues/AnnotationValues.k2.txt @@ -4,7 +4,7 @@ PsiJetFileStubImpl[package=test] IMPORT_LIST CLASS[classId=test/AnnotationValues, fqName=test.AnnotationValues, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=AnnotationValues, superNames=[]] MODIFIER_LIST[public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=AnnotationValues] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=AnnotationValues] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY @@ -17,7 +17,7 @@ PsiJetFileStubImpl[package=test] USER_TYPE REFERENCE_EXPRESSION[referencedName=test] REFERENCE_EXPRESSION[referencedName=Simple] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=WithSimple] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=WithSimple] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY @@ -30,7 +30,7 @@ PsiJetFileStubImpl[package=test] USER_TYPE REFERENCE_EXPRESSION[referencedName=test] REFERENCE_EXPRESSION[referencedName=StringLiteral] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=WithStringLiteral] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=WithStringLiteral] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY @@ -43,7 +43,7 @@ PsiJetFileStubImpl[package=test] USER_TYPE REFERENCE_EXPRESSION[referencedName=test] REFERENCE_EXPRESSION[referencedName=EnumLiteral] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=WithEnumLiteral] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=WithEnumLiteral] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY @@ -56,7 +56,7 @@ PsiJetFileStubImpl[package=test] USER_TYPE REFERENCE_EXPRESSION[referencedName=test] REFERENCE_EXPRESSION[referencedName=VarArg] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=WithVarArg] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=WithVarArg] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY @@ -69,7 +69,7 @@ PsiJetFileStubImpl[package=test] USER_TYPE REFERENCE_EXPRESSION[referencedName=test] REFERENCE_EXPRESSION[referencedName=Arrays] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=WithArrays] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=WithArrays] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY @@ -84,7 +84,7 @@ PsiJetFileStubImpl[package=test] REFERENCE_EXPRESSION[referencedName=ClassLiteral] TYPE_PARAMETER_LIST TYPE_PARAMETER[fqName=null, isInVariance=false, isOutVariance=false, name=T] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=WithClassLiteral] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=WithClassLiteral] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY @@ -97,7 +97,7 @@ PsiJetFileStubImpl[package=test] USER_TYPE REFERENCE_EXPRESSION[referencedName=test] REFERENCE_EXPRESSION[referencedName=Outer] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=WithNested] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=WithNested] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotationValues/AnnotationValues.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotationValues/AnnotationValues.txt index 19eed58c106..ed64bc52126 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotationValues/AnnotationValues.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotationValues/AnnotationValues.txt @@ -4,7 +4,7 @@ PsiJetFileStubImpl[package=test] IMPORT_LIST CLASS[classId=test/AnnotationValues, fqName=test.AnnotationValues, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=AnnotationValues, superNames=[]] MODIFIER_LIST[public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=AnnotationValues] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=AnnotationValues] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY @@ -17,7 +17,7 @@ PsiJetFileStubImpl[package=test] USER_TYPE REFERENCE_EXPRESSION[referencedName=test] REFERENCE_EXPRESSION[referencedName=Arrays] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=WithArrays] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=WithArrays] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY @@ -32,7 +32,7 @@ PsiJetFileStubImpl[package=test] REFERENCE_EXPRESSION[referencedName=ClassLiteral] TYPE_PARAMETER_LIST TYPE_PARAMETER[fqName=null, isInVariance=false, isOutVariance=false, name=T] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=WithClassLiteral] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=WithClassLiteral] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY @@ -45,7 +45,7 @@ PsiJetFileStubImpl[package=test] USER_TYPE REFERENCE_EXPRESSION[referencedName=test] REFERENCE_EXPRESSION[referencedName=EnumLiteral] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=WithEnumLiteral] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=WithEnumLiteral] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY @@ -58,7 +58,7 @@ PsiJetFileStubImpl[package=test] USER_TYPE REFERENCE_EXPRESSION[referencedName=test] REFERENCE_EXPRESSION[referencedName=Outer] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=WithNested] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=WithNested] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY @@ -71,7 +71,7 @@ PsiJetFileStubImpl[package=test] USER_TYPE REFERENCE_EXPRESSION[referencedName=test] REFERENCE_EXPRESSION[referencedName=Simple] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=WithSimple] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=WithSimple] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY @@ -84,7 +84,7 @@ PsiJetFileStubImpl[package=test] USER_TYPE REFERENCE_EXPRESSION[referencedName=test] REFERENCE_EXPRESSION[referencedName=StringLiteral] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=WithStringLiteral] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=WithStringLiteral] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY @@ -97,7 +97,7 @@ PsiJetFileStubImpl[package=test] USER_TYPE REFERENCE_EXPRESSION[referencedName=test] REFERENCE_EXPRESSION[referencedName=VarArg] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=WithVarArg] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=WithVarArg] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Annotations/Annotations.k2.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Annotations/Annotations.k2.txt index c12c8b275ad..d9dd3b06c62 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Annotations/Annotations.k2.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Annotations/Annotations.k2.txt @@ -8,7 +8,7 @@ PsiJetFileStubImpl[package=] TYPE_REFERENCE USER_TYPE REFERENCE_EXPRESSION[referencedName=a] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=Annotations] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=Annotations] MODIFIER_LIST[private] ANNOTATION_ENTRY[hasValueArguments=false, shortName=a] CONSTRUCTOR_CALLEE @@ -349,7 +349,7 @@ PsiJetFileStubImpl[package=] REFERENCE_EXPRESSION[referencedName=Unit] CLASS[classId=/Annotations.Nested, fqName=Annotations.Nested, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=Nested, superNames=[]] MODIFIER_LIST[public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=Nested] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=Nested] MODIFIER_LIST[private] ANNOTATION_ENTRY[hasValueArguments=false, shortName=a] CONSTRUCTOR_CALLEE @@ -360,7 +360,7 @@ PsiJetFileStubImpl[package=] CLASS_BODY CLASS[classId=/Annotations.En, fqName=Annotations.En, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=En, superNames=[Enum]] MODIFIER_LIST[enum public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=En] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=En] MODIFIER_LIST[private] VALUE_PARAMETER_LIST SUPER_TYPE_LIST @@ -400,7 +400,7 @@ PsiJetFileStubImpl[package=] REFERENCE_EXPRESSION[referencedName=c] CLASS[classId=/Annotations.ClassWithConstructor, fqName=Annotations.ClassWithConstructor, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=ClassWithConstructor, superNames=[]] MODIFIER_LIST[public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=ClassWithConstructor] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=ClassWithConstructor] MODIFIER_LIST[public] VALUE_PARAMETER_LIST VALUE_PARAMETER[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=b] diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Annotations/Annotations.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Annotations/Annotations.txt index b3389869919..70ac600c998 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Annotations/Annotations.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Annotations/Annotations.txt @@ -8,7 +8,7 @@ PsiJetFileStubImpl[package=] TYPE_REFERENCE USER_TYPE REFERENCE_EXPRESSION[referencedName=a] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=Annotations] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=Annotations] MODIFIER_LIST[private] ANNOTATION_ENTRY[hasValueArguments=false, shortName=a] CONSTRUCTOR_CALLEE @@ -365,7 +365,7 @@ PsiJetFileStubImpl[package=] REFERENCE_EXPRESSION[referencedName=Unit] CLASS[classId=/Annotations.ClassWithConstructor, fqName=Annotations.ClassWithConstructor, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=ClassWithConstructor, superNames=[]] MODIFIER_LIST[public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=ClassWithConstructor] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=ClassWithConstructor] MODIFIER_LIST[public] VALUE_PARAMETER_LIST VALUE_PARAMETER[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=b] @@ -390,7 +390,7 @@ PsiJetFileStubImpl[package=] REFERENCE_EXPRESSION[referencedName=Int] CLASS[classId=/Annotations.En, fqName=Annotations.En, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=En, superNames=[Enum]] MODIFIER_LIST[enum public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=En] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=En] MODIFIER_LIST[private] VALUE_PARAMETER_LIST SUPER_TYPE_LIST @@ -430,7 +430,7 @@ PsiJetFileStubImpl[package=] REFERENCE_EXPRESSION[referencedName=c] CLASS[classId=/Annotations.Nested, fqName=Annotations.Nested, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=Nested, superNames=[]] MODIFIER_LIST[public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=Nested] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=Nested] MODIFIER_LIST[private] ANNOTATION_ENTRY[hasValueArguments=false, shortName=a] CONSTRUCTOR_CALLEE diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotationsOnNullableTypes/AnnotationsOnNullableTypes.k2.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotationsOnNullableTypes/AnnotationsOnNullableTypes.k2.txt index 280a237964c..0596ed3dfae 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotationsOnNullableTypes/AnnotationsOnNullableTypes.k2.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotationsOnNullableTypes/AnnotationsOnNullableTypes.k2.txt @@ -3,7 +3,7 @@ PsiJetFileStubImpl[package=] IMPORT_LIST CLASS[classId=/AnnotationsOnNullableTypes, fqName=AnnotationsOnNullableTypes, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=AnnotationsOnNullableTypes, superNames=[]] MODIFIER_LIST[public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=AnnotationsOnNullableTypes] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=AnnotationsOnNullableTypes] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotationsOnNullableTypes/AnnotationsOnNullableTypes.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotationsOnNullableTypes/AnnotationsOnNullableTypes.txt index 09d4057bbf5..7ed54874ca2 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotationsOnNullableTypes/AnnotationsOnNullableTypes.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotationsOnNullableTypes/AnnotationsOnNullableTypes.txt @@ -3,7 +3,7 @@ PsiJetFileStubImpl[package=] IMPORT_LIST CLASS[classId=/AnnotationsOnNullableTypes, fqName=AnnotationsOnNullableTypes, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=AnnotationsOnNullableTypes, superNames=[]] MODIFIER_LIST[public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=AnnotationsOnNullableTypes] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=AnnotationsOnNullableTypes] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotationsOnParenthesizedTypes/AnnotationsOnParenthesizedTypes.k2.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotationsOnParenthesizedTypes/AnnotationsOnParenthesizedTypes.k2.txt index 4f77be71e4b..7b2c7d12ed5 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotationsOnParenthesizedTypes/AnnotationsOnParenthesizedTypes.k2.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotationsOnParenthesizedTypes/AnnotationsOnParenthesizedTypes.k2.txt @@ -3,7 +3,7 @@ PsiJetFileStubImpl[package=] IMPORT_LIST CLASS[classId=/AnnotationsOnParenthesizedTypes, fqName=AnnotationsOnParenthesizedTypes, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=AnnotationsOnParenthesizedTypes, superNames=[]] MODIFIER_LIST[public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=AnnotationsOnParenthesizedTypes] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=AnnotationsOnParenthesizedTypes] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotationsOnParenthesizedTypes/AnnotationsOnParenthesizedTypes.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotationsOnParenthesizedTypes/AnnotationsOnParenthesizedTypes.txt index a3b505ef940..262e6c207d8 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotationsOnParenthesizedTypes/AnnotationsOnParenthesizedTypes.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnnotationsOnParenthesizedTypes/AnnotationsOnParenthesizedTypes.txt @@ -3,7 +3,7 @@ PsiJetFileStubImpl[package=] IMPORT_LIST CLASS[classId=/AnnotationsOnParenthesizedTypes, fqName=AnnotationsOnParenthesizedTypes, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=AnnotationsOnParenthesizedTypes, superNames=[]] MODIFIER_LIST[public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=AnnotationsOnParenthesizedTypes] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=AnnotationsOnParenthesizedTypes] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnonymousReturnWithGenericType/AnonymousReturnWithGenericType.k2.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnonymousReturnWithGenericType/AnonymousReturnWithGenericType.k2.txt index 0bfccaa9c66..2f2dc847313 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnonymousReturnWithGenericType/AnonymousReturnWithGenericType.k2.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnonymousReturnWithGenericType/AnonymousReturnWithGenericType.k2.txt @@ -5,7 +5,7 @@ PsiJetFileStubImpl[package=] MODIFIER_LIST[public final] TYPE_PARAMETER_LIST TYPE_PARAMETER[fqName=null, isInVariance=false, isOutVariance=false, name=T] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=AnonymousReturnWithGenericType] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=AnonymousReturnWithGenericType] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnonymousReturnWithGenericType/AnonymousReturnWithGenericType.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnonymousReturnWithGenericType/AnonymousReturnWithGenericType.txt index 0bfccaa9c66..2f2dc847313 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnonymousReturnWithGenericType/AnonymousReturnWithGenericType.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/AnonymousReturnWithGenericType/AnonymousReturnWithGenericType.txt @@ -5,7 +5,7 @@ PsiJetFileStubImpl[package=] MODIFIER_LIST[public final] TYPE_PARAMETER_LIST TYPE_PARAMETER[fqName=null, isInVariance=false, isOutVariance=false, name=T] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=AnonymousReturnWithGenericType] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=AnonymousReturnWithGenericType] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/ClassMembers/ClassMembers.k2.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/ClassMembers/ClassMembers.k2.txt index 560563def82..7e6fbe915b1 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/ClassMembers/ClassMembers.k2.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/ClassMembers/ClassMembers.k2.txt @@ -4,7 +4,7 @@ PsiJetFileStubImpl[package=test] IMPORT_LIST CLASS[classId=test/ClassMembers, fqName=test.ClassMembers, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=ClassMembers, superNames=[]] MODIFIER_LIST[abstract public] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=ClassMembers] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=ClassMembers] MODIFIER_LIST[public] VALUE_PARAMETER_LIST VALUE_PARAMETER[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p] diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/ClassMembers/ClassMembers.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/ClassMembers/ClassMembers.txt index 742b5fc0f6a..8d9d7eba31b 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/ClassMembers/ClassMembers.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/ClassMembers/ClassMembers.txt @@ -4,7 +4,7 @@ PsiJetFileStubImpl[package=test] IMPORT_LIST CLASS[classId=test/ClassMembers, fqName=test.ClassMembers, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=ClassMembers, superNames=[]] MODIFIER_LIST[abstract public] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=ClassMembers] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=ClassMembers] MODIFIER_LIST[public] VALUE_PARAMETER_LIST VALUE_PARAMETER[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p] diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/ClassObject/ClassObject.k2.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/ClassObject/ClassObject.k2.txt index e914f57c854..65d2de82d1c 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/ClassObject/ClassObject.k2.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/ClassObject/ClassObject.k2.txt @@ -6,7 +6,7 @@ PsiJetFileStubImpl[package=test.class_object] IMPORT_LIST CLASS[classId=test/class_object/ClassObject, fqName=test.class_object.ClassObject, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=ClassObject, superNames=[]] MODIFIER_LIST[public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=ClassObject] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=ClassObject] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY @@ -30,13 +30,13 @@ PsiJetFileStubImpl[package=test.class_object] REFERENCE_EXPRESSION[referencedName=Int] CLASS[classId=test/class_object/ClassObject.Companion.A, fqName=test.class_object.ClassObject.Companion.A, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=A, superNames=[]] MODIFIER_LIST[public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=A] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=A] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY CLASS[classId=test/class_object/ClassObject.Companion.A.B, fqName=test.class_object.ClassObject.Companion.A.B, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=B, superNames=[]] MODIFIER_LIST[public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=B] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=B] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY @@ -72,7 +72,7 @@ PsiJetFileStubImpl[package=test.class_object] REFERENCE_EXPRESSION[referencedName=Unit] CLASS[classId=test/class_object/ClassObject.B, fqName=test.class_object.ClassObject.B, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=B, superNames=[]] MODIFIER_LIST[public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=B] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=B] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY @@ -81,7 +81,7 @@ PsiJetFileStubImpl[package=test.class_object] CLASS_BODY CLASS[classId=test/class_object/ClassObject.B.Companion.C, fqName=test.class_object.ClassObject.B.Companion.C, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=C, superNames=[]] MODIFIER_LIST[public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=C] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=C] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY @@ -90,7 +90,7 @@ PsiJetFileStubImpl[package=test.class_object] CLASS_BODY CLASS[classId=test/class_object/ClassObject.B.Companion.C.Companion.D, fqName=test.class_object.ClassObject.B.Companion.C.Companion.D, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=D, superNames=[]] MODIFIER_LIST[public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=D] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=D] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY @@ -114,7 +114,7 @@ PsiJetFileStubImpl[package=test.class_object] REFERENCE_EXPRESSION[referencedName=Unit] CLASS[classId=test/class_object/ClassObject.B.Companion.C.Companion.D.Companion.En, fqName=test.class_object.ClassObject.B.Companion.C.Companion.D.Companion.En, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=En, superNames=[Enum]] MODIFIER_LIST[enum public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=En] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=En] MODIFIER_LIST[private] VALUE_PARAMETER_LIST SUPER_TYPE_LIST @@ -150,7 +150,7 @@ PsiJetFileStubImpl[package=test.class_object] CLASS_BODY CLASS[classId=test/class_object/ClassObject.B.Companion.C.Companion.D.Companion.Anno, fqName=test.class_object.ClassObject.B.Companion.C.Companion.D.Companion.Anno, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=Anno, superNames=[Annotation]] MODIFIER_LIST[public final annotation] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=Anno] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=Anno] MODIFIER_LIST[public] VALUE_PARAMETER_LIST SUPER_TYPE_LIST diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/ClassObject/ClassObject.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/ClassObject/ClassObject.txt index b13db90c17f..e4fd19d3729 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/ClassObject/ClassObject.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/ClassObject/ClassObject.txt @@ -6,7 +6,7 @@ PsiJetFileStubImpl[package=test.class_object] IMPORT_LIST CLASS[classId=test/class_object/ClassObject, fqName=test.class_object.ClassObject, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=ClassObject, superNames=[]] MODIFIER_LIST[public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=ClassObject] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=ClassObject] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY @@ -30,13 +30,13 @@ PsiJetFileStubImpl[package=test.class_object] REFERENCE_EXPRESSION[referencedName=Int] CLASS[classId=test/class_object/ClassObject.Companion.A, fqName=test.class_object.ClassObject.Companion.A, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=A, superNames=[]] MODIFIER_LIST[public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=A] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=A] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY CLASS[classId=test/class_object/ClassObject.Companion.A.B, fqName=test.class_object.ClassObject.Companion.A.B, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=B, superNames=[]] MODIFIER_LIST[public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=B] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=B] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY @@ -72,7 +72,7 @@ PsiJetFileStubImpl[package=test.class_object] REFERENCE_EXPRESSION[referencedName=Unit] CLASS[classId=test/class_object/ClassObject.B, fqName=test.class_object.ClassObject.B, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=B, superNames=[]] MODIFIER_LIST[public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=B] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=B] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY @@ -81,7 +81,7 @@ PsiJetFileStubImpl[package=test.class_object] CLASS_BODY CLASS[classId=test/class_object/ClassObject.B.Companion.C, fqName=test.class_object.ClassObject.B.Companion.C, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=C, superNames=[]] MODIFIER_LIST[public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=C] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=C] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY @@ -90,7 +90,7 @@ PsiJetFileStubImpl[package=test.class_object] CLASS_BODY CLASS[classId=test/class_object/ClassObject.B.Companion.C.Companion.D, fqName=test.class_object.ClassObject.B.Companion.C.Companion.D, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=D, superNames=[]] MODIFIER_LIST[public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=D] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=D] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY @@ -114,7 +114,7 @@ PsiJetFileStubImpl[package=test.class_object] REFERENCE_EXPRESSION[referencedName=Unit] CLASS[classId=test/class_object/ClassObject.B.Companion.C.Companion.D.Companion.Anno, fqName=test.class_object.ClassObject.B.Companion.C.Companion.D.Companion.Anno, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=Anno, superNames=[Annotation]] MODIFIER_LIST[public final annotation] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=Anno] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=Anno] MODIFIER_LIST[public] VALUE_PARAMETER_LIST SUPER_TYPE_LIST @@ -127,7 +127,7 @@ PsiJetFileStubImpl[package=test.class_object] CLASS_BODY CLASS[classId=test/class_object/ClassObject.B.Companion.C.Companion.D.Companion.En, fqName=test.class_object.ClassObject.B.Companion.C.Companion.D.Companion.En, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=En, superNames=[Enum]] MODIFIER_LIST[enum public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=En] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=En] MODIFIER_LIST[private] VALUE_PARAMETER_LIST SUPER_TYPE_LIST diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/ContextReceiversCallableMembers/ContextReceiversCallableMembers.k2.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/ContextReceiversCallableMembers/ContextReceiversCallableMembers.k2.txt index f4a6fc4b94d..4c6d3358608 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/ContextReceiversCallableMembers/ContextReceiversCallableMembers.k2.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/ContextReceiversCallableMembers/ContextReceiversCallableMembers.k2.txt @@ -3,7 +3,7 @@ PsiJetFileStubImpl[package=] IMPORT_LIST CLASS[classId=/ContextReceiversCallableMembers, fqName=ContextReceiversCallableMembers, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=ContextReceiversCallableMembers, superNames=[]] MODIFIER_LIST[open private] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=ContextReceiversCallableMembers] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=ContextReceiversCallableMembers] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/ContextReceiversCallableMembers/ContextReceiversCallableMembers.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/ContextReceiversCallableMembers/ContextReceiversCallableMembers.txt index f4a6fc4b94d..4c6d3358608 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/ContextReceiversCallableMembers/ContextReceiversCallableMembers.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/ContextReceiversCallableMembers/ContextReceiversCallableMembers.txt @@ -3,7 +3,7 @@ PsiJetFileStubImpl[package=] IMPORT_LIST CLASS[classId=/ContextReceiversCallableMembers, fqName=ContextReceiversCallableMembers, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=ContextReceiversCallableMembers, superNames=[]] MODIFIER_LIST[open private] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=ContextReceiversCallableMembers] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=ContextReceiversCallableMembers] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/ContextReceiversOnClass/ContextReceiversOnClass.k2.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/ContextReceiversOnClass/ContextReceiversOnClass.k2.txt index b56f3339262..8e04c8f2e74 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/ContextReceiversOnClass/ContextReceiversOnClass.k2.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/ContextReceiversOnClass/ContextReceiversOnClass.k2.txt @@ -12,7 +12,7 @@ PsiJetFileStubImpl[package=] USER_TYPE REFERENCE_EXPRESSION[referencedName=B] MODIFIER_LIST[open private] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=ContextReceiversOnClass] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=ContextReceiversOnClass] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/ContextReceiversOnClass/ContextReceiversOnClass.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/ContextReceiversOnClass/ContextReceiversOnClass.txt index b56f3339262..8e04c8f2e74 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/ContextReceiversOnClass/ContextReceiversOnClass.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/ContextReceiversOnClass/ContextReceiversOnClass.txt @@ -12,7 +12,7 @@ PsiJetFileStubImpl[package=] USER_TYPE REFERENCE_EXPRESSION[referencedName=B] MODIFIER_LIST[open private] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=ContextReceiversOnClass] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=ContextReceiversOnClass] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/DataClass/DataClass.k2.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/DataClass/DataClass.k2.txt index b6cdf476934..2d353aa36dd 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/DataClass/DataClass.k2.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/DataClass/DataClass.k2.txt @@ -8,7 +8,7 @@ PsiJetFileStubImpl[package=a.b.c] IMPORT_LIST CLASS[classId=a/b/c/DataClass, fqName=a.b.c.DataClass, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=DataClass, superNames=[]] MODIFIER_LIST[public final data] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=DataClass] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=DataClass] MODIFIER_LIST[public] VALUE_PARAMETER_LIST VALUE_PARAMETER[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=i] diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/DataClass/DataClass.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/DataClass/DataClass.txt index 3333d84ce64..622929895f5 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/DataClass/DataClass.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/DataClass/DataClass.txt @@ -8,7 +8,7 @@ PsiJetFileStubImpl[package=a.b.c] IMPORT_LIST CLASS[classId=a/b/c/DataClass, fqName=a.b.c.DataClass, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=DataClass, superNames=[]] MODIFIER_LIST[public final data] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=DataClass] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=DataClass] MODIFIER_LIST[public] VALUE_PARAMETER_LIST VALUE_PARAMETER[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=i] diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/DefinitelyNotNullTypes/DefinitelyNotNullTypes.k2.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/DefinitelyNotNullTypes/DefinitelyNotNullTypes.k2.txt index 9f37405d69f..a2b8a5f88bc 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/DefinitelyNotNullTypes/DefinitelyNotNullTypes.k2.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/DefinitelyNotNullTypes/DefinitelyNotNullTypes.k2.txt @@ -5,7 +5,7 @@ PsiJetFileStubImpl[package=] MODIFIER_LIST[public final] TYPE_PARAMETER_LIST TYPE_PARAMETER[fqName=null, isInVariance=false, isOutVariance=false, name=T] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=DefinitelyNotNullTypes] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=DefinitelyNotNullTypes] MODIFIER_LIST[public] VALUE_PARAMETER_LIST VALUE_PARAMETER[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=x] diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/DefinitelyNotNullTypes/DefinitelyNotNullTypes.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/DefinitelyNotNullTypes/DefinitelyNotNullTypes.txt index f54d058c19c..e3097c6a3a7 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/DefinitelyNotNullTypes/DefinitelyNotNullTypes.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/DefinitelyNotNullTypes/DefinitelyNotNullTypes.txt @@ -5,7 +5,7 @@ PsiJetFileStubImpl[package=] MODIFIER_LIST[public final] TYPE_PARAMETER_LIST TYPE_PARAMETER[fqName=null, isInVariance=false, isOutVariance=false, name=T] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=DefinitelyNotNullTypes] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=DefinitelyNotNullTypes] MODIFIER_LIST[public] VALUE_PARAMETER_LIST VALUE_PARAMETER[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=x] diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Delegation/Delegation.k2.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Delegation/Delegation.k2.txt index 4911dcc25a5..5b1ebb526c4 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Delegation/Delegation.k2.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Delegation/Delegation.k2.txt @@ -3,7 +3,7 @@ PsiJetFileStubImpl[package=] IMPORT_LIST CLASS[classId=/Delegation, fqName=Delegation, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=Delegation, superNames=[T]] MODIFIER_LIST[public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=Delegation] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=Delegation] MODIFIER_LIST[public] VALUE_PARAMETER_LIST VALUE_PARAMETER[fqName=null, hasDefaultValue=true, hasValOrVar=false, isMutable=false, name=c] diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Delegation/Delegation.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Delegation/Delegation.txt index 00fce7bf9d5..60dd4258333 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Delegation/Delegation.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Delegation/Delegation.txt @@ -3,7 +3,7 @@ PsiJetFileStubImpl[package=] IMPORT_LIST CLASS[classId=/Delegation, fqName=Delegation, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=Delegation, superNames=[T]] MODIFIER_LIST[public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=Delegation] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=Delegation] MODIFIER_LIST[public] VALUE_PARAMETER_LIST VALUE_PARAMETER[fqName=null, hasDefaultValue=true, hasValOrVar=false, isMutable=false, name=c] diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/DependencyOnNestedClasses/DependencyOnNestedClasses.k2.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/DependencyOnNestedClasses/DependencyOnNestedClasses.k2.txt index d1202b20f74..001fa0be842 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/DependencyOnNestedClasses/DependencyOnNestedClasses.k2.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/DependencyOnNestedClasses/DependencyOnNestedClasses.k2.txt @@ -4,7 +4,7 @@ PsiJetFileStubImpl[package=test] IMPORT_LIST CLASS[classId=test/DependencyOnNestedClasses, fqName=test.DependencyOnNestedClasses, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=DependencyOnNestedClasses, superNames=[Nested]] MODIFIER_LIST[public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=DependencyOnNestedClasses] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=DependencyOnNestedClasses] MODIFIER_LIST[public] VALUE_PARAMETER_LIST SUPER_TYPE_LIST diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/DependencyOnNestedClasses/DependencyOnNestedClasses.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/DependencyOnNestedClasses/DependencyOnNestedClasses.txt index d1202b20f74..001fa0be842 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/DependencyOnNestedClasses/DependencyOnNestedClasses.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/DependencyOnNestedClasses/DependencyOnNestedClasses.txt @@ -4,7 +4,7 @@ PsiJetFileStubImpl[package=test] IMPORT_LIST CLASS[classId=test/DependencyOnNestedClasses, fqName=test.DependencyOnNestedClasses, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=DependencyOnNestedClasses, superNames=[Nested]] MODIFIER_LIST[public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=DependencyOnNestedClasses] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=DependencyOnNestedClasses] MODIFIER_LIST[public] VALUE_PARAMETER_LIST SUPER_TYPE_LIST diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Enum/Enum.k2.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Enum/Enum.k2.txt index 99bdacb5aab..28ad120c053 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Enum/Enum.k2.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Enum/Enum.k2.txt @@ -12,7 +12,7 @@ PsiJetFileStubImpl[package=a.b.c.test.enum] IMPORT_LIST CLASS[classId=a/b/c/test/enum/Enum, fqName=a.b.c.test.enum.Enum, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=Enum, superNames=[Enum]] MODIFIER_LIST[enum public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=Enum] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=Enum] MODIFIER_LIST[private] VALUE_PARAMETER_LIST SUPER_TYPE_LIST diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Enum/Enum.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Enum/Enum.txt index 99bdacb5aab..28ad120c053 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Enum/Enum.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Enum/Enum.txt @@ -12,7 +12,7 @@ PsiJetFileStubImpl[package=a.b.c.test.enum] IMPORT_LIST CLASS[classId=a/b/c/test/enum/Enum, fqName=a.b.c.test.enum.Enum, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=Enum, superNames=[Enum]] MODIFIER_LIST[enum public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=Enum] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=Enum] MODIFIER_LIST[private] VALUE_PARAMETER_LIST SUPER_TYPE_LIST diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/FunInterfaceDeclaration/FunInterfaceDeclaration.k2.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/FunInterfaceDeclaration/FunInterfaceDeclaration.k2.txt index 247788f599f..8e51cb55dc9 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/FunInterfaceDeclaration/FunInterfaceDeclaration.k2.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/FunInterfaceDeclaration/FunInterfaceDeclaration.k2.txt @@ -4,7 +4,7 @@ PsiJetFileStubImpl[package=test] IMPORT_LIST CLASS[classId=test/FunInterfaceDeclaration, fqName=test.FunInterfaceDeclaration, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=FunInterfaceDeclaration, superNames=[]] MODIFIER_LIST[public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=FunInterfaceDeclaration] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=FunInterfaceDeclaration] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/FunInterfaceDeclaration/FunInterfaceDeclaration.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/FunInterfaceDeclaration/FunInterfaceDeclaration.txt index 6e4bc163c1c..822e0a213f9 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/FunInterfaceDeclaration/FunInterfaceDeclaration.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/FunInterfaceDeclaration/FunInterfaceDeclaration.txt @@ -4,7 +4,7 @@ PsiJetFileStubImpl[package=test] IMPORT_LIST CLASS[classId=test/FunInterfaceDeclaration, fqName=test.FunInterfaceDeclaration, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=FunInterfaceDeclaration, superNames=[]] MODIFIER_LIST[public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=FunInterfaceDeclaration] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=FunInterfaceDeclaration] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/InheritingClasses/InheritingClasses.k2.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/InheritingClasses/InheritingClasses.k2.txt index 455bf8957b2..8d3c28c4bcc 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/InheritingClasses/InheritingClasses.k2.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/InheritingClasses/InheritingClasses.k2.txt @@ -4,13 +4,13 @@ PsiJetFileStubImpl[package=a] IMPORT_LIST CLASS[classId=a/InheritingClasses, fqName=a.InheritingClasses, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=InheritingClasses, superNames=[]] MODIFIER_LIST[public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=InheritingClasses] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=InheritingClasses] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY CLASS[classId=a/InheritingClasses.A, fqName=a.InheritingClasses.A, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=A, superNames=[C]] MODIFIER_LIST[abstract public] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=A] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=A] MODIFIER_LIST[public] VALUE_PARAMETER_LIST VALUE_PARAMETER[fqName=null, hasDefaultValue=true, hasValOrVar=false, isMutable=false, name=c] @@ -69,7 +69,7 @@ PsiJetFileStubImpl[package=a] REFERENCE_EXPRESSION[referencedName=Int] CLASS[classId=a/InheritingClasses.B, fqName=a.InheritingClasses.B, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=B, superNames=[A]] MODIFIER_LIST[open public] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=B] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=B] MODIFIER_LIST[public] VALUE_PARAMETER_LIST SUPER_TYPE_LIST @@ -148,7 +148,7 @@ PsiJetFileStubImpl[package=a] CLASS_BODY CLASS[classId=a/InheritingClasses.G, fqName=a.InheritingClasses.G, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=G, superNames=[B, C, D, E]] MODIFIER_LIST[public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=G] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=G] MODIFIER_LIST[public] VALUE_PARAMETER_LIST SUPER_TYPE_LIST @@ -194,7 +194,7 @@ PsiJetFileStubImpl[package=a] CLASS_BODY CLASS[classId=a/InheritingClasses.InheritAny, fqName=a.InheritingClasses.InheritAny, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=InheritAny, superNames=[]] MODIFIER_LIST[public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=InheritAny] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=InheritAny] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY @@ -206,19 +206,19 @@ PsiJetFileStubImpl[package=a] CLASS_BODY CLASS[classId=a/InheritingClasses.InheritAny.ImplicitAny, fqName=a.InheritingClasses.InheritAny.ImplicitAny, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=ImplicitAny, superNames=[]] MODIFIER_LIST[public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=ImplicitAny] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=ImplicitAny] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY CLASS[classId=a/InheritingClasses.InheritAny.ExplicitAny, fqName=a.InheritingClasses.InheritAny.ExplicitAny, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=ExplicitAny, superNames=[]] MODIFIER_LIST[public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=ExplicitAny] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=ExplicitAny] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY CLASS[classId=a/InheritingClasses.InheritAny.OnlyTrait, fqName=a.InheritingClasses.InheritAny.OnlyTrait, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=OnlyTrait, superNames=[SomeTrait]] MODIFIER_LIST[public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=OnlyTrait] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=OnlyTrait] MODIFIER_LIST[public] VALUE_PARAMETER_LIST SUPER_TYPE_LIST @@ -235,7 +235,7 @@ PsiJetFileStubImpl[package=a] CLASS_BODY CLASS[classId=a/InheritingClasses.InheritAny.OnlyTraits, fqName=a.InheritingClasses.InheritAny.OnlyTraits, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=OnlyTraits, superNames=[SomeTrait, SomeTrait2]] MODIFIER_LIST[public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=OnlyTraits] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=OnlyTraits] MODIFIER_LIST[public] VALUE_PARAMETER_LIST SUPER_TYPE_LIST @@ -262,7 +262,7 @@ PsiJetFileStubImpl[package=a] CLASS_BODY CLASS[classId=a/InheritingClasses.InheritAny.TraitWithExplicitAny, fqName=a.InheritingClasses.InheritAny.TraitWithExplicitAny, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=TraitWithExplicitAny, superNames=[Any, SomeTrait]] MODIFIER_LIST[public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=TraitWithExplicitAny] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=TraitWithExplicitAny] MODIFIER_LIST[public] VALUE_PARAMETER_LIST SUPER_TYPE_LIST @@ -285,7 +285,7 @@ PsiJetFileStubImpl[package=a] CLASS_BODY CLASS[classId=a/InheritingClasses.InheritAny.TraitsWithExplicitAny, fqName=a.InheritingClasses.InheritAny.TraitsWithExplicitAny, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=TraitsWithExplicitAny, superNames=[SomeTrait2, Any, SomeTrait]] MODIFIER_LIST[public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=TraitsWithExplicitAny] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=TraitsWithExplicitAny] MODIFIER_LIST[public] VALUE_PARAMETER_LIST SUPER_TYPE_LIST @@ -318,7 +318,7 @@ PsiJetFileStubImpl[package=a] CLASS_BODY CLASS[classId=a/InheritingClasses.InheritFunctionType, fqName=a.InheritingClasses.InheritFunctionType, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=InheritFunctionType, superNames=[]] MODIFIER_LIST[abstract public] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=InheritFunctionType] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=InheritFunctionType] MODIFIER_LIST[public] VALUE_PARAMETER_LIST SUPER_TYPE_LIST diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/InheritingClasses/InheritingClasses.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/InheritingClasses/InheritingClasses.txt index 9a7eb15907b..e8abc587dc8 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/InheritingClasses/InheritingClasses.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/InheritingClasses/InheritingClasses.txt @@ -4,13 +4,13 @@ PsiJetFileStubImpl[package=a] IMPORT_LIST CLASS[classId=a/InheritingClasses, fqName=a.InheritingClasses, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=InheritingClasses, superNames=[]] MODIFIER_LIST[public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=InheritingClasses] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=InheritingClasses] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY CLASS[classId=a/InheritingClasses.A, fqName=a.InheritingClasses.A, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=A, superNames=[C]] MODIFIER_LIST[abstract public] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=A] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=A] MODIFIER_LIST[public] VALUE_PARAMETER_LIST VALUE_PARAMETER[fqName=null, hasDefaultValue=true, hasValOrVar=false, isMutable=false, name=c] @@ -69,7 +69,7 @@ PsiJetFileStubImpl[package=a] REFERENCE_EXPRESSION[referencedName=Int] CLASS[classId=a/InheritingClasses.B, fqName=a.InheritingClasses.B, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=B, superNames=[A]] MODIFIER_LIST[open public] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=B] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=B] MODIFIER_LIST[public] VALUE_PARAMETER_LIST SUPER_TYPE_LIST @@ -148,7 +148,7 @@ PsiJetFileStubImpl[package=a] CLASS_BODY CLASS[classId=a/InheritingClasses.G, fqName=a.InheritingClasses.G, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=G, superNames=[B, C, D, E]] MODIFIER_LIST[public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=G] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=G] MODIFIER_LIST[public] VALUE_PARAMETER_LIST SUPER_TYPE_LIST @@ -194,25 +194,25 @@ PsiJetFileStubImpl[package=a] CLASS_BODY CLASS[classId=a/InheritingClasses.InheritAny, fqName=a.InheritingClasses.InheritAny, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=InheritAny, superNames=[]] MODIFIER_LIST[public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=InheritAny] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=InheritAny] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY CLASS[classId=a/InheritingClasses.InheritAny.ExplicitAny, fqName=a.InheritingClasses.InheritAny.ExplicitAny, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=ExplicitAny, superNames=[]] MODIFIER_LIST[public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=ExplicitAny] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=ExplicitAny] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY CLASS[classId=a/InheritingClasses.InheritAny.ImplicitAny, fqName=a.InheritingClasses.InheritAny.ImplicitAny, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=ImplicitAny, superNames=[]] MODIFIER_LIST[public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=ImplicitAny] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=ImplicitAny] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY CLASS[classId=a/InheritingClasses.InheritAny.OnlyTrait, fqName=a.InheritingClasses.InheritAny.OnlyTrait, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=OnlyTrait, superNames=[SomeTrait]] MODIFIER_LIST[public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=OnlyTrait] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=OnlyTrait] MODIFIER_LIST[public] VALUE_PARAMETER_LIST SUPER_TYPE_LIST @@ -229,7 +229,7 @@ PsiJetFileStubImpl[package=a] CLASS_BODY CLASS[classId=a/InheritingClasses.InheritAny.OnlyTraits, fqName=a.InheritingClasses.InheritAny.OnlyTraits, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=OnlyTraits, superNames=[SomeTrait, SomeTrait2]] MODIFIER_LIST[public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=OnlyTraits] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=OnlyTraits] MODIFIER_LIST[public] VALUE_PARAMETER_LIST SUPER_TYPE_LIST @@ -262,7 +262,7 @@ PsiJetFileStubImpl[package=a] CLASS_BODY CLASS[classId=a/InheritingClasses.InheritAny.TraitWithExplicitAny, fqName=a.InheritingClasses.InheritAny.TraitWithExplicitAny, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=TraitWithExplicitAny, superNames=[Any, SomeTrait]] MODIFIER_LIST[public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=TraitWithExplicitAny] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=TraitWithExplicitAny] MODIFIER_LIST[public] VALUE_PARAMETER_LIST SUPER_TYPE_LIST @@ -285,7 +285,7 @@ PsiJetFileStubImpl[package=a] CLASS_BODY CLASS[classId=a/InheritingClasses.InheritAny.TraitsWithExplicitAny, fqName=a.InheritingClasses.InheritAny.TraitsWithExplicitAny, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=TraitsWithExplicitAny, superNames=[SomeTrait2, Any, SomeTrait]] MODIFIER_LIST[public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=TraitsWithExplicitAny] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=TraitsWithExplicitAny] MODIFIER_LIST[public] VALUE_PARAMETER_LIST SUPER_TYPE_LIST @@ -318,7 +318,7 @@ PsiJetFileStubImpl[package=a] CLASS_BODY CLASS[classId=a/InheritingClasses.InheritFunctionType, fqName=a.InheritingClasses.InheritFunctionType, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=InheritFunctionType, superNames=[]] MODIFIER_LIST[abstract public] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=InheritFunctionType] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=InheritFunctionType] MODIFIER_LIST[public] VALUE_PARAMETER_LIST SUPER_TYPE_LIST diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/InnerClassEnumEntry/InnerClassEnumEntry.k2.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/InnerClassEnumEntry/InnerClassEnumEntry.k2.txt index 13edbeab79e..e4674597503 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/InnerClassEnumEntry/InnerClassEnumEntry.k2.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/InnerClassEnumEntry/InnerClassEnumEntry.k2.txt @@ -3,7 +3,7 @@ PsiJetFileStubImpl[package=] IMPORT_LIST CLASS[classId=/InnerClassEnumEntry, fqName=InnerClassEnumEntry, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=InnerClassEnumEntry, superNames=[Enum]] MODIFIER_LIST[enum public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=InnerClassEnumEntry] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=InnerClassEnumEntry] MODIFIER_LIST[private] VALUE_PARAMETER_LIST SUPER_TYPE_LIST diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/InnerClassEnumEntry/InnerClassEnumEntry.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/InnerClassEnumEntry/InnerClassEnumEntry.txt index 13edbeab79e..e4674597503 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/InnerClassEnumEntry/InnerClassEnumEntry.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/InnerClassEnumEntry/InnerClassEnumEntry.txt @@ -3,7 +3,7 @@ PsiJetFileStubImpl[package=] IMPORT_LIST CLASS[classId=/InnerClassEnumEntry, fqName=InnerClassEnumEntry, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=InnerClassEnumEntry, superNames=[Enum]] MODIFIER_LIST[enum public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=InnerClassEnumEntry] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=InnerClassEnumEntry] MODIFIER_LIST[private] VALUE_PARAMETER_LIST SUPER_TYPE_LIST diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/InnerTypes/InnerTypes.k2.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/InnerTypes/InnerTypes.k2.txt index 7cb8ef046cf..1bc7587009d 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/InnerTypes/InnerTypes.k2.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/InnerTypes/InnerTypes.k2.txt @@ -7,7 +7,7 @@ PsiJetFileStubImpl[package=test] TYPE_PARAMETER_LIST TYPE_PARAMETER[fqName=null, isInVariance=false, isOutVariance=false, name=E] TYPE_PARAMETER[fqName=null, isInVariance=false, isOutVariance=false, name=F] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=InnerTypes] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=InnerTypes] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY @@ -62,7 +62,7 @@ PsiJetFileStubImpl[package=test] TYPE_PARAMETER_LIST TYPE_PARAMETER[fqName=null, isInVariance=false, isOutVariance=false, name=G] TYPE_PARAMETER[fqName=null, isInVariance=false, isOutVariance=false, name=H] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=Inner] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=Inner] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY @@ -70,7 +70,7 @@ PsiJetFileStubImpl[package=test] MODIFIER_LIST[inner public final] TYPE_PARAMETER_LIST TYPE_PARAMETER[fqName=null, isInVariance=false, isOutVariance=false, name=I] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=Inner3] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=Inner3] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY @@ -211,7 +211,7 @@ PsiJetFileStubImpl[package=test] REFERENCE_EXPRESSION[referencedName=Unit] CLASS[classId=test/InnerTypes.Inner2, fqName=test.InnerTypes.Inner2, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=Inner2, superNames=[]] MODIFIER_LIST[inner public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=Inner2] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=Inner2] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/InnerTypes/InnerTypes.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/InnerTypes/InnerTypes.txt index 7cb8ef046cf..1bc7587009d 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/InnerTypes/InnerTypes.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/InnerTypes/InnerTypes.txt @@ -7,7 +7,7 @@ PsiJetFileStubImpl[package=test] TYPE_PARAMETER_LIST TYPE_PARAMETER[fqName=null, isInVariance=false, isOutVariance=false, name=E] TYPE_PARAMETER[fqName=null, isInVariance=false, isOutVariance=false, name=F] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=InnerTypes] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=InnerTypes] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY @@ -62,7 +62,7 @@ PsiJetFileStubImpl[package=test] TYPE_PARAMETER_LIST TYPE_PARAMETER[fqName=null, isInVariance=false, isOutVariance=false, name=G] TYPE_PARAMETER[fqName=null, isInVariance=false, isOutVariance=false, name=H] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=Inner] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=Inner] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY @@ -70,7 +70,7 @@ PsiJetFileStubImpl[package=test] MODIFIER_LIST[inner public final] TYPE_PARAMETER_LIST TYPE_PARAMETER[fqName=null, isInVariance=false, isOutVariance=false, name=I] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=Inner3] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=Inner3] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY @@ -211,7 +211,7 @@ PsiJetFileStubImpl[package=test] REFERENCE_EXPRESSION[referencedName=Unit] CLASS[classId=test/InnerTypes.Inner2, fqName=test.InnerTypes.Inner2, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=Inner2, superNames=[]] MODIFIER_LIST[inner public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=Inner2] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=Inner2] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/LocalClass/LocalClass.k2.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/LocalClass/LocalClass.k2.txt index a48faecc0f4..bba03b0e91b 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/LocalClass/LocalClass.k2.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/LocalClass/LocalClass.k2.txt @@ -4,7 +4,7 @@ PsiJetFileStubImpl[package=test] IMPORT_LIST CLASS[classId=test/LocalClass, fqName=test.LocalClass, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=LocalClass, superNames=[]] MODIFIER_LIST[public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=LocalClass] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=LocalClass] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/LocalClass/LocalClass.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/LocalClass/LocalClass.txt index a48faecc0f4..bba03b0e91b 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/LocalClass/LocalClass.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/LocalClass/LocalClass.txt @@ -4,7 +4,7 @@ PsiJetFileStubImpl[package=test] IMPORT_LIST CLASS[classId=test/LocalClass, fqName=test.LocalClass, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=LocalClass, superNames=[]] MODIFIER_LIST[public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=LocalClass] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=LocalClass] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Modifiers/Modifiers.k2.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Modifiers/Modifiers.k2.txt index af8010be1ac..40e62f7a528 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Modifiers/Modifiers.k2.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Modifiers/Modifiers.k2.txt @@ -4,7 +4,7 @@ PsiJetFileStubImpl[package=test] IMPORT_LIST CLASS[classId=test/Modifiers, fqName=test.Modifiers, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=Modifiers, superNames=[]] MODIFIER_LIST[public final data] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=Modifiers] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=Modifiers] MODIFIER_LIST[public] VALUE_PARAMETER_LIST VALUE_PARAMETER[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=x] @@ -183,7 +183,7 @@ PsiJetFileStubImpl[package=test] REFERENCE_EXPRESSION[referencedName=String] CLASS[classId=test/Modifiers.Ann, fqName=test.Modifiers.Ann, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=Ann, superNames=[Annotation]] MODIFIER_LIST[public final annotation] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=Ann] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=Ann] MODIFIER_LIST[public] VALUE_PARAMETER_LIST SUPER_TYPE_LIST diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Modifiers/Modifiers.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Modifiers/Modifiers.txt index a6dfc0bb241..94899408dd9 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Modifiers/Modifiers.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Modifiers/Modifiers.txt @@ -4,7 +4,7 @@ PsiJetFileStubImpl[package=test] IMPORT_LIST CLASS[classId=test/Modifiers, fqName=test.Modifiers, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=Modifiers, superNames=[]] MODIFIER_LIST[public final data] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=Modifiers] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=Modifiers] MODIFIER_LIST[public] VALUE_PARAMETER_LIST VALUE_PARAMETER[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=x] @@ -183,7 +183,7 @@ PsiJetFileStubImpl[package=test] REFERENCE_EXPRESSION[referencedName=String] CLASS[classId=test/Modifiers.Ann, fqName=test.Modifiers.Ann, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=Ann, superNames=[Annotation]] MODIFIER_LIST[public final annotation] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=Ann] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=Ann] MODIFIER_LIST[public] VALUE_PARAMETER_LIST SUPER_TYPE_LIST diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/NamedCompanionObject/NamedCompanionObject.k2.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/NamedCompanionObject/NamedCompanionObject.k2.txt index 087e39bc9fa..aacf0eb39c5 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/NamedCompanionObject/NamedCompanionObject.k2.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/NamedCompanionObject/NamedCompanionObject.k2.txt @@ -4,7 +4,7 @@ PsiJetFileStubImpl[package=test] IMPORT_LIST CLASS[classId=test/NamedCompanionObject, fqName=test.NamedCompanionObject, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=NamedCompanionObject, superNames=[]] MODIFIER_LIST[public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=NamedCompanionObject] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=NamedCompanionObject] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY @@ -28,13 +28,13 @@ PsiJetFileStubImpl[package=test] REFERENCE_EXPRESSION[referencedName=Int] CLASS[classId=test/NamedCompanionObject.Named.A, fqName=test.NamedCompanionObject.Named.A, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=A, superNames=[]] MODIFIER_LIST[public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=A] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=A] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY CLASS[classId=test/NamedCompanionObject.Named.A.B, fqName=test.NamedCompanionObject.Named.A.B, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=B, superNames=[]] MODIFIER_LIST[public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=B] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=B] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY @@ -70,7 +70,7 @@ PsiJetFileStubImpl[package=test] REFERENCE_EXPRESSION[referencedName=Unit] CLASS[classId=test/NamedCompanionObject.B, fqName=test.NamedCompanionObject.B, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=B, superNames=[]] MODIFIER_LIST[public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=B] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=B] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY @@ -79,7 +79,7 @@ PsiJetFileStubImpl[package=test] CLASS_BODY CLASS[classId=test/NamedCompanionObject.B.NamedInB.C, fqName=test.NamedCompanionObject.B.NamedInB.C, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=C, superNames=[]] MODIFIER_LIST[public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=C] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=C] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY @@ -88,7 +88,7 @@ PsiJetFileStubImpl[package=test] CLASS_BODY CLASS[classId=test/NamedCompanionObject.B.NamedInB.C.NamedInC.D, fqName=test.NamedCompanionObject.B.NamedInB.C.NamedInC.D, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=D, superNames=[]] MODIFIER_LIST[public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=D] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=D] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY @@ -112,7 +112,7 @@ PsiJetFileStubImpl[package=test] REFERENCE_EXPRESSION[referencedName=Unit] CLASS[classId=test/NamedCompanionObject.B.NamedInB.C.NamedInC.D.Companion.En, fqName=test.NamedCompanionObject.B.NamedInB.C.NamedInC.D.Companion.En, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=En, superNames=[Enum]] MODIFIER_LIST[enum public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=En] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=En] MODIFIER_LIST[private] VALUE_PARAMETER_LIST SUPER_TYPE_LIST @@ -150,7 +150,7 @@ PsiJetFileStubImpl[package=test] CLASS_BODY CLASS[classId=test/NamedCompanionObject.B.NamedInB.C.NamedInC.D.Companion.Anno, fqName=test.NamedCompanionObject.B.NamedInB.C.NamedInC.D.Companion.Anno, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=Anno, superNames=[Annotation]] MODIFIER_LIST[public final annotation] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=Anno] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=Anno] MODIFIER_LIST[public] VALUE_PARAMETER_LIST SUPER_TYPE_LIST diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/NamedCompanionObject/NamedCompanionObject.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/NamedCompanionObject/NamedCompanionObject.txt index 5ba07cad34a..14ae81df64d 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/NamedCompanionObject/NamedCompanionObject.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/NamedCompanionObject/NamedCompanionObject.txt @@ -4,7 +4,7 @@ PsiJetFileStubImpl[package=test] IMPORT_LIST CLASS[classId=test/NamedCompanionObject, fqName=test.NamedCompanionObject, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=NamedCompanionObject, superNames=[]] MODIFIER_LIST[public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=NamedCompanionObject] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=NamedCompanionObject] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY @@ -28,13 +28,13 @@ PsiJetFileStubImpl[package=test] REFERENCE_EXPRESSION[referencedName=Int] CLASS[classId=test/NamedCompanionObject.Named.A, fqName=test.NamedCompanionObject.Named.A, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=A, superNames=[]] MODIFIER_LIST[public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=A] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=A] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY CLASS[classId=test/NamedCompanionObject.Named.A.B, fqName=test.NamedCompanionObject.Named.A.B, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=B, superNames=[]] MODIFIER_LIST[public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=B] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=B] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY @@ -70,7 +70,7 @@ PsiJetFileStubImpl[package=test] REFERENCE_EXPRESSION[referencedName=Unit] CLASS[classId=test/NamedCompanionObject.B, fqName=test.NamedCompanionObject.B, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=B, superNames=[]] MODIFIER_LIST[public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=B] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=B] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY @@ -79,7 +79,7 @@ PsiJetFileStubImpl[package=test] CLASS_BODY CLASS[classId=test/NamedCompanionObject.B.NamedInB.C, fqName=test.NamedCompanionObject.B.NamedInB.C, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=C, superNames=[]] MODIFIER_LIST[public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=C] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=C] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY @@ -88,7 +88,7 @@ PsiJetFileStubImpl[package=test] CLASS_BODY CLASS[classId=test/NamedCompanionObject.B.NamedInB.C.NamedInC.D, fqName=test.NamedCompanionObject.B.NamedInB.C.NamedInC.D, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=D, superNames=[]] MODIFIER_LIST[public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=D] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=D] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY @@ -112,7 +112,7 @@ PsiJetFileStubImpl[package=test] REFERENCE_EXPRESSION[referencedName=Unit] CLASS[classId=test/NamedCompanionObject.B.NamedInB.C.NamedInC.D.Companion.Anno, fqName=test.NamedCompanionObject.B.NamedInB.C.NamedInC.D.Companion.Anno, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=Anno, superNames=[Annotation]] MODIFIER_LIST[public final annotation] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=Anno] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=Anno] MODIFIER_LIST[public] VALUE_PARAMETER_LIST SUPER_TYPE_LIST @@ -125,7 +125,7 @@ PsiJetFileStubImpl[package=test] CLASS_BODY CLASS[classId=test/NamedCompanionObject.B.NamedInB.C.NamedInC.D.Companion.En, fqName=test.NamedCompanionObject.B.NamedInB.C.NamedInC.D.Companion.En, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=En, superNames=[Enum]] MODIFIER_LIST[enum public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=En] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=En] MODIFIER_LIST[private] VALUE_PARAMETER_LIST SUPER_TYPE_LIST diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/NestedClasses/NestedClasses.k2.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/NestedClasses/NestedClasses.k2.txt index c18a83de707..d576bde54d2 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/NestedClasses/NestedClasses.k2.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/NestedClasses/NestedClasses.k2.txt @@ -6,7 +6,7 @@ PsiJetFileStubImpl[package=test] MODIFIER_LIST[public final] TYPE_PARAMETER_LIST TYPE_PARAMETER[fqName=null, isInVariance=false, isOutVariance=false, name=TOuter] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=NestedClasses] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=NestedClasses] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY @@ -29,7 +29,7 @@ PsiJetFileStubImpl[package=test] MODIFIER_LIST[private final] TYPE_PARAMETER_LIST TYPE_PARAMETER[fqName=null, isInVariance=false, isOutVariance=false, name=TN] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=Nested] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=Nested] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY @@ -56,7 +56,7 @@ PsiJetFileStubImpl[package=test] MODIFIER_LIST[public final] TYPE_PARAMETER_LIST TYPE_PARAMETER[fqName=null, isInVariance=false, isOutVariance=false, name=TNN] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=NN] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=NN] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY @@ -86,7 +86,7 @@ PsiJetFileStubImpl[package=test] TYPE_REFERENCE USER_TYPE REFERENCE_EXPRESSION[referencedName=TN] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=NI] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=NI] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY @@ -113,7 +113,7 @@ PsiJetFileStubImpl[package=test] TYPE_REFERENCE USER_TYPE REFERENCE_EXPRESSION[referencedName=TOuter] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=Inner] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=Inner] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY @@ -133,7 +133,7 @@ PsiJetFileStubImpl[package=test] MODIFIER_LIST[inner private final] TYPE_PARAMETER_LIST TYPE_PARAMETER[fqName=null, isInVariance=false, isOutVariance=false, name=TII] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=II] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=II] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/NestedClasses/NestedClasses.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/NestedClasses/NestedClasses.txt index ce044d4c4b2..61dead30cfd 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/NestedClasses/NestedClasses.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/NestedClasses/NestedClasses.txt @@ -6,7 +6,7 @@ PsiJetFileStubImpl[package=test] MODIFIER_LIST[public final] TYPE_PARAMETER_LIST TYPE_PARAMETER[fqName=null, isInVariance=false, isOutVariance=false, name=TOuter] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=NestedClasses] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=NestedClasses] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY @@ -32,7 +32,7 @@ PsiJetFileStubImpl[package=test] TYPE_REFERENCE USER_TYPE REFERENCE_EXPRESSION[referencedName=TOuter] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=Inner] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=Inner] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY @@ -52,7 +52,7 @@ PsiJetFileStubImpl[package=test] MODIFIER_LIST[inner private final] TYPE_PARAMETER_LIST TYPE_PARAMETER[fqName=null, isInVariance=false, isOutVariance=false, name=TII] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=II] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=II] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY @@ -108,7 +108,7 @@ PsiJetFileStubImpl[package=test] MODIFIER_LIST[private final] TYPE_PARAMETER_LIST TYPE_PARAMETER[fqName=null, isInVariance=false, isOutVariance=false, name=TN] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=Nested] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=Nested] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY @@ -138,7 +138,7 @@ PsiJetFileStubImpl[package=test] TYPE_REFERENCE USER_TYPE REFERENCE_EXPRESSION[referencedName=TN] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=NI] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=NI] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY @@ -162,7 +162,7 @@ PsiJetFileStubImpl[package=test] MODIFIER_LIST[public final] TYPE_PARAMETER_LIST TYPE_PARAMETER[fqName=null, isInVariance=false, isOutVariance=false, name=TNN] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=NN] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=NN] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Objects/Objects.k2.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Objects/Objects.k2.txt index 6974c9010a3..3e043896cac 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Objects/Objects.k2.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Objects/Objects.k2.txt @@ -77,7 +77,7 @@ PsiJetFileStubImpl[package=] REFERENCE_EXPRESSION[referencedName=Unit] CLASS[classId=/Objects.NestedClass, fqName=Objects.NestedClass, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=NestedClass, superNames=[]] MODIFIER_LIST[open public] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=NestedClass] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=NestedClass] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Objects/Objects.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Objects/Objects.txt index 5dd5d6ad001..3089a868d7e 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Objects/Objects.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Objects/Objects.txt @@ -52,7 +52,7 @@ PsiJetFileStubImpl[package=] REFERENCE_EXPRESSION[referencedName=Unit] CLASS[classId=/Objects.NestedClass, fqName=Objects.NestedClass, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=NestedClass, superNames=[]] MODIFIER_LIST[open public] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=NestedClass] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=NestedClass] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/PrivateConstField/PrivateConstField.k2.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/PrivateConstField/PrivateConstField.k2.txt index ed7df89534f..8dcbf5dfecd 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/PrivateConstField/PrivateConstField.k2.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/PrivateConstField/PrivateConstField.k2.txt @@ -4,7 +4,7 @@ PsiJetFileStubImpl[package=test] IMPORT_LIST CLASS[classId=test/PrivateConstField, fqName=test.PrivateConstField, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=PrivateConstField, superNames=[]] MODIFIER_LIST[public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=PrivateConstField] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=PrivateConstField] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/PrivateConstField/PrivateConstField.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/PrivateConstField/PrivateConstField.txt index ed7df89534f..8dcbf5dfecd 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/PrivateConstField/PrivateConstField.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/PrivateConstField/PrivateConstField.txt @@ -4,7 +4,7 @@ PsiJetFileStubImpl[package=test] IMPORT_LIST CLASS[classId=test/PrivateConstField, fqName=test.PrivateConstField, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=PrivateConstField, superNames=[]] MODIFIER_LIST[public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=PrivateConstField] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=PrivateConstField] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/PrivateToThis/PrivateToThis.k2.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/PrivateToThis/PrivateToThis.k2.txt index 16f79f36f97..7ca0b2acc3d 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/PrivateToThis/PrivateToThis.k2.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/PrivateToThis/PrivateToThis.k2.txt @@ -7,7 +7,7 @@ PsiJetFileStubImpl[package=p] TYPE_PARAMETER_LIST TYPE_PARAMETER[fqName=null, isInVariance=true, isOutVariance=false, name=I] MODIFIER_LIST[in] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=PrivateToThis] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=PrivateToThis] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/PrivateToThis/PrivateToThis.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/PrivateToThis/PrivateToThis.txt index 5fc1ab85012..581242e4898 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/PrivateToThis/PrivateToThis.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/PrivateToThis/PrivateToThis.txt @@ -7,7 +7,7 @@ PsiJetFileStubImpl[package=p] TYPE_PARAMETER_LIST TYPE_PARAMETER[fqName=null, isInVariance=true, isOutVariance=false, name=I] MODIFIER_LIST[in] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=PrivateToThis] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=PrivateToThis] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Sealed/Sealed.k2.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Sealed/Sealed.k2.txt index 3214a8c7434..68ccb1d9216 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Sealed/Sealed.k2.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Sealed/Sealed.k2.txt @@ -4,13 +4,13 @@ PsiJetFileStubImpl[package=test] IMPORT_LIST CLASS[classId=test/Sealed, fqName=test.Sealed, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=Sealed, superNames=[]] MODIFIER_LIST[public sealed] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=Sealed] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=Sealed] MODIFIER_LIST[protected] VALUE_PARAMETER_LIST CLASS_BODY CLASS[classId=test/Sealed.Nested, fqName=test.Sealed.Nested, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=Nested, superNames=[Sealed]] MODIFIER_LIST[public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=Nested] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=Nested] MODIFIER_LIST[public] VALUE_PARAMETER_LIST SUPER_TYPE_LIST diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Sealed/Sealed.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Sealed/Sealed.txt index 3214a8c7434..68ccb1d9216 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Sealed/Sealed.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Sealed/Sealed.txt @@ -4,13 +4,13 @@ PsiJetFileStubImpl[package=test] IMPORT_LIST CLASS[classId=test/Sealed, fqName=test.Sealed, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=Sealed, superNames=[]] MODIFIER_LIST[public sealed] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=Sealed] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=Sealed] MODIFIER_LIST[protected] VALUE_PARAMETER_LIST CLASS_BODY CLASS[classId=test/Sealed.Nested, fqName=test.Sealed.Nested, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=Nested, superNames=[Sealed]] MODIFIER_LIST[public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=Nested] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=Nested] MODIFIER_LIST[public] VALUE_PARAMETER_LIST SUPER_TYPE_LIST diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/SealedInterface/SealedInterface.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/SealedInterface/SealedInterface.txt index 5625c10895d..586ad7803b2 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/SealedInterface/SealedInterface.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/SealedInterface/SealedInterface.txt @@ -7,7 +7,7 @@ PsiJetFileStubImpl[package=test] CLASS_BODY CLASS[classId=test/SealedInterface.Nested, fqName=test.SealedInterface.Nested, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=Nested, superNames=[SealedInterface]] MODIFIER_LIST[public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=Nested] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=Nested] MODIFIER_LIST[public] VALUE_PARAMETER_LIST SUPER_TYPE_LIST diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/SecondaryConstructors/SecondaryConstructors.k2.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/SecondaryConstructors/SecondaryConstructors.k2.txt index a9a3912087b..68758e1e0d5 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/SecondaryConstructors/SecondaryConstructors.k2.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/SecondaryConstructors/SecondaryConstructors.k2.txt @@ -4,7 +4,7 @@ PsiJetFileStubImpl[package=test] IMPORT_LIST CLASS[classId=test/SecondaryConstructors, fqName=test.SecondaryConstructors, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=SecondaryConstructors, superNames=[]] MODIFIER_LIST[public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=SecondaryConstructors] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=SecondaryConstructors] MODIFIER_LIST[public] VALUE_PARAMETER_LIST VALUE_PARAMETER[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=x] @@ -14,7 +14,7 @@ PsiJetFileStubImpl[package=test] REFERENCE_EXPRESSION[referencedName=kotlin] REFERENCE_EXPRESSION[referencedName=Boolean] CLASS_BODY - SECONDARY_CONSTRUCTOR[fqName=null, hasBody=true, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=SecondaryConstructors] + SECONDARY_CONSTRUCTOR[fqName=null, hasBody=true, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=SecondaryConstructors] MODIFIER_LIST[public] ANNOTATION_ENTRY[hasValueArguments=false, shortName=anno] CONSTRUCTOR_CALLEE @@ -30,7 +30,7 @@ PsiJetFileStubImpl[package=test] USER_TYPE REFERENCE_EXPRESSION[referencedName=kotlin] REFERENCE_EXPRESSION[referencedName=String] - SECONDARY_CONSTRUCTOR[fqName=null, hasBody=true, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=SecondaryConstructors] + SECONDARY_CONSTRUCTOR[fqName=null, hasBody=true, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=SecondaryConstructors] MODIFIER_LIST[private] VALUE_PARAMETER_LIST VALUE_PARAMETER[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=x] @@ -65,7 +65,7 @@ PsiJetFileStubImpl[package=test] REFERENCE_EXPRESSION[referencedName=io] REFERENCE_EXPRESSION[referencedName=Serializable] CLASS_BODY - SECONDARY_CONSTRUCTOR[fqName=null, hasBody=true, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=Inner] + SECONDARY_CONSTRUCTOR[fqName=null, hasBody=true, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=Inner] MODIFIER_LIST[public] VALUE_PARAMETER_LIST VALUE_PARAMETER[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=x] @@ -79,7 +79,7 @@ PsiJetFileStubImpl[package=test] CLASS[classId=test/SecondaryConstructors.Nested, fqName=test.SecondaryConstructors.Nested, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=Nested, superNames=[]] MODIFIER_LIST[public final] CLASS_BODY - SECONDARY_CONSTRUCTOR[fqName=null, hasBody=true, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=Nested] + SECONDARY_CONSTRUCTOR[fqName=null, hasBody=true, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=Nested] MODIFIER_LIST[public] ANNOTATION_ENTRY[hasValueArguments=false, shortName=anno] CONSTRUCTOR_CALLEE @@ -95,6 +95,6 @@ PsiJetFileStubImpl[package=test] USER_TYPE REFERENCE_EXPRESSION[referencedName=kotlin] REFERENCE_EXPRESSION[referencedName=Int] - SECONDARY_CONSTRUCTOR[fqName=null, hasBody=true, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=Nested] + SECONDARY_CONSTRUCTOR[fqName=null, hasBody=true, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=Nested] MODIFIER_LIST[internal] VALUE_PARAMETER_LIST diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/SecondaryConstructors/SecondaryConstructors.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/SecondaryConstructors/SecondaryConstructors.txt index a9a3912087b..68758e1e0d5 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/SecondaryConstructors/SecondaryConstructors.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/SecondaryConstructors/SecondaryConstructors.txt @@ -4,7 +4,7 @@ PsiJetFileStubImpl[package=test] IMPORT_LIST CLASS[classId=test/SecondaryConstructors, fqName=test.SecondaryConstructors, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=SecondaryConstructors, superNames=[]] MODIFIER_LIST[public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=SecondaryConstructors] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=SecondaryConstructors] MODIFIER_LIST[public] VALUE_PARAMETER_LIST VALUE_PARAMETER[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=x] @@ -14,7 +14,7 @@ PsiJetFileStubImpl[package=test] REFERENCE_EXPRESSION[referencedName=kotlin] REFERENCE_EXPRESSION[referencedName=Boolean] CLASS_BODY - SECONDARY_CONSTRUCTOR[fqName=null, hasBody=true, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=SecondaryConstructors] + SECONDARY_CONSTRUCTOR[fqName=null, hasBody=true, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=SecondaryConstructors] MODIFIER_LIST[public] ANNOTATION_ENTRY[hasValueArguments=false, shortName=anno] CONSTRUCTOR_CALLEE @@ -30,7 +30,7 @@ PsiJetFileStubImpl[package=test] USER_TYPE REFERENCE_EXPRESSION[referencedName=kotlin] REFERENCE_EXPRESSION[referencedName=String] - SECONDARY_CONSTRUCTOR[fqName=null, hasBody=true, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=SecondaryConstructors] + SECONDARY_CONSTRUCTOR[fqName=null, hasBody=true, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=SecondaryConstructors] MODIFIER_LIST[private] VALUE_PARAMETER_LIST VALUE_PARAMETER[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=x] @@ -65,7 +65,7 @@ PsiJetFileStubImpl[package=test] REFERENCE_EXPRESSION[referencedName=io] REFERENCE_EXPRESSION[referencedName=Serializable] CLASS_BODY - SECONDARY_CONSTRUCTOR[fqName=null, hasBody=true, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=Inner] + SECONDARY_CONSTRUCTOR[fqName=null, hasBody=true, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=Inner] MODIFIER_LIST[public] VALUE_PARAMETER_LIST VALUE_PARAMETER[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=x] @@ -79,7 +79,7 @@ PsiJetFileStubImpl[package=test] CLASS[classId=test/SecondaryConstructors.Nested, fqName=test.SecondaryConstructors.Nested, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=false, name=Nested, superNames=[]] MODIFIER_LIST[public final] CLASS_BODY - SECONDARY_CONSTRUCTOR[fqName=null, hasBody=true, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=Nested] + SECONDARY_CONSTRUCTOR[fqName=null, hasBody=true, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=Nested] MODIFIER_LIST[public] ANNOTATION_ENTRY[hasValueArguments=false, shortName=anno] CONSTRUCTOR_CALLEE @@ -95,6 +95,6 @@ PsiJetFileStubImpl[package=test] USER_TYPE REFERENCE_EXPRESSION[referencedName=kotlin] REFERENCE_EXPRESSION[referencedName=Int] - SECONDARY_CONSTRUCTOR[fqName=null, hasBody=true, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=Nested] + SECONDARY_CONSTRUCTOR[fqName=null, hasBody=true, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=Nested] MODIFIER_LIST[internal] VALUE_PARAMETER_LIST diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/TypeBoundsAndDelegationSpecifiers/TypeBoundsAndDelegationSpecifiers.k2.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/TypeBoundsAndDelegationSpecifiers/TypeBoundsAndDelegationSpecifiers.k2.txt index d5498a99ae5..3c87cf796b6 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/TypeBoundsAndDelegationSpecifiers/TypeBoundsAndDelegationSpecifiers.k2.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/TypeBoundsAndDelegationSpecifiers/TypeBoundsAndDelegationSpecifiers.k2.txt @@ -18,7 +18,7 @@ PsiJetFileStubImpl[package=test] USER_TYPE REFERENCE_EXPRESSION[referencedName=test] REFERENCE_EXPRESSION[referencedName=T] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=TypeBoundsAndDelegationSpecifiers] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=TypeBoundsAndDelegationSpecifiers] MODIFIER_LIST[public] VALUE_PARAMETER_LIST SUPER_TYPE_LIST diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/TypeBoundsAndDelegationSpecifiers/TypeBoundsAndDelegationSpecifiers.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/TypeBoundsAndDelegationSpecifiers/TypeBoundsAndDelegationSpecifiers.txt index d5498a99ae5..3c87cf796b6 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/TypeBoundsAndDelegationSpecifiers/TypeBoundsAndDelegationSpecifiers.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/TypeBoundsAndDelegationSpecifiers/TypeBoundsAndDelegationSpecifiers.txt @@ -18,7 +18,7 @@ PsiJetFileStubImpl[package=test] USER_TYPE REFERENCE_EXPRESSION[referencedName=test] REFERENCE_EXPRESSION[referencedName=T] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=TypeBoundsAndDelegationSpecifiers] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=TypeBoundsAndDelegationSpecifiers] MODIFIER_LIST[public] VALUE_PARAMETER_LIST SUPER_TYPE_LIST diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/TypeModifiers/TypeModifiers.k2.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/TypeModifiers/TypeModifiers.k2.txt index ccf72cc88a7..ccd5c9ebd9d 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/TypeModifiers/TypeModifiers.k2.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/TypeModifiers/TypeModifiers.k2.txt @@ -3,7 +3,7 @@ PsiJetFileStubImpl[package=] IMPORT_LIST CLASS[classId=/TypeModifiers, fqName=TypeModifiers, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=TypeModifiers, superNames=[]] MODIFIER_LIST[public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=TypeModifiers] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=TypeModifiers] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/TypeModifiers/TypeModifiers.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/TypeModifiers/TypeModifiers.txt index 25bd81f0684..fc67db7bc02 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/TypeModifiers/TypeModifiers.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/TypeModifiers/TypeModifiers.txt @@ -3,7 +3,7 @@ PsiJetFileStubImpl[package=] IMPORT_LIST CLASS[classId=/TypeModifiers, fqName=TypeModifiers, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=TypeModifiers, superNames=[]] MODIFIER_LIST[public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=TypeModifiers] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=TypeModifiers] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/TypeParams/TypeParams.k2.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/TypeParams/TypeParams.k2.txt index 4608aa114dc..b3863c10aa5 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/TypeParams/TypeParams.k2.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/TypeParams/TypeParams.k2.txt @@ -44,7 +44,7 @@ PsiJetFileStubImpl[package=test] TYPE_REFERENCE USER_TYPE REFERENCE_EXPRESSION[referencedName=T6] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=TypeParams] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=TypeParams] MODIFIER_LIST[public] VALUE_PARAMETER_LIST TYPE_CONSTRAINT_LIST diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/TypeParams/TypeParams.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/TypeParams/TypeParams.txt index 7897cca0a6d..331f73e370e 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/TypeParams/TypeParams.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/TypeParams/TypeParams.txt @@ -44,7 +44,7 @@ PsiJetFileStubImpl[package=test] TYPE_REFERENCE USER_TYPE REFERENCE_EXPRESSION[referencedName=T6] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=TypeParams] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=TypeParams] MODIFIER_LIST[public] VALUE_PARAMETER_LIST TYPE_CONSTRAINT_LIST diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Types/Types.k2.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Types/Types.k2.txt index 6f2c9193657..7ff50ff577a 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Types/Types.k2.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Types/Types.k2.txt @@ -4,7 +4,7 @@ PsiJetFileStubImpl[package=test] IMPORT_LIST CLASS[classId=test/Types, fqName=test.Types, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=Types, superNames=[]] MODIFIER_LIST[abstract public] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=Types] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=Types] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Types/Types.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Types/Types.txt index c8a32278b4f..55dc26478be 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Types/Types.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/Types/Types.txt @@ -4,7 +4,7 @@ PsiJetFileStubImpl[package=test] IMPORT_LIST CLASS[classId=test/Types, fqName=test.Types, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=Types, superNames=[]] MODIFIER_LIST[abstract public] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=Types] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=Types] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY diff --git a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/UnderscoreParameterName/UnderscoreParameterName.txt b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/UnderscoreParameterName/UnderscoreParameterName.txt index 88c38535d13..76ed90dc607 100644 --- a/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/UnderscoreParameterName/UnderscoreParameterName.txt +++ b/analysis/decompiled/decompiler-to-file-stubs/testData/clsFileStubBuilder/UnderscoreParameterName/UnderscoreParameterName.txt @@ -4,7 +4,7 @@ PsiJetFileStubImpl[package=test] IMPORT_LIST CLASS[classId=test/UnderscoreParameterName, fqName=test.UnderscoreParameterName, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=UnderscoreParameterName, superNames=[]] MODIFIER_LIST[public final] - PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExtension=false, isTopLevel=false, name=UnderscoreParameterName] + PRIMARY_CONSTRUCTOR[fqName=null, hasBody=false, isDelegatedCallToThis=false, isExplicitDelegationCall=false, isExtension=false, isTopLevel=false, name=UnderscoreParameterName] MODIFIER_LIST[public] VALUE_PARAMETER_LIST CLASS_BODY diff --git a/analysis/decompiled/decompiler-to-stubs/src/org/jetbrains/kotlin/analysis/decompiler/stub/CallableClsStubBuilder.kt b/analysis/decompiled/decompiler-to-stubs/src/org/jetbrains/kotlin/analysis/decompiler/stub/CallableClsStubBuilder.kt index a1765deb1cb..0f57d34b2ed 100644 --- a/analysis/decompiled/decompiler-to-stubs/src/org/jetbrains/kotlin/analysis/decompiler/stub/CallableClsStubBuilder.kt +++ b/analysis/decompiled/decompiler-to-stubs/src/org/jetbrains/kotlin/analysis/decompiler/stub/CallableClsStubBuilder.kt @@ -462,9 +462,17 @@ private class ConstructorClsStubBuilder( // delegated call is not to this (as there is no this keyword) and it has body (while primary does not have one) // This info is anyway irrelevant for the purposes these stubs are used return if (Flags.IS_SECONDARY.get(constructorProto.flags)) - KotlinConstructorStubImpl(parent, KtStubElementTypes.SECONDARY_CONSTRUCTOR, name, hasBody = true, isDelegatedCallToThis = false) + KotlinConstructorStubImpl( + parent, KtStubElementTypes.SECONDARY_CONSTRUCTOR, name, hasBody = true, + isDelegatedCallToThis = false, + isExplicitDelegationCall = false, + ) else - KotlinConstructorStubImpl(parent, KtStubElementTypes.PRIMARY_CONSTRUCTOR, name, hasBody = false, isDelegatedCallToThis = false) + KotlinConstructorStubImpl( + parent, KtStubElementTypes.PRIMARY_CONSTRUCTOR, name, hasBody = false, + isDelegatedCallToThis = false, + isExplicitDelegationCall = false, + ) } } diff --git a/compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/PsiRawFirBuilder.kt b/compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/PsiRawFirBuilder.kt index c4f2126b919..5108ece7168 100644 --- a/compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/PsiRawFirBuilder.kt +++ b/compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/PsiRawFirBuilder.kt @@ -2006,14 +2006,12 @@ open class PsiRawFirBuilder( } dispatchReceiverType = owner.obtainDispatchReceiverForConstructor() contextReceivers.addAll(convertContextReceivers(owner.contextReceivers)) - val delegationCall = getDelegationCall() - val hasExplicitDelegationCall = delegationCall.textLength > 0 - if (!owner.hasModifier(EXTERNAL_KEYWORD) || hasExplicitDelegationCall) { + if (!owner.hasModifier(EXTERNAL_KEYWORD) || isExplicitDelegationCall()) { delegatedConstructor = buildOrLazyDelegatedConstructorCall( isThis = isDelegatedCallToThis(), constructedTypeRef = delegatedTypeRef, ) { - delegationCall.convert(delegatedTypeRef) + getDelegationCall().convert(delegatedTypeRef) } } this@PsiRawFirBuilder.context.firFunctionTargets += target diff --git a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/annotation.kt b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/annotation.kt index 986f843ab26..f2cc39451c7 100644 --- a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/annotation.kt +++ b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/annotation.kt @@ -1,4 +1,3 @@ -// IGNORE_TREE_ACCESS: KT-65268 @Target( AnnotationTarget.CLASS, AnnotationTarget.PROPERTY, diff --git a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/classWithWrongSuperCall.kt b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/classWithWrongSuperCall.kt index d2d558d82fd..a1f38602ea3 100644 --- a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/classWithWrongSuperCall.kt +++ b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/classWithWrongSuperCall.kt @@ -1,4 +1,3 @@ -// IGNORE_TREE_ACCESS: KT-65268 open class A(init: A.() -> Unit) { val prop: String = "" } diff --git a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/constructorInObject.kt b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/constructorInObject.kt index c6781f3bd22..98fcf0c9e1f 100644 --- a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/constructorInObject.kt +++ b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/constructorInObject.kt @@ -1,4 +1,3 @@ -// IGNORE_TREE_ACCESS: KT-65268 object A { constructor() init {} diff --git a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/constructorWithAnnotations.kt b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/constructorWithAnnotations.kt index 1942ecf5ad0..d12f76aea68 100644 --- a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/constructorWithAnnotations.kt +++ b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/constructorWithAnnotations.kt @@ -1,4 +1,3 @@ -// IGNORE_TREE_ACCESS: KT-65268 class A { constructor(param: @Anno("parameter type $prop") List<@Anno("nested parameter type $prop") Collection<@Anno("nested nested parameter type $prop") String>> = @Anno("defaultValue $prop") fun(i: @Anno("anonymousFunction parameter type $prop") Int): @Anno("anonymousFunction return type $prop") Int {}) } \ No newline at end of file diff --git a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/constructorWithLocalDeclarations.kt b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/constructorWithLocalDeclarations.kt index 18ed72f6ffc..598bd138676 100644 --- a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/constructorWithLocalDeclarations.kt +++ b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/constructorWithLocalDeclarations.kt @@ -1,4 +1,3 @@ -// IGNORE_TREE_ACCESS: KT-65268 package util class A { diff --git a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/noParameterType/noParameterTypRefInSecondaryConstructor.kt b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/noParameterType/noParameterTypRefInSecondaryConstructor.kt index 9c07e7e0fdf..8c5f0069c2c 100644 --- a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/noParameterType/noParameterTypRefInSecondaryConstructor.kt +++ b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/noParameterType/noParameterTypRefInSecondaryConstructor.kt @@ -1,4 +1,3 @@ -// IGNORE_TREE_ACCESS: KT-65268 class C { constructor(x) {} } \ No newline at end of file diff --git a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/noPrimaryConstructor.kt b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/noPrimaryConstructor.kt index c9da03146e2..fbd6b4e236e 100644 --- a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/noPrimaryConstructor.kt +++ b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/noPrimaryConstructor.kt @@ -1,4 +1,3 @@ -// IGNORE_TREE_ACCESS: KT-65268 class NoPrimary { val x: String diff --git a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/secondaryConstructor.kt b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/secondaryConstructor.kt index 5797c3d1101..d9e3c4eb00b 100644 --- a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/secondaryConstructor.kt +++ b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/secondaryConstructor.kt @@ -1,4 +1,3 @@ -// IGNORE_TREE_ACCESS: KT-65268 package util @Target(AnnotationTarget.TYPE) diff --git a/compiler/psi/src/org/jetbrains/kotlin/psi/KtConstructor.kt b/compiler/psi/src/org/jetbrains/kotlin/psi/KtConstructor.kt index 38a68a32eaf..7770d1fe39e 100644 --- a/compiler/psi/src/org/jetbrains/kotlin/psi/KtConstructor.kt +++ b/compiler/psi/src/org/jetbrains/kotlin/psi/KtConstructor.kt @@ -64,6 +64,15 @@ abstract class KtConstructor> : KtDeclarationStub false + is KtSecondaryConstructor -> getDelegationCallOrNull()?.isImplicit == false + else -> throw IllegalStateException("Unknown constructor type: $this") + } + } + override fun hasBody(): Boolean { stub?.let { return it.hasBody() } return bodyExpression != null diff --git a/compiler/psi/src/org/jetbrains/kotlin/psi/stubs/KotlinStubVersions.kt b/compiler/psi/src/org/jetbrains/kotlin/psi/stubs/KotlinStubVersions.kt index fc3cb8f8461..4368127d729 100644 --- a/compiler/psi/src/org/jetbrains/kotlin/psi/stubs/KotlinStubVersions.kt +++ b/compiler/psi/src/org/jetbrains/kotlin/psi/stubs/KotlinStubVersions.kt @@ -12,12 +12,12 @@ object KotlinStubVersions { // Though only kotlin declarations (no code in the bodies) are stubbed, please do increase this version // if you are not 100% sure it can be avoided. // Increasing this version will lead to reindexing of all kotlin source files on the first IDE startup with the new version. - const val SOURCE_STUB_VERSION = 158 + const val SOURCE_STUB_VERSION = 159 // Binary stub version should be increased if stub format (org.jetbrains.kotlin.psi.stubs.impl) is changed // or changes are made to the core stub building code (org.jetbrains.kotlin.idea.decompiler.stubBuilder). // Increasing this version will lead to reindexing of all binary files that are potentially kotlin binaries (including all class files). - private const val BINARY_STUB_VERSION = 96 + private const val BINARY_STUB_VERSION = 97 // Classfile stub version should be increased if changes are made to classfile stub building subsystem (org.jetbrains.kotlin.idea.decompiler.classFile) // Increasing this version will lead to reindexing of all classfiles. diff --git a/compiler/psi/src/org/jetbrains/kotlin/psi/stubs/StubInterfaces.kt b/compiler/psi/src/org/jetbrains/kotlin/psi/stubs/StubInterfaces.kt index e1b3ca414eb..7ec110ee4f2 100644 --- a/compiler/psi/src/org/jetbrains/kotlin/psi/stubs/StubInterfaces.kt +++ b/compiler/psi/src/org/jetbrains/kotlin/psi/stubs/StubInterfaces.kt @@ -91,6 +91,7 @@ interface KotlinConstructorStub> : KotlinCallableStubBase { fun hasBody(): Boolean fun isDelegatedCallToThis(): Boolean + fun isExplicitDelegationCall(): Boolean } interface KotlinImportAliasStub : StubElement { diff --git a/compiler/psi/src/org/jetbrains/kotlin/psi/stubs/elements/KtConstructorElementType.kt b/compiler/psi/src/org/jetbrains/kotlin/psi/stubs/elements/KtConstructorElementType.kt index 24bda209fa0..8590ebf885c 100644 --- a/compiler/psi/src/org/jetbrains/kotlin/psi/stubs/elements/KtConstructorElementType.kt +++ b/compiler/psi/src/org/jetbrains/kotlin/psi/stubs/elements/KtConstructorElementType.kt @@ -12,7 +12,6 @@ import com.intellij.util.io.StringRef import org.jetbrains.annotations.NonNls import org.jetbrains.kotlin.psi.KtConstructor import org.jetbrains.kotlin.psi.stubs.KotlinConstructorStub -import org.jetbrains.kotlin.psi.stubs.elements.StubIndexService.Companion.getInstance import java.io.IOException abstract class KtConstructorElementType>( @@ -25,14 +24,18 @@ abstract class KtConstructorElementType>( nameRef: StringRef?, hasBody: Boolean, isDelegatedCallToThis: Boolean, + isExplicitDelegationCall: Boolean, ): KotlinConstructorStub protected abstract fun isDelegatedCallToThis(constructor: T): Boolean + protected abstract fun isExplicitDelegationCall(constructor: T): Boolean + override fun createStub(psi: T, parentStub: StubElement<*>): KotlinConstructorStub { val hasBody = psi.hasBody() val isDelegatedCallToThis = isDelegatedCallToThis(psi) - return newStub(parentStub, StringRef.fromString(psi.name), hasBody, isDelegatedCallToThis) + val isExplicitDelegationCall = isExplicitDelegationCall(psi) + return newStub(parentStub, StringRef.fromString(psi.name), hasBody, isDelegatedCallToThis, isExplicitDelegationCall) } @Throws(IOException::class) @@ -40,6 +43,7 @@ abstract class KtConstructorElementType>( dataStream.writeName(stub.name) dataStream.writeBoolean(stub.hasBody()) dataStream.writeBoolean(stub.isDelegatedCallToThis()) + dataStream.writeBoolean(stub.isExplicitDelegationCall()) } @Throws(IOException::class) @@ -47,7 +51,8 @@ abstract class KtConstructorElementType>( val name = dataStream.readName() val hasBody = dataStream.readBoolean() val isDelegatedCallToThis = dataStream.readBoolean() - return newStub(parentStub, name, hasBody, isDelegatedCallToThis) + val isExplicitDelegationCall = dataStream.readBoolean() + return newStub(parentStub, name, hasBody, isDelegatedCallToThis, isExplicitDelegationCall) } override fun indexStub(stub: KotlinConstructorStub, sink: IndexSink) { diff --git a/compiler/psi/src/org/jetbrains/kotlin/psi/stubs/elements/KtPrimaryConstructorElementType.kt b/compiler/psi/src/org/jetbrains/kotlin/psi/stubs/elements/KtPrimaryConstructorElementType.kt index cf73b369236..0217cf262a1 100644 --- a/compiler/psi/src/org/jetbrains/kotlin/psi/stubs/elements/KtPrimaryConstructorElementType.kt +++ b/compiler/psi/src/org/jetbrains/kotlin/psi/stubs/elements/KtPrimaryConstructorElementType.kt @@ -17,11 +17,14 @@ class KtPrimaryConstructorElementType(debugName: String) : nameRef: StringRef?, hasBody: Boolean, isDelegatedCallToThis: Boolean, + isExplicitDelegationCall: Boolean, ): KotlinConstructorStub { return KotlinConstructorStubImpl( - parentStub, KtStubElementTypes.PRIMARY_CONSTRUCTOR, nameRef, hasBody, isDelegatedCallToThis + parentStub, KtStubElementTypes.PRIMARY_CONSTRUCTOR, nameRef, hasBody, isDelegatedCallToThis, isExplicitDelegationCall ) } override fun isDelegatedCallToThis(constructor: KtPrimaryConstructor) = false + + override fun isExplicitDelegationCall(constructor: KtPrimaryConstructor) = false } \ No newline at end of file diff --git a/compiler/psi/src/org/jetbrains/kotlin/psi/stubs/elements/KtSecondaryConstructorElementType.kt b/compiler/psi/src/org/jetbrains/kotlin/psi/stubs/elements/KtSecondaryConstructorElementType.kt index 0ab1eb18a5e..e8c64d10986 100644 --- a/compiler/psi/src/org/jetbrains/kotlin/psi/stubs/elements/KtSecondaryConstructorElementType.kt +++ b/compiler/psi/src/org/jetbrains/kotlin/psi/stubs/elements/KtSecondaryConstructorElementType.kt @@ -17,11 +17,14 @@ class KtSecondaryConstructorElementType(debugName: String) : nameRef: StringRef?, hasBody: Boolean, isDelegatedCallToThis: Boolean, + isExplicitDelegationCall: Boolean, ): KotlinConstructorStub { return KotlinConstructorStubImpl( - parentStub, KtStubElementTypes.SECONDARY_CONSTRUCTOR, nameRef, hasBody, isDelegatedCallToThis + parentStub, KtStubElementTypes.SECONDARY_CONSTRUCTOR, nameRef, hasBody, isDelegatedCallToThis, isExplicitDelegationCall ) } override fun isDelegatedCallToThis(constructor: KtSecondaryConstructor) = constructor.getDelegationCallOrNull()?.isCallToThis ?: true + + override fun isExplicitDelegationCall(constructor: KtSecondaryConstructor) = constructor.getDelegationCallOrNull()?.isImplicit == false } \ No newline at end of file diff --git a/compiler/psi/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinConstructorStubImpl.kt b/compiler/psi/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinConstructorStubImpl.kt index e02f380f3a3..a0ec7d09c49 100644 --- a/compiler/psi/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinConstructorStubImpl.kt +++ b/compiler/psi/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinConstructorStubImpl.kt @@ -18,6 +18,7 @@ class KotlinConstructorStubImpl>( private val containingClassName: StringRef?, private val hasBody: Boolean, private val isDelegatedCallToThis: Boolean, + private val isExplicitDelegationCall: Boolean, ) : KotlinStubBaseImpl(parent, elementType), KotlinConstructorStub { override fun getFqName() = null override fun getName() = StringRef.toString(containingClassName) @@ -25,4 +26,5 @@ class KotlinConstructorStubImpl>( override fun isExtension() = false override fun hasBody() = hasBody override fun isDelegatedCallToThis() = isDelegatedCallToThis + override fun isExplicitDelegationCall() = isExplicitDelegationCall }