diff --git a/analysis/analysis-api/testData/components/scopeProvider/declaredMemberScope/enumEntryInitializer.txt b/analysis/analysis-api/testData/components/scopeProvider/declaredMemberScope/enumEntryInitializer.txt index 47b8d4851c4..5aaa48aa192 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/declaredMemberScope/enumEntryInitializer.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/declaredMemberScope/enumEntryInitializer.txt @@ -43,7 +43,7 @@ KtKotlinPropertySymbol: getDispatchReceiver(): KtUsualClassType: annotationsList: [] ownTypeArguments: [] - type: + type: test/ getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null hasBackingField: true @@ -75,7 +75,7 @@ KtKotlinPropertySymbol: getDispatchReceiver(): KtUsualClassType: annotationsList: [] ownTypeArguments: [] - type: + type: test/ getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null getterDeprecationStatus: null @@ -98,7 +98,7 @@ KtConstructorSymbol: returnType: KtUsualClassType: annotationsList: [] ownTypeArguments: [] - type: + type: test/ symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [] diff --git a/analysis/analysis-api/testData/components/scopeProvider/declaredMemberScope/enumEntryInitializerWithEmptyBody.txt b/analysis/analysis-api/testData/components/scopeProvider/declaredMemberScope/enumEntryInitializerWithEmptyBody.txt index bbecb88a9dd..d93e3bf5ece 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/declaredMemberScope/enumEntryInitializerWithEmptyBody.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/declaredMemberScope/enumEntryInitializerWithEmptyBody.txt @@ -13,7 +13,7 @@ KtConstructorSymbol: returnType: KtUsualClassType: annotationsList: [] ownTypeArguments: [] - type: + type: test/ symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [] diff --git a/analysis/analysis-api/testData/components/scopeProvider/declaredMemberScope/enumEntryInitializerWithFinalEnumMember.txt b/analysis/analysis-api/testData/components/scopeProvider/declaredMemberScope/enumEntryInitializerWithFinalEnumMember.txt index 47b8d4851c4..5aaa48aa192 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/declaredMemberScope/enumEntryInitializerWithFinalEnumMember.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/declaredMemberScope/enumEntryInitializerWithFinalEnumMember.txt @@ -43,7 +43,7 @@ KtKotlinPropertySymbol: getDispatchReceiver(): KtUsualClassType: annotationsList: [] ownTypeArguments: [] - type: + type: test/ getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null hasBackingField: true @@ -75,7 +75,7 @@ KtKotlinPropertySymbol: getDispatchReceiver(): KtUsualClassType: annotationsList: [] ownTypeArguments: [] - type: + type: test/ getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null getterDeprecationStatus: null @@ -98,7 +98,7 @@ KtConstructorSymbol: returnType: KtUsualClassType: annotationsList: [] ownTypeArguments: [] - type: + type: test/ symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [] diff --git a/analysis/analysis-api/testData/components/scopeProvider/declaredMemberScope/enumEntryInitializerWithOverriddenMember.txt b/analysis/analysis-api/testData/components/scopeProvider/declaredMemberScope/enumEntryInitializerWithOverriddenMember.txt index c08c5e53b0f..ac4f54cc329 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/declaredMemberScope/enumEntryInitializerWithOverriddenMember.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/declaredMemberScope/enumEntryInitializerWithOverriddenMember.txt @@ -43,7 +43,7 @@ KtKotlinPropertySymbol: getDispatchReceiver(): KtUsualClassType: annotationsList: [] ownTypeArguments: [] - type: + type: test/ getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null hasBackingField: true @@ -75,7 +75,7 @@ KtKotlinPropertySymbol: getDispatchReceiver(): KtUsualClassType: annotationsList: [] ownTypeArguments: [] - type: + type: test/ getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null getterDeprecationStatus: null @@ -98,7 +98,7 @@ KtConstructorSymbol: returnType: KtUsualClassType: annotationsList: [] ownTypeArguments: [] - type: + type: test/ symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [] diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/enumEntryInitializer.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/enumEntryInitializer.txt index 9b59ca977d0..04e2342a20b 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/enumEntryInitializer.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/enumEntryInitializer.txt @@ -43,7 +43,7 @@ KtKotlinPropertySymbol: getDispatchReceiver(): KtUsualClassType: annotationsList: [] ownTypeArguments: [] - type: + type: test/ getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null hasBackingField: true @@ -75,7 +75,7 @@ KtKotlinPropertySymbol: getDispatchReceiver(): KtUsualClassType: annotationsList: [] ownTypeArguments: [] - type: + type: test/ getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null getterDeprecationStatus: null @@ -573,7 +573,7 @@ KtConstructorSymbol: returnType: KtUsualClassType: annotationsList: [] ownTypeArguments: [] - type: + type: test/ symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [] diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/enumEntryInitializerWithFinalEnumMember.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/enumEntryInitializerWithFinalEnumMember.txt index 83e3f727e7a..0fd24d29455 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/enumEntryInitializerWithFinalEnumMember.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/enumEntryInitializerWithFinalEnumMember.txt @@ -43,7 +43,7 @@ KtKotlinPropertySymbol: getDispatchReceiver(): KtUsualClassType: annotationsList: [] ownTypeArguments: [] - type: + type: test/ getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null hasBackingField: true @@ -75,7 +75,7 @@ KtKotlinPropertySymbol: getDispatchReceiver(): KtUsualClassType: annotationsList: [] ownTypeArguments: [] - type: + type: test/ getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null getterDeprecationStatus: null @@ -658,7 +658,7 @@ KtConstructorSymbol: returnType: KtUsualClassType: annotationsList: [] ownTypeArguments: [] - type: + type: test/ symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [] diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/enumEntryInitializerWithOverriddenMember.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/enumEntryInitializerWithOverriddenMember.txt index 21a150045c1..1b541f0e84a 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/enumEntryInitializerWithOverriddenMember.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/enumEntryInitializerWithOverriddenMember.txt @@ -43,7 +43,7 @@ KtKotlinPropertySymbol: getDispatchReceiver(): KtUsualClassType: annotationsList: [] ownTypeArguments: [] - type: + type: test/ getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null hasBackingField: true @@ -75,7 +75,7 @@ KtKotlinPropertySymbol: getDispatchReceiver(): KtUsualClassType: annotationsList: [] ownTypeArguments: [] - type: + type: test/ getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null getterDeprecationStatus: null @@ -573,7 +573,7 @@ KtConstructorSymbol: returnType: KtUsualClassType: annotationsList: [] ownTypeArguments: [] - type: + type: test/ symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [] diff --git a/analysis/low-level-api-fir/testData/lazyResolve/localFunctionInsideSuperEntryCall.txt b/analysis/low-level-api-fir/testData/lazyResolve/localFunctionInsideSuperEntryCall.txt index 9ef3a8009a0..f4783790d15 100644 --- a/analysis/low-level-api-fir/testData/lazyResolve/localFunctionInsideSuperEntryCall.txt +++ b/analysis/low-level-api-fir/testData/lazyResolve/localFunctionInsideSuperEntryCall.txt @@ -13,7 +13,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCall.kt public final [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|one/ClassWithParameter| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| { super(object : R|one/Interface| { - private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|| { + private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|one/| { super() } @@ -41,7 +41,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCall.kt public final [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|one/ClassWithParameter| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| { super(object : R|one/Interface| { - private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|| { + private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|one/| { super() } @@ -69,7 +69,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCall.kt public final [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|one/ClassWithParameter| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| { super(object : R|one/Interface| { - private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|| { + private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|one/| { super() } @@ -97,7 +97,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCall.kt public final [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|one/ClassWithParameter| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| { super(object : R|one/Interface| { - private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|| { + private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|one/| { super() } @@ -125,7 +125,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCall.kt public final [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|one/ClassWithParameter| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| { super(object : R|one/Interface| { - private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|| { + private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|one/| { super() } @@ -153,7 +153,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCall.kt public final [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|one/ClassWithParameter| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| { super(object : R|one/Interface| { - private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|| { + private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|one/| { super() } @@ -181,7 +181,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCall.kt public final [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|one/ClassWithParameter| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| { super(object : R|one/Interface| { - private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|| { + private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|one/| { super() } @@ -209,7 +209,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCall.kt public final [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|one/ClassWithParameter| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| { super(object : R|one/Interface| { - private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|| { + private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|one/| { super() } @@ -237,7 +237,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCall.kt public final [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|one/ClassWithParameter| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| { super(object : R|one/Interface| { - private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|| { + private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|one/| { super() } @@ -265,7 +265,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCall.kt public final [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|one/ClassWithParameter| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| { super(object : R|one/Interface| { - private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|| { + private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|one/| { super() } @@ -293,7 +293,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCall.kt public final [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|one/ClassWithParameter| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| { super(object : R|one/Interface| { - private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|| { + private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|one/| { super() } @@ -321,7 +321,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCall.kt public final [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|one/ClassWithParameter| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| { super(object : R|one/Interface| { - private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|| { + private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|one/| { super() } @@ -349,7 +349,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCall.kt public final [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|one/ClassWithParameter| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| { super(object : R|one/Interface| { - private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|| { + private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|one/| { super() } @@ -377,7 +377,7 @@ FILE: [ResolvedTo(BODY_RESOLVE)] localFunctionInsideSuperEntryCall.kt public final [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|one/ClassWithParameter| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| { super(object : R|one/Interface| { - private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|| { + private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|one/| { super() } diff --git a/analysis/low-level-api-fir/testData/lazyResolve/localFunctionInsideSuperEntryCallScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/localFunctionInsideSuperEntryCallScript.txt index 927c9d836da..a61812cf89c 100644 --- a/analysis/low-level-api-fir/testData/lazyResolve/localFunctionInsideSuperEntryCallScript.txt +++ b/analysis/low-level-api-fir/testData/lazyResolve/localFunctionInsideSuperEntryCallScript.txt @@ -19,7 +19,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCallScript.kts public final [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|one/ClassWithParameter| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| { super(object : R|one/Interface| { - private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|| { + private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|one/| { super() } @@ -54,7 +54,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCallScript.kts public final [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|one/ClassWithParameter| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| { super(object : R|one/Interface| { - private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|| { + private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|one/| { super() } @@ -89,7 +89,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCallScript.kts public final [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|one/ClassWithParameter| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| { super(object : R|one/Interface| { - private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|| { + private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|one/| { super() } @@ -124,7 +124,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCallScript.kts public final [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|one/ClassWithParameter| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| { super(object : R|one/Interface| { - private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|| { + private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|one/| { super() } @@ -159,7 +159,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCallScript.kts public final [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|one/ClassWithParameter| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| { super(object : R|one/Interface| { - private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|| { + private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|one/| { super() } @@ -194,7 +194,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCallScript.kts public final [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|one/ClassWithParameter| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| { super(object : R|one/Interface| { - private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|| { + private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|one/| { super() } @@ -229,7 +229,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCallScript.kts public final [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|one/ClassWithParameter| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| { super(object : R|one/Interface| { - private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|| { + private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|one/| { super() } @@ -264,7 +264,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCallScript.kts public final [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|one/ClassWithParameter| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| { super(object : R|one/Interface| { - private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|| { + private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|one/| { super() } @@ -299,7 +299,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCallScript.kts public final [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|one/ClassWithParameter| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| { super(object : R|one/Interface| { - private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|| { + private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|one/| { super() } @@ -334,7 +334,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCallScript.kts public final [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|one/ClassWithParameter| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| { super(object : R|one/Interface| { - private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|| { + private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|one/| { super() } @@ -369,7 +369,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCallScript.kts public final [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|one/ClassWithParameter| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| { super(object : R|one/Interface| { - private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|| { + private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|one/| { super() } @@ -404,7 +404,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCallScript.kts public final [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|one/ClassWithParameter| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| { super(object : R|one/Interface| { - private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|| { + private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|one/| { super() } @@ -439,7 +439,7 @@ FILE: [ResolvedTo(IMPORTS)] localFunctionInsideSuperEntryCallScript.kts public final [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|one/ClassWithParameter| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| { super(object : R|one/Interface| { - private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|| { + private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|one/| { super() } @@ -474,7 +474,7 @@ FILE: [ResolvedTo(BODY_RESOLVE)] localFunctionInsideSuperEntryCallScript.kts public final [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|one/ClassWithParameter| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| { super(object : R|one/Interface| { - private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|| { + private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|one/| { super() } diff --git a/analysis/low-level-api-fir/testData/lazyResolve/localParameterInsideSuperEntryCall.txt b/analysis/low-level-api-fir/testData/lazyResolve/localParameterInsideSuperEntryCall.txt index a2ba6cd50d0..02c5881fda8 100644 --- a/analysis/low-level-api-fir/testData/lazyResolve/localParameterInsideSuperEntryCall.txt +++ b/analysis/low-level-api-fir/testData/lazyResolve/localParameterInsideSuperEntryCall.txt @@ -13,7 +13,7 @@ FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCall.kt public final [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|one/ClassWithParameter| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| { super(object : R|one/Interface| { - private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|| { + private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|one/| { super() } @@ -41,7 +41,7 @@ FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCall.kt public final [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|one/ClassWithParameter| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| { super(object : R|one/Interface| { - private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|| { + private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|one/| { super() } @@ -69,7 +69,7 @@ FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCall.kt public final [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|one/ClassWithParameter| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| { super(object : R|one/Interface| { - private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|| { + private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|one/| { super() } @@ -97,7 +97,7 @@ FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCall.kt public final [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|one/ClassWithParameter| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| { super(object : R|one/Interface| { - private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|| { + private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|one/| { super() } @@ -125,7 +125,7 @@ FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCall.kt public final [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|one/ClassWithParameter| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| { super(object : R|one/Interface| { - private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|| { + private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|one/| { super() } @@ -153,7 +153,7 @@ FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCall.kt public final [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|one/ClassWithParameter| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| { super(object : R|one/Interface| { - private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|| { + private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|one/| { super() } @@ -181,7 +181,7 @@ FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCall.kt public final [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|one/ClassWithParameter| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| { super(object : R|one/Interface| { - private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|| { + private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|one/| { super() } @@ -209,7 +209,7 @@ FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCall.kt public final [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|one/ClassWithParameter| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| { super(object : R|one/Interface| { - private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|| { + private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|one/| { super() } @@ -237,7 +237,7 @@ FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCall.kt public final [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|one/ClassWithParameter| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| { super(object : R|one/Interface| { - private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|| { + private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|one/| { super() } @@ -265,7 +265,7 @@ FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCall.kt public final [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|one/ClassWithParameter| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| { super(object : R|one/Interface| { - private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|| { + private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|one/| { super() } @@ -293,7 +293,7 @@ FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCall.kt public final [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|one/ClassWithParameter| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| { super(object : R|one/Interface| { - private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|| { + private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|one/| { super() } @@ -321,7 +321,7 @@ FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCall.kt public final [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|one/ClassWithParameter| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| { super(object : R|one/Interface| { - private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|| { + private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|one/| { super() } @@ -349,7 +349,7 @@ FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCall.kt public final [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|one/ClassWithParameter| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| { super(object : R|one/Interface| { - private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|| { + private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|one/| { super() } @@ -377,7 +377,7 @@ FILE: [ResolvedTo(BODY_RESOLVE)] localParameterInsideSuperEntryCall.kt public final [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|one/ClassWithParameter| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| { super(object : R|one/Interface| { - private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|| { + private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|one/| { super() } diff --git a/analysis/low-level-api-fir/testData/lazyResolve/localParameterInsideSuperEntryCallScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/localParameterInsideSuperEntryCallScript.txt index 21dbf0008d1..f754306867d 100644 --- a/analysis/low-level-api-fir/testData/lazyResolve/localParameterInsideSuperEntryCallScript.txt +++ b/analysis/low-level-api-fir/testData/lazyResolve/localParameterInsideSuperEntryCallScript.txt @@ -19,7 +19,7 @@ FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCallScript.kts public final [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|one/ClassWithParameter| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| { super(object : R|one/Interface| { - private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|| { + private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|one/| { super() } @@ -54,7 +54,7 @@ FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCallScript.kts public final [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|one/ClassWithParameter| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| { super(object : R|one/Interface| { - private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|| { + private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|one/| { super() } @@ -89,7 +89,7 @@ FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCallScript.kts public final [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|one/ClassWithParameter| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| { super(object : R|one/Interface| { - private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|| { + private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|one/| { super() } @@ -124,7 +124,7 @@ FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCallScript.kts public final [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|one/ClassWithParameter| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| { super(object : R|one/Interface| { - private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|| { + private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|one/| { super() } @@ -159,7 +159,7 @@ FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCallScript.kts public final [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|one/ClassWithParameter| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| { super(object : R|one/Interface| { - private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|| { + private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|one/| { super() } @@ -194,7 +194,7 @@ FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCallScript.kts public final [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|one/ClassWithParameter| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| { super(object : R|one/Interface| { - private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|| { + private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|one/| { super() } @@ -229,7 +229,7 @@ FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCallScript.kts public final [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|one/ClassWithParameter| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| { super(object : R|one/Interface| { - private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|| { + private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|one/| { super() } @@ -264,7 +264,7 @@ FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCallScript.kts public final [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|one/ClassWithParameter| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| { super(object : R|one/Interface| { - private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|| { + private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|one/| { super() } @@ -299,7 +299,7 @@ FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCallScript.kts public final [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|one/ClassWithParameter| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| { super(object : R|one/Interface| { - private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|| { + private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|one/| { super() } @@ -334,7 +334,7 @@ FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCallScript.kts public final [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|one/ClassWithParameter| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| { super(object : R|one/Interface| { - private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|| { + private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|one/| { super() } @@ -369,7 +369,7 @@ FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCallScript.kts public final [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|one/ClassWithParameter| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| { super(object : R|one/Interface| { - private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|| { + private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|one/| { super() } @@ -404,7 +404,7 @@ FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCallScript.kts public final [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|one/ClassWithParameter| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| { super(object : R|one/Interface| { - private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|| { + private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|one/| { super() } @@ -439,7 +439,7 @@ FILE: [ResolvedTo(IMPORTS)] localParameterInsideSuperEntryCallScript.kts public final [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|one/ClassWithParameter| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| { super(object : R|one/Interface| { - private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|| { + private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|one/| { super() } @@ -474,7 +474,7 @@ FILE: [ResolvedTo(BODY_RESOLVE)] localParameterInsideSuperEntryCallScript.kts public final [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|one/ClassWithParameter| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=TopLevelClass] constructor(): R|one/TopLevelClass| { super(object : R|one/Interface| { - private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|| { + private [ResolvedTo(RAW_FIR)] [ContainingClassKey=] constructor(): R|one/| { super() } diff --git a/analysis/low-level-api-fir/testData/partialRawBuilder/paramemtersCatching.txt b/analysis/low-level-api-fir/testData/partialRawBuilder/paramemtersCatching.txt index c95ffaaade5..81e18ceceb2 100644 --- a/analysis/low-level-api-fir/testData/partialRawBuilder/paramemtersCatching.txt +++ b/analysis/low-level-api-fir/testData/partialRawBuilder/paramemtersCatching.txt @@ -1,6 +1,6 @@ public? final? fun test/classes/Outer.foo(): R|kotlin/Unit| { lval /z: = object : R|kotlin/Any| { - private constructor(): R|| { + private constructor(): R|test/classes/| { super() } diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/CallBasedInExpressionGenerator.fir.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/CallBasedInExpressionGenerator.fir.txt index f0319d887af..cedd04f9b76 100644 --- a/compiler/fir/analysis-tests/testData/resolve/expresssions/CallBasedInExpressionGenerator.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/expresssions/CallBasedInExpressionGenerator.fir.txt @@ -54,17 +54,17 @@ FILE: CallBasedInExpressionGenerator.kt private final fun gen(argument: R|org/jetbrains/kotlin/codegen/range/inExpression/StackValue|): R|org/jetbrains/kotlin/codegen/range/inExpression/BranchedValue| { ^gen object : R|org/jetbrains/kotlin/codegen/range/inExpression/BranchedValue| { - private constructor(): R|| { + private constructor(): R|org/jetbrains/kotlin/codegen/range/inExpression/| { super(R|/argument|, Null(null), R|/argument|.#, #.#) } public open override fun putSelector(type: R|org/jetbrains/kotlin/codegen/range/inExpression/Type|, kotlinType: R|org/jetbrains/kotlin/codegen/range/inExpression/KotlinType?|, v: R|org/jetbrains/kotlin/codegen/range/inExpression/InstructionAdapter|): R|kotlin/Unit| { - this@R|/|.R|/.invokeFunction|(R|/v|) + this@R|org/jetbrains/kotlin/codegen/range/inExpression/|.R|org/jetbrains/kotlin/codegen/range/inExpression/.invokeFunction|(R|/v|) #(R|/type|, R|/kotlinType|, R|/v|) } public open override fun condJump(jumpLabel: R|org/jetbrains/kotlin/codegen/range/inExpression/Label|, v: R|org/jetbrains/kotlin/codegen/range/inExpression/InstructionAdapter|, jumpIfFalse: R|kotlin/Boolean|): R|kotlin/Unit| { - this@R|/|.R|/.invokeFunction|(R|/v|) + this@R|org/jetbrains/kotlin/codegen/range/inExpression/|.R|org/jetbrains/kotlin/codegen/range/inExpression/.invokeFunction|(R|/v|) R|/v|.#(when () { R|/jumpIfFalse| -> { #.# diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/intellij/baseIntrospector.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/intellij/baseIntrospector.fir.txt index 3a95d6658af..3d16f15eea3 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/intellij/baseIntrospector.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/intellij/baseIntrospector.fir.txt @@ -56,7 +56,7 @@ FILE: m2.kt protected open override fun createDatabaseRetriever(database: R|m2/SqliteRoot|): R|m1/BaseIntrospector.AbstractDatabaseRetriever| { ^createDatabaseRetriever object : R|m1/BaseIntrospector.AbstractDatabaseRetriever| { - private constructor(): R|| { + private constructor(): R|m2/| { this@R|m2/SqliteIntrospector|.super|>(R|/database|) } diff --git a/compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/checkers/expression/FirInterfaceDefaultMethodCallChecker.kt b/compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/checkers/expression/FirInterfaceDefaultMethodCallChecker.kt index cc622081973..0066e516c80 100644 --- a/compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/checkers/expression/FirInterfaceDefaultMethodCallChecker.kt +++ b/compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/checkers/expression/FirInterfaceDefaultMethodCallChecker.kt @@ -19,8 +19,8 @@ import org.jetbrains.kotlin.fir.expressions.FirQualifiedAccessExpression import org.jetbrains.kotlin.fir.java.jvmDefaultModeState import org.jetbrains.kotlin.fir.references.toResolvedCallableSymbol import org.jetbrains.kotlin.fir.resolve.providers.symbolProvider -import org.jetbrains.kotlin.fir.symbols.impl.ANONYMOUS_CLASS_ID import org.jetbrains.kotlin.fir.symbols.impl.FirRegularClassSymbol +import org.jetbrains.kotlin.name.SpecialNames.ANONYMOUS_FQ_NAME object FirInterfaceDefaultMethodCallChecker : FirQualifiedAccessExpressionChecker() { override fun check(expression: FirQualifiedAccessExpression, context: CheckerContext, reporter: DiagnosticReporter) { @@ -51,7 +51,7 @@ object FirInterfaceDefaultMethodCallChecker : FirQualifiedAccessExpressionChecke private fun CheckerContext.findContainingMember(): FirCallableDeclaration? { return findClosest { - (it is FirSimpleFunction && it.symbol.callableId.classId != ANONYMOUS_CLASS_ID) || it is FirProperty + (it is FirSimpleFunction && it.symbol.callableId.classId?.relativeClassName != ANONYMOUS_FQ_NAME) || it is FirProperty } } } diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java index 17006f0c8a3..7615e82ab7f 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java @@ -35991,6 +35991,12 @@ public class FirLightTreeBlackBoxCodegenTestGenerated extends AbstractFirLightTr runTest("compiler/testData/codegen/box/package/kt57353.kt"); } + @Test + @TestMetadata("kt62017.kt") + public void testKt62017() throws Exception { + runTest("compiler/testData/codegen/box/package/kt62017.kt"); + } + @Test @TestMetadata("mainInFiles.kt") public void testMainInFiles() throws Exception { diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenWithIrFakeOverrideGeneratorTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenWithIrFakeOverrideGeneratorTestGenerated.java index 56becf651a0..90e12b2c63b 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenWithIrFakeOverrideGeneratorTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenWithIrFakeOverrideGeneratorTestGenerated.java @@ -35991,6 +35991,12 @@ public class FirLightTreeBlackBoxCodegenWithIrFakeOverrideGeneratorTestGenerated runTest("compiler/testData/codegen/box/package/kt57353.kt"); } + @Test + @TestMetadata("kt62017.kt") + public void testKt62017() throws Exception { + runTest("compiler/testData/codegen/box/package/kt62017.kt"); + } + @Test @TestMetadata("mainInFiles.kt") public void testMainInFiles() throws Exception { diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java index 2e22a7d9a51..d351112a4c2 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java @@ -35991,6 +35991,12 @@ public class FirPsiBlackBoxCodegenTestGenerated extends AbstractFirPsiBlackBoxCo runTest("compiler/testData/codegen/box/package/kt57353.kt"); } + @Test + @TestMetadata("kt62017.kt") + public void testKt62017() throws Exception { + runTest("compiler/testData/codegen/box/package/kt62017.kt"); + } + @Test @TestMetadata("mainInFiles.kt") public void testMainInFiles() throws Exception { diff --git a/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/LightTreeRawFirDeclarationBuilder.kt b/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/LightTreeRawFirDeclarationBuilder.kt index f2f66339c14..0e26e68643e 100644 --- a/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/LightTreeRawFirDeclarationBuilder.kt +++ b/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/LightTreeRawFirDeclarationBuilder.kt @@ -653,7 +653,7 @@ class LightTreeRawFirDeclarationBuilder( moduleData = baseModuleData classKind = ClassKind.CLASS scopeProvider = baseScopeProvider - symbol = FirAnonymousObjectSymbol() + symbol = FirAnonymousObjectSymbol(context.packageFqName) status = FirDeclarationStatusImpl(Visibilities.Local, Modality.FINAL) context.appendOuterTypeParameters(ignoreLastLevel = false, typeParameters) val delegatedSelfType = objectLiteral.toDelegatedSelfType(this) @@ -777,7 +777,7 @@ class LightTreeRawFirDeclarationBuilder( origin = FirDeclarationOrigin.Source classKind = ClassKind.ENUM_ENTRY scopeProvider = baseScopeProvider - symbol = FirAnonymousObjectSymbol() + symbol = FirAnonymousObjectSymbol(context.packageFqName) status = FirDeclarationStatusImpl(Visibilities.Local, Modality.FINAL) val enumClassWrapper = ClassWrapper( modifiers, diff --git a/compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/PsiRawFirBuilder.kt b/compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/PsiRawFirBuilder.kt index 30b34c58d5f..ee80316fbb7 100644 --- a/compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/PsiRawFirBuilder.kt +++ b/compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/PsiRawFirBuilder.kt @@ -1312,7 +1312,7 @@ open class PsiRawFirBuilder( origin = FirDeclarationOrigin.Source classKind = ClassKind.ENUM_ENTRY scopeProvider = this@PsiRawFirBuilder.baseScopeProvider - symbol = FirAnonymousObjectSymbol() + symbol = FirAnonymousObjectSymbol(this@PsiRawFirBuilder.context.packageFqName) status = FirDeclarationStatusImpl(Visibilities.Local, Modality.FINAL) val delegatedEntrySelfType = buildResolvedTypeRef { @@ -1559,7 +1559,7 @@ open class PsiRawFirBuilder( origin = FirDeclarationOrigin.Source classKind = ClassKind.CLASS scopeProvider = baseScopeProvider - symbol = FirAnonymousObjectSymbol() + symbol = FirAnonymousObjectSymbol(context.packageFqName) status = FirDeclarationStatusImpl(Visibilities.Local, Modality.FINAL) context.appendOuterTypeParameters(ignoreLastLevel = false, typeParameters) val delegatedSelfType = objectDeclaration.toDelegatedSelfType(this) diff --git a/compiler/fir/raw-fir/raw-fir.common/src/org/jetbrains/kotlin/fir/builder/AbstractRawFirBuilder.kt b/compiler/fir/raw-fir/raw-fir.common/src/org/jetbrains/kotlin/fir/builder/AbstractRawFirBuilder.kt index 607694622ad..afda2d4bd7f 100644 --- a/compiler/fir/raw-fir/raw-fir.common/src/org/jetbrains/kotlin/fir/builder/AbstractRawFirBuilder.kt +++ b/compiler/fir/raw-fir/raw-fir.common/src/org/jetbrains/kotlin/fir/builder/AbstractRawFirBuilder.kt @@ -152,7 +152,9 @@ abstract class AbstractRawFirBuilder(val baseSession: FirSession, val context fun callableIdForName(name: Name) = when { - context.className.shortNameOrSpecial() == SpecialNames.ANONYMOUS -> CallableId(ANONYMOUS_CLASS_ID, name) + context.className.shortNameOrSpecial() == SpecialNames.ANONYMOUS -> CallableId( + ClassId(context.packageFqName, SpecialNames.ANONYMOUS_FQ_NAME, true), name + ) context.className.isRoot && !context.inLocalContext -> CallableId(context.packageFqName, name) context.inLocalContext -> { val pathFqName = diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/impl/FirClassLikeSymbol.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/impl/FirClassLikeSymbol.kt index 1f6d3e08ea9..d005744d982 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/impl/FirClassLikeSymbol.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/impl/FirClassLikeSymbol.kt @@ -83,9 +83,9 @@ class FirRegularClassSymbol(classId: ClassId) : FirClassSymbol( } } -val ANONYMOUS_CLASS_ID = ClassId(FqName.ROOT, FqName.topLevel(SpecialNames.ANONYMOUS), true) - -class FirAnonymousObjectSymbol : FirClassSymbol(ANONYMOUS_CLASS_ID) +class FirAnonymousObjectSymbol(packageFqName: FqName) : FirClassSymbol( + ClassId(packageFqName, SpecialNames.ANONYMOUS_FQ_NAME, true) +) class FirTypeAliasSymbol(classId: ClassId) : FirClassLikeSymbol(classId), TypeAliasSymbolMarker { override fun toLookupTag(): ConeClassLikeLookupTag = classId.toLookupTag() diff --git a/compiler/testData/codegen/box/package/kt62017.kt b/compiler/testData/codegen/box/package/kt62017.kt new file mode 100644 index 00000000000..0764c40e627 --- /dev/null +++ b/compiler/testData/codegen/box/package/kt62017.kt @@ -0,0 +1,20 @@ +// TARGET_BACKEND: JVM +// FILE: a/A.java + +package a; + +abstract class A { + String o() { return "O"; } + String k() { return "K"; } +} + +// FILE: a/1.kt + +package a + +private val o = object : A() {} + +fun box(): String { + val k = object : A() {} + return o.o() + k.k() +} diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java index b6b24ff30d5..83c84b711f7 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java @@ -34185,6 +34185,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { runTest("compiler/testData/codegen/box/package/kt57353.kt"); } + @Test + @TestMetadata("kt62017.kt") + public void testKt62017() throws Exception { + runTest("compiler/testData/codegen/box/package/kt62017.kt"); + } + @Test @TestMetadata("mainInFiles.kt") public void testMainInFiles() throws Exception { diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java index f6b397d66f4..2b3d356737d 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java @@ -35991,6 +35991,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes runTest("compiler/testData/codegen/box/package/kt57353.kt"); } + @Test + @TestMetadata("kt62017.kt") + public void testKt62017() throws Exception { + runTest("compiler/testData/codegen/box/package/kt62017.kt"); + } + @Test @TestMetadata("mainInFiles.kt") public void testMainInFiles() throws Exception { diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java index b4e3f478745..8fee15106d6 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java @@ -35991,6 +35991,12 @@ public class IrBlackBoxCodegenWithIrInlinerTestGenerated extends AbstractIrBlack runTest("compiler/testData/codegen/box/package/kt57353.kt"); } + @Test + @TestMetadata("kt62017.kt") + public void testKt62017() throws Exception { + runTest("compiler/testData/codegen/box/package/kt62017.kt"); + } + @Test @TestMetadata("mainInFiles.kt") public void testMainInFiles() throws Exception { diff --git a/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java index fecb756e5e8..ba2a7b22ac3 100644 --- a/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java +++ b/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java @@ -30727,6 +30727,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes runTest("compiler/testData/codegen/box/package/kt57353.kt"); } + @TestMetadata("kt62017.kt") + public void testKt62017() throws Exception { + runTest("compiler/testData/codegen/box/package/kt62017.kt"); + } + @TestMetadata("mainInFiles.kt") public void testMainInFiles() throws Exception { runTest("compiler/testData/codegen/box/package/mainInFiles.kt"); diff --git a/core/compiler.common/src/org/jetbrains/kotlin/name/SpecialNames.kt b/core/compiler.common/src/org/jetbrains/kotlin/name/SpecialNames.kt index e6cb97319a6..63348e641b0 100644 --- a/core/compiler.common/src/org/jetbrains/kotlin/name/SpecialNames.kt +++ b/core/compiler.common/src/org/jetbrains/kotlin/name/SpecialNames.kt @@ -37,6 +37,9 @@ object SpecialNames { @JvmField val ANONYMOUS = Name.special(ANONYMOUS_STRING) + @JvmField + val ANONYMOUS_FQ_NAME = FqName.topLevel(Name.special(ANONYMOUS_STRING)) + @JvmField val UNARY = Name.special("")