From 12dc6b1ebc4fa54ca4f98a713f45a556666be4e0 Mon Sep 17 00:00:00 2001 From: Dmitrii Gridin Date: Mon, 18 Sep 2023 16:46:59 +0200 Subject: [PATCH] [FIR] FirRenderer: render name for scripts A script name is important information, so it is better to render it. This also will fix the inconsistency with redundant space after 'SCRIPT:'. --- .../scripts/insideClassMember.txt | 4 +-- .../scripts/insideTopLevelFunction.txt | 6 ++-- .../contextCollector/scripts/topLevel.txt | 6 ++-- .../dependentCopy/classBodyScript.context.txt | 2 +- .../dependentCopy/classScript.context.txt | 2 +- .../moreStatementsInCopy.context.txt | 2 +- .../moreStatementsInCopy.fir.txt | 2 +- .../testData/dependentCopy/script.context.txt | 2 +- .../testData/dependentCopy/script.fir.txt | 2 +- .../dependentCopy/scriptFunction.context.txt | 2 +- .../scriptInsideLastStatement.context.txt | 2 +- .../scriptLastStatement.context.txt | 2 +- .../scriptLastStatementCall.context.txt | 2 +- .../dependentCopy/scriptStatement.context.txt | 2 +- .../scriptStatementCall.context.txt | 2 +- ...classMemberPropertyScript.lazy.resolve.txt | 3 +- .../classScript.lazy.resolve.txt | 3 +- .../constructorsScript.lazy.resolve.txt | 3 +- ...nnotationClassLevelScript.lazy.resolve.txt | 3 +- ...tionsInPropertyInitScript.lazy.resolve.txt | 2 +- .../enumClassScript.lazy.resolve.txt | 3 +- .../enumClassWithBodyScript.lazy.resolve.txt | 3 +- .../initBlockScript.lazy.resolve.txt | 3 +- .../localClassScript.lazy.resolve.txt | 2 +- .../localFunScript.lazy.resolve.txt | 3 +- .../localPropertyScript.lazy.resolve.txt | 3 +- .../memberTypeAliasScript.lazy.resolve.txt | 3 +- .../nestedClassesScript.lazy.resolve.txt | 3 +- .../propertyAccessorsScript.lazy.resolve.txt | 3 +- .../fileStructure/script.lazy.resolve.txt | 2 +- .../superClassCallScript.lazy.resolve.txt | 3 +- ...sionBodyFunWithTypeScript.lazy.resolve.txt | 2 +- ...nBodyFunWithoutTypeScript.lazy.resolve.txt | 2 +- ...topLevelFunWithTypeScript.lazy.resolve.txt | 2 +- .../topLevelPropertyScript.lazy.resolve.txt | 2 +- .../topLevelUnitFunScript.lazy.resolve.txt | 2 +- .../withoutNameScript.lazy.resolve.txt | 3 +- ...notationApplicationArgumentOnStatement.txt | 4 +-- .../annotationApplicationArgumentScript.txt | 4 +-- ...otationApplicationCallExpressionScript.txt | 4 +-- .../annotationOnReturnTypeScript.txt | 4 +-- .../annotations/fileAnnotationScript.txt | 4 +-- .../annotations/retentionValueScript.txt | 4 +-- .../annotations/statementAnnotation.txt | 4 +-- .../annotations/superCallAnnotationScript.txt | 4 +-- ...OnConstructorParameterExpressionScript.txt | 4 +-- ...AnnotationOnConstructorParameterScript.txt | 4 +-- ...nAnnotationOnConstructorPropertyScript.txt | 4 +-- ...ConstructorPropertyWithArgumentsScript.txt | 4 +-- ...eOnAnnotationOnFunctionParameterScript.txt | 4 +-- ...OnFunctionParameterWithArgumentsScript.txt | 4 +-- ...peOnAnnotationOnReceiverFunctionScript.txt | 4 +-- ...eOnAnnotationOnReceiverParameterScript.txt | 4 +-- ...AnnotationOnReceiverPropertyCallScript.txt | 4 +-- ...peOnAnnotationOnReceiverPropertyScript.txt | 4 +-- ...typeOnAnnotationOnReturnFunctionScript.txt | 4 +-- ...typeOnAnnotationOnReturnPropertyScript.txt | 4 +-- .../annotations/useSite/delegateScript.txt | 4 +-- .../annotations/useSite/fieldScript.txt | 4 +-- .../annotations/useSite/fileScript.txt | 4 +-- .../annotations/useSite/getterScript.txt | 4 +-- .../annotations/useSite/paramScript.txt | 4 +-- .../annotations/useSite/propertyScript.txt | 4 +-- .../annotations/useSite/setParamScript.txt | 4 +-- .../annotations/useSite/setterScript.txt | 4 +-- .../getOrBuildFir/calls/argsFromFunction.txt | 4 +-- .../getOrBuildFir/calls/argsFromInit.txt | 4 +-- .../calls/argsFromMemberFunction.txt | 4 +-- .../calls/argsFromMemberProperty.txt | 4 +-- .../getOrBuildFir/calls/argsFromProperty.txt | 4 +-- .../getOrBuildFir/calls/argsFromStatement.txt | 4 +-- .../calls/callArgumentScript.txt | 4 +-- ...eSuperCallAndExplicitConstructorScript.txt | 4 +-- .../calls/callOnePropertyFromAnother.txt | 4 +-- .../calls/calllTypeArgumentsScript.txt | 4 +-- .../calls/compoundAssignOnVarScript.txt | 6 ++-- ...dAssignWithArrayAccessConventionScript.txt | 4 +-- ...oundAssignWithArrayGetConventionScript.txt | 4 +-- .../constructorDelegationSuperCallScript.txt | 4 +-- .../calls/functionCallArgumentListScript.txt | 4 +-- .../calls/invokeCallArgumentListScript.txt | 4 +-- .../qualifiedCallInsideSuperCallScript.txt | 4 +-- .../getOrBuildFir/calls/setOperatorScript.txt | 4 +-- .../getOrBuildFir/calls/superTypeScript.txt | 4 +-- .../calls/syntheticResultDeclaration.txt | 4 +-- .../constructorParameterScript.txt | 4 +-- .../constructorPropertyScript.txt | 4 +-- .../destructionWithNoRValueScript.txt | 4 +-- .../declarations/destructuringEntryScript.txt | 4 +-- .../declarations/destructuringScript.txt | 4 +-- .../objectLiteralExpressionScript.txt | 4 +-- .../declarations/objectLiteralScript.txt | 4 +-- .../declarations/propertyDelegateScript.txt | 4 +-- .../declarations/whereClause1Script.txt | 4 +-- .../declarations/whereClause2Script.txt | 4 +-- .../arrayAccessExpressionScript.txt | 4 +-- .../arrayIndexExpressionWithIncScript.txt | 2 +- .../getOrBuildFir/expressions/assignment.txt | 4 +-- .../binaryExpressionOperatorScript.txt | 4 +-- .../expressions/binaryExpressionScript.txt | 4 +-- .../expressions/blockExpressionScript.txt | 4 +-- .../expressions/boolLiteralScript.txt | 4 +-- .../expressions/callInsideFunction.txt | 4 +-- .../expressions/callInsideStatement.txt | 4 +-- .../expressions/forExpressionRangeScript.txt | 4 +-- .../expressions/forExpressionScript.txt | 4 +-- .../forExpressionVariableScript.txt | 4 +-- .../expressions/ifExpressionScript.txt | 4 +-- .../expressions/incExpressionScript.txt | 4 +-- .../insidePlusAssignTargetScript.txt | 4 +-- .../expressions/intLiteralScript.txt | 4 +-- .../expressions/isExpressionScript.txt | 4 +-- .../objectLiteralExpressionScript.txt | 4 +-- .../parenthesizedExpressionScript.txt | 4 +-- .../expressions/stringLiteralScript.txt | 4 +-- .../stringTemplateExpressionEntryScript.txt | 4 +-- .../expressions/throwExpressionScript.txt | 4 +-- .../expressions/tryExpressionScript.txt | 4 +-- .../expressions/whenExpressionScript.txt | 4 +-- .../expressions/whileExpressionScript.txt | 4 +-- .../expressions/wholeStringTemplateScript.txt | 4 +-- .../inImport/firstImportNamePartScript.txt | 4 +-- .../inImport/importListScript.txt | 4 +-- .../inImport/middleImportNamePartScript.txt | 4 +-- .../qualifiedImportNamePartScript.txt | 4 +-- .../inImport/wholeImportDirectiveScript.txt | 4 +-- .../inImport/wholeImportNameScript.txt | 4 +-- .../inPackage/firstPackageNamePartScript.txt | 4 +-- .../inPackage/middlePackageNamePartScript.txt | 4 +-- .../qualifiedPackageNamePartScript.txt | 4 +-- .../inPackage/wholePackageDirectiveScript.txt | 4 +-- .../inPackage/wholePackageNameScript.txt | 4 +-- ...OfQualifiedCallWithNestedClassesScript.txt | 4 +-- ...iedPartOfQualifiedCallUnresolvedScript.txt | 2 +- .../types/functionalTypeScript.txt | 4 +-- .../types/nestedClassTypeScript.txt | 4 +-- .../types/nullableTypeScript.txt | 4 +-- .../types/receiverTypeScript.txt | 4 +-- .../getOrBuildFir/types/wholeTypeScript.txt | 4 +-- .../wholeDeclaration/assignmentStatement.txt | 4 +-- .../getOrBuildFir/wholeDeclaration/class.txt | 4 +-- .../classTypeParemeterScript.txt | 4 +-- .../wholeDeclaration/enumEntryScript.txt | 4 +-- .../wholeDeclaration/function.txt | 4 +-- .../wholeDeclaration/getterScript.txt | 4 +-- .../wholeDeclaration/localClassScript.txt | 4 +-- .../wholeDeclaration/localFunctionScript.txt | 4 +-- .../wholeDeclaration/localPropertyScript.txt | 4 +-- .../wholeDeclaration/memberFunctionScript.txt | 4 +-- .../wholeDeclaration/memberPropertyScript.txt | 4 +-- .../memberTypeAliasScript.txt | 4 +-- .../wholeDeclaration/nestedClassScript.txt | 4 +-- ...primaryConstructorValueParameterScript.txt | 4 +-- .../wholeDeclaration/scriptInitializer.txt | 6 ++-- ...condaryConstructorValueParameterScript.txt | 4 +-- .../wholeDeclaration/setterScript.txt | 4 +-- .../wholeDeclaration/statement.txt | 6 ++-- .../topLevelPropertyScript.txt | 4 +-- .../topLevelTypelTypeAliasScript.txt | 4 +-- .../annotationArgumentsMixScript.txt | 29 +++++++++---------- .../annotationClassWithJavaTargetScript.txt | 29 +++++++++---------- .../annotationOnLocalClassScript.txt | 28 +++++++++--------- .../annotationParametersScript.txt | 29 +++++++++---------- .../annotationWithTypeArgumentScript.txt | 29 +++++++++---------- .../lazyResolve/annotationsScript.txt | 29 +++++++++---------- ...sFunctionWithAnnotatedParameter2Script.txt | 29 +++++++++---------- ...atedParameterOnImplicitTypePhaseScript.txt | 29 +++++++++---------- ...usFunctionWithAnnotatedParameterScript.txt | 29 +++++++++---------- .../lazyResolve/classMembersScript.txt | 29 +++++++++---------- .../classes/annotationWithTargetScript.txt | 29 +++++++++---------- .../classes/classWithTypeParametersScript.txt | 29 +++++++++---------- .../classes/functionInValueClassScript.txt | 29 +++++++++---------- ...archyWithOverrideAndNestedClass2Script.txt | 29 +++++++++---------- ...archyWithOverrideAndNestedClass3Script.txt | 29 +++++++++---------- ...archyWithOverrideAndNestedClass4Script.txt | 29 +++++++++---------- ...rarchyWithOverrideAndNestedClassScript.txt | 29 +++++++++---------- .../classes/hierarchyWithOverrideScript.txt | 29 +++++++++---------- .../lazyResolve/classes/nestedClassScript.txt | 29 +++++++++---------- ...stedClassWithPropertiesOverridesScript.txt | 29 +++++++++---------- .../classes/simpleLoopInOverride2Script.txt | 29 +++++++++---------- .../classes/simpleLoopInOverrideScript.txt | 29 +++++++++---------- ...erRequiredAnnotationOnLocalClassScript.txt | 28 +++++++++--------- ...AnnotationsOnConstructorPropertyScript.txt | 29 +++++++++---------- ...RequiredAnnotationsOnConstructorScript.txt | 29 +++++++++---------- ...lerRequiredAnnotationsOnFunctionScript.txt | 29 +++++++++---------- ...redAnnotationsOnPropertyDelegateScript.txt | 29 +++++++++---------- ...lerRequiredAnnotationsOnPropertyScript.txt | 29 +++++++++---------- .../complexLocalHierarchyScript.txt | 28 +++++++++--------- .../complexRedeclarationScript.txt | 28 +++++++++--------- .../lazyResolve/cyclicHierarchy2Script.txt | 29 +++++++++---------- .../lazyResolve/cyclicHierarchy3Script.txt | 29 +++++++++---------- .../lazyResolve/cyclicHierarchyScript.txt | 29 +++++++++---------- .../cyclicNestedHierarchy2Script.txt | 29 +++++++++---------- .../cyclicNestedHierarchyScript.txt | 29 +++++++++---------- .../lazyResolve/dataClassCopyScript.txt | 29 +++++++++---------- .../lazyResolve/dataComponent2Script.txt | 29 +++++++++---------- .../delegateWithImplicitTypeScript.txt | 29 +++++++++---------- .../lazyResolve/delegatedFieldScript.txt | 29 +++++++++---------- .../testData/lazyResolve/delegatesScript.txt | 29 +++++++++---------- .../lazyResolve/enumEntriesScript.txt | 29 +++++++++---------- .../testData/lazyResolve/enumEntryScript.txt | 29 +++++++++---------- .../lazyResolve/enumValueOfScript.txt | 29 +++++++++---------- .../testData/lazyResolve/enumValuesScript.txt | 29 +++++++++---------- .../lazyResolve/fakeOverrideScript.txt | 29 +++++++++---------- .../fakePrimaryConstructorScript.txt | 29 +++++++++---------- .../lazyResolve/fileAnnotationsScript.txt | 29 +++++++++---------- .../fromLocalHierarchyToOuterScript.txt | 28 +++++++++--------- .../functionWithParameterScript.txt | 29 +++++++++---------- .../lazyResolve/functions/contractScript.txt | 29 +++++++++---------- .../lazyResolve/functions/contractScript2.txt | 29 +++++++++---------- .../functionCallWithGenericResultScript.txt | 29 +++++++++---------- .../functions/functionParameterScript.txt | 29 +++++++++---------- ...ionWithGenericExpectedTypeInsideScript.txt | 29 +++++++++---------- .../functionWithTypeParametersScript.txt | 29 +++++++++---------- ...archyWithOverrideAndNestedClass2Script.txt | 29 +++++++++---------- ...archyWithOverrideAndNestedClass3Script.txt | 29 +++++++++---------- ...rarchyWithOverrideAndNestedClassScript.txt | 29 +++++++++---------- .../functions/hierarchyWithOverrideScript.txt | 29 +++++++++---------- .../functions/simpleLoopInOverride2Script.txt | 29 +++++++++---------- .../functions/simpleLoopInOverrideScript.txt | 29 +++++++++---------- .../lambdaAsSAMInterfaceScript.txt | 29 +++++++++---------- .../lazyResolve/lazyPropertyScript.txt | 29 +++++++++---------- .../lazyResolve/localConstructorScript.txt | 28 +++++++++--------- ...ocalFunctionInsideAnnotationCallScript.txt | 29 +++++++++---------- ...calFunctionInsideFunctionLiteralScript.txt | 29 +++++++++---------- ...deLambdaCallInsideStringTemplateScript.txt | 29 +++++++++---------- .../localFunctionInsideStatement.txt | 28 +++++++++--------- ...ocalFunctionInsideStringTemplateScript.txt | 29 +++++++++---------- ...ocalFunctionInsideSuperEntryCallScript.txt | 29 +++++++++---------- .../lazyResolve/localNestedClassScript.txt | 28 +++++++++--------- ...calParameterInsideSuperEntryCallScript.txt | 29 +++++++++---------- ...ilerRequiredAnnotationsForMemberScript.txt | 29 +++++++++---------- ...lerRequiredAnnotationsInsideBodyScript.txt | 28 +++++++++--------- ...estedCompilerRequiredAnnotationsScript.txt | 29 +++++++++---------- .../lazyResolve/nestedTypeAlias2Script.txt | 29 +++++++++---------- .../lazyResolve/nestedTypeAliasScript.txt | 29 +++++++++---------- .../parameterOfNonLocalSetterScript.txt | 29 +++++++++---------- .../parameterOfTopSetterScript.txt | 29 +++++++++---------- .../primaryConstructorParameterScript.txt | 29 +++++++++---------- .../primaryConstructorPropertyScript.txt | 29 +++++++++---------- .../lazyResolve/primaryConstructorScript.txt | 29 +++++++++---------- .../properties/getterWithDelegationScript.txt | 29 +++++++++---------- ...archyWithOverrideAndNestedClass2Script.txt | 29 +++++++++---------- ...archyWithOverrideAndNestedClass3Script.txt | 29 +++++++++---------- ...archyWithOverrideAndNestedClass4Script.txt | 29 +++++++++---------- ...rarchyWithOverrideAndNestedClassScript.txt | 29 +++++++++---------- .../hierarchyWithOverrideScript.txt | 29 +++++++++---------- ...rtyGetterWithExplicitTypeAndBodyScript.txt | 29 +++++++++---------- .../propertyGetterWithExplicitTypeScript.txt | 29 +++++++++---------- .../propertyGetterWithImplicitTypeScript.txt | 29 +++++++++---------- .../properties/propertySetterScript.txt | 29 +++++++++---------- .../propertyWithTypeParametersScript.txt | 29 +++++++++---------- .../simpleLoopInOverride2Script.txt | 29 +++++++++---------- .../properties/simpleLoopInOverrideScript.txt | 29 +++++++++---------- .../propertyWithGetterAndSetterScript.txt | 29 +++++++++---------- .../lazyResolve/propertyWithGetterScript.txt | 29 +++++++++---------- .../propertyWithInitializerScript.txt | 29 +++++++++---------- .../lazyResolve/redeclarationScript.txt | 29 +++++++++---------- .../resolveSuperTypeFromLocalClassScript.txt | 28 +++++++++--------- ...lveTypeFromLocalClassConstructorScript.txt | 29 +++++++++---------- .../resolveTypeFromLocalFunctionScript.txt | 29 +++++++++---------- .../testData/lazyResolve/script.txt | 28 +++++++++--------- .../testData/lazyResolve/script2.txt | 29 +++++++++---------- .../testData/lazyResolve/script3.txt | 28 +++++++++--------- .../testData/lazyResolve/script4.txt | 29 +++++++++---------- .../testData/lazyResolve/scriptArgument.txt | 29 +++++++++---------- .../secondaryConstructorParameterScript.txt | 29 +++++++++---------- .../secondaryConstructorScript.txt | 29 +++++++++---------- .../testData/lazyResolve/statement.txt | 28 +++++++++--------- .../testData/lazyResolve/statement2.txt | 29 +++++++++---------- .../lazyResolve/statementTransformation.txt | 29 +++++++++---------- .../substitutionFakeOverrideScript.txt | 29 +++++++++---------- ...tionFakeOverrideWithImplicitTypeScript.txt | 29 +++++++++---------- .../lazyResolve/superTypesLoopScript.txt | 29 +++++++++---------- .../testData/lazyResolve/superTypesScript.txt | 29 +++++++++---------- .../syntheticResultDeclaration.txt | 29 +++++++++---------- .../syntheticResultDeclarationWithBigBody.txt | 29 +++++++++---------- .../lazyResolve/topLevelFunctionsScript.txt | 29 +++++++++---------- ...ithExpressionBodyAndExplicitTypeScript.txt | 29 +++++++++---------- ...opLevelFunctionsWithImplicitTypeScript.txt | 29 +++++++++---------- .../typeAliasWithTypeParametersScript.txt | 29 +++++++++---------- .../lazyResolve/typeParameterBoundsScript.txt | 29 +++++++++---------- .../typeParameterOfClass2Script.txt | 29 +++++++++---------- .../typeParameterOfClassScript.txt | 29 +++++++++---------- .../typeParameterOfNonLocalFunctionScript.txt | 29 +++++++++---------- .../typeParameterOfTopFunctionScript.txt | 29 +++++++++---------- .../typeParameterOfTopSetterScript.txt | 29 +++++++++---------- .../typeParameterOfTypeAliasScript.txt | 29 +++++++++---------- .../declarations/script.lazyBodies.txt | 2 +- .../rawBuilder/declarations/script.txt | 2 +- .../kotlin/fir/renderer/FirRenderer.kt | 2 +- 291 files changed, 2096 insertions(+), 2226 deletions(-) diff --git a/analysis/low-level-api-fir/testData/contextCollector/scripts/insideClassMember.txt b/analysis/low-level-api-fir/testData/contextCollector/scripts/insideClassMember.txt index b81b7864ea6..a3f153330f9 100644 --- a/analysis/low-level-api-fir/testData/contextCollector/scripts/insideClassMember.txt +++ b/analysis/low-level-api-fir/testData/contextCollector/scripts/insideClassMember.txt @@ -36,7 +36,7 @@ Tower Data Context: Element 9 Context receivers: FirScriptSymbol context(