From 69b9bfc3e05c46ae594f884d1d6d3c446bd9f750 Mon Sep 17 00:00:00 2001 From: Ivan Kochurkin Date: Wed, 13 Dec 2023 23:57:19 +0100 Subject: [PATCH] [FIR] Initialize public visibility for class-like declarations at FIR building phase if no modifier is presented Java resolving subsystem requires calculated visibility for correct disambiguation of supertypes. But visibility remains `Unknown` for Kotlin class-like declarations during supertypes resolving because `STATUS` resolve phase is performed after `SUPER_TYPES` phase. To fix the problem, the visibility should be initialized to public at the FIR building phase if no modifier is presented. ^KT-64127 Fixed --- .../classHeaderPositions/contextReceiver.txt | 2 +- .../classHeaderPositions/superTypeCallee.txt | 2 +- .../superTypeCalleeGenerics.txt | 2 +- .../superTypeCallee_objectLiteral.txt | 4 +- .../classHeaderPositions/superTypeRef.txt | 2 +- .../superTypeRefGenerics.txt | 2 +- .../scripts/insideClassMember.txt | 12 +- .../scripts/insideTopLevelFunction.txt | 12 +- .../testData/contextCollector/simple.txt | 2 +- .../contextCollector/smartCasts/onType.txt | 2 +- .../contextCollector/smartCasts/orRight.txt | 2 +- .../dependentCopy/classBodyScript.context.txt | 4 +- .../dependentCopy/classScript.context.txt | 4 +- .../testData/dependentCopy/script.context.txt | 4 +- .../testData/dependentCopy/script.fir.txt | 2 +- .../dependentCopy/scriptFunction.context.txt | 4 +- .../scriptInsideLastStatement.context.txt | 4 +- .../scriptLastStatement.context.txt | 4 +- .../scriptLastStatementCall.context.txt | 4 +- .../dependentCopy/scriptStatement.context.txt | 4 +- .../scriptStatementCall.context.txt | 4 +- .../annotationInsideWhereFunction.txt | 4 +- .../annotations/superCallAnnotation.txt | 2 +- .../annotations/superCallAnnotation2.txt | 2 +- .../annotations/superCallAnnotationScript.txt | 2 +- .../typeOnAnnotationOnFunctionParameter.txt | 4 +- ...eOnAnnotationOnFunctionParameterScript.txt | 4 +- ...tationOnFunctionParameterWithArguments.txt | 4 +- ...OnFunctionParameterWithArgumentsScript.txt | 4 +- .../calls/noReceiverOnLambda.txt | 4 +- .../calls/qualifiedCallInsideSuperCall5.txt | 2 +- .../getOrBuildFir/calls/superType.txt | 2 +- .../getOrBuildFir/calls/superTypeScript.txt | 2 +- .../declarations/initializerConflict.txt | 2 +- .../getOrBuildFir/declarations/ktij23263.txt | 4 +- .../missedTypeArgumentsInAnnotationCall.txt | 2 +- .../getOrBuildFir/types/nestedClassType.txt | 4 +- .../types/nestedClassTypeScript.txt | 4 +- .../getOrBuildFir/types/superType.txt | 2 +- .../getOrBuildFir/types/superType2.txt | 2 +- .../getOrBuildFir/types/superType3.txt | 2 +- .../types/superTypeAndGeneratedProperty.txt | 2 +- .../getOrBuildFir/types/superTypeInObject.txt | 2 +- .../types/superTypeInObject2.txt | 2 +- .../types/superTypeInObject3.txt | 2 +- .../getOrBuildFir/types/whereFunction.txt | 4 +- .../wholeDeclaration/assignmentStatement.txt | 2 +- .../getOrBuildFir/wholeDeclaration/class.txt | 4 +- .../wholeDeclaration/function.txt | 2 +- .../lambdaAsSAMInterfaceWithAnnotation.txt | 2 +- .../wholeDeclaration/scriptInitializer.txt | 2 +- .../wholeDeclaration/statement.txt | 2 +- .../lazyResolve/annotationArgumentsMix.txt | 60 ++-- .../annotationArgumentsMixScript.txt | 61 ++-- ...onClassWithJavaTarget.out_of_src_roots.txt | 12 +- .../annotationClassWithJavaTarget.txt | 12 +- .../annotationClassWithJavaTargetScript.txt | 13 +- .../annotationFromImplicitJavaType.txt | 24 +- ...FromImplicitJavaTypeWithJavaAnnotation.txt | 24 +- .../annotationInsideWhereFunction.txt | 68 ++--- .../annotationInsideWhereProperty.txt | 56 ++-- .../lazyResolve/annotationOnLocalClass.txt | 44 +-- .../annotationOnLocalClassScript.txt | 45 +-- .../lazyResolve/annotationParameters.txt | 52 ++-- .../annotationParametersScript.txt | 53 ++-- .../annotationWithTypeArgument.txt | 20 +- .../annotationWithTypeArgumentScript.txt | 21 +- ...ithAnnotatedParameter.out_of_src_roots.txt | 24 +- ...nonymousFunctionWithAnnotatedParameter.txt | 22 +- ...thAnnotatedParameter2.out_of_src_roots.txt | 24 +- ...onymousFunctionWithAnnotatedParameter2.txt | 22 +- ...sFunctionWithAnnotatedParameter2Script.txt | 22 +- ...erOnImplicitTypePhase.out_of_src_roots.txt | 24 +- ...hAnnotatedParameterOnImplicitTypePhase.txt | 20 +- ...atedParameterOnImplicitTypePhaseScript.txt | 20 +- ...usFunctionWithAnnotatedParameterScript.txt | 22 +- .../testData/lazyResolve/classMembers.txt | 12 +- .../lazyResolve/classMembersScript.txt | 13 +- .../testData/lazyResolve/classes/actual.txt | 36 +-- ...otationWithArgumentInsideSuperTypeCall.txt | 52 ++-- ...hArgumentInsideSuperTypeCallUnresolved.txt | 12 +- .../annotationWithConstantFromNestedClass.txt | 56 ++-- .../classes/annotationWithTarget.txt | 32 +- .../classes/annotationWithTargetScript.txt | 33 +- .../classes/classWithTypeParameters.txt | 12 +- .../classes/classWithTypeParametersScript.txt | 13 +- .../compilerRequiredAnnotationConflict.txt | 44 +-- .../compilerRequiredAnnotationConflict2.txt | 24 +- .../dataClass/component1TypeCollision.txt | 60 ++-- .../component1TypeCollisionScript.txt | 60 ++-- .../classes/dataClass/copyTypeCollision.txt | 60 ++-- .../dataClass/copyTypeCollisionScript.txt | 60 ++-- .../dataClass/parameterTypeCollision.txt | 60 ++-- .../parameterTypeCollisionScript.txt | 60 ++-- .../dataClass/propertyTypeCollision.txt | 60 ++-- .../dataClass/propertyTypeCollisionScript.txt | 60 ++-- .../classes/functionInValueClass.txt | 12 +- .../classes/functionInValueClassScript.txt | 13 +- .../classes/hierarchyWithOverride.txt | 56 ++-- .../hierarchyWithOverrideAndNestedClass.txt | 178 +++++------ .../hierarchyWithOverrideAndNestedClass2.txt | 158 +++++----- ...archyWithOverrideAndNestedClass2Script.txt | 159 +++++----- .../hierarchyWithOverrideAndNestedClass3.txt | 160 +++++----- ...archyWithOverrideAndNestedClass3Script.txt | 161 +++++----- .../hierarchyWithOverrideAndNestedClass4.txt | 156 +++++----- ...archyWithOverrideAndNestedClass4Script.txt | 157 +++++----- ...rarchyWithOverrideAndNestedClassScript.txt | 179 +++++------ .../classes/hierarchyWithOverrideScript.txt | 57 ++-- .../lazyResolve/classes/nestedClass.txt | 56 ++-- .../lazyResolve/classes/nestedClassScript.txt | 57 ++-- .../nestedClassWithPropertiesOverrides.txt | 48 +-- ...stedClassWithPropertiesOverridesScript.txt | 49 +-- .../classes/simpleLoopInOverride.txt | 60 ++-- .../classes/simpleLoopInOverride2.txt | 60 ++-- .../classes/simpleLoopInOverride2Script.txt | 61 ++-- .../classes/simpleLoopInOverrideScript.txt | 61 ++-- .../classes/superTypeCallNameClash.txt | 58 ++-- ...erTypeCallNameClashImplicitConstructor.txt | 58 ++-- ...CallNameClashImplicitConstructorScript.txt | 58 ++-- .../classes/superTypeCallNameClashScript.txt | 58 ++-- .../classes/superTypeCallNestedNameClash.txt | 58 ++-- ...CallNestedNameClashImplicitConstructor.txt | 58 ++-- ...stedNameClashImplicitConstructorScript.txt | 58 ++-- .../superTypeCallNestedNameClashScript.txt | 58 ++-- ...mpilerRequiredAnnotationsOnConstructor.txt | 32 +- ...quiredAnnotationsOnConstructorProperty.txt | 32 +- ...AnnotationsOnConstructorPropertyScript.txt | 32 +- ...RequiredAnnotationsOnConstructorScript.txt | 32 +- .../compilerRequiredAnnotationsOnFunction.txt | 20 +- ...lerRequiredAnnotationsOnFunctionScript.txt | 21 +- .../compilerRequiredAnnotationsOnProperty.txt | 20 +- ...onsOnPropertyDelegate.out_of_src_roots.txt | 20 +- ...rRequiredAnnotationsOnPropertyDelegate.txt | 20 +- ...redAnnotationsOnPropertyDelegateScript.txt | 20 +- ...lerRequiredAnnotationsOnPropertyScript.txt | 21 +- .../lazyResolve/complexLocalHierarchy.txt | 22 +- .../complexLocalHierarchyScript.txt | 23 +- .../lazyResolve/complexRedeclaration.txt | 284 +++++++++--------- .../complexRedeclarationScript.txt | 284 +++++++++--------- .../testData/lazyResolve/cyclicHierarchy.txt | 132 ++++---- .../testData/lazyResolve/cyclicHierarchy2.txt | 132 ++++---- .../lazyResolve/cyclicHierarchy2Script.txt | 133 ++++---- .../testData/lazyResolve/cyclicHierarchy3.txt | 180 +++++------ .../lazyResolve/cyclicHierarchy3Script.txt | 181 +++++------ .../lazyResolve/cyclicHierarchyScript.txt | 133 ++++---- .../lazyResolve/cyclicNestedHierarchy.txt | 58 ++-- .../lazyResolve/cyclicNestedHierarchy2.txt | 56 ++-- .../cyclicNestedHierarchy2Script.txt | 57 ++-- .../cyclicNestedHierarchyScript.txt | 59 ++-- .../testData/lazyResolve/dataClassCopy.txt | 12 +- .../lazyResolve/dataClassCopyScript.txt | 12 +- .../testData/lazyResolve/dataComponent2.txt | 12 +- .../lazyResolve/dataComponent2Script.txt | 12 +- .../testData/lazyResolve/delegatedField.txt | 48 +-- .../delegatedFieldNestedNameClash.txt | 48 +-- .../delegatedFieldNestedNameClashScript.txt | 48 +-- ...tedFieldNestedNameClashWithNestedTypes.txt | 48 +-- ...ldNestedNameClashWithNestedTypesScript.txt | 48 +-- .../lazyResolve/delegatedFieldScript.txt | 48 +-- .../testData/lazyResolve/enumEntries.txt | 12 +- .../lazyResolve/enumEntriesScript.txt | 13 +- .../testData/lazyResolve/enumEntry.txt | 32 +- .../testData/lazyResolve/enumEntryScript.txt | 33 +- .../testData/lazyResolve/enumValueOf.txt | 12 +- .../lazyResolve/enumValueOfScript.txt | 13 +- .../testData/lazyResolve/enumValues.txt | 12 +- .../testData/lazyResolve/enumValuesScript.txt | 13 +- .../annotationWithNamedFunctionArgument.txt | 12 +- .../anonymousObjectInInvalidPosition.txt | 22 +- .../testData/lazyResolve/expectClass.txt | 12 +- .../explicitSubstitutionOverrideProperty.txt | 8 +- ...icitSubstitutionOverridePropertyScript.txt | 8 +- .../testData/lazyResolve/fakeOverride.txt | 66 ++-- .../lazyResolve/fakeOverrideScript.txt | 66 ++-- .../lazyResolve/fakePrimaryConstructor.txt | 12 +- .../fakePrimaryConstructorScript.txt | 12 +- .../testData/lazyResolve/fileAnnotations.txt | 20 +- .../lazyResolve/fileAnnotationsScript.txt | 21 +- .../testData/lazyResolve/fileElements.txt | 68 ++--- .../lazyResolve/fromLocalHierarchyToOuter.txt | 44 +-- .../fromLocalHierarchyToOuterScript.txt | 45 +-- ...functionWithImplicitTypeAndAnnotations.txt | 20 +- ...onWithImplicitTypeAndAnnotationsScript.txt | 21 +- .../lazyResolve/functionWithParameter.txt | 24 +- .../functionWithParameterScript.txt | 25 +- .../lazyResolve/functionWithWhere.txt | 48 +-- .../lazyResolve/functions/actualOverride.txt | 72 ++--- .../functionCallWithGenericResult.txt | 24 +- .../functionCallWithGenericResultScript.txt | 25 +- .../functionWithGenericExpectedTypeInside.txt | 44 +-- ...ionWithGenericExpectedTypeInsideScript.txt | 45 +-- .../functions/hierarchyWithOverride.txt | 36 +-- .../hierarchyWithOverrideAndNestedClass.txt | 144 ++++----- .../hierarchyWithOverrideAndNestedClass2.txt | 132 ++++---- ...archyWithOverrideAndNestedClass2Script.txt | 133 ++++---- .../hierarchyWithOverrideAndNestedClass3.txt | 156 +++++----- ...archyWithOverrideAndNestedClass3Script.txt | 157 +++++----- ...rarchyWithOverrideAndNestedClassScript.txt | 145 ++++----- .../functions/hierarchyWithOverrideScript.txt | 37 +-- ...AnnotationWithDefaultValueForenumArray.txt | 20 +- .../functions/simpleLoopInOverride.txt | 60 ++-- .../functions/simpleLoopInOverride2.txt | 60 ++-- .../functions/simpleLoopInOverride2Script.txt | 61 ++-- .../functions/simpleLoopInOverrideScript.txt | 61 ++-- .../functions/superTypeCallNameClash.txt | 48 +-- ...erTypeCallNameClashImplicitConstructor.txt | 48 +-- ...CallNameClashImplicitConstructorScript.txt | 48 +-- .../superTypeCallNameClashScript.txt | 48 +-- .../superTypeCallNestedNameClash.txt | 48 +-- ...CallNestedNameClashImplicitConstructor.txt | 48 +-- ...stedNameClashImplicitConstructorScript.txt | 48 +-- .../superTypeCallNestedNameClashScript.txt | 48 +-- .../transitiveSubstitutionFakeOverride.txt | 72 ++--- .../functions/typeArgumentInAnnotation.txt | 20 +- .../implicitSubstitutionOverrideProperty.txt | 8 +- ...icitSubstitutionOverridePropertyScript.txt | 8 +- ...implicitTypeWithInaccessibleAnnotation.txt | 38 +-- .../lazyResolve/initWithAnnotation.txt | 32 +- .../lazyResolve/lambdaAsSAMInterface.txt | 46 +-- .../lambdaAsSAMInterfaceScript.txt | 46 +-- .../testData/lazyResolve/lazyProperty.txt | 34 +-- .../lazyResolve/lazyPropertyScript.txt | 34 +-- .../testData/lazyResolve/localConstructor.txt | 12 +- .../lazyResolve/localConstructorScript.txt | 13 +- .../testData/lazyResolve/localNestedClass.txt | 44 +-- .../lazyResolve/localNestedClassScript.txt | 45 +-- .../nestedCompilerRequiredAnnotations.txt | 102 +++---- ...edCompilerRequiredAnnotationsForMember.txt | 84 +++--- ...ilerRequiredAnnotationsForMemberScript.txt | 85 +++--- ...dCompilerRequiredAnnotationsInsideBody.txt | 46 +-- ...lerRequiredAnnotationsInsideBodyScript.txt | 47 +-- ...estedCompilerRequiredAnnotationsScript.txt | 103 +++---- .../testData/lazyResolve/nestedTypeAlias.txt | 88 +++--- .../testData/lazyResolve/nestedTypeAlias2.txt | 84 +++--- .../lazyResolve/nestedTypeAlias2Script.txt | 85 +++--- .../lazyResolve/nestedTypeAliasScript.txt | 89 +++--- .../arrayOfCall.out_of_src_roots.txt | 12 +- .../lazyResolve/noRuntime/arrayOfCall.txt | 12 +- .../lazyResolve/parameterOfNonLocalSetter.txt | 12 +- .../parameterOfNonLocalSetterScript.txt | 13 +- .../lazyResolve/primaryConstructor.txt | 12 +- .../primaryConstructorParameter.txt | 12 +- .../primaryConstructorParameterScript.txt | 12 +- .../primaryConstructorProperty.txt | 12 +- .../primaryConstructorPropertyScript.txt | 12 +- .../lazyResolve/primaryConstructorScript.txt | 12 +- .../properties/constructorParameter.txt | 56 ++-- ...rameterWithImplicitParameterAnnotation.txt | 32 +- .../delegateWithAnnotationOnAccessor.txt | 38 +-- ...thAnnotationOnAccessorWithExplicitType.txt | 42 +-- .../generatedPropertyFromParameter.txt | 52 ++-- ...rtyFromParameterWithImplicitAnnotation.txt | 32 +- .../properties/getterWithDelegation.txt | 22 +- .../properties/getterWithDelegationScript.txt | 22 +- .../properties/hierarchyWithOverride.txt | 36 +-- .../hierarchyWithOverrideAndNestedClass.txt | 168 +++++------ .../hierarchyWithOverrideAndNestedClass2.txt | 144 ++++----- ...archyWithOverrideAndNestedClass2Script.txt | 145 ++++----- .../hierarchyWithOverrideAndNestedClass3.txt | 156 +++++----- ...archyWithOverrideAndNestedClass3Script.txt | 157 +++++----- .../hierarchyWithOverrideAndNestedClass4.txt | 132 ++++---- ...archyWithOverrideAndNestedClass4Script.txt | 133 ++++---- ...rarchyWithOverrideAndNestedClassScript.txt | 169 +++++------ .../hierarchyWithOverrideScript.txt | 37 +-- .../impliciyTypeWithAnnotationOnFunction.txt | 20 +- .../impliciyTypeWithAnnotationOnProperty.txt | 20 +- .../properties/resultWithPropagatedType.txt | 20 +- .../scriptWithResultWithPropagatedType.txt | 20 +- ...scriptWithTypeAnnotationsOnDeclaration.txt | 24 +- .../properties/simpleLoopInOverride.txt | 60 ++-- .../properties/simpleLoopInOverride2.txt | 60 ++-- .../simpleLoopInOverride2Script.txt | 61 ++-- .../properties/simpleLoopInOverrideScript.txt | 61 ++-- .../properties/typeParameterAnnotations.txt | 48 +-- .../propertyDelegateWithImplicitType.txt | 8 +- ...propertyDelegateWithImplicitTypeScript.txt | 8 +- ...propertyWithImplicitTypeAndAnnotations.txt | 20 +- ...tyWithImplicitTypeAndAnnotationsScript.txt | 21 +- ...rtyWithImplicitTypeAndFieldAnnotations.txt | 20 +- ...hImplicitTypeAndFieldAnnotationsScript.txt | 21 +- .../lazyResolve/propertyWithWhere.txt | 36 +-- .../testData/lazyResolve/redeclaration.txt | 28 +- .../lazyResolve/redeclarationScript.txt | 28 +- .../resolveSuperTypeFromLocalClass.txt | 68 ++--- .../resolveSuperTypeFromLocalClassScript.txt | 69 ++--- .../resolveTypeFromLocalClassConstructor.txt | 72 ++--- ...lveTypeFromLocalClassConstructorScript.txt | 73 ++--- .../resolveTypeFromLocalFunction.txt | 72 ++--- .../resolveTypeFromLocalFunctionScript.txt | 73 ++--- .../testData/lazyResolve/script.txt | 66 ++-- .../testData/lazyResolve/script2.txt | 25 +- .../testData/lazyResolve/script3.txt | 24 +- .../testData/lazyResolve/script4.txt | 19 +- .../lazyResolve/secondaryConstructor.txt | 22 +- .../secondaryConstructorParameter.txt | 12 +- .../secondaryConstructorParameterScript.txt | 12 +- .../secondaryConstructorScript.txt | 23 +- .../substitutionFakeOverrideConstructor.txt | 24 +- ...stitutionFakeOverrideConstructorScript.txt | 24 +- .../testData/lazyResolve/superTypes.txt | 58 ++-- .../testData/lazyResolve/superTypesLoop.txt | 82 ++--- .../lazyResolve/superTypesLoopScript.txt | 83 ++--- .../testData/lazyResolve/superTypesScript.txt | 59 ++-- .../explicitReturnTypeAndAnnotations.txt | 8 +- .../implicitReturnTypeAndAnnotations.txt | 8 +- ...plicitReturnTypeAndAnnotationsAsGetter.txt | 8 +- .../secondGenerationOverride.txt | 8 +- ...terAndExplicitReturnTypeAndAnnotations.txt | 8 +- ...plicitReturnTypeAndAnnotationsAsGetter.txt | 8 +- ...plicitReturnTypeAndAnnotationsAsSetter.txt | 8 +- .../typeAliasWithAnnotationOnType.txt | 32 +- .../typeAliasWithTypeParameters.txt | 12 +- .../typeAliasWithTypeParametersScript.txt | 13 +- .../lazyResolve/typeParameterBounds.txt | 46 +-- .../lazyResolve/typeParameterBoundsScript.txt | 47 +-- .../lazyResolve/typeParameterOfClass.txt | 12 +- .../lazyResolve/typeParameterOfClass2.txt | 24 +- .../typeParameterOfClass2Script.txt | 25 +- .../typeParameterOfClassScript.txt | 13 +- .../typeParameterOfNonLocalFunction.txt | 12 +- .../typeParameterOfNonLocalFunctionScript.txt | 13 +- .../lazyResolve/typeParameterOfTypeAlias.txt | 36 +-- .../typeParameterOfTypeAliasScript.txt | 37 +-- ...assAnnotationsInLocalClass.lazyResolve.txt | 44 +-- ...otationsInLocalClassScript.lazyResolve.txt | 45 +-- ...delegateFieldWithAnnotationClash.after.txt | 4 +- ...elegateFieldWithAnnotationClash.before.txt | 8 +- ...teFieldWithAnnotationClash.lazyResolve.txt | 78 ++--- ...teFieldWithAnnotationClashScript.after.txt | 5 +- ...eFieldWithAnnotationClashScript.before.txt | 9 +- ...dWithAnnotationClashScript.lazyResolve.txt | 79 ++--- ...eldNestedNameClashAndAnnotations.after.txt | 6 +- ...ldNestedNameClashAndAnnotations.before.txt | 10 +- ...tedNameClashAndAnnotations.lazyResolve.txt | 100 +++--- ...tedNameClashAndAnnotationsScript.after.txt | 7 +- ...edNameClashAndAnnotationsScript.before.txt | 11 +- ...eClashAndAnnotationsScript.lazyResolve.txt | 100 +++--- ...ashWithNestedTypesAndAnnotations.after.txt | 6 +- ...shWithNestedTypesAndAnnotations.before.txt | 10 +- ...hNestedTypesAndAnnotations.lazyResolve.txt | 100 +++--- ...hNestedTypesAndAnnotationsScript.after.txt | 7 +- ...NestedTypesAndAnnotationsScript.before.txt | 11 +- ...dTypesAndAnnotationsScript.lazyResolve.txt | 100 +++--- .../nestedClassAsAnnotationArgument.after.txt | 2 +- ...nestedClassAsAnnotationArgument.before.txt | 8 +- ...dClassAsAnnotationArgument.lazyResolve.txt | 66 ++-- ...nestedClassAsAnnotationArgument2.after.txt | 2 +- ...estedClassAsAnnotationArgument2.before.txt | 8 +- ...ClassAsAnnotationArgument2.lazyResolve.txt | 66 ++-- ...meterTypeCollisionAndAnnotations.after.txt | 4 +- ...eterTypeCollisionAndAnnotations.before.txt | 10 +- ...ypeCollisionAndAnnotations.lazyResolve.txt | 96 +++--- ...ypeCollisionAndAnnotationsScript.after.txt | 4 +- ...peCollisionAndAnnotationsScript.before.txt | 10 +- ...lisionAndAnnotationsScript.lazyResolve.txt | 96 +++--- ...dNestedClassAsAnnotationArgument.after.txt | 2 +- ...NestedClassAsAnnotationArgument.before.txt | 8 +- ...dClassAsAnnotationArgument.lazyResolve.txt | 66 ++-- ...NestedClassAsAnnotationArgument2.after.txt | 2 +- ...estedClassAsAnnotationArgument2.before.txt | 8 +- ...ClassAsAnnotationArgument2.lazyResolve.txt | 66 ++-- ...rTypeCallNameClashWithAnnotation.after.txt | 6 +- ...TypeCallNameClashWithAnnotation.before.txt | 10 +- ...allNameClashWithAnnotation.lazyResolve.txt | 100 +++--- ...ithAnnotationImplicitConstructor.after.txt | 6 +- ...thAnnotationImplicitConstructor.before.txt | 10 +- ...otationImplicitConstructor.lazyResolve.txt | 100 +++--- ...otationImplicitConstructorScript.after.txt | 7 +- ...tationImplicitConstructorScript.before.txt | 11 +- ...nImplicitConstructorScript.lazyResolve.txt | 101 ++++--- ...allNameClashWithAnnotationScript.after.txt | 7 +- ...llNameClashWithAnnotationScript.before.txt | 11 +- ...eClashWithAnnotationScript.lazyResolve.txt | 101 ++++--- ...allNestedNameClashWithAnnotation.after.txt | 6 +- ...llNestedNameClashWithAnnotation.before.txt | 10 +- ...tedNameClashWithAnnotation.lazyResolve.txt | 100 +++--- ...ithAnnotationImplicitConstructor.after.txt | 6 +- ...thAnnotationImplicitConstructor.before.txt | 10 +- ...otationImplicitConstructor.lazyResolve.txt | 100 +++--- ...otationImplicitConstructorScript.after.txt | 7 +- ...tationImplicitConstructorScript.before.txt | 11 +- ...nImplicitConstructorScript.lazyResolve.txt | 101 ++++--- ...tedNameClashWithAnnotationScript.after.txt | 7 +- ...edNameClashWithAnnotationScript.before.txt | 11 +- ...eClashWithAnnotationScript.lazyResolve.txt | 101 ++++--- .../constructor/call.lazyResolve.txt | 44 +-- .../constructor/callScript.lazyResolve.txt | 44 +-- .../callWithConstructor.lazyResolve.txt | 44 +-- .../callWithConstructorScript.lazyResolve.txt | 44 +-- .../parameterWithAnnotations.before.txt | 4 +- .../parameterWithAnnotations.lazyResolve.txt | 32 +- ...WithAnnotationsBodyResolve.lazyResolve.txt | 32 +- .../parameterWithAnnotationsScript.before.txt | 4 +- ...meterWithAnnotationsScript.lazyResolve.txt | 33 +- ...notationsScriptBodyResolve.lazyResolve.txt | 33 +- ...ationToLocalMemberFunction.lazyResolve.txt | 34 +-- ...oLocalMemberFunctionScript.lazyResolve.txt | 35 +-- .../constructor/reference.after.txt | 2 +- .../constructor/reference.before.txt | 2 +- .../constructor/reference.lazyResolve.txt | 56 ++-- .../constructor/referenceScript.after.txt | 2 +- .../constructor/referenceScript.before.txt | 2 +- .../referenceScript.lazyResolve.txt | 56 ++-- .../referenceWithConstructor.after.txt | 2 +- .../referenceWithConstructor.before.txt | 2 +- .../referenceWithConstructor.lazyResolve.txt | 56 ++-- .../referenceWithConstructorScript.after.txt | 2 +- .../referenceWithConstructorScript.before.txt | 2 +- ...renceWithConstructorScript.lazyResolve.txt | 56 ++-- .../secondaryConstructor.lazyResolve.txt | 44 +-- ...secondaryConstructorScript.lazyResolve.txt | 45 +-- ...delegateFieldWithAnnotationClash.after.txt | 4 +- ...elegateFieldWithAnnotationClash.before.txt | 8 +- ...teFieldWithAnnotationClash.lazyResolve.txt | 68 ++--- ...teFieldWithAnnotationClashScript.after.txt | 4 +- ...eFieldWithAnnotationClashScript.before.txt | 8 +- ...dWithAnnotationClashScript.lazyResolve.txt | 68 ++--- .../delegateWithExplicitType.before.txt | 2 +- .../delegateWithExplicitType.lazyResolve.txt | 8 +- .../delegateWithExplicitTypeScript.before.txt | 2 +- ...gateWithExplicitTypeScript.lazyResolve.txt | 8 +- ...gateWithExplicitTypeUnavailable.before.txt | 4 +- ...ithExplicitTypeUnavailable.lazyResolve.txt | 12 +- ...thExplicitTypeUnavailableScript.before.txt | 4 +- ...licitTypeUnavailableScript.lazyResolve.txt | 12 +- .../delegateWithImplicitType.before.txt | 2 +- .../delegateWithImplicitType.lazyResolve.txt | 8 +- .../delegateWithImplicitTypeScript.before.txt | 2 +- ...gateWithImplicitTypeScript.lazyResolve.txt | 8 +- ...gateWithImplicitTypeUnavailable.before.txt | 2 +- ...ithImplicitTypeUnavailable.lazyResolve.txt | 12 +- ...thImplicitTypeUnavailableScript.before.txt | 2 +- ...licitTypeUnavailableScript.lazyResolve.txt | 12 +- .../delegatedFieldNestedName.after.txt | 8 +- .../delegatedFieldNestedName.before.txt | 12 +- .../delegatedFieldNestedName.lazyResolve.txt | 96 +++--- ...eldNestedNameClashAndAnnotations.after.txt | 6 +- ...ldNestedNameClashAndAnnotations.before.txt | 10 +- ...tedNameClashAndAnnotations.lazyResolve.txt | 84 +++--- ...tedNameClashAndAnnotationsScript.after.txt | 6 +- ...edNameClashAndAnnotationsScript.before.txt | 10 +- ...eClashAndAnnotationsScript.lazyResolve.txt | 84 +++--- ...ashWithNestedTypesAndAnnotations.after.txt | 6 +- ...shWithNestedTypesAndAnnotations.before.txt | 10 +- ...hNestedTypesAndAnnotations.lazyResolve.txt | 84 +++--- ...hNestedTypesAndAnnotationsScript.after.txt | 6 +- ...NestedTypesAndAnnotationsScript.before.txt | 10 +- ...dTypesAndAnnotationsScript.lazyResolve.txt | 84 +++--- .../delegatedFieldNestedNameScript.after.txt | 8 +- .../delegatedFieldNestedNameScript.before.txt | 12 +- ...gatedFieldNestedNameScript.lazyResolve.txt | 96 +++--- .../delegate/field.before.txt | 4 +- .../delegate/field.lazyResolve.txt | 32 +- .../delegate/fieldScript.before.txt | 4 +- .../delegate/fieldScript.lazyResolve.txt | 32 +- .../propertyWithExplicitType.before.txt | 2 +- .../propertyWithExplicitType.lazyResolve.txt | 38 +-- .../propertyWithExplicitTypeScript.before.txt | 2 +- ...ertyWithExplicitTypeScript.lazyResolve.txt | 38 +-- ...ertyWithExplicitTypeUnavailable.before.txt | 2 +- ...ithExplicitTypeUnavailable.lazyResolve.txt | 56 ++-- ...thExplicitTypeUnavailableScript.before.txt | 2 +- ...licitTypeUnavailableScript.lazyResolve.txt | 56 ++-- .../propertyWithImplicitType.before.txt | 2 +- .../propertyWithImplicitType.lazyResolve.txt | 38 +-- .../propertyWithImplicitTypeScript.before.txt | 2 +- ...ertyWithImplicitTypeScript.lazyResolve.txt | 38 +-- ...ertyWithImplicitTypeUnavailable.before.txt | 2 +- ...ithImplicitTypeUnavailable.lazyResolve.txt | 38 +-- ...thImplicitTypeUnavailableScript.before.txt | 2 +- ...licitTypeUnavailableScript.lazyResolve.txt | 38 +-- .../classLevel.after.txt | 8 +- .../classLevel.before.txt | 8 +- .../classLevel.lazyResolve.txt | 96 +++--- .../scriptClassLevel.after.txt | 9 +- .../scriptClassLevel.before.txt | 9 +- .../scriptClassLevel.lazyResolve.txt | 97 +++--- .../scriptStatementLevel.lazyResolve.txt | 44 +-- ...tementLevelAsLastStatement.lazyResolve.txt | 36 +-- .../topLevel.after.txt | 4 +- .../topLevel.before.txt | 4 +- .../topLevel.lazyResolve.txt | 48 +-- .../errorType/errorType.before.txt | 2 +- .../errorType/errorType.lazyResolve.txt | 20 +- .../errorType/errorTypeScript.before.txt | 2 +- .../errorType/errorTypeScript.lazyResolve.txt | 21 +- .../nestedErrorReturnType.before.txt | 2 +- .../nestedErrorReturnType.lazyResolve.txt | 20 +- .../nestedErrorReturnTypeScript.before.txt | 2 +- ...estedErrorReturnTypeScript.lazyResolve.txt | 21 +- ...nent1TypeCollisionAndAnnotations.after.txt | 4 +- ...ent1TypeCollisionAndAnnotations.before.txt | 10 +- ...ypeCollisionAndAnnotations.lazyResolve.txt | 96 +++--- ...ypeCollisionAndAnnotationsScript.after.txt | 4 +- ...peCollisionAndAnnotationsScript.before.txt | 10 +- ...lisionAndAnnotationsScript.lazyResolve.txt | 96 +++--- .../copyTypeCollisionAndAnnotations.after.txt | 4 +- ...copyTypeCollisionAndAnnotations.before.txt | 10 +- ...ypeCollisionAndAnnotations.lazyResolve.txt | 96 +++--- ...ypeCollisionAndAnnotationsScript.after.txt | 4 +- ...peCollisionAndAnnotationsScript.before.txt | 10 +- ...lisionAndAnnotationsScript.lazyResolve.txt | 96 +++--- ...ClashAndAnnotationsAsConstructor.after.txt | 2 +- ...lashAndAnnotationsAsConstructor.before.txt | 10 +- ...ndAnnotationsAsConstructor.lazyResolve.txt | 84 +++--- ...ndAnnotationsAsConstructorScript.after.txt | 2 +- ...dAnnotationsAsConstructorScript.before.txt | 10 +- ...tationsAsConstructorScript.lazyResolve.txt | 84 +++--- ...TypesAndAnnotationsAsConstructor.after.txt | 2 +- ...ypesAndAnnotationsAsConstructor.before.txt | 10 +- ...ndAnnotationsAsConstructor.lazyResolve.txt | 84 +++--- ...ndAnnotationsAsConstructorScript.after.txt | 2 +- ...dAnnotationsAsConstructorScript.before.txt | 10 +- ...tationsAsConstructorScript.lazyResolve.txt | 84 +++--- .../function/explicitType.after.txt | 2 +- .../function/explicitType.before.txt | 4 +- .../function/explicitType.lazyResolve.txt | 44 +-- .../function/explicitTypeScript.after.txt | 2 +- .../function/explicitTypeScript.before.txt | 4 +- .../explicitTypeScript.lazyResolve.txt | 45 +-- .../function/generatedComponentN.before.txt | 4 +- .../generatedComponentN.lazyResolve.txt | 32 +- .../generatedComponentNScript.before.txt | 4 +- .../generatedComponentNScript.lazyResolve.txt | 32 +- .../function/generatedCopy.before.txt | 4 +- .../function/generatedCopy.lazyResolve.txt | 32 +- .../function/generatedCopyScript.before.txt | 4 +- .../generatedCopyScript.lazyResolve.txt | 32 +- .../function/implicitType.before.txt | 2 +- .../function/implicitType.lazyResolve.txt | 20 +- .../function/implicitTypeScript.before.txt | 2 +- .../implicitTypeScript.lazyResolve.txt | 20 +- .../implicitTypeUnavailable.before.txt | 2 +- .../implicitTypeUnavailable.lazyResolve.txt | 38 +-- .../implicitTypeUnavailableScript.before.txt | 2 +- ...licitTypeUnavailableScript.lazyResolve.txt | 38 +-- .../function/localFunction.after.txt | 2 +- .../function/localFunction.before.txt | 2 +- .../function/localFunction.lazyResolve.txt | 46 +-- .../localFunctionImplicitType.after.txt | 2 +- .../localFunctionImplicitType.before.txt | 2 +- .../localFunctionImplicitType.lazyResolve.txt | 46 +-- ...calImplicitTypeUnavailable.lazyResolve.txt | 22 +- ...eUnavailableInImplicitBody.lazyResolve.txt | 18 +- ...ilableInImplicitBodyScript.lazyResolve.txt | 18 +- ...licitTypeUnavailableScript.lazyResolve.txt | 22 +- .../function/multiDeclaration.lazyResolve.txt | 36 +-- .../multiDeclarationScript.lazyResolve.txt | 36 +-- .../parameterAsImplicitReturnType.before.txt | 2 +- ...ameterAsImplicitReturnType.lazyResolve.txt | 20 +- ...licitReturnTypeBodyResolve.lazyResolve.txt | 20 +- ...AsImplicitReturnTypePropagation.before.txt | 2 +- ...licitReturnTypePropagation.lazyResolve.txt | 20 +- ...icitReturnTypePropagationScript.before.txt | 2 +- ...eturnTypePropagationScript.lazyResolve.txt | 20 +- ...meterAsImplicitReturnTypeScript.before.txt | 2 +- ...AsImplicitReturnTypeScript.lazyResolve.txt | 20 +- ...eturnTypeScriptBodyResolve.lazyResolve.txt | 20 +- ...etweenLocalMemberFunctions.lazyResolve.txt | 22 +- ...emberFunctionsImplicitBody.lazyResolve.txt | 18 +- ...unctionsImplicitBodyScript.lazyResolve.txt | 18 +- ...LocalMemberFunctionsScript.lazyResolve.txt | 23 +- ...ationToLocalMemberFunction.lazyResolve.txt | 22 +- ...LocalMemberFunctionImplicitBody.before.txt | 2 +- ...MemberFunctionImplicitBody.lazyResolve.txt | 20 +- ...emberFunctionImplicitBodyScript.before.txt | 2 +- ...FunctionImplicitBodyScript.lazyResolve.txt | 20 +- ...oLocalMemberFunctionScript.lazyResolve.txt | 22 +- ...rTypeCallNameClashWithAnnotation.after.txt | 6 +- ...TypeCallNameClashWithAnnotation.before.txt | 10 +- ...allNameClashWithAnnotation.lazyResolve.txt | 84 +++--- ...ithAnnotationImplicitConstructor.after.txt | 6 +- ...thAnnotationImplicitConstructor.before.txt | 10 +- ...otationImplicitConstructor.lazyResolve.txt | 84 +++--- ...otationImplicitConstructorScript.after.txt | 6 +- ...tationImplicitConstructorScript.before.txt | 10 +- ...nImplicitConstructorScript.lazyResolve.txt | 84 +++--- ...allNameClashWithAnnotationScript.after.txt | 6 +- ...llNameClashWithAnnotationScript.before.txt | 10 +- ...eClashWithAnnotationScript.lazyResolve.txt | 84 +++--- ...allNestedNameClashWithAnnotation.after.txt | 6 +- ...llNestedNameClashWithAnnotation.before.txt | 10 +- ...tedNameClashWithAnnotation.lazyResolve.txt | 84 +++--- ...ithAnnotationImplicitConstructor.after.txt | 6 +- ...thAnnotationImplicitConstructor.before.txt | 10 +- ...otationImplicitConstructor.lazyResolve.txt | 84 +++--- ...otationImplicitConstructorScript.after.txt | 6 +- ...tationImplicitConstructorScript.before.txt | 10 +- ...nImplicitConstructorScript.lazyResolve.txt | 84 +++--- ...tedNameClashWithAnnotationScript.after.txt | 6 +- ...edNameClashWithAnnotationScript.before.txt | 10 +- ...eClashWithAnnotationScript.lazyResolve.txt | 84 +++--- .../typeParameterAnnotations.before.txt | 6 +- .../typeParameterAnnotations.lazyResolve.txt | 48 +-- ...terAnnotationsInLocalClass.lazyResolve.txt | 22 +- ...otationsInLocalClassScript.lazyResolve.txt | 23 +- ...hInaccessibleAnnotationArgument.before.txt | 2 +- ...cessibleAnnotationArgument.lazyResolve.txt | 20 +- ...thInaccessibleAnnotationArgument.after.txt | 2 +- ...hInaccessibleAnnotationArgument.before.txt | 2 +- ...cessibleAnnotationArgument.lazyResolve.txt | 22 +- .../classInitializer.lazyResolve.txt | 34 +-- .../classInitializerScript.lazyResolve.txt | 35 +-- .../property/constructorParameter.before.txt | 4 +- .../constructorParameter.lazyResolve.txt | 32 +- .../constructorParameterScript.before.txt | 4 +- ...constructorParameterScript.lazyResolve.txt | 32 +- .../property/explicitType.before.txt | 2 +- .../property/explicitType.lazyResolve.txt | 20 +- .../property/explicitTypeScript.before.txt | 2 +- .../explicitTypeScript.lazyResolve.txt | 21 +- ...eneratedPropertyFromConstructor.before.txt | 4 +- ...tedPropertyFromConstructor.lazyResolve.txt | 32 +- ...edPropertyFromConstructorScript.before.txt | 4 +- ...pertyFromConstructorScript.lazyResolve.txt | 32 +- .../property/implicitType.before.txt | 2 +- .../property/implicitType.lazyResolve.txt | 20 +- ...plicitTypeFromIncorrectAccessors.after.txt | 4 +- ...licitTypeFromIncorrectAccessors.before.txt | 4 +- ...TypeFromIncorrectAccessors.lazyResolve.txt | 26 +- ...romIncorrectAccessorsPropagation.after.txt | 4 +- ...omIncorrectAccessorsPropagation.before.txt | 4 +- ...orrectAccessorsPropagation.lazyResolve.txt | 26 +- ...orrectAccessorsPropagationScript.after.txt | 3 +- ...rrectAccessorsPropagationScript.before.txt | 3 +- ...AccessorsPropagationScript.lazyResolve.txt | 25 +- ...TypeFromIncorrectAccessorsScript.after.txt | 3 +- ...ypeFromIncorrectAccessorsScript.before.txt | 3 +- ...omIncorrectAccessorsScript.lazyResolve.txt | 25 +- ...implicitTypeFromIncorrectSetter.before.txt | 2 +- ...citTypeFromIncorrectSetter.lazyResolve.txt | 20 +- ...peFromIncorrectSetterPropagation.after.txt | 2 +- ...eFromIncorrectSetterPropagation.before.txt | 2 +- ...IncorrectSetterPropagation.lazyResolve.txt | 24 +- ...IncorrectSetterPropagationScript.after.txt | 3 +- ...ncorrectSetterPropagationScript.before.txt | 3 +- ...ectSetterPropagationScript.lazyResolve.txt | 25 +- ...itTypeFromIncorrectSetterScript.before.txt | 3 +- ...eFromIncorrectSetterScript.lazyResolve.txt | 21 +- .../implicitTypeInLocalClass.lazyResolve.txt | 22 +- .../property/implicitTypeScript.before.txt | 2 +- .../implicitTypeScript.lazyResolve.txt | 20 +- .../implicitTypeUnavailable.before.txt | 2 +- .../implicitTypeUnavailable.lazyResolve.txt | 38 +-- ...PropertyWithPropagatedType.lazyResolve.txt | 22 +- ...PropagatedType.out_of_src_roots.before.txt | 2 +- ...gatedType.out_of_src_roots.lazyResolve.txt | 24 +- ...tyWithPropagatedTypeScript.lazyResolve.txt | 22 +- ...hPropagatedTypeUnavailable.lazyResolve.txt | 44 +-- ...ypeUnavailable.out_of_src_roots.before.txt | 2 +- ...available.out_of_src_roots.lazyResolve.txt | 46 +-- ...gatedTypeUnavailableScript.lazyResolve.txt | 44 +-- ...calImplicitTypeUnavailable.lazyResolve.txt | 22 +- ...eUnavailableInImplicitBody.lazyResolve.txt | 18 +- ...ilableInImplicitBodyScript.lazyResolve.txt | 18 +- ...licitTypeUnavailableScript.lazyResolve.txt | 22 +- ...alPropertyWithExplicitType.lazyResolve.txt | 22 +- ...PropertyWithPropagatedType.lazyResolve.txt | 22 +- ...tyWithPropagatedTypeScript.lazyResolve.txt | 22 +- ...hPropagatedTypeUnavailable.lazyResolve.txt | 44 +-- ...tweenLocalMemberProperties.lazyResolve.txt | 22 +- ...mberPropertiesImplicitBody.lazyResolve.txt | 18 +- ...opertiesImplicitBodyScript.lazyResolve.txt | 18 +- ...ocalMemberPropertiesScript.lazyResolve.txt | 23 +- ...ationToLocalMemberProperty.lazyResolve.txt | 22 +- ...LocalMemberPropertyImplicitBody.before.txt | 2 +- ...MemberPropertyImplicitBody.lazyResolve.txt | 20 +- ...emberPropertyImplicitBodyScript.before.txt | 2 +- ...PropertyImplicitBodyScript.lazyResolve.txt | 20 +- ...oLocalMemberPropertyScript.lazyResolve.txt | 22 +- ...pertyTypeCollisionAndAnnotations.after.txt | 4 +- ...ertyTypeCollisionAndAnnotations.before.txt | 10 +- ...ypeCollisionAndAnnotations.lazyResolve.txt | 96 +++--- ...ypeCollisionAndAnnotationsScript.after.txt | 4 +- ...peCollisionAndAnnotationsScript.before.txt | 10 +- ...lisionAndAnnotationsScript.lazyResolve.txt | 96 +++--- .../resultWithPropagatedType.before.txt | 2 +- .../resultWithPropagatedType.lazyResolve.txt | 20 +- ...ltWithPropagatedTypeUnavailable.before.txt | 2 +- ...hPropagatedTypeUnavailable.lazyResolve.txt | 38 +-- ...terAnnotationsInLocalClass.lazyResolve.txt | 22 +- ...otationsInLocalClassScript.lazyResolve.txt | 23 +- .../constructor.after.txt | 2 +- .../constructor.before.txt | 6 +- .../constructor.lazyResolve.txt | 44 +-- .../constructorCallSite.lazyResolve.txt | 54 ++-- .../constructorCallSiteScript.lazyResolve.txt | 54 ++-- .../constructorScript.after.txt | 3 +- .../constructorScript.before.txt | 7 +- .../constructorScript.lazyResolve.txt | 44 +-- .../substitutionOverride/function.before.txt | 2 +- .../function.lazyResolve.txt | 8 +- .../functionScript.before.txt | 2 +- .../functionScript.lazyResolve.txt | 8 +- .../functionUnavailable.before.txt | 4 +- .../functionUnavailable.lazyResolve.txt | 12 +- .../functionUnavailableScript.before.txt | 4 +- .../functionUnavailableScript.lazyResolve.txt | 12 +- .../implicitFunction.before.txt | 2 +- .../implicitFunction.lazyResolve.txt | 8 +- .../implicitFunctionScript.before.txt | 2 +- .../implicitFunctionScript.lazyResolve.txt | 8 +- .../implicitFunctionUnavailable.before.txt | 2 +- ...mplicitFunctionUnavailable.lazyResolve.txt | 8 +- ...plicitFunctionUnavailableScript.before.txt | 2 +- ...tFunctionUnavailableScript.lazyResolve.txt | 8 +- .../implicitProperty.before.txt | 2 +- .../implicitProperty.lazyResolve.txt | 8 +- .../implicitPropertyAndReceiver.after.txt | 2 +- .../implicitPropertyAndReceiver.before.txt | 4 +- ...mplicitPropertyAndReceiver.lazyResolve.txt | 20 +- ...mplicitPropertyAndReceiverScript.after.txt | 2 +- ...plicitPropertyAndReceiverScript.before.txt | 4 +- ...tPropertyAndReceiverScript.lazyResolve.txt | 20 +- .../implicitPropertyScript.after.txt | 2 +- .../implicitPropertyScript.before.txt | 4 +- .../implicitPropertyScript.lazyResolve.txt | 20 +- .../implicitPropertyUnavailable.before.txt | 2 +- ...mplicitPropertyUnavailable.lazyResolve.txt | 12 +- ...plicitPropertyUnavailableScript.before.txt | 2 +- ...tPropertyUnavailableScript.lazyResolve.txt | 12 +- .../substitutionOverride/property.after.txt | 2 +- .../substitutionOverride/property.before.txt | 4 +- .../property.lazyResolve.txt | 20 +- .../propertyScript.before.txt | 2 +- .../propertyScript.lazyResolve.txt | 8 +- .../propertyUnavailable.after.txt | 2 +- .../propertyUnavailable.before.txt | 6 +- .../propertyUnavailable.lazyResolve.txt | 24 +- .../propertyUnavailableScript.after.txt | 2 +- .../propertyUnavailableScript.before.txt | 6 +- .../propertyUnavailableScript.lazyResolve.txt | 24 +- ...AndSetterWithExplicitReturnType.before.txt | 2 +- ...tterWithExplicitReturnType.lazyResolve.txt | 8 +- .../getterWithExplicitReturnType.before.txt | 2 +- ...tterWithExplicitReturnType.lazyResolve.txt | 8 +- .../getterWithImplicitReturnType.before.txt | 2 +- ...tterWithImplicitReturnType.lazyResolve.txt | 8 +- .../typeAlias/insideFunction.after.txt | 4 +- .../typeAlias/insideFunction.before.txt | 4 +- .../typeAlias/insideFunction.lazyResolve.txt | 48 +-- .../typeAlias/insideFunctionComplex.after.txt | 2 +- .../insideFunctionComplex.before.txt | 4 +- .../insideFunctionComplex.lazyResolve.txt | 44 +-- .../insideFunctionComplexScript.after.txt | 2 +- .../insideFunctionComplexScript.before.txt | 4 +- ...nsideFunctionComplexScript.lazyResolve.txt | 45 +-- .../typeAlias/insideFunctionScript.after.txt | 5 +- .../typeAlias/insideFunctionScript.before.txt | 5 +- .../insideFunctionScript.lazyResolve.txt | 49 +-- ...stedAnnotationInLocalClass.lazyResolve.txt | 22 +- ...notationInLocalClassScript.lazyResolve.txt | 23 +- .../typeAlias/simple.before.txt | 4 +- .../typeAlias/simple.lazyResolve.txt | 32 +- .../typeAlias/simpleScript.before.txt | 5 +- .../typeAlias/simpleScript.lazyResolve.txt | 33 +- .../typeAlias/withMissedArguments.before.txt | 4 +- .../withMissedArguments.lazyResolve.txt | 32 +- .../withMissedArgumentsScript.before.txt | 5 +- .../withMissedArgumentsScript.lazyResolve.txt | 32 +- ...CompilerTestFE10TestdataTestGenerated.java | 6 + ...sticCompilerFE10TestDataTestGenerated.java | 6 + ...eeOldFrontendDiagnosticsTestGenerated.java | 6 + ...siOldFrontendDiagnosticsTestGenerated.java | 6 + .../LightTreeRawFirDeclarationBuilder.kt | 4 +- .../fir/lightTree/fir/modifier/Modifier.kt | 4 +- .../kotlin/fir/builder/PsiRawFirBuilder.kt | 40 +-- .../rawBuilder/declarations/F.lazyBodies.txt | 4 +- .../testData/rawBuilder/declarations/F.txt | 4 +- .../NestedOfAliasedType.lazyBodies.txt | 10 +- .../declarations/NestedOfAliasedType.txt | 10 +- .../NestedSuperType.lazyBodies.txt | 10 +- .../declarations/NestedSuperType.txt | 10 +- .../declarations/annotation.lazyBodies.txt | 12 +- .../rawBuilder/declarations/annotation.txt | 12 +- .../annotationOnField.lazyBodies.txt | 8 +- .../declarations/annotationOnField.txt | 8 +- .../annotationOnProperty.lazyBodies.txt | 4 +- .../declarations/annotationOnProperty.txt | 4 +- .../annotationOnSuperType.lazyBodies.txt | 8 +- .../declarations/annotationOnSuperType.txt | 8 +- .../annotationOnSuperTypeCall.lazyBodies.txt | 8 +- .../annotationOnSuperTypeCall.txt | 8 +- ...nNullableParenthesizedTypes.lazyBodies.txt | 8 +- ...nnotationsOnNullableParenthesizedTypes.txt | 8 +- ...tationsOnParenthesizedTypes.lazyBodies.txt | 8 +- .../annotationsOnParenthesizedTypes.txt | 8 +- ...DestructuringWithAnnotation.lazyBodies.txt | 2 +- .../classLevelDestructuringWithAnnotation.txt | 2 +- .../classWithWrongSuperCall.lazyBodies.txt | 16 +- .../declarations/classWithWrongSuperCall.txt | 16 +- .../declarations/complexTypes.lazyBodies.txt | 6 +- .../rawBuilder/declarations/complexTypes.txt | 6 +- .../constructorInObject.lazyBodies.txt | 8 +- .../declarations/constructorInObject.txt | 8 +- .../constructorWithAnnotations.lazyBodies.txt | 2 +- .../constructorWithAnnotations.txt | 2 +- ...ructorWithLocalDeclarations.lazyBodies.txt | 2 +- .../constructorWithLocalDeclarations.txt | 2 +- .../contextReceivers.lazyBodies.txt | 2 +- .../declarations/contextReceivers.txt | 2 +- ...ccessorsContractDescription.lazyBodies.txt | 6 +- .../propertyAccessorsContractDescription.txt | 6 +- ...nglingAnnotationsClassLevel.lazyBodies.txt | 10 +- .../danglingAnnotationsClassLevel.txt | 10 +- .../danglingConstrants.lazyBodies.txt | 4 +- .../declarations/danglingConstrants.txt | 4 +- .../dataClassWithAnnotations.lazyBodies.txt | 2 +- .../declarations/dataClassWithAnnotations.txt | 2 +- .../delegatedFieldNestedName.lazyBodies.txt | 12 +- .../declarations/delegatedFieldNestedName.txt | 12 +- .../declarations/delegates.lazyBodies.txt | 4 +- .../rawBuilder/declarations/delegates.txt | 4 +- .../declarations/derivedClass.lazyBodies.txt | 4 +- .../rawBuilder/declarations/derivedClass.txt | 4 +- .../enumEntryWithAnnotations.lazyBodies.txt | 2 +- .../declarations/enumEntryWithAnnotations.txt | 2 +- .../declarations/enums.lazyBodies.txt | 8 +- .../rawBuilder/declarations/enums.txt | 8 +- .../declarations/enums2.lazyBodies.txt | 8 +- .../rawBuilder/declarations/enums2.txt | 8 +- .../declarations/enums3.lazyBodies.txt | 2 +- .../rawBuilder/declarations/enums3.txt | 2 +- .../declarations/expectActual.lazyBodies.txt | 4 +- .../rawBuilder/declarations/expectActual.txt | 4 +- .../expectClassesAndFunctions.lazyBodies.txt | 12 +- .../expectClassesAndFunctions.txt | 12 +- ...assWithConstructorParameter.lazyBodies.txt | 4 +- ...nnotationClassWithConstructorParameter.txt | 4 +- .../expectNestedClassMembers.lazyBodies.txt | 4 +- .../declarations/expectNestedClassMembers.txt | 4 +- ...edEnumClassGeneratedMembers.lazyBodies.txt | 4 +- .../expectNestedEnumClassGeneratedMembers.txt | 4 +- .../declarations/external.lazyBodies.txt | 4 +- .../rawBuilder/declarations/external.txt | 4 +- .../genericFunctions.lazyBodies.txt | 4 +- .../declarations/genericFunctions.txt | 4 +- .../initBlockWithDeclarations.lazyBodies.txt | 4 +- .../initBlockWithDeclarations.txt | 4 +- .../initWithLocalDeclarations.lazyBodies.txt | 2 +- .../initWithLocalDeclarations.txt | 2 +- .../invalidDestructing.lazyBodies.txt | 2 +- .../declarations/invalidDestructing.txt | 2 +- .../kotlinAnyNonTopLevel.lazyBodies.txt | 4 +- .../declarations/kotlinAnyNonTopLevel.txt | 4 +- ...ocalDeclarationsInEnumEntry.lazyBodies.txt | 2 +- .../localDeclarationsInEnumEntry.txt | 2 +- .../declarations/nestedClass.lazyBodies.txt | 8 +- .../rawBuilder/declarations/nestedClass.txt | 8 +- ...rTypRefInPrimaryConstructor.lazyBodies.txt | 2 +- .../noParameterTypRefInPrimaryConstructor.txt | 2 +- ...rimaryConstructorWithVararg.lazyBodies.txt | 2 +- ...erTypRefInPrimaryConstructorWithVararg.txt | 2 +- ...pRefInPrimaryConsturctorVal.lazyBodies.txt | 2 +- ...ParameterTypRefInPrimaryConsturctorVal.txt | 2 +- ...aryConsturctorValWithVararg.lazyBodies.txt | 2 +- ...ypRefInPrimaryConsturctorValWithVararg.txt | 2 +- ...ypRefInSecondaryConstructor.lazyBodies.txt | 2 +- ...oParameterTypRefInSecondaryConstructor.txt | 2 +- ...rimaryConstructorWithVararg.lazyBodies.txt | 2 +- ...edTypRefInPrimaryConstructorWithVararg.txt | 2 +- ...aryConsturctorValWithVararg.lazyBodies.txt | 2 +- ...ypRefInPrimaryConsturctorValWithVararg.txt | 2 +- .../noPrimaryConstructor.lazyBodies.txt | 2 +- .../declarations/noPrimaryConstructor.txt | 2 +- .../declarations/script.lazyBodies.txt | 4 +- .../rawBuilder/declarations/script.txt | 4 +- .../secondaryConstructor.lazyBodies.txt | 6 +- .../declarations/secondaryConstructor.txt | 6 +- .../declarations/simpleClass.lazyBodies.txt | 6 +- .../rawBuilder/declarations/simpleClass.txt | 6 +- .../simpleTypeAlias.lazyBodies.txt | 6 +- .../declarations/simpleTypeAlias.txt | 6 +- .../splitModifierList.lazyBodies.txt | 24 +- .../declarations/splitModifierList.txt | 24 +- .../typeAliasWithGeneric.lazyBodies.txt | 8 +- .../declarations/typeAliasWithGeneric.txt | 8 +- .../typeParameterVsNested.lazyBodies.txt | 8 +- .../declarations/typeParameterVsNested.txt | 8 +- .../typeParameters.lazyBodies.txt | 10 +- .../declarations/typeParameters.txt | 10 +- .../declarations/where.lazyBodies.txt | 6 +- .../rawBuilder/declarations/where.txt | 6 +- .../expressions/annotated.lazyBodies.txt | 4 +- .../rawBuilder/expressions/annotated.txt | 4 +- .../expressions/arrayAccess.lazyBodies.txt | 2 +- .../rawBuilder/expressions/arrayAccess.txt | 2 +- .../callableReferences.lazyBodies.txt | 2 +- .../expressions/callableReferences.txt | 2 +- .../expressions/calls.lazyBodies.txt | 2 +- .../testData/rawBuilder/expressions/calls.txt | 2 +- .../expressions/classReference.lazyBodies.txt | 2 +- .../rawBuilder/expressions/classReference.txt | 2 +- .../collectionLiterals.lazyBodies.txt | 14 +- .../expressions/collectionLiterals.txt | 14 +- .../expressions/destructuring.lazyBodies.txt | 2 +- .../rawBuilder/expressions/destructuring.txt | 2 +- .../rawBuilder/expressions/for.lazyBodies.txt | 2 +- .../testData/rawBuilder/expressions/for.txt | 2 +- .../expressions/init.lazyBodies.txt | 2 +- .../testData/rawBuilder/expressions/init.txt | 2 +- .../expressions/invalidWhen.lazyBodies.txt | 2 +- .../rawBuilder/expressions/invalidWhen.txt | 2 +- .../expressions/lambda.lazyBodies.txt | 2 +- .../rawBuilder/expressions/lambda.txt | 2 +- .../expressions/super.lazyBodies.txt | 6 +- .../testData/rawBuilder/expressions/super.txt | 6 +- .../expressions/these.lazyBodies.txt | 2 +- .../testData/rawBuilder/expressions/these.txt | 2 +- .../expressions/typeOperators.lazyBodies.txt | 2 +- .../rawBuilder/expressions/typeOperators.txt | 2 +- .../expressions/unary.lazyBodies.txt | 4 +- .../testData/rawBuilder/expressions/unary.txt | 4 +- .../j+k/javaSupertypeNameDisambiguation.kt | 32 ++ .../test/runners/DiagnosticTestGenerated.java | 6 + 915 files changed, 12362 insertions(+), 12164 deletions(-) create mode 100644 compiler/testData/diagnostics/tests/j+k/javaSupertypeNameDisambiguation.kt diff --git a/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/contextReceiver.txt b/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/contextReceiver.txt index 92dd88eb151..ba8c04d85ba 100644 --- a/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/contextReceiver.txt +++ b/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/contextReceiver.txt @@ -18,7 +18,7 @@ FILE: [ResolvedTo(IMPORTS)] contextReceiver.kt LAZY_super } - public? final? [ResolvedTo(RAW_FIR)] class Nested : R|kotlin/Any| { + public final? [ResolvedTo(RAW_FIR)] class Nested : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] constructor(): R|test/Base.Nested| { LAZY_super } diff --git a/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeCallee.txt b/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeCallee.txt index 94b0a9ddf4f..eea00a1f6d9 100644 --- a/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeCallee.txt +++ b/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeCallee.txt @@ -18,7 +18,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallee.kt LAZY_super } - public? final? [ResolvedTo(RAW_FIR)] class Nested : R|kotlin/Any| { + public final? [ResolvedTo(RAW_FIR)] class Nested : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] constructor(): R|test/Base.Nested| { LAZY_super } diff --git a/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeCalleeGenerics.txt b/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeCalleeGenerics.txt index 05f09545743..b5f1e9f2beb 100644 --- a/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeCalleeGenerics.txt +++ b/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeCalleeGenerics.txt @@ -18,7 +18,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCalleeGenerics.kt LAZY_super } - public? final? [ResolvedTo(RAW_FIR)] class Nested : R|kotlin/Any| { + public final? [ResolvedTo(RAW_FIR)] class Nested : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] constructor(): R|test/Base.Nested| { LAZY_super } diff --git a/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeCallee_objectLiteral.txt b/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeCallee_objectLiteral.txt index bdfd805b5c9..62cf870825e 100644 --- a/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeCallee_objectLiteral.txt +++ b/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeCallee_objectLiteral.txt @@ -18,7 +18,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallee_objectLiteral.kt LAZY_super } - public? final? [ResolvedTo(RAW_FIR)] class Nested : R|kotlin/Any| { + public final? [ResolvedTo(RAW_FIR)] class Nested : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] constructor(): R|test/Base.Nested| { LAZY_super } @@ -33,4 +33,4 @@ FILE: [ResolvedTo(IMPORTS)] superTypeCallee_objectLiteral.kt } - public [ResolvedTo(BODY_RESOLVE)] get(): R|test/Base| + public [ResolvedTo(BODY_RESOLVE)] get(): R|test/Base| \ No newline at end of file diff --git a/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeRef.txt b/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeRef.txt index e494a88169b..fca81775dc0 100644 --- a/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeRef.txt +++ b/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeRef.txt @@ -18,7 +18,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeRef.kt LAZY_super } - public? final? [ResolvedTo(RAW_FIR)] class Nested : R|kotlin/Any| { + public final? [ResolvedTo(RAW_FIR)] class Nested : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] constructor(): R|test/Base.Nested| { LAZY_super } diff --git a/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeRefGenerics.txt b/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeRefGenerics.txt index edb9bd1b1db..4e92d22794e 100644 --- a/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeRefGenerics.txt +++ b/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeRefGenerics.txt @@ -18,7 +18,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeRefGenerics.kt LAZY_super } - public? final? [ResolvedTo(RAW_FIR)] class Nested : R|kotlin/Any| { + public final? [ResolvedTo(RAW_FIR)] class Nested : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] constructor(): R|test/Base.Nested| { LAZY_super } 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 2a5e7cc6b61..f2f000948d6 100644 --- a/analysis/low-level-api-fir/testData/contextCollector/scripts/insideClassMember.txt +++ b/analysis/low-level-api-fir/testData/contextCollector/scripts/insideClassMember.txt @@ -14,8 +14,8 @@ Tower Data Context: Element 6 Scope: FirScriptDeclarationsScope Classifiers: - FirRegularClassSymbol public? final? class After_OtherClass : R|kotlin/Any| - FirRegularClassSymbol public? final? class Before_OtherClass : R|kotlin/Any| + FirRegularClassSymbol public final? class After_OtherClass : R|kotlin/Any| + FirRegularClassSymbol public final? class Before_OtherClass : R|kotlin/Any| FirRegularClassSymbol public final class MyClass : R|kotlin/Any| Functions FirNamedFunctionSymbol public? final? fun after_Fun(): R|kotlin/Unit| @@ -41,13 +41,13 @@ Tower Data Context: public? final? val before_Val: public? get(): - public? final? class Before_OtherClass : R|kotlin/Any| + public final? class Before_OtherClass : R|kotlin/Any| public final class MyClass : R|kotlin/Any| public? final? fun after_Fun(): R|kotlin/Unit| public? final? val after_Val: public? get(): - public? final? class After_OtherClass : R|kotlin/Any| + public final? class After_OtherClass : R|kotlin/Any| Type: kotlin.script.templates.standard.ScriptTemplateWithArgs Label: