From 5fe3fa878e493200f745ff384edb198663aa3580 Mon Sep 17 00:00:00 2001 From: Ivan Kylchik Date: Fri, 1 Mar 2024 13:31:47 +0100 Subject: [PATCH] [Test] Fix LL FIR test data after introducing new `CONSTANT_EVALUATION` phase #KT-64151 --- .../lazyResolve/annotationArgumentsMix.txt | 46 ++++++++ .../annotationArgumentsMixScript.txt | 55 ++++++++- ...onClassWithJavaTarget.out_of_src_roots.txt | 9 ++ .../annotationClassWithJavaTarget.txt | 9 ++ .../annotationClassWithJavaTargetScript.txt | 15 ++- .../annotationFromImplicitJavaType.txt | 14 +++ ...FromImplicitJavaTypeWithJavaAnnotation.txt | 14 +++ .../annotationInsideWhereFunction.txt | 19 ++++ .../annotationInsideWhereProperty.txt | 20 ++++ .../lazyResolve/annotationOnLocalClass.txt | 27 +++++ .../annotationOnLocalClassScript.txt | 35 +++++- .../lazyResolve/annotationParameters.txt | 39 +++++++ .../annotationParametersScript.txt | 47 +++++++- .../annotationWithTypeArgument.txt | 14 +++ .../annotationWithTypeArgumentScript.txt | 21 +++- .../testData/lazyResolve/annotations.txt | 6 + .../lazyResolve/annotationsScript.txt | 11 ++ ...ithAnnotatedParameter.out_of_src_roots.txt | 21 ++++ ...nonymousFunctionWithAnnotatedParameter.txt | 21 ++++ ...thAnnotatedParameter2.out_of_src_roots.txt | 21 ++++ ...onymousFunctionWithAnnotatedParameter2.txt | 21 ++++ ...sFunctionWithAnnotatedParameter2Script.txt | 29 ++++- ...erOnImplicitTypePhase.out_of_src_roots.txt | 23 ++++ ...hAnnotatedParameterOnImplicitTypePhase.txt | 23 ++++ ...atedParameterOnImplicitTypePhaseScript.txt | 31 ++++- ...usFunctionWithAnnotatedParameterScript.txt | 29 ++++- .../testData/lazyResolve/classMembers.txt | 20 ++++ .../lazyResolve/classMembersScript.txt | 26 ++++- .../testData/lazyResolve/classes/actual.txt | 23 ++++ ...otationWithArgumentInsideSuperTypeCall.txt | 17 +++ ...hArgumentInsideSuperTypeCallUnresolved.txt | 9 ++ .../annotationWithConstantFromNestedClass.txt | 35 ++++++ .../classes/annotationWithTarget.txt | 21 ++++ .../classes/annotationWithTargetScript.txt | 28 ++++- .../classes/classDelegatedInCommonCode.txt | 16 +++ .../classes/classWithTypeParameters.txt | 9 ++ .../classes/classWithTypeParametersScript.txt | 14 +++ .../compilerRequiredAnnotationConflict.txt | 33 ++++++ .../compilerRequiredAnnotationConflict2.txt | 19 ++++ .../dataClass/component1TypeCollision.txt | 29 +++++ .../component1TypeCollisionScript.txt | 35 ++++++ .../classes/dataClass/copyTypeCollision.txt | 29 +++++ .../dataClass/copyTypeCollisionScript.txt | 36 +++++- .../dataClass/parameterTypeCollision.txt | 29 +++++ .../parameterTypeCollisionScript.txt | 36 +++++- .../dataClass/propertyTypeCollision.txt | 29 +++++ .../dataClass/propertyTypeCollisionScript.txt | 36 +++++- .../classes/functionInValueClass.txt | 15 +++ .../classes/functionInValueClassScript.txt | 21 +++- .../classes/hierarchyWithOverride.txt | 29 +++++ .../hierarchyWithOverrideAndNestedClass.txt | 70 ++++++++++++ .../hierarchyWithOverrideAndNestedClass2.txt | 70 ++++++++++++ ...archyWithOverrideAndNestedClass2Script.txt | 79 ++++++++++++- .../hierarchyWithOverrideAndNestedClass3.txt | 70 ++++++++++++ ...archyWithOverrideAndNestedClass3Script.txt | 79 ++++++++++++- .../hierarchyWithOverrideAndNestedClass4.txt | 70 ++++++++++++ ...archyWithOverrideAndNestedClass4Script.txt | 78 +++++++++++++ ...rarchyWithOverrideAndNestedClassScript.txt | 79 ++++++++++++- .../classes/hierarchyWithOverrideScript.txt | 37 +++++- .../lazyResolve/classes/nestedClass.txt | 28 +++++ .../lazyResolve/classes/nestedClassScript.txt | 36 +++++- .../nestedClassWithPropertiesOverrides.txt | 24 ++++ ...stedClassWithPropertiesOverridesScript.txt | 31 ++++- .../classes/simpleLoopInOverride.txt | 15 +++ .../classes/simpleLoopInOverride2.txt | 15 +++ .../classes/simpleLoopInOverride2Script.txt | 23 +++- .../classes/simpleLoopInOverrideScript.txt | 23 +++- .../classes/superTypeCallNameClash.txt | 22 ++++ ...erTypeCallNameClashImplicitConstructor.txt | 22 ++++ ...CallNameClashImplicitConstructorScript.txt | 29 ++++- .../classes/superTypeCallNameClashScript.txt | 28 +++++ .../classes/superTypeCallNestedNameClash.txt | 22 ++++ ...CallNestedNameClashImplicitConstructor.txt | 22 ++++ ...stedNameClashImplicitConstructorScript.txt | 28 +++++ .../superTypeCallNestedNameClashScript.txt | 29 ++++- ...compilerRequiredAnnotationOnLocalClass.txt | 19 ++++ ...erRequiredAnnotationOnLocalClassScript.txt | 24 ++++ ...mpilerRequiredAnnotationsOnConstructor.txt | 21 ++++ ...quiredAnnotationsOnConstructorProperty.txt | 21 ++++ ...AnnotationsOnConstructorPropertyScript.txt | 28 ++++- ...RequiredAnnotationsOnConstructorScript.txt | 28 ++++- .../compilerRequiredAnnotationsOnFunction.txt | 14 +++ ...lerRequiredAnnotationsOnFunctionScript.txt | 21 +++- .../compilerRequiredAnnotationsOnProperty.txt | 19 ++++ ...onsOnPropertyDelegate.out_of_src_roots.txt | 19 ++++ ...rRequiredAnnotationsOnPropertyDelegate.txt | 19 ++++ ...redAnnotationsOnPropertyDelegateScript.txt | 26 ++++- ...lerRequiredAnnotationsOnPropertyScript.txt | 26 ++++- .../lazyResolve/complexLocalHierarchy.txt | 28 +++++ .../complexLocalHierarchyScript.txt | 35 +++++- .../lazyResolve/complexRedeclaration.txt | 92 +++++++++++++++ .../complexRedeclarationScript.txt | 106 +++++++++++++++++- .../testData/lazyResolve/cyclicHierarchy.txt | 15 +++ .../testData/lazyResolve/cyclicHierarchy2.txt | 15 +++ .../lazyResolve/cyclicHierarchy2Script.txt | 26 ++++- .../testData/lazyResolve/cyclicHierarchy3.txt | 19 ++++ .../lazyResolve/cyclicHierarchy3Script.txt | 32 +++++- .../lazyResolve/cyclicHierarchyScript.txt | 26 ++++- .../lazyResolve/cyclicNestedHierarchy.txt | 22 ++++ .../lazyResolve/cyclicNestedHierarchy2.txt | 22 ++++ .../cyclicNestedHierarchy2Script.txt | 29 ++++- .../cyclicNestedHierarchyScript.txt | 29 ++++- .../testData/lazyResolve/dataClassCopy.txt | 21 ++++ .../lazyResolve/dataClassCopyScript.txt | 27 ++++- .../testData/lazyResolve/dataComponent2.txt | 21 ++++ .../lazyResolve/dataComponent2Script.txt | 27 ++++- .../lazyResolve/delegateWithImplicitType.txt | 19 ++++ ...gateWithImplicitTypeInDifferentModules.txt | 21 ++++ .../delegateWithImplicitTypeScript.txt | 26 ++++- .../testData/lazyResolve/delegatedField.txt | 23 ++++ .../delegatedFieldNestedNameClash.txt | 21 ++++ .../delegatedFieldNestedNameClashScript.txt | 28 ++++- ...tedFieldNestedNameClashWithNestedTypes.txt | 21 ++++ ...ldNestedNameClashWithNestedTypesScript.txt | 28 ++++- .../lazyResolve/delegatedFieldScript.txt | 31 ++++- .../testData/lazyResolve/delegates.txt | 22 ++++ .../testData/lazyResolve/delegatesScript.txt | 34 +++++- .../testData/lazyResolve/destructuring.txt | 44 ++++++++ .../lazyResolve/destructuringFirstEntry.txt | 44 ++++++++ .../lazyResolve/destructuringSecondEntry.txt | 44 ++++++++ .../testData/lazyResolve/enumEntries.txt | 19 ++++ .../lazyResolve/enumEntriesScript.txt | 25 ++++- .../testData/lazyResolve/enumEntry.txt | 25 +++++ .../testData/lazyResolve/enumEntryScript.txt | 32 +++++- .../testData/lazyResolve/enumValueOf.txt | 19 ++++ .../lazyResolve/enumValueOfScript.txt | 25 ++++- .../testData/lazyResolve/enumValues.txt | 19 ++++ .../testData/lazyResolve/enumValuesScript.txt | 25 ++++- .../annotationWithNamedFunctionArgument.txt | 9 ++ .../anonymousObjectInInvalidPosition.txt | 18 +++ .../testData/lazyResolve/expectClass.txt | 5 + .../explicitSubstitutionOverrideProperty.txt | 36 ++++++ ...icitSubstitutionOverridePropertyScript.txt | 45 +++++++- .../testData/lazyResolve/fakeOverride.txt | 47 ++++++++ .../lazyResolve/fakeOverrideScript.txt | 55 ++++++++- .../lazyResolve/fakePrimaryConstructor.txt | 11 ++ .../fakePrimaryConstructorScript.txt | 17 ++- .../testData/lazyResolve/fileAnnotations.txt | 14 +++ .../lazyResolve/fileAnnotationsScript.txt | 19 ++++ .../testData/lazyResolve/fileElements.txt | 38 +++++++ .../lazyResolve/fromLocalHierarchyToOuter.txt | 43 +++++++ .../fromLocalHierarchyToOuterScript.txt | 51 ++++++++- ...functionWithImplicitTypeAndAnnotations.txt | 29 +++++ ...onWithImplicitTypeAndAnnotationsScript.txt | 43 ++++++- ...citTypeAndStringTemplateAsDefaultValue.txt | 8 ++ ...eAndStringTemplateAsDefaultValueScript.txt | 14 +++ .../lazyResolve/functionWithParameter.txt | 8 ++ .../functionWithParameterScript.txt | 15 ++- .../lazyResolve/functionWithWhere.txt | 10 ++ .../lazyResolve/functions/actualOverride.txt | 46 ++++++++ .../functions/contract.out_of_src_roots.txt | 10 ++ .../lazyResolve/functions/contract.txt | 18 +++ .../lazyResolve/functions/contractScript.txt | 23 ++++ .../lazyResolve/functions/contractScript2.txt | 9 ++ .../functionCallWithGenericResult.txt | 13 +++ .../functionCallWithGenericResultScript.txt | 21 +++- .../functions/functionParameter.txt | 6 + .../functions/functionParameterScript.txt | 11 ++ .../functionWithGenericExpectedTypeInside.txt | 19 ++++ ...ionWithGenericExpectedTypeInsideScript.txt | 28 ++++- .../functions/functionWithTypeParameters.txt | 5 + .../functionWithTypeParametersScript.txt | 10 ++ .../functions/hierarchyWithOverride.txt | 30 +++++ .../hierarchyWithOverrideAndNestedClass.txt | 71 ++++++++++++ .../hierarchyWithOverrideAndNestedClass2.txt | 71 ++++++++++++ ...archyWithOverrideAndNestedClass2Script.txt | 80 ++++++++++++- .../hierarchyWithOverrideAndNestedClass3.txt | 71 ++++++++++++ ...archyWithOverrideAndNestedClass3Script.txt | 80 ++++++++++++- ...rarchyWithOverrideAndNestedClassScript.txt | 80 ++++++++++++- .../functions/hierarchyWithOverrideScript.txt | 38 ++++++- ...icitTypeFromFunctionWithDuplicatedName.txt | 25 +++++ ...AnnotationWithDefaultValueForenumArray.txt | 23 ++++ .../functions/simpleLoopInOverride.txt | 15 +++ .../functions/simpleLoopInOverride2.txt | 15 +++ .../functions/simpleLoopInOverride2Script.txt | 23 +++- .../functions/simpleLoopInOverrideScript.txt | 23 +++- .../functions/superTypeCallNameClash.txt | 22 ++++ ...erTypeCallNameClashImplicitConstructor.txt | 22 ++++ ...CallNameClashImplicitConstructorScript.txt | 29 ++++- .../superTypeCallNameClashScript.txt | 29 ++++- .../superTypeCallNestedNameClash.txt | 22 ++++ ...CallNestedNameClashImplicitConstructor.txt | 22 ++++ ...stedNameClashImplicitConstructorScript.txt | 29 ++++- .../superTypeCallNestedNameClashScript.txt | 29 ++++- .../transitiveSubstitutionFakeOverride.txt | 49 ++++++++ .../functions/typeArgumentInAnnotation.txt | 14 +++ .../unresolvedAnnotationOnFunctionType.txt | 5 + .../implicitSubstitutionOverrideProperty.txt | 38 +++++++ ...icitSubstitutionOverridePropertyScript.txt | 47 +++++++- ...nctionWithRawContract.out_of_src_roots.txt | 10 ++ .../implicitTypeOnFunctionWithRawContract.txt | 11 ++ ...ypeOnFunctionWithUnresolvedRawContract.txt | 10 ++ ...nWithWrongRawContract.out_of_src_roots.txt | 10 ++ ...icitTypeOnFunctionWithWrongRawContract.txt | 10 ++ ...implicitTypeWithInaccessibleAnnotation.txt | 31 +++++ .../lazyResolve/initWithAnnotation.txt | 24 ++++ .../lazyResolve/lambdaAsSAMInterface.txt | 20 ++++ .../lambdaAsSAMInterfaceScript.txt | 29 ++++- ...tWithDestructuringDeclarationReference.txt | 51 ++++++++- .../testData/lazyResolve/lazyProperty.txt | 26 +++++ .../lazyResolve/lazyPropertyScript.txt | 36 +++++- .../testData/lazyResolve/localConstructor.txt | 35 ++++++ .../lazyResolve/localConstructorScript.txt | 42 ++++++- .../localFunctionInsideAnnotationCall.txt | 20 ++++ ...ocalFunctionInsideAnnotationCallScript.txt | 26 +++++ .../localFunctionInsideFunctionLiteral.txt | 20 ++++ ...calFunctionInsideFunctionLiteralScript.txt | 26 +++++ ...onInsideLambdaCallInsideStringTemplate.txt | 22 ++++ ...deLambdaCallInsideStringTemplateScript.txt | 28 +++++ .../localFunctionInsideStringTemplate.txt | 18 +++ ...ocalFunctionInsideStringTemplateScript.txt | 24 ++++ .../localFunctionInsideSuperEntryCall.txt | 28 +++++ ...ocalFunctionInsideSuperEntryCallScript.txt | 35 ++++++ .../testData/lazyResolve/localNestedClass.txt | 40 +++++++ .../lazyResolve/localNestedClassScript.txt | 48 +++++++- .../localParameterInsideSuperEntryCall.txt | 28 +++++ ...calParameterInsideSuperEntryCallScript.txt | 35 ++++++ .../nestedCompilerRequiredAnnotations.txt | 61 ++++++++++ ...edCompilerRequiredAnnotationsForMember.txt | 62 ++++++++++ ...ilerRequiredAnnotationsForMemberScript.txt | 70 +++++++++++- ...dCompilerRequiredAnnotationsInsideBody.txt | 41 +++++++ ...lerRequiredAnnotationsInsideBodyScript.txt | 49 +++++++- ...estedCompilerRequiredAnnotationsScript.txt | 69 +++++++++++- .../testData/lazyResolve/nestedTypeAlias.txt | 30 +++++ .../testData/lazyResolve/nestedTypeAlias2.txt | 19 ++++ .../lazyResolve/nestedTypeAlias2Script.txt | 26 ++++- .../lazyResolve/nestedTypeAliasScript.txt | 38 ++++++- .../arrayOfCall.out_of_src_roots.txt | 12 ++ .../lazyResolve/noRuntime/arrayOfCall.txt | 12 ++ .../noRuntime/integerLiteralCall.txt | 6 + .../lazyResolve/parameterOfNonLocalSetter.txt | 15 +++ .../parameterOfNonLocalSetterScript.txt | 21 +++- .../lazyResolve/parameterOfTopSetter.txt | 8 ++ .../parameterOfTopSetterScript.txt | 13 +++ .../lazyResolve/primaryConstructor.txt | 11 ++ .../primaryConstructorParameter.txt | 11 ++ .../primaryConstructorParameterScript.txt | 17 ++- .../primaryConstructorProperty.txt | 14 +++ .../primaryConstructorPropertyScript.txt | 20 +++- .../lazyResolve/primaryConstructorScript.txt | 17 ++- .../properties/constructorParameter.txt | 35 ++++++ ...rameterWithImplicitParameterAnnotation.txt | 24 ++++ .../delegateWithAnnotationOnAccessor.txt | 32 ++++++ ...thAnnotationOnAccessorWithExplicitType.txt | 25 +++++ .../generatedPropertyFromParameter.txt | 35 ++++++ ...rtyFromParameterWithImplicitAnnotation.txt | 24 ++++ .../properties/getterWithDelegation.txt | 13 +++ .../properties/getterWithDelegationScript.txt | 20 +++- .../properties/hierarchyWithOverride.txt | 32 ++++++ .../hierarchyWithOverrideAndNestedClass.txt | 73 ++++++++++++ .../hierarchyWithOverrideAndNestedClass2.txt | 73 ++++++++++++ ...archyWithOverrideAndNestedClass2Script.txt | 82 +++++++++++++- .../hierarchyWithOverrideAndNestedClass3.txt | 73 ++++++++++++ ...archyWithOverrideAndNestedClass3Script.txt | 82 +++++++++++++- .../hierarchyWithOverrideAndNestedClass4.txt | 76 +++++++++++++ ...archyWithOverrideAndNestedClass4Script.txt | 85 +++++++++++++- ...rarchyWithOverrideAndNestedClassScript.txt | 82 +++++++++++++- .../hierarchyWithOverrideScript.txt | 40 ++++++- .../impliciyTypeWithAnnotationOnFunction.txt | 20 ++++ .../impliciyTypeWithAnnotationOnProperty.txt | 23 ++++ .../propertyGetterWithExplicitType.txt | 7 ++ .../propertyGetterWithExplicitTypeAndBody.txt | 7 ++ ...rtyGetterWithExplicitTypeAndBodyScript.txt | 12 ++ .../propertyGetterWithExplicitTypeScript.txt | 12 ++ .../propertyGetterWithImplicitType.txt | 7 ++ .../propertyGetterWithImplicitTypeScript.txt | 12 ++ .../lazyResolve/properties/propertySetter.txt | 7 ++ .../properties/propertySetterScript.txt | 12 ++ .../properties/propertyWithTypeParameters.txt | 7 ++ .../propertyWithTypeParametersScript.txt | 12 ++ .../properties/resultWithPropagatedType.txt | 28 ++++- .../scriptWithResultWithPropagatedType.txt | 26 ++++- ...scriptWithTypeAnnotationsOnDeclaration.txt | 23 +++- .../properties/simpleLoopInOverride.txt | 24 ++++ .../properties/simpleLoopInOverride2.txt | 24 ++++ .../simpleLoopInOverride2Script.txt | 32 +++++- .../properties/simpleLoopInOverrideScript.txt | 32 +++++- .../properties/typeParameterAnnotations.txt | 29 +++++ .../unresolvedAnnotationOnPropertyType.txt | 5 + .../propertyDelegateWithImplicitType.txt | 36 ++++++ ...propertyDelegateWithImplicitTypeScript.txt | 45 +++++++- .../lazyResolve/propertyWithGetter.txt | 9 ++ .../propertyWithGetterAndSetter.txt | 11 ++ .../propertyWithGetterAndSetterScript.txt | 18 +++ .../lazyResolve/propertyWithGetterScript.txt | 16 +++ ...propertyWithImplicitTypeAndAnnotations.txt | 33 ++++++ ...tyWithImplicitTypeAndAnnotationsScript.txt | 47 +++++++- ...rtyWithImplicitTypeAndFieldAnnotations.txt | 29 +++++ ...hImplicitTypeAndFieldAnnotationsScript.txt | 41 ++++++- .../lazyResolve/propertyWithInitializer.txt | 8 ++ .../propertyWithInitializerScript.txt | 14 +++ .../lazyResolve/propertyWithWhere.txt | 11 ++ .../testData/lazyResolve/redeclaration.txt | 15 +++ .../lazyResolve/redeclarationScript.txt | 22 +++- .../resolveSuperTypeFromLocalClass.txt | 22 ++++ .../resolveSuperTypeFromLocalClassScript.txt | 31 ++++- .../resolveTypeFromLocalClassConstructor.txt | 29 +++++ ...lveTypeFromLocalClassConstructorScript.txt | 38 ++++++- .../resolveTypeFromLocalFunction.txt | 29 +++++ .../resolveTypeFromLocalFunctionScript.txt | 38 ++++++- .../testData/lazyResolve/script.txt | 61 +++++++++- .../testData/lazyResolve/script2.txt | 44 +++++++- .../testData/lazyResolve/script3.txt | 39 ++++++- .../testData/lazyResolve/script4.txt | 27 ++++- .../testData/lazyResolve/scriptArgument.txt | 8 +- .../lazyResolve/secondaryConstructor.txt | 11 ++ .../secondaryConstructorParameter.txt | 19 ++++ .../secondaryConstructorParameterScript.txt | 26 ++++- .../secondaryConstructorScript.txt | 19 +++- .../testData/lazyResolve/statement.txt | 34 +++++- .../testData/lazyResolve/statement2.txt | 36 +++++- .../lazyResolve/statementTransformation.txt | 14 +++ .../lazyResolve/substitutionFakeOverride.txt | 21 ++++ .../substitutionFakeOverrideConstructor.txt | 15 +++ ...stitutionFakeOverrideConstructorScript.txt | 22 +++- .../substitutionFakeOverrideFunction.txt | 19 ++++ ...substitutionFakeOverrideFunctionScript.txt | 26 ++++- ...onFakeOverrideFunctionWithImplicitType.txt | 25 +++++ ...OverrideFunctionWithImplicitTypeScript.txt | 32 +++++- ...titutionFakeOverrideInDifferentModules.txt | 23 ++++ .../substitutionFakeOverrideScript.txt | 28 ++++- ...bstitutionFakeOverrideWithImplicitType.txt | 23 ++++ ...akeOverrideWithImplicitTypeAndReceiver.txt | 23 ++++ ...rrideWithImplicitTypeAndReceiverScript.txt | 30 ++++- ...tionFakeOverrideWithImplicitTypeScript.txt | 30 ++++- .../testData/lazyResolve/superTypes.txt | 21 ++++ .../testData/lazyResolve/superTypesLoop.txt | 27 +++++ .../lazyResolve/superTypesLoopScript.txt | 36 +++++- .../testData/lazyResolve/superTypesScript.txt | 29 ++++- .../explicitReturnType.txt | 18 +++ .../explicitReturnTypeAndAnnotations.txt | 29 +++++ .../getterFromLibraryAndSetterFromSources.txt | 17 +++ .../implicitReturnType.txt | 18 +++ .../implicitReturnTypeAndAnnotations.txt | 31 +++++ ...plicitReturnTypeAndAnnotationsAsGetter.txt | 30 +++++ .../secondGenerationOverride.txt | 52 +++++++++ .../setterAndExplicitReturnType.txt | 23 ++++ ...terAndExplicitReturnTypeAndAnnotations.txt | 42 +++++++ ...plicitReturnTypeAndAnnotationsAsGetter.txt | 36 ++++++ ...plicitReturnTypeAndAnnotationsAsSetter.txt | 36 ++++++ .../setterFromLibraryAndGetterFromSources.txt | 19 ++++ .../syntheticResultDeclaration.txt | 15 ++- .../syntheticResultDeclarationWithBigBody.txt | 23 +++- .../lazyResolve/topLevelFunctions.txt | 8 ++ .../lazyResolve/topLevelFunctionsScript.txt | 15 +++ ...tionsWithExpressionBodyAndExplicitType.txt | 8 ++ ...ithExpressionBodyAndExplicitTypeScript.txt | 15 +++ .../topLevelFunctionsWithImplicitType.txt | 8 ++ ...opLevelFunctionsWithImplicitTypeScript.txt | 15 +++ .../typeAliasWithAnnotationOnType.txt | 13 +++ .../typeAliasWithTypeParameters.txt | 4 + .../typeAliasWithTypeParametersScript.txt | 10 +- .../unresolvedAnnotationOnTypeAlias.txt | 5 + .../lazyResolve/typeParameterBounds.txt | 11 ++ .../lazyResolve/typeParameterBoundsScript.txt | 20 +++- .../lazyResolve/typeParameterOfClass.txt | 11 ++ .../lazyResolve/typeParameterOfClass2.txt | 16 +++ .../typeParameterOfClass2Script.txt | 22 +++- .../typeParameterOfClassScript.txt | 17 ++- .../typeParameterOfNonLocalFunction.txt | 12 ++ .../typeParameterOfNonLocalFunctionScript.txt | 18 ++- .../typeParameterOfTopFunction.txt | 5 + .../typeParameterOfTopFunctionScript.txt | 10 ++ .../lazyResolve/typeParameterOfTopSetter.txt | 7 ++ .../typeParameterOfTopSetterScript.txt | 12 ++ .../lazyResolve/typeParameterOfTypeAlias.txt | 10 ++ .../typeParameterOfTypeAliasScript.txt | 17 ++- .../linkedHashMap.txt | 49 ++++++++ .../lazyResolveStdlibSources/wrappedInt.txt | 60 ++++++++++ ...assAnnotationsInLocalClass.lazyResolve.txt | 38 +++++++ ...otationsInLocalClassScript.lazyResolve.txt | 46 +++++++- ...teFieldWithAnnotationClash.lazyResolve.txt | 35 ++++++ ...dWithAnnotationClashScript.lazyResolve.txt | 45 +++++++- ...tedNameClashAndAnnotations.lazyResolve.txt | 47 ++++++++ ...eClashAndAnnotationsScript.lazyResolve.txt | 57 +++++++++- ...hNestedTypesAndAnnotations.lazyResolve.txt | 47 ++++++++ ...dTypesAndAnnotationsScript.lazyResolve.txt | 57 +++++++++- ...dClassAsAnnotationArgument.lazyResolve.txt | 27 +++++ ...ClassAsAnnotationArgument2.lazyResolve.txt | 27 +++++ ...ypeCollisionAndAnnotations.lazyResolve.txt | 50 +++++++++ ...lisionAndAnnotationsScript.lazyResolve.txt | 59 +++++++++- ...dClassAsAnnotationArgument.lazyResolve.txt | 27 +++++ ...ClassAsAnnotationArgument2.lazyResolve.txt | 27 +++++ ...allNameClashWithAnnotation.lazyResolve.txt | 48 ++++++++ ...otationImplicitConstructor.lazyResolve.txt | 48 ++++++++ ...nImplicitConstructorScript.lazyResolve.txt | 58 +++++++++- ...eClashWithAnnotationScript.lazyResolve.txt | 58 +++++++++- ...tedNameClashWithAnnotation.lazyResolve.txt | 48 ++++++++ ...otationImplicitConstructor.lazyResolve.txt | 48 ++++++++ ...nImplicitConstructorScript.lazyResolve.txt | 58 +++++++++- ...eClashWithAnnotationScript.lazyResolve.txt | 58 +++++++++- .../constructor/call.lazyResolve.txt | 26 +++++ .../constructor/callScript.lazyResolve.txt | 35 +++++- .../callWithConstructor.lazyResolve.txt | 26 +++++ .../callWithConstructorScript.lazyResolve.txt | 35 +++++- .../parameterWithAnnotations.lazyResolve.txt | 22 ++++ ...WithAnnotationsBodyResolve.lazyResolve.txt | 22 ++++ ...meterWithAnnotationsScript.lazyResolve.txt | 30 ++++- ...notationsScriptBodyResolve.lazyResolve.txt | 30 ++++- ...ationToLocalMemberFunction.lazyResolve.txt | 59 ++++++++++ ...oLocalMemberFunctionScript.lazyResolve.txt | 68 ++++++++++- .../constructor/reference.lazyResolve.txt | 22 ++++ .../referenceScript.lazyResolve.txt | 31 ++++- .../referenceWithConstructor.lazyResolve.txt | 22 ++++ ...renceWithConstructorScript.lazyResolve.txt | 31 ++++- .../secondaryConstructor.lazyResolve.txt | 26 +++++ ...secondaryConstructorScript.lazyResolve.txt | 35 +++++- ...teFieldWithAnnotationClash.lazyResolve.txt | 35 ++++++ ...dWithAnnotationClashScript.lazyResolve.txt | 45 +++++++- .../delegateWithExplicitType.lazyResolve.txt | 30 +++++ ...gateWithExplicitTypeScript.lazyResolve.txt | 39 ++++++- ...ithExplicitTypeUnavailable.lazyResolve.txt | 38 +++++++ ...licitTypeUnavailableScript.lazyResolve.txt | 46 +++++++- .../delegateWithImplicitType.lazyResolve.txt | 33 ++++++ ...gateWithImplicitTypeScript.lazyResolve.txt | 43 ++++++- ...ithImplicitTypeUnavailable.lazyResolve.txt | 42 +++++++ ...licitTypeUnavailableScript.lazyResolve.txt | 50 ++++++++- .../delegatedFieldNestedName.lazyResolve.txt | 52 +++++++++ ...tedNameClashAndAnnotations.lazyResolve.txt | 47 ++++++++ ...eClashAndAnnotationsScript.lazyResolve.txt | 57 +++++++++- ...hNestedTypesAndAnnotations.lazyResolve.txt | 47 ++++++++ ...dTypesAndAnnotationsScript.lazyResolve.txt | 57 +++++++++- ...gatedFieldNestedNameScript.lazyResolve.txt | 63 ++++++++++- .../delegate/field.lazyResolve.txt | 22 ++++ .../delegate/fieldScript.lazyResolve.txt | 30 ++++- .../propertyWithExplicitType.lazyResolve.txt | 34 ++++++ ...ertyWithExplicitTypeScript.lazyResolve.txt | 43 ++++++- ...ithExplicitTypeUnavailable.lazyResolve.txt | 42 +++++++ ...licitTypeUnavailableScript.lazyResolve.txt | 50 ++++++++- .../propertyWithImplicitType.lazyResolve.txt | 38 +++++++ ...ertyWithImplicitTypeScript.lazyResolve.txt | 47 +++++++- ...ithImplicitTypeUnavailable.lazyResolve.txt | 46 ++++++++ ...licitTypeUnavailableScript.lazyResolve.txt | 54 ++++++++- .../classLevel.lazyResolve.txt | 49 ++++++++ .../destruct.lazyResolve.txt | 49 ++++++++ .../destructEntry.lazyResolve.txt | 49 ++++++++ .../destructEntryUsage.lazyResolve.txt | 52 +++++++++ .../destructEntryWithType.lazyResolve.txt | 49 ++++++++ ...destructEntryWithTypeUsage.lazyResolve.txt | 52 +++++++++ .../scriptClassLevel.lazyResolve.txt | 56 ++++++++- .../scriptLevel.lazyResolve.txt | 58 ++++++++++ .../scriptStatementLevel.lazyResolve.txt | 47 +++++++- ...tementLevelAsLastStatement.lazyResolve.txt | 56 ++++++++- .../topLevel.lazyResolve.txt | 33 ++++++ .../errorType/errorType.lazyResolve.txt | 16 +++ .../errorType/errorTypeScript.lazyResolve.txt | 24 +++- .../nestedErrorReturnType.lazyResolve.txt | 16 +++ ...estedErrorReturnTypeScript.lazyResolve.txt | 24 +++- ...ypeCollisionAndAnnotations.lazyResolve.txt | 55 +++++++++ ...lisionAndAnnotationsScript.lazyResolve.txt | 64 ++++++++++- ...ypeCollisionAndAnnotations.lazyResolve.txt | 55 +++++++++ ...lisionAndAnnotationsScript.lazyResolve.txt | 64 ++++++++++- ...ndAnnotationsAsConstructor.lazyResolve.txt | 47 ++++++++ ...tationsAsConstructorScript.lazyResolve.txt | 57 +++++++++- ...ndAnnotationsAsConstructor.lazyResolve.txt | 47 ++++++++ ...tationsAsConstructorScript.lazyResolve.txt | 57 +++++++++- .../function/explicitType.lazyResolve.txt | 19 ++++ .../explicitTypeScript.lazyResolve.txt | 28 ++++- .../generatedComponentN.lazyResolve.txt | 27 +++++ .../generatedComponentNScript.lazyResolve.txt | 35 +++++- .../function/generatedCopy.lazyResolve.txt | 32 ++++++ .../generatedCopyScript.lazyResolve.txt | 40 ++++++- .../function/implicitType.lazyResolve.txt | 20 ++++ .../implicitTypeScript.lazyResolve.txt | 29 ++++- .../implicitTypeUnavailable.lazyResolve.txt | 28 +++++ ...licitTypeUnavailableScript.lazyResolve.txt | 36 +++++- .../function/localFunction.lazyResolve.txt | 22 ++++ .../localFunctionImplicitType.lazyResolve.txt | 26 +++++ ...calImplicitTypeUnavailable.lazyResolve.txt | 44 ++++++++ ...eUnavailableInImplicitBody.lazyResolve.txt | 50 +++++++++ ...ilableInImplicitBodyScript.lazyResolve.txt | 58 +++++++++- ...licitTypeUnavailableScript.lazyResolve.txt | 51 ++++++++- .../function/multiDeclaration.lazyResolve.txt | 80 +++++++++++++ .../multiDeclarationScript.lazyResolve.txt | 91 ++++++++++++++- ...ameterAsImplicitReturnType.lazyResolve.txt | 19 ++++ ...licitReturnTypeBodyResolve.lazyResolve.txt | 19 ++++ ...licitReturnTypePropagation.lazyResolve.txt | 22 ++++ ...eturnTypePropagationScript.lazyResolve.txt | 31 ++++- ...AsImplicitReturnTypeScript.lazyResolve.txt | 27 ++++- ...eturnTypeScriptBodyResolve.lazyResolve.txt | 27 ++++- ...etweenLocalMemberFunctions.lazyResolve.txt | 35 ++++++ ...emberFunctionsImplicitBody.lazyResolve.txt | 41 +++++++ ...unctionsImplicitBodyScript.lazyResolve.txt | 50 ++++++++- ...LocalMemberFunctionsScript.lazyResolve.txt | 43 ++++++- ...ationToLocalMemberFunction.lazyResolve.txt | 36 ++++++ ...MemberFunctionImplicitBody.lazyResolve.txt | 44 ++++++++ ...FunctionImplicitBodyScript.lazyResolve.txt | 54 ++++++++- ...oLocalMemberFunctionScript.lazyResolve.txt | 45 +++++++- ...ceiverAsImplicitReturnType.lazyResolve.txt | 17 +++ ...licitReturnTypePropagation.lazyResolve.txt | 20 ++++ ...eturnTypePropagationScript.lazyResolve.txt | 29 ++++- ...AsImplicitReturnTypeScript.lazyResolve.txt | 25 ++++- ...allNameClashWithAnnotation.lazyResolve.txt | 48 ++++++++ ...otationImplicitConstructor.lazyResolve.txt | 48 ++++++++ ...nImplicitConstructorScript.lazyResolve.txt | 58 +++++++++- ...eClashWithAnnotationScript.lazyResolve.txt | 58 +++++++++- ...tedNameClashWithAnnotation.lazyResolve.txt | 48 ++++++++ ...otationImplicitConstructor.lazyResolve.txt | 48 ++++++++ ...nImplicitConstructorScript.lazyResolve.txt | 58 +++++++++- ...eClashWithAnnotationScript.lazyResolve.txt | 58 +++++++++- .../typeParameterAnnotations.lazyResolve.txt | 28 +++++ ...terAnnotationsInLocalClass.lazyResolve.txt | 28 +++++ ...otationsInLocalClassScript.lazyResolve.txt | 35 +++++- ...cessibleAnnotationArgument.lazyResolve.txt | 23 ++++ ...cessibleAnnotationArgument.lazyResolve.txt | 29 +++++ .../classInitializer.lazyResolve.txt | 23 ++++ .../classInitializerScript.lazyResolve.txt | 32 +++++- .../constructorParameter.lazyResolve.txt | 24 ++++ ...constructorParameterScript.lazyResolve.txt | 32 +++++- .../property/explicitType.lazyResolve.txt | 21 ++++ .../explicitTypeScript.lazyResolve.txt | 29 ++++- ...tedPropertyFromConstructor.lazyResolve.txt | 28 +++++ ...pertyFromConstructorScript.lazyResolve.txt | 36 +++++- .../property/implicitType.lazyResolve.txt | 23 ++++ ...TypeFromIncorrectAccessors.lazyResolve.txt | 19 +++- ...orrectAccessorsPropagation.lazyResolve.txt | 21 +++- ...AccessorsPropagationScript.lazyResolve.txt | 35 +++++- ...omIncorrectAccessorsScript.lazyResolve.txt | 32 +++++- ...citTypeFromIncorrectSetter.lazyResolve.txt | 21 ++++ ...IncorrectSetterPropagation.lazyResolve.txt | 23 ++++ ...ectSetterPropagationScript.lazyResolve.txt | 32 +++++- ...eFromIncorrectSetterScript.lazyResolve.txt | 29 ++++- .../implicitTypeInLocalClass.lazyResolve.txt | 34 ++++++ .../implicitTypeScript.lazyResolve.txt | 32 +++++- .../implicitTypeUnavailable.lazyResolve.txt | 31 +++++ ...PropertyWithPropagatedType.lazyResolve.txt | 21 ++++ ...gatedType.out_of_src_roots.lazyResolve.txt | 21 ++++ ...tyWithPropagatedTypeScript.lazyResolve.txt | 30 ++++- ...hPropagatedTypeUnavailable.lazyResolve.txt | 29 +++++ ...available.out_of_src_roots.lazyResolve.txt | 29 +++++ ...gatedTypeUnavailableScript.lazyResolve.txt | 37 +++++- ...calImplicitTypeUnavailable.lazyResolve.txt | 45 ++++++++ ...eUnavailableInImplicitBody.lazyResolve.txt | 51 +++++++++ ...ilableInImplicitBodyScript.lazyResolve.txt | 59 +++++++++- ...licitTypeUnavailableScript.lazyResolve.txt | 52 ++++++++- ...alPropertyWithExplicitType.lazyResolve.txt | 19 ++++ ...PropertyWithPropagatedType.lazyResolve.txt | 18 +++ ...tyWithPropagatedTypeScript.lazyResolve.txt | 27 ++++- ...hPropagatedTypeUnavailable.lazyResolve.txt | 26 +++++ ...tweenLocalMemberProperties.lazyResolve.txt | 36 ++++++ ...mberPropertiesImplicitBody.lazyResolve.txt | 42 +++++++ ...opertiesImplicitBodyScript.lazyResolve.txt | 51 ++++++++- ...ocalMemberPropertiesScript.lazyResolve.txt | 44 +++++++- ...ationToLocalMemberProperty.lazyResolve.txt | 39 +++++++ ...MemberPropertyImplicitBody.lazyResolve.txt | 45 ++++++++ ...PropertyImplicitBodyScript.lazyResolve.txt | 55 ++++++++- ...oLocalMemberPropertyScript.lazyResolve.txt | 48 +++++++- ...ypeCollisionAndAnnotations.lazyResolve.txt | 50 +++++++++ ...lisionAndAnnotationsScript.lazyResolve.txt | 59 +++++++++- ...ceiverAsImplicitReturnType.lazyResolve.txt | 20 ++++ ...licitReturnTypePropagation.lazyResolve.txt | 23 ++++ ...eturnTypePropagationScript.lazyResolve.txt | 32 +++++- ...AsImplicitReturnTypeScript.lazyResolve.txt | 28 ++++- .../resultBodyAnnotation.lazyResolve.txt | 29 +++++ .../resultWithPropagatedType.lazyResolve.txt | 28 ++++- ...hPropagatedTypeUnavailable.lazyResolve.txt | 35 +++++- ...terAnnotationsInLocalClass.lazyResolve.txt | 29 +++++ ...otationsInLocalClassScript.lazyResolve.txt | 36 +++++- .../constructor.lazyResolve.txt | 26 +++++ .../constructorCallSite.lazyResolve.txt | 31 +++++ .../constructorCallSiteScript.lazyResolve.txt | 38 ++++++- .../constructorScript.lazyResolve.txt | 35 +++++- .../function.lazyResolve.txt | 30 +++++ .../functionScript.lazyResolve.txt | 39 ++++++- .../functionUnavailable.lazyResolve.txt | 38 +++++++ .../functionUnavailableScript.lazyResolve.txt | 46 +++++++- .../implicitFunction.lazyResolve.txt | 36 ++++++ .../implicitFunctionScript.lazyResolve.txt | 45 +++++++- ...mplicitFunctionUnavailable.lazyResolve.txt | 44 ++++++++ ...tFunctionUnavailableScript.lazyResolve.txt | 52 ++++++++- .../implicitProperty.lazyResolve.txt | 38 +++++++ ...mplicitPropertyAndReceiver.lazyResolve.txt | 44 ++++++++ ...tPropertyAndReceiverScript.lazyResolve.txt | 54 ++++++++- .../implicitPropertyScript.lazyResolve.txt | 54 ++++++++- ...mplicitPropertyUnavailable.lazyResolve.txt | 46 ++++++++ ...tPropertyUnavailableScript.lazyResolve.txt | 54 ++++++++- .../property.lazyResolve.txt | 40 +++++++ .../propertyScript.lazyResolve.txt | 43 ++++++- .../propertyUnavailable.lazyResolve.txt | 48 ++++++++ .../propertyUnavailableScript.lazyResolve.txt | 57 +++++++++- ...tterWithExplicitReturnType.lazyResolve.txt | 32 ++++++ ...tterWithExplicitReturnType.lazyResolve.txt | 29 +++++ ...tterWithImplicitReturnType.lazyResolve.txt | 32 ++++++ .../typeAlias/insideFunction.lazyResolve.txt | 17 +++ .../insideFunctionComplex.lazyResolve.txt | 17 +++ ...nsideFunctionComplexScript.lazyResolve.txt | 26 ++++- .../insideFunctionScript.lazyResolve.txt | 26 ++++- ...stedAnnotationInLocalClass.lazyResolve.txt | 26 +++++ ...notationInLocalClassScript.lazyResolve.txt | 33 +++++- .../typeAlias/simple.lazyResolve.txt | 15 +++ .../typeAlias/simpleScript.lazyResolve.txt | 23 +++- .../withMissedArguments.lazyResolve.txt | 13 +++ .../withMissedArgumentsScript.lazyResolve.txt | 20 +++- 593 files changed, 18597 insertions(+), 226 deletions(-) diff --git a/analysis/low-level-api-fir/testData/lazyResolve/annotationArgumentsMix.txt b/analysis/low-level-api-fir/testData/lazyResolve/annotationArgumentsMix.txt index bf5286e0792..4c162e3b6e9 100644 --- a/analysis/low-level-api-fir/testData/lazyResolve/annotationArgumentsMix.txt +++ b/analysis/low-level-api-fir/testData/lazyResolve/annotationArgumentsMix.txt @@ -450,6 +450,52 @@ FILE: [ResolvedTo(IMPORTS)] annotationArgumentsMix.kt @R|kotlin/Deprecated|[Types](boo#()) @R|Anno|[Types](LAZY_EXPRESSION, LAZY_EXPRESSION, LAZY_EXPRESSION, LAZY_EXPRESSION) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun foo(): R|kotlin/Unit| { } +CONSTANT_EVALUATION: +FILE: [ResolvedTo(IMPORTS)] annotationArgumentsMix.kt + public final? [ResolvedTo(RAW_FIR)] annotation class AnotherAnnotation : R|kotlin/Annotation| { + public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherAnnotation] constructor(): R|AnotherAnnotation| { + LAZY_super + } + + } + public final? [ResolvedTo(RAW_FIR)] enum class EnumClass : R|kotlin/Enum| { + private [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] constructor(): R|EnumClass| { + LAZY_super|> + } + + public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] enum entry First: R|EnumClass| + public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] enum entry Second: R|EnumClass| + public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] fun values(): R|kotlin/Array| { + } + + public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] fun valueOf([ResolvedTo(RAW_FIR)] value: R|kotlin/String|): R|EnumClass| { + } + + public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] val entries: R|kotlin/enums/EnumEntries| + public [ResolvedTo(RAW_FIR)] get(): R|kotlin/enums/EnumEntries| + + } + public final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| { + public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.str] str: String, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.ann] ann: AnotherAnnotation, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.c] c: KClass<*>, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.entry] entry: EnumClass): R|Anno| { + LAZY_super + } + + public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val str: String = R|/str| + public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): String + + public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val ann: AnotherAnnotation = R|/ann| + public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): AnotherAnnotation + + public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val c: KClass<*> = R|/c| + public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): KClass<*> + + public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val entry: EnumClass = R|/entry| + public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] get(): EnumClass + + } + @R|kotlin/Deprecated|[Types](boo#()) @R|Anno|[Types](LAZY_EXPRESSION, LAZY_EXPRESSION, LAZY_EXPRESSION, LAZY_EXPRESSION) public final [ResolvedTo(CONSTANT_EVALUATION)] fun foo(): R|kotlin/Unit| { + } + ANNOTATION_ARGUMENTS: FILE: [ResolvedTo(IMPORTS)] annotationArgumentsMix.kt public final [ResolvedTo(STATUS)] annotation class AnotherAnnotation : R|kotlin/Annotation| { diff --git a/analysis/low-level-api-fir/testData/lazyResolve/annotationArgumentsMixScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/annotationArgumentsMixScript.txt index fcb878ba045..0d5daef0f69 100644 --- a/analysis/low-level-api-fir/testData/lazyResolve/annotationArgumentsMixScript.txt +++ b/analysis/low-level-api-fir/testData/lazyResolve/annotationArgumentsMixScript.txt @@ -530,6 +530,60 @@ FILE: [ResolvedTo(IMPORTS)] annotationArgumentsMixScript.kts } +CONSTANT_EVALUATION: +FILE: [ResolvedTo(IMPORTS)] annotationArgumentsMixScript.kts + context(