From f9c6af4d2a6f4591a563f6b940a3503edd458952 Mon Sep 17 00:00:00 2001 From: Nikolay Lunyak Date: Wed, 9 Aug 2023 15:18:03 +0300 Subject: [PATCH] [FIR] Properly assign `` packages to symbols This prevents `FirConflictsExpressionChecker.kt` from missing conflicting local functions. It used to due to inconsistencies in assigning ``, and this commit makes it a bit more straightforward. The change in KtClassTypeQualifierRenderer prevents `FirOverrideImplementTest.testLocalClass` from failing in `intellij`. It didn't fail for callables, because `KtCallableSignatureRenderer` doesn't try to render packages. ^KT-59186 Fixed --- .../renderers/KtClassTypeQualifierRenderer.kt | 3 +- .../localTypeScope.txt | 7 +- .../symbolByPsi/outerAndInnerClasses.txt | 2 +- .../symbolByPsi/outerAndInnerTypeAlias.txt | 8 +- .../genericFromFunctionInLocalClass.txt | 2 +- .../localClassType.txt | 2 +- .../localClassWithTypeArgumentsType.txt | 2 +- .../localNestedClassType.txt | 2 +- ...glingAnnotationClassLevel.lazy.resolve.txt | 2 +- ...nnotationClassLevelScript.lazy.resolve.txt | 3 +- ...eclarationsInPropertyInit.lazy.resolve.txt | 2 +- ...tionsInPropertyInitScript.lazy.resolve.txt | 3 +- .../fileStructure/initBlock.lazy.resolve.txt | 2 +- .../initBlockScript.lazy.resolve.txt | 3 +- .../fileStructure/localClass.lazy.resolve.txt | 4 +- .../localClass2.lazy.resolve.txt | 2 +- .../localClassScript.lazy.resolve.txt | 5 +- ...calDeclarationsInAccessor.lazy.resolve.txt | 12 +- .../fileStructure/script.lazy.resolve.txt | 3 +- .../getOrBuildFir/expressions/assignment.txt | 4 +- .../expressions/callInsideFunction.txt | 2 +- .../expressions/callInsideStatement.txt | 2 +- .../wholeDeclaration/assignmentStatement.txt | 2 +- .../getOrBuildFir/wholeDeclaration/class.txt | 2 +- .../wholeDeclaration/function.txt | 2 +- .../wholeDeclaration/localClass.txt | 6 +- .../wholeDeclaration/localClassScript.txt | 6 +- .../wholeDeclaration/scriptInitializer.txt | 6 +- .../wholeDeclaration/statement.txt | 6 +- .../codeFragments/localClass.txt | 4 +- .../lazyResolve/annotationOnLocalClass.txt | 10 +- .../annotationOnLocalClassScript.txt | 39 ++-- ...compilerRequiredAnnotationOnLocalClass.txt | 20 +- ...erRequiredAnnotationOnLocalClassScript.txt | 49 ++-- .../lazyResolve/complexLocalHierarchy.txt | 38 ++-- .../complexLocalHierarchyScript.txt | 67 +++--- .../lazyResolve/complexRedeclaration.txt | 2 +- .../complexRedeclarationScript.txt | 31 ++- .../lazyResolve/fromLocalHierarchyToOuter.txt | 28 +-- .../fromLocalHierarchyToOuterScript.txt | 57 +++-- .../testdata/lazyResolve/localConstructor.txt | 34 +-- .../lazyResolve/localConstructorScript.txt | 55 +++-- .../localFunctionInsideStatement.txt | 31 ++- .../testdata/lazyResolve/localNestedClass.txt | 20 +- .../lazyResolve/localNestedClassScript.txt | 49 ++-- ...dCompilerRequiredAnnotationsInsideBody.txt | 10 +- ...lerRequiredAnnotationsInsideBodyScript.txt | 39 ++-- .../resolveSuperTypeFromLocalClass.txt | 10 +- .../resolveSuperTypeFromLocalClassScript.txt | 39 ++-- .../resolveTypeFromLocalClassConstructor.txt | 10 +- ...lveTypeFromLocalClassConstructorScript.txt | 38 ++-- .../resolveTypeFromLocalFunction.txt | 14 +- .../resolveTypeFromLocalFunctionScript.txt | 42 ++-- .../testdata/lazyResolve/script.txt | 30 +-- .../testdata/lazyResolve/script3.txt | 4 +- .../testdata/lazyResolve/statement.txt | 30 +-- .../testdata/onAirResolve/localClass.txt | 4 +- .../testData/resolve/cfa/kt53819.fir.txt | 6 +- .../resolve/cfg/annotatedLocalClass.fir.txt | 2 +- .../cfg/innerClassInAnonymousObject.fir.txt | 2 +- .../resolve/cfg/localClassesWithImplicit.dot | 8 +- .../cfg/localClassesWithImplicit.fir.txt | 6 +- .../cfg/propertiesAndInitBlocks.fir.txt | 4 +- .../diagnostics/localAnnotationClass.fir.txt | 8 +- .../localEntitytNotAllowed.fir.txt | 8 +- .../diagnostics/sealedSupertype.fir.txt | 2 +- .../diagnostics/sealedSupertype.ll.fir.txt | 2 +- .../typeParametersInObject.fir.txt | 2 +- .../localClassAccessesContainingClass.fir.txt | 2 +- .../expresssions/localConstructor.fir.txt | 4 +- .../expresssions/localInnerClass.fir.txt | 2 +- .../resolve/expresssions/localObjects.fir.txt | 4 +- .../resolve/expresssions/localScopes.fir.txt | 12 +- .../resolve/expresssions/localTypes.fir.txt | 2 +- .../expresssions/privateVisibility.fir.txt | 10 +- ...RedundantVisibilityModifierChecker.fir.txt | 2 +- ...ModifierCheckerWithExplicitApiMode.fir.txt | 2 +- .../unused/localVariable.fir.txt | 2 +- ...ocalVariableInSecondaryConstructor.fir.txt | 6 +- .../callableReferenceToLocalClass.fir.txt | 6 +- .../inlineClassDeclaration.fir.txt | 2 +- .../implicitInLocalClasses.fir.txt | 30 +-- .../localClasses/overrideInLocal.fir.txt | 2 +- .../testData/resolve/objectInnerClass.fir.txt | 52 ++--- ...ndKotlinPropertyReferenceFromInner.fir.txt | 2 +- .../resolve/throwableSubclass.fir.txt | 4 +- .../bad/callsInPlace/inLocalClass.fir.txt | 4 +- .../initialization/fromLocalMembers.fir.txt | 2 +- .../resolveWithStdlib/problems.fir.txt | 2 +- .../FieldAnnotationWithClasses.fir.txt | 2 +- .../localScopesInAnonymousObject.fir.txt | 8 +- .../LightTreeRawFirDeclarationBuilder.kt | 26 ++- .../LightTreeRawFirExpressionBuilder.kt | 48 ++-- .../kotlin/fir/builder/PsiRawFirBuilder.kt | 77 ++++--- .../danglingAnnotationsClassLevel.txt | 2 +- .../rawBuilder/declarations/enums3.txt | 28 +-- .../initBlockWithDeclarations.txt | 4 +- .../rawBuilder/declarations/script.txt | 2 +- .../rawBuilder/expressions/locals.txt | 2 +- .../fir/builder/AbstractRawFirBuilder.kt | 40 +++- .../jetbrains/kotlin/fir/builder/Context.kt | 12 +- .../tests/overload/LocalFunctions.fir.kt | 213 ------------------ .../tests/overload/LocalFunctions.kt | 1 + .../methodDeclaration.fir.diag.txt | 2 +- .../box/localClassWithCompanionObject.fir.txt | 8 +- .../localClassWithCompanionObject.fir.txt | 16 +- .../firMembers/serializerInLocalClass.fir.txt | 18 +- 107 files changed, 733 insertions(+), 891 deletions(-) delete mode 100644 compiler/testData/diagnostics/tests/overload/LocalFunctions.fir.kt diff --git a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renderers/KtClassTypeQualifierRenderer.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renderers/KtClassTypeQualifierRenderer.kt index 1856fbeccc4..377ac857282 100644 --- a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renderers/KtClassTypeQualifierRenderer.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renderers/KtClassTypeQualifierRenderer.kt @@ -12,6 +12,7 @@ import org.jetbrains.kotlin.analysis.api.types.KtClassTypeQualifier import org.jetbrains.kotlin.analysis.api.types.KtNonErrorClassType import org.jetbrains.kotlin.analysis.api.types.KtType import org.jetbrains.kotlin.analysis.utils.printer.PrettyPrinter +import org.jetbrains.kotlin.name.CallableId import org.jetbrains.kotlin.renderer.render public interface KtClassTypeQualifierRenderer { @@ -37,7 +38,7 @@ public interface KtClassTypeQualifierRenderer { override fun renderClassTypeQualifier(type: KtClassType, printer: PrettyPrinter): Unit = printer { ".".separated( { - if (type is KtNonErrorClassType) { + if (type is KtNonErrorClassType && type.classId.packageFqName != CallableId.PACKAGE_FQ_NAME_FOR_LOCAL) { append(type.classId.packageFqName.render()) } }, diff --git a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/localTypeScope.txt b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/localTypeScope.txt index f2b0f8d9ead..962f8448ae5 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/localTypeScope.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/localTypeScope.txt @@ -3,7 +3,7 @@ implicit receivers: type: KtUsualClassType: annotationsList: [] ownTypeArguments: [] - type: Y + type: /Y owner symbol: KtFirNamedClassOrObjectSymbol scopes: @@ -257,7 +257,7 @@ scopes: returnType: KtUsualClassType: annotationsList: [] ownTypeArguments: [] - type: Y + type: /Y symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [] @@ -386,4 +386,5 @@ scopes: DefaultSimpleImportingScope, index = 10 - DefaultStarImportingScope, index = 11 \ No newline at end of file + DefaultStarImportingScope, index = 11 + diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerClasses.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerClasses.txt index 0cb6cdc9bfd..2bbb09cc19a 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerClasses.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerClasses.txt @@ -469,7 +469,7 @@ KtFunctionSymbol: annotationsList: [] type: T ] - type: X.U.X + type: /U.X getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerTypeAlias.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerTypeAlias.txt index b4ae2a21a1a..efb455c1fed 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerTypeAlias.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerTypeAlias.txt @@ -100,7 +100,7 @@ KtTypeAliasSymbol: isExpect: false name: LocalTypeAlias origin: SOURCE - symbolKind: CLASS_MEMBER + symbolKind: LOCAL typeParameters: [] visibility: Public getContainingModule: KtSourceModule "Sources of main" @@ -144,7 +144,7 @@ KtTypeAliasSymbol: isExpect: false name: LocalTypeAlias origin: SOURCE - symbolKind: CLASS_MEMBER + symbolKind: LOCAL typeParameters: [] visibility: Public getContainingModule: KtSourceModule "Sources of main" @@ -204,7 +204,7 @@ KtFunctionSymbol: getDispatchReceiver(): KtUsualClassType: annotationsList: [] ownTypeArguments: [] - type: A.LocalClass.LocalClass + type: /LocalClass getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null @@ -269,7 +269,7 @@ KtFunctionSymbol: getDispatchReceiver(): KtUsualClassType: annotationsList: [] ownTypeArguments: [] - type: A.LocalClass + type: /LocalClass getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null diff --git a/analysis/analysis-api/testData/symbols/symbolByReference/genericFromFunctionInLocalClass.txt b/analysis/analysis-api/testData/symbols/symbolByReference/genericFromFunctionInLocalClass.txt index 59fa2300a41..04e649e9252 100644 --- a/analysis/analysis-api/testData/symbols/symbolByReference/genericFromFunctionInLocalClass.txt +++ b/analysis/analysis-api/testData/symbols/symbolByReference/genericFromFunctionInLocalClass.txt @@ -29,6 +29,6 @@ KtFunctionSymbol: getDispatchReceiver(): KtUsualClassType: annotationsList: [] ownTypeArguments: [] - type: test/Base + type: /Base getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null \ No newline at end of file diff --git a/analysis/analysis-api/testData/types/byDeclarationReturnType/localClassType.txt b/analysis/analysis-api/testData/types/byDeclarationReturnType/localClassType.txt index 5922cf24391..43adbe252f6 100644 --- a/analysis/analysis-api/testData/types/byDeclarationReturnType/localClassType.txt +++ b/analysis/analysis-api/testData/types/byDeclarationReturnType/localClassType.txt @@ -1,5 +1,5 @@ annotationsList: [] -classId: A.B +classId: /B classSymbol: KtNamedClassOrObjectSymbol(/B) nullability: NON_NULLABLE ownTypeArguments: [] diff --git a/analysis/analysis-api/testData/types/byDeclarationReturnType/localClassWithTypeArgumentsType.txt b/analysis/analysis-api/testData/types/byDeclarationReturnType/localClassWithTypeArgumentsType.txt index 0df15dd9eef..10e0bc4c97a 100644 --- a/analysis/analysis-api/testData/types/byDeclarationReturnType/localClassWithTypeArgumentsType.txt +++ b/analysis/analysis-api/testData/types/byDeclarationReturnType/localClassWithTypeArgumentsType.txt @@ -1,5 +1,5 @@ annotationsList: [] -classId: A.B +classId: /B classSymbol: KtNamedClassOrObjectSymbol(/B) nullability: NON_NULLABLE ownTypeArguments: [ diff --git a/analysis/analysis-api/testData/types/byDeclarationReturnType/localNestedClassType.txt b/analysis/analysis-api/testData/types/byDeclarationReturnType/localNestedClassType.txt index dfccd88ffda..e90bd19b186 100644 --- a/analysis/analysis-api/testData/types/byDeclarationReturnType/localNestedClassType.txt +++ b/analysis/analysis-api/testData/types/byDeclarationReturnType/localNestedClassType.txt @@ -1,5 +1,5 @@ annotationsList: [] -classId: A.B.C +classId: /B.C classSymbol: KtNamedClassOrObjectSymbol(/C) nullability: NON_NULLABLE ownTypeArguments: [] diff --git a/analysis/low-level-api-fir/testdata/fileStructure/danglingAnnotationClassLevel.lazy.resolve.txt b/analysis/low-level-api-fir/testdata/fileStructure/danglingAnnotationClassLevel.lazy.resolve.txt index 30342446729..20267f82a2d 100644 --- a/analysis/low-level-api-fir/testdata/fileStructure/danglingAnnotationClassLevel.lazy.resolve.txt +++ b/analysis/low-level-api-fir/testdata/fileStructure/danglingAnnotationClassLevel.lazy.resolve.txt @@ -28,7 +28,7 @@ FILE: [ResolvedTo(BODY_RESOLVE)] danglingAnnotationClassLevel.kt public final [ResolvedTo(BODY_RESOLVE)] fun foo(): R|kotlin/Unit| { local final [ResolvedTo(BODY_RESOLVE)] class Local : R|kotlin/Any| { - public [ResolvedTo(BODY_RESOLVE)] constructor(): R|Outer.Local| { + public [ResolvedTo(BODY_RESOLVE)] constructor(): R|/Local| { super() } diff --git a/analysis/low-level-api-fir/testdata/fileStructure/danglingAnnotationClassLevelScript.lazy.resolve.txt b/analysis/low-level-api-fir/testdata/fileStructure/danglingAnnotationClassLevelScript.lazy.resolve.txt index 5184b4f0bd4..2c676aa0828 100644 --- a/analysis/low-level-api-fir/testdata/fileStructure/danglingAnnotationClassLevelScript.lazy.resolve.txt +++ b/analysis/low-level-api-fir/testdata/fileStructure/danglingAnnotationClassLevelScript.lazy.resolve.txt @@ -34,7 +34,7 @@ FILE: [ResolvedTo(BODY_RESOLVE)] danglingAnnotationClassLevelScript.kts public final [ResolvedTo(BODY_RESOLVE)] fun foo(): R|kotlin/Unit| { local final [ResolvedTo(BODY_RESOLVE)] class Local : R|kotlin/Any| { - public [ResolvedTo(BODY_RESOLVE)] constructor(): R|Outer.Local| { + public [ResolvedTo(BODY_RESOLVE)] constructor(): R|/Local| { super() } @@ -44,4 +44,3 @@ FILE: [ResolvedTo(BODY_RESOLVE)] danglingAnnotationClassLevelScript.kts } } - diff --git a/analysis/low-level-api-fir/testdata/fileStructure/declarationsInPropertyInit.lazy.resolve.txt b/analysis/low-level-api-fir/testdata/fileStructure/declarationsInPropertyInit.lazy.resolve.txt index b0d4d7307d4..d9fb8808737 100644 --- a/analysis/low-level-api-fir/testdata/fileStructure/declarationsInPropertyInit.lazy.resolve.txt +++ b/analysis/low-level-api-fir/testdata/fileStructure/declarationsInPropertyInit.lazy.resolve.txt @@ -6,7 +6,7 @@ FILE: [ResolvedTo(BODY_RESOLVE)] declarationsInPropertyInit.kt public final [ResolvedTo(BODY_RESOLVE)] val a: R|kotlin/Unit| = R|/myRun|( = [ResolvedTo(BODY_RESOLVE)] myRun@fun (): R|kotlin/Unit| { local final [ResolvedTo(BODY_RESOLVE)] class X : R|kotlin/Any| { - public [ResolvedTo(BODY_RESOLVE)] constructor(): R|A.X| { + public [ResolvedTo(BODY_RESOLVE)] constructor(): R|/X| { super() } diff --git a/analysis/low-level-api-fir/testdata/fileStructure/declarationsInPropertyInitScript.lazy.resolve.txt b/analysis/low-level-api-fir/testdata/fileStructure/declarationsInPropertyInitScript.lazy.resolve.txt index 91f450a5c1e..50bbf2b8dc8 100644 --- a/analysis/low-level-api-fir/testdata/fileStructure/declarationsInPropertyInitScript.lazy.resolve.txt +++ b/analysis/low-level-api-fir/testdata/fileStructure/declarationsInPropertyInitScript.lazy.resolve.txt @@ -10,7 +10,7 @@ FILE: [ResolvedTo(BODY_RESOLVE)] declarationsInPropertyInitScript.kts public final [ResolvedTo(BODY_RESOLVE)] val a: R|kotlin/Unit| = this@R|/A|.R|kotlin/run|( = [ResolvedTo(BODY_RESOLVE)] run@fun R|A|.(): R|kotlin/Unit| { local final [ResolvedTo(BODY_RESOLVE)] class X : R|kotlin/Any| { - public [ResolvedTo(BODY_RESOLVE)] constructor(): R|A.X| { + public [ResolvedTo(BODY_RESOLVE)] constructor(): R|/X| { super() } @@ -26,4 +26,3 @@ FILE: [ResolvedTo(BODY_RESOLVE)] declarationsInPropertyInitScript.kts public final inline [ResolvedTo(BODY_RESOLVE)] fun <[ResolvedTo(BODY_RESOLVE)] R> run([ResolvedTo(BODY_RESOLVE)] block: R|() -> R|): R|R| { ^run R|/block|.R|SubstitutionOverride|() } - diff --git a/analysis/low-level-api-fir/testdata/fileStructure/initBlock.lazy.resolve.txt b/analysis/low-level-api-fir/testdata/fileStructure/initBlock.lazy.resolve.txt index 1e018815d9c..c894024e1d6 100644 --- a/analysis/low-level-api-fir/testdata/fileStructure/initBlock.lazy.resolve.txt +++ b/analysis/low-level-api-fir/testdata/fileStructure/initBlock.lazy.resolve.txt @@ -7,7 +7,7 @@ FILE: [ResolvedTo(BODY_RESOLVE)] initBlock.kt init { [ResolvedTo(RAW_FIR)] lval x: R|kotlin/Int| = Int(10) local final [ResolvedTo(RAW_FIR)] class B : R|kotlin/Any| { - public [ResolvedTo(RAW_FIR)] constructor(): R|A.B| { + public [ResolvedTo(RAW_FIR)] constructor(): R|/B| { super() } diff --git a/analysis/low-level-api-fir/testdata/fileStructure/initBlockScript.lazy.resolve.txt b/analysis/low-level-api-fir/testdata/fileStructure/initBlockScript.lazy.resolve.txt index 60ad12d6908..1e3b2d5b789 100644 --- a/analysis/low-level-api-fir/testdata/fileStructure/initBlockScript.lazy.resolve.txt +++ b/analysis/low-level-api-fir/testdata/fileStructure/initBlockScript.lazy.resolve.txt @@ -11,7 +11,7 @@ FILE: [ResolvedTo(BODY_RESOLVE)] initBlockScript.kts init { [ResolvedTo(RAW_FIR)] lval x: R|kotlin/Int| = Int(10) local final [ResolvedTo(RAW_FIR)] class B : R|kotlin/Any| { - public [ResolvedTo(RAW_FIR)] constructor(): R|A.B| { + public [ResolvedTo(RAW_FIR)] constructor(): R|/B| { super() } @@ -20,4 +20,3 @@ FILE: [ResolvedTo(BODY_RESOLVE)] initBlockScript.kts } } - diff --git a/analysis/low-level-api-fir/testdata/fileStructure/localClass.lazy.resolve.txt b/analysis/low-level-api-fir/testdata/fileStructure/localClass.lazy.resolve.txt index 046ef0ddd78..a93cf9b16f5 100644 --- a/analysis/low-level-api-fir/testdata/fileStructure/localClass.lazy.resolve.txt +++ b/analysis/low-level-api-fir/testdata/fileStructure/localClass.lazy.resolve.txt @@ -1,7 +1,7 @@ FILE: [ResolvedTo(BODY_RESOLVE)] localClass.kt public final [ResolvedTo(BODY_RESOLVE)] fun a(): R|kotlin/Unit| { local final [ResolvedTo(BODY_RESOLVE)] class X : R|kotlin/Any| { - public [ResolvedTo(BODY_RESOLVE)] constructor(): R|X| { + public [ResolvedTo(BODY_RESOLVE)] constructor(): R|/X| { super() } @@ -15,7 +15,7 @@ FILE: [ResolvedTo(BODY_RESOLVE)] localClass.kt public final [ResolvedTo(BODY_RESOLVE)] fun b(): R|kotlin/Unit| { local final [ResolvedTo(BODY_RESOLVE)] class Z : R|kotlin/Any| { - public [ResolvedTo(BODY_RESOLVE)] constructor(): R|Y.Z| { + public [ResolvedTo(BODY_RESOLVE)] constructor(): R|/Z| { super() } diff --git a/analysis/low-level-api-fir/testdata/fileStructure/localClass2.lazy.resolve.txt b/analysis/low-level-api-fir/testdata/fileStructure/localClass2.lazy.resolve.txt index c8b1e90944b..4cab06e87e3 100644 --- a/analysis/low-level-api-fir/testdata/fileStructure/localClass2.lazy.resolve.txt +++ b/analysis/low-level-api-fir/testdata/fileStructure/localClass2.lazy.resolve.txt @@ -1,7 +1,7 @@ FILE: [ResolvedTo(BODY_RESOLVE)] localClass2.kt public final [ResolvedTo(BODY_RESOLVE)] fun x(): R|kotlin/Unit| { local final [ResolvedTo(BODY_RESOLVE)] class Local : R|kotlin/Any| { - public [ResolvedTo(BODY_RESOLVE)] constructor(): R|Local| { + public [ResolvedTo(BODY_RESOLVE)] constructor(): R|/Local| { super() } diff --git a/analysis/low-level-api-fir/testdata/fileStructure/localClassScript.lazy.resolve.txt b/analysis/low-level-api-fir/testdata/fileStructure/localClassScript.lazy.resolve.txt index 2533be35f33..8cbd3066762 100644 --- a/analysis/low-level-api-fir/testdata/fileStructure/localClassScript.lazy.resolve.txt +++ b/analysis/low-level-api-fir/testdata/fileStructure/localClassScript.lazy.resolve.txt @@ -5,7 +5,7 @@ FILE: [ResolvedTo(BODY_RESOLVE)] localClassScript.kts public final [ResolvedTo(BODY_RESOLVE)] fun a(): R|kotlin/Unit| { local final [ResolvedTo(BODY_RESOLVE)] class X : R|kotlin/Any| { - public [ResolvedTo(BODY_RESOLVE)] constructor(): R|X| { + public [ResolvedTo(BODY_RESOLVE)] constructor(): R|/X| { super() } @@ -20,7 +20,7 @@ FILE: [ResolvedTo(BODY_RESOLVE)] localClassScript.kts public final [ResolvedTo(BODY_RESOLVE)] fun b(): R|kotlin/Unit| { local final [ResolvedTo(BODY_RESOLVE)] class Z : R|kotlin/Any| { - public [ResolvedTo(BODY_RESOLVE)] constructor(): R|Y.Z| { + public [ResolvedTo(BODY_RESOLVE)] constructor(): R|/Z| { super() } @@ -29,4 +29,3 @@ FILE: [ResolvedTo(BODY_RESOLVE)] localClassScript.kts } } - diff --git a/analysis/low-level-api-fir/testdata/fileStructure/localDeclarationsInAccessor.lazy.resolve.txt b/analysis/low-level-api-fir/testdata/fileStructure/localDeclarationsInAccessor.lazy.resolve.txt index 8889f564fb9..c3682b70bf9 100644 --- a/analysis/low-level-api-fir/testdata/fileStructure/localDeclarationsInAccessor.lazy.resolve.txt +++ b/analysis/low-level-api-fir/testdata/fileStructure/localDeclarationsInAccessor.lazy.resolve.txt @@ -7,26 +7,26 @@ FILE: [ResolvedTo(BODY_RESOLVE)] localDeclarationsInAccessor.kt public final [ResolvedTo(BODY_RESOLVE)] val i: R|kotlin/Int| = Int(1) public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/Int| { local final [ResolvedTo(BODY_RESOLVE)] class Inner : R|kotlin/Any| { - public [ResolvedTo(BODY_RESOLVE)] constructor(): R|Outer.Inner| { + public [ResolvedTo(BODY_RESOLVE)] constructor(): R|/Inner| { super() } public final [ResolvedTo(BODY_RESOLVE)] var i: R|kotlin/Int| = Int(2) public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/Int| { { - [ResolvedTo(BODY_RESOLVE)] lval : R|kotlin/Int| = this@R|/Outer.Inner|.F|/i| - this@R|/Outer.Inner|.F|/i| = R|/|.R|kotlin/Int.inc|() + [ResolvedTo(BODY_RESOLVE)] lval : R|kotlin/Int| = this@R|/Inner|.F|/i| + this@R|/Inner|.F|/i| = R|/|.R|kotlin/Int.inc|() R|/| } - ^ this@R|/Outer.Inner|.F|/i| + ^ this@R|/Inner|.F|/i| } public [ResolvedTo(BODY_RESOLVE)] set([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/Int|): R|kotlin/Unit| public final [ResolvedTo(BODY_RESOLVE)] val j: R|kotlin/Int| = Int(3) public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/Int| { - this@R|/Outer.Inner|.F|/j| = Int(42) - ^ this@R|/Outer.Inner|.F|/j| + this@R|/Inner|.F|/j| = Int(42) + ^ this@R|/Inner|.F|/j| } public final [ResolvedTo(BODY_RESOLVE)] fun innerMember(): R|kotlin/Unit| { diff --git a/analysis/low-level-api-fir/testdata/fileStructure/script.lazy.resolve.txt b/analysis/low-level-api-fir/testdata/fileStructure/script.lazy.resolve.txt index 8baf156bdb7..a9f35780e76 100644 --- a/analysis/low-level-api-fir/testdata/fileStructure/script.lazy.resolve.txt +++ b/analysis/low-level-api-fir/testdata/fileStructure/script.lazy.resolve.txt @@ -29,7 +29,7 @@ FILE: [ResolvedTo(BODY_RESOLVE)] script.kts R|/build|( = [ResolvedTo(BODY_RESOLVE)] build@fun R|Builder|.(): R|kotlin/Unit| { this@R|special/anonymous|.R|/Builder.version| = String(123) local final [ResolvedTo(BODY_RESOLVE)] class A : R|kotlin/Any| { - public [ResolvedTo(BODY_RESOLVE)] constructor(): R|A| { + public [ResolvedTo(BODY_RESOLVE)] constructor(): R|/A| { super() } @@ -49,4 +49,3 @@ FILE: [ResolvedTo(BODY_RESOLVE)] script.kts public final [ResolvedTo(BODY_RESOLVE)] val $$result: R|kotlin/Unit| = R|/builder|.R|/Builder.execute|() public [ResolvedTo(BODY_RESOLVE)] get(): R|kotlin/Unit| - diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/assignment.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/assignment.txt index e890851468c..f4be6fb0b07 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/assignment.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/assignment.txt @@ -8,7 +8,7 @@ String() FIR FILE: FILE: [ResolvedTo(IMPORTS)] assignment.kts context(