From c9f11ad74f2042d3346dcaabbe904c236f338523 Mon Sep 17 00:00:00 2001 From: Dmitrii Gridin Date: Fri, 15 Dec 2023 14:42:02 +0100 Subject: [PATCH] [FIR] FirFakeOverrideGenerator: unify value parameter copy between regular functions and property accessors This commit contains: * correct containingFunctionSymbol for value parameter from accessors * correct choose between originalForIntersectionOverrideAttr and originalForSubstitutionOverrideAttr for value parameters from functions ^KT-64243 --- ...mplicitTypeInsideAnonymousObject.after.txt | 2 +- ...plicitTypeInsideAnonymousObject.before.txt | 2 +- ...tTypeInsideAnonymousObjectScript.after.txt | 2 +- ...TypeInsideAnonymousObjectScript.before.txt | 2 +- ...rrideWithImplicitTypeInsideClass.after.txt | 2 +- ...rideWithImplicitTypeInsideClass.before.txt | 2 +- ...ithImplicitTypeInsideClassScript.after.txt | 2 +- ...thImplicitTypeInsideClassScript.before.txt | 2 +- ...mplicitTypeInsideAnonymousObject.after.txt | 2 +- ...plicitTypeInsideAnonymousObject.before.txt | 2 +- ...tTypeInsideAnonymousObjectScript.after.txt | 2 +- ...TypeInsideAnonymousObjectScript.before.txt | 2 +- ...deWithoutImplicitTypeInsideClass.after.txt | 2 +- ...eWithoutImplicitTypeInsideClass.before.txt | 2 +- ...outImplicitTypeInsideClassScript.after.txt | 2 +- ...utImplicitTypeInsideClassScript.before.txt | 2 +- .../intersectionOverride.after.txt | 4 +- .../intersectionOverride.before.txt | 4 +- .../intersectionOverride2.after.txt | 4 +- .../intersectionOverride2.before.txt | 4 +- .../intersectionOverride2Script.after.txt | 4 +- .../intersectionOverride2Script.before.txt | 4 +- .../intersectionOverrideScript.after.txt | 4 +- .../intersectionOverrideScript.before.txt | 4 +- ...mplicitTypeInsideAnonymousObject.after.txt | 4 +- ...plicitTypeInsideAnonymousObject.before.txt | 4 +- ...tTypeInsideAnonymousObjectScript.after.txt | 4 +- ...TypeInsideAnonymousObjectScript.before.txt | 4 +- ...mplicitTypeInsideAnonymousObject.after.txt | 4 +- ...plicitTypeInsideAnonymousObject.before.txt | 4 +- ...tTypeInsideAnonymousObjectScript.after.txt | 4 +- ...TypeInsideAnonymousObjectScript.before.txt | 4 +- .../delegateWithExplicitType.after.txt | 2 +- .../delegateWithExplicitType.before.txt | 2 +- .../delegateWithExplicitType.lazyResolve.txt | 12 ++-- .../delegateWithExplicitTypeScript.after.txt | 2 +- .../delegateWithExplicitTypeScript.before.txt | 2 +- ...gateWithExplicitTypeScript.lazyResolve.txt | 12 ++-- ...egateWithExplicitTypeUnavailable.after.txt | 2 +- ...gateWithExplicitTypeUnavailable.before.txt | 2 +- ...ithExplicitTypeUnavailable.lazyResolve.txt | 12 ++-- ...ithExplicitTypeUnavailableScript.after.txt | 2 +- ...thExplicitTypeUnavailableScript.before.txt | 2 +- ...licitTypeUnavailableScript.lazyResolve.txt | 12 ++-- .../delegateWithImplicitType.after.txt | 2 +- .../delegateWithImplicitType.before.txt | 2 +- .../delegateWithImplicitType.lazyResolve.txt | 12 ++-- .../delegateWithImplicitTypeScript.after.txt | 2 +- .../delegateWithImplicitTypeScript.before.txt | 2 +- ...gateWithImplicitTypeScript.lazyResolve.txt | 12 ++-- ...egateWithImplicitTypeUnavailable.after.txt | 2 +- ...gateWithImplicitTypeUnavailable.before.txt | 2 +- ...ithImplicitTypeUnavailable.lazyResolve.txt | 12 ++-- ...ithImplicitTypeUnavailableScript.after.txt | 2 +- ...thImplicitTypeUnavailableScript.before.txt | 2 +- ...licitTypeUnavailableScript.lazyResolve.txt | 12 ++-- .../scopes/impl/FirFakeOverrideGenerator.kt | 61 +++++++++++++------ 57 files changed, 154 insertions(+), 131 deletions(-) diff --git a/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithImplicitTypeInsideAnonymousObject.after.txt b/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithImplicitTypeInsideAnonymousObject.after.txt index 223028520f9..dfa6ca7e1d7 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithImplicitTypeInsideAnonymousObject.after.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithImplicitTypeInsideAnonymousObject.after.txt @@ -6,7 +6,7 @@ public open [ResolvedTo(BODY_RESOLVE)] fun isSchemeFile([ResolvedTo(BODY_RESOLVE ^isSchemeFile Boolean(true) } -public open [ResolvedTo(STATUS)] [CallableCopySubstitutionKey=CallableCopySubstitution(substitutor=Empty, baseSymbol=FirNamedFunctionSymbol /BaseInterface.anotherFunction), DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /BaseInterface.anotherFunction, containingClass=, delegateField=FirFieldSymbol /.$$delegate_0] fun anotherFunction([ResolvedTo(STATUS)] [SubstitutedOverrideOriginalKey=/name] name: R|kotlin/CharSequence| = LAZY_EXPRESSION): +public open [ResolvedTo(STATUS)] [CallableCopySubstitutionKey=CallableCopySubstitution(substitutor=Empty, baseSymbol=FirNamedFunctionSymbol /BaseInterface.anotherFunction), DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /BaseInterface.anotherFunction, containingClass=, delegateField=FirFieldSymbol /.$$delegate_0] fun anotherFunction([ResolvedTo(STATUS)] name: R|kotlin/CharSequence| = LAZY_EXPRESSION): public open [ResolvedTo(BODY_RESOLVE)] fun anotherFunction([ResolvedTo(BODY_RESOLVE)] name: R|kotlin/CharSequence| = R|/genericCall|()): R|kotlin/Boolean| { ^anotherFunction Boolean(true) diff --git a/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithImplicitTypeInsideAnonymousObject.before.txt b/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithImplicitTypeInsideAnonymousObject.before.txt index e58857af14d..be60bfffd49 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithImplicitTypeInsideAnonymousObject.before.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithImplicitTypeInsideAnonymousObject.before.txt @@ -4,7 +4,7 @@ public open override [ResolvedTo(BODY_RESOLVE)] fun isSchemeFile([ResolvedTo(BOD public open [ResolvedTo(STATUS)] fun isSchemeFile([ResolvedTo(STATUS)] name: R|kotlin/CharSequence| = LAZY_EXPRESSION): { LAZY_BLOCK } -public open [ResolvedTo(STATUS)] [CallableCopySubstitutionKey=CallableCopySubstitution(substitutor=Empty, baseSymbol=FirNamedFunctionSymbol /BaseInterface.anotherFunction), DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /BaseInterface.anotherFunction, containingClass=, delegateField=FirFieldSymbol /.$$delegate_0] fun anotherFunction([ResolvedTo(STATUS)] [SubstitutedOverrideOriginalKey=/name] name: R|kotlin/CharSequence| = LAZY_EXPRESSION): +public open [ResolvedTo(STATUS)] [CallableCopySubstitutionKey=CallableCopySubstitution(substitutor=Empty, baseSymbol=FirNamedFunctionSymbol /BaseInterface.anotherFunction), DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /BaseInterface.anotherFunction, containingClass=, delegateField=FirFieldSymbol /.$$delegate_0] fun anotherFunction([ResolvedTo(STATUS)] name: R|kotlin/CharSequence| = LAZY_EXPRESSION): public open [ResolvedTo(STATUS)] fun anotherFunction([ResolvedTo(STATUS)] name: R|kotlin/CharSequence| = LAZY_EXPRESSION): { LAZY_BLOCK } diff --git a/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithImplicitTypeInsideAnonymousObjectScript.after.txt b/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithImplicitTypeInsideAnonymousObjectScript.after.txt index 223028520f9..dfa6ca7e1d7 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithImplicitTypeInsideAnonymousObjectScript.after.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithImplicitTypeInsideAnonymousObjectScript.after.txt @@ -6,7 +6,7 @@ public open [ResolvedTo(BODY_RESOLVE)] fun isSchemeFile([ResolvedTo(BODY_RESOLVE ^isSchemeFile Boolean(true) } -public open [ResolvedTo(STATUS)] [CallableCopySubstitutionKey=CallableCopySubstitution(substitutor=Empty, baseSymbol=FirNamedFunctionSymbol /BaseInterface.anotherFunction), DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /BaseInterface.anotherFunction, containingClass=, delegateField=FirFieldSymbol /.$$delegate_0] fun anotherFunction([ResolvedTo(STATUS)] [SubstitutedOverrideOriginalKey=/name] name: R|kotlin/CharSequence| = LAZY_EXPRESSION): +public open [ResolvedTo(STATUS)] [CallableCopySubstitutionKey=CallableCopySubstitution(substitutor=Empty, baseSymbol=FirNamedFunctionSymbol /BaseInterface.anotherFunction), DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /BaseInterface.anotherFunction, containingClass=, delegateField=FirFieldSymbol /.$$delegate_0] fun anotherFunction([ResolvedTo(STATUS)] name: R|kotlin/CharSequence| = LAZY_EXPRESSION): public open [ResolvedTo(BODY_RESOLVE)] fun anotherFunction([ResolvedTo(BODY_RESOLVE)] name: R|kotlin/CharSequence| = R|/genericCall|()): R|kotlin/Boolean| { ^anotherFunction Boolean(true) diff --git a/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithImplicitTypeInsideAnonymousObjectScript.before.txt b/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithImplicitTypeInsideAnonymousObjectScript.before.txt index e58857af14d..be60bfffd49 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithImplicitTypeInsideAnonymousObjectScript.before.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithImplicitTypeInsideAnonymousObjectScript.before.txt @@ -4,7 +4,7 @@ public open override [ResolvedTo(BODY_RESOLVE)] fun isSchemeFile([ResolvedTo(BOD public open [ResolvedTo(STATUS)] fun isSchemeFile([ResolvedTo(STATUS)] name: R|kotlin/CharSequence| = LAZY_EXPRESSION): { LAZY_BLOCK } -public open [ResolvedTo(STATUS)] [CallableCopySubstitutionKey=CallableCopySubstitution(substitutor=Empty, baseSymbol=FirNamedFunctionSymbol /BaseInterface.anotherFunction), DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /BaseInterface.anotherFunction, containingClass=, delegateField=FirFieldSymbol /.$$delegate_0] fun anotherFunction([ResolvedTo(STATUS)] [SubstitutedOverrideOriginalKey=/name] name: R|kotlin/CharSequence| = LAZY_EXPRESSION): +public open [ResolvedTo(STATUS)] [CallableCopySubstitutionKey=CallableCopySubstitution(substitutor=Empty, baseSymbol=FirNamedFunctionSymbol /BaseInterface.anotherFunction), DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /BaseInterface.anotherFunction, containingClass=, delegateField=FirFieldSymbol /.$$delegate_0] fun anotherFunction([ResolvedTo(STATUS)] name: R|kotlin/CharSequence| = LAZY_EXPRESSION): public open [ResolvedTo(STATUS)] fun anotherFunction([ResolvedTo(STATUS)] name: R|kotlin/CharSequence| = LAZY_EXPRESSION): { LAZY_BLOCK } diff --git a/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithImplicitTypeInsideClass.after.txt b/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithImplicitTypeInsideClass.after.txt index dbd62603d18..a1a532457d7 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithImplicitTypeInsideClass.after.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithImplicitTypeInsideClass.after.txt @@ -6,7 +6,7 @@ public open [ResolvedTo(BODY_RESOLVE)] fun isSchemeFile([ResolvedTo(BODY_RESOLVE ^isSchemeFile Boolean(true) } -public open [ResolvedTo(BODY_RESOLVE)] [DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /BaseInterface.anotherFunction, containingClass=MyClass, delegateField=FirFieldSymbol /MyClass.$$delegate_0] fun anotherFunction([ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=/name] name: R|kotlin/CharSequence| = R|/genericCall|()): R|kotlin/Boolean| +public open [ResolvedTo(BODY_RESOLVE)] [DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /BaseInterface.anotherFunction, containingClass=MyClass, delegateField=FirFieldSymbol /MyClass.$$delegate_0] fun anotherFunction([ResolvedTo(BODY_RESOLVE)] name: R|kotlin/CharSequence| = R|/genericCall|()): R|kotlin/Boolean| public open [ResolvedTo(BODY_RESOLVE)] fun anotherFunction([ResolvedTo(BODY_RESOLVE)] name: R|kotlin/CharSequence| = R|/genericCall|()): R|kotlin/Boolean| { ^anotherFunction Boolean(true) diff --git a/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithImplicitTypeInsideClass.before.txt b/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithImplicitTypeInsideClass.before.txt index a1473f87996..dc2967db8e3 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithImplicitTypeInsideClass.before.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithImplicitTypeInsideClass.before.txt @@ -2,7 +2,7 @@ public open override [ResolvedTo(STATUS)] fun isSchemeFile([ResolvedTo(STATUS)] public open [ResolvedTo(STATUS)] fun isSchemeFile([ResolvedTo(STATUS)] name: R|kotlin/CharSequence| = LAZY_EXPRESSION): { LAZY_BLOCK } -public open [ResolvedTo(STATUS)] [CallableCopySubstitutionKey=CallableCopySubstitution(substitutor=Empty, baseSymbol=FirNamedFunctionSymbol /BaseInterface.anotherFunction), DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /BaseInterface.anotherFunction, containingClass=MyClass, delegateField=FirFieldSymbol /MyClass.$$delegate_0] fun anotherFunction([ResolvedTo(STATUS)] [SubstitutedOverrideOriginalKey=/name] name: R|kotlin/CharSequence| = LAZY_EXPRESSION): +public open [ResolvedTo(STATUS)] [CallableCopySubstitutionKey=CallableCopySubstitution(substitutor=Empty, baseSymbol=FirNamedFunctionSymbol /BaseInterface.anotherFunction), DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /BaseInterface.anotherFunction, containingClass=MyClass, delegateField=FirFieldSymbol /MyClass.$$delegate_0] fun anotherFunction([ResolvedTo(STATUS)] name: R|kotlin/CharSequence| = LAZY_EXPRESSION): public open [ResolvedTo(STATUS)] fun anotherFunction([ResolvedTo(STATUS)] name: R|kotlin/CharSequence| = LAZY_EXPRESSION): { LAZY_BLOCK } diff --git a/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithImplicitTypeInsideClassScript.after.txt b/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithImplicitTypeInsideClassScript.after.txt index dbd62603d18..a1a532457d7 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithImplicitTypeInsideClassScript.after.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithImplicitTypeInsideClassScript.after.txt @@ -6,7 +6,7 @@ public open [ResolvedTo(BODY_RESOLVE)] fun isSchemeFile([ResolvedTo(BODY_RESOLVE ^isSchemeFile Boolean(true) } -public open [ResolvedTo(BODY_RESOLVE)] [DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /BaseInterface.anotherFunction, containingClass=MyClass, delegateField=FirFieldSymbol /MyClass.$$delegate_0] fun anotherFunction([ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=/name] name: R|kotlin/CharSequence| = R|/genericCall|()): R|kotlin/Boolean| +public open [ResolvedTo(BODY_RESOLVE)] [DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /BaseInterface.anotherFunction, containingClass=MyClass, delegateField=FirFieldSymbol /MyClass.$$delegate_0] fun anotherFunction([ResolvedTo(BODY_RESOLVE)] name: R|kotlin/CharSequence| = R|/genericCall|()): R|kotlin/Boolean| public open [ResolvedTo(BODY_RESOLVE)] fun anotherFunction([ResolvedTo(BODY_RESOLVE)] name: R|kotlin/CharSequence| = R|/genericCall|()): R|kotlin/Boolean| { ^anotherFunction Boolean(true) diff --git a/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithImplicitTypeInsideClassScript.before.txt b/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithImplicitTypeInsideClassScript.before.txt index a1473f87996..dc2967db8e3 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithImplicitTypeInsideClassScript.before.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithImplicitTypeInsideClassScript.before.txt @@ -2,7 +2,7 @@ public open override [ResolvedTo(STATUS)] fun isSchemeFile([ResolvedTo(STATUS)] public open [ResolvedTo(STATUS)] fun isSchemeFile([ResolvedTo(STATUS)] name: R|kotlin/CharSequence| = LAZY_EXPRESSION): { LAZY_BLOCK } -public open [ResolvedTo(STATUS)] [CallableCopySubstitutionKey=CallableCopySubstitution(substitutor=Empty, baseSymbol=FirNamedFunctionSymbol /BaseInterface.anotherFunction), DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /BaseInterface.anotherFunction, containingClass=MyClass, delegateField=FirFieldSymbol /MyClass.$$delegate_0] fun anotherFunction([ResolvedTo(STATUS)] [SubstitutedOverrideOriginalKey=/name] name: R|kotlin/CharSequence| = LAZY_EXPRESSION): +public open [ResolvedTo(STATUS)] [CallableCopySubstitutionKey=CallableCopySubstitution(substitutor=Empty, baseSymbol=FirNamedFunctionSymbol /BaseInterface.anotherFunction), DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /BaseInterface.anotherFunction, containingClass=MyClass, delegateField=FirFieldSymbol /MyClass.$$delegate_0] fun anotherFunction([ResolvedTo(STATUS)] name: R|kotlin/CharSequence| = LAZY_EXPRESSION): public open [ResolvedTo(STATUS)] fun anotherFunction([ResolvedTo(STATUS)] name: R|kotlin/CharSequence| = LAZY_EXPRESSION): { LAZY_BLOCK } diff --git a/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithoutImplicitTypeInsideAnonymousObject.after.txt b/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithoutImplicitTypeInsideAnonymousObject.after.txt index a3a79ed0eea..d1c417685ef 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithoutImplicitTypeInsideAnonymousObject.after.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithoutImplicitTypeInsideAnonymousObject.after.txt @@ -6,7 +6,7 @@ public open [ResolvedTo(BODY_RESOLVE)] fun isSchemeFile([ResolvedTo(BODY_RESOLVE ^isSchemeFile Boolean(true) } -public open [ResolvedTo(STATUS)] [DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /BaseInterface.anotherFunction, containingClass=, delegateField=FirFieldSymbol /.$$delegate_0] fun anotherFunction([ResolvedTo(STATUS)] [SubstitutedOverrideOriginalKey=/name] name: R|kotlin/CharSequence|): R|kotlin/Boolean| +public open [ResolvedTo(STATUS)] [DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /BaseInterface.anotherFunction, containingClass=, delegateField=FirFieldSymbol /.$$delegate_0] fun anotherFunction([ResolvedTo(STATUS)] name: R|kotlin/CharSequence|): R|kotlin/Boolean| public open [ResolvedTo(BODY_RESOLVE)] fun anotherFunction([ResolvedTo(BODY_RESOLVE)] name: R|kotlin/CharSequence|): R|kotlin/Boolean| { ^anotherFunction Boolean(true) diff --git a/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithoutImplicitTypeInsideAnonymousObject.before.txt b/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithoutImplicitTypeInsideAnonymousObject.before.txt index bb10b550c14..de6976d8abd 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithoutImplicitTypeInsideAnonymousObject.before.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithoutImplicitTypeInsideAnonymousObject.before.txt @@ -4,7 +4,7 @@ public open override [ResolvedTo(BODY_RESOLVE)] fun isSchemeFile([ResolvedTo(BOD public open [ResolvedTo(STATUS)] fun isSchemeFile([ResolvedTo(STATUS)] name: R|kotlin/CharSequence|): R|kotlin/Boolean| { LAZY_BLOCK } -public open [ResolvedTo(STATUS)] [DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /BaseInterface.anotherFunction, containingClass=, delegateField=FirFieldSymbol /.$$delegate_0] fun anotherFunction([ResolvedTo(STATUS)] [SubstitutedOverrideOriginalKey=/name] name: R|kotlin/CharSequence|): R|kotlin/Boolean| +public open [ResolvedTo(STATUS)] [DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /BaseInterface.anotherFunction, containingClass=, delegateField=FirFieldSymbol /.$$delegate_0] fun anotherFunction([ResolvedTo(STATUS)] name: R|kotlin/CharSequence|): R|kotlin/Boolean| public open [ResolvedTo(STATUS)] fun anotherFunction([ResolvedTo(STATUS)] name: R|kotlin/CharSequence|): R|kotlin/Boolean| { LAZY_BLOCK } diff --git a/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithoutImplicitTypeInsideAnonymousObjectScript.after.txt b/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithoutImplicitTypeInsideAnonymousObjectScript.after.txt index a3a79ed0eea..d1c417685ef 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithoutImplicitTypeInsideAnonymousObjectScript.after.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithoutImplicitTypeInsideAnonymousObjectScript.after.txt @@ -6,7 +6,7 @@ public open [ResolvedTo(BODY_RESOLVE)] fun isSchemeFile([ResolvedTo(BODY_RESOLVE ^isSchemeFile Boolean(true) } -public open [ResolvedTo(STATUS)] [DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /BaseInterface.anotherFunction, containingClass=, delegateField=FirFieldSymbol /.$$delegate_0] fun anotherFunction([ResolvedTo(STATUS)] [SubstitutedOverrideOriginalKey=/name] name: R|kotlin/CharSequence|): R|kotlin/Boolean| +public open [ResolvedTo(STATUS)] [DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /BaseInterface.anotherFunction, containingClass=, delegateField=FirFieldSymbol /.$$delegate_0] fun anotherFunction([ResolvedTo(STATUS)] name: R|kotlin/CharSequence|): R|kotlin/Boolean| public open [ResolvedTo(BODY_RESOLVE)] fun anotherFunction([ResolvedTo(BODY_RESOLVE)] name: R|kotlin/CharSequence|): R|kotlin/Boolean| { ^anotherFunction Boolean(true) diff --git a/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithoutImplicitTypeInsideAnonymousObjectScript.before.txt b/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithoutImplicitTypeInsideAnonymousObjectScript.before.txt index bb10b550c14..de6976d8abd 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithoutImplicitTypeInsideAnonymousObjectScript.before.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithoutImplicitTypeInsideAnonymousObjectScript.before.txt @@ -4,7 +4,7 @@ public open override [ResolvedTo(BODY_RESOLVE)] fun isSchemeFile([ResolvedTo(BOD public open [ResolvedTo(STATUS)] fun isSchemeFile([ResolvedTo(STATUS)] name: R|kotlin/CharSequence|): R|kotlin/Boolean| { LAZY_BLOCK } -public open [ResolvedTo(STATUS)] [DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /BaseInterface.anotherFunction, containingClass=, delegateField=FirFieldSymbol /.$$delegate_0] fun anotherFunction([ResolvedTo(STATUS)] [SubstitutedOverrideOriginalKey=/name] name: R|kotlin/CharSequence|): R|kotlin/Boolean| +public open [ResolvedTo(STATUS)] [DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /BaseInterface.anotherFunction, containingClass=, delegateField=FirFieldSymbol /.$$delegate_0] fun anotherFunction([ResolvedTo(STATUS)] name: R|kotlin/CharSequence|): R|kotlin/Boolean| public open [ResolvedTo(STATUS)] fun anotherFunction([ResolvedTo(STATUS)] name: R|kotlin/CharSequence|): R|kotlin/Boolean| { LAZY_BLOCK } diff --git a/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithoutImplicitTypeInsideClass.after.txt b/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithoutImplicitTypeInsideClass.after.txt index df7057fec8e..b3837436d24 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithoutImplicitTypeInsideClass.after.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithoutImplicitTypeInsideClass.after.txt @@ -6,7 +6,7 @@ public open [ResolvedTo(BODY_RESOLVE)] fun isSchemeFile([ResolvedTo(BODY_RESOLVE ^isSchemeFile Boolean(true) } -public open [ResolvedTo(BODY_RESOLVE)] [DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /BaseInterface.anotherFunction, containingClass=MyClass, delegateField=FirFieldSymbol /MyClass.$$delegate_0] fun anotherFunction([ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=/name] name: R|kotlin/CharSequence|): R|kotlin/Boolean| +public open [ResolvedTo(BODY_RESOLVE)] [DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /BaseInterface.anotherFunction, containingClass=MyClass, delegateField=FirFieldSymbol /MyClass.$$delegate_0] fun anotherFunction([ResolvedTo(BODY_RESOLVE)] name: R|kotlin/CharSequence|): R|kotlin/Boolean| public open [ResolvedTo(BODY_RESOLVE)] fun anotherFunction([ResolvedTo(BODY_RESOLVE)] name: R|kotlin/CharSequence|): R|kotlin/Boolean| { ^anotherFunction Boolean(true) diff --git a/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithoutImplicitTypeInsideClass.before.txt b/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithoutImplicitTypeInsideClass.before.txt index a551d77caf5..13052b58aa9 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithoutImplicitTypeInsideClass.before.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithoutImplicitTypeInsideClass.before.txt @@ -2,7 +2,7 @@ public open override [ResolvedTo(STATUS)] fun isSchemeFile([ResolvedTo(STATUS)] public open [ResolvedTo(STATUS)] fun isSchemeFile([ResolvedTo(STATUS)] name: R|kotlin/CharSequence|): R|kotlin/Boolean| { LAZY_BLOCK } -public open [ResolvedTo(STATUS)] [DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /BaseInterface.anotherFunction, containingClass=MyClass, delegateField=FirFieldSymbol /MyClass.$$delegate_0] fun anotherFunction([ResolvedTo(STATUS)] [SubstitutedOverrideOriginalKey=/name] name: R|kotlin/CharSequence|): R|kotlin/Boolean| +public open [ResolvedTo(STATUS)] [DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /BaseInterface.anotherFunction, containingClass=MyClass, delegateField=FirFieldSymbol /MyClass.$$delegate_0] fun anotherFunction([ResolvedTo(STATUS)] name: R|kotlin/CharSequence|): R|kotlin/Boolean| public open [ResolvedTo(STATUS)] fun anotherFunction([ResolvedTo(STATUS)] name: R|kotlin/CharSequence|): R|kotlin/Boolean| { LAZY_BLOCK } diff --git a/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithoutImplicitTypeInsideClassScript.after.txt b/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithoutImplicitTypeInsideClassScript.after.txt index df7057fec8e..b3837436d24 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithoutImplicitTypeInsideClassScript.after.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithoutImplicitTypeInsideClassScript.after.txt @@ -6,7 +6,7 @@ public open [ResolvedTo(BODY_RESOLVE)] fun isSchemeFile([ResolvedTo(BODY_RESOLVE ^isSchemeFile Boolean(true) } -public open [ResolvedTo(BODY_RESOLVE)] [DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /BaseInterface.anotherFunction, containingClass=MyClass, delegateField=FirFieldSymbol /MyClass.$$delegate_0] fun anotherFunction([ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=/name] name: R|kotlin/CharSequence|): R|kotlin/Boolean| +public open [ResolvedTo(BODY_RESOLVE)] [DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /BaseInterface.anotherFunction, containingClass=MyClass, delegateField=FirFieldSymbol /MyClass.$$delegate_0] fun anotherFunction([ResolvedTo(BODY_RESOLVE)] name: R|kotlin/CharSequence|): R|kotlin/Boolean| public open [ResolvedTo(BODY_RESOLVE)] fun anotherFunction([ResolvedTo(BODY_RESOLVE)] name: R|kotlin/CharSequence|): R|kotlin/Boolean| { ^anotherFunction Boolean(true) diff --git a/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithoutImplicitTypeInsideClassScript.before.txt b/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithoutImplicitTypeInsideClassScript.before.txt index a551d77caf5..13052b58aa9 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithoutImplicitTypeInsideClassScript.before.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithoutImplicitTypeInsideClassScript.before.txt @@ -2,7 +2,7 @@ public open override [ResolvedTo(STATUS)] fun isSchemeFile([ResolvedTo(STATUS)] public open [ResolvedTo(STATUS)] fun isSchemeFile([ResolvedTo(STATUS)] name: R|kotlin/CharSequence|): R|kotlin/Boolean| { LAZY_BLOCK } -public open [ResolvedTo(STATUS)] [DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /BaseInterface.anotherFunction, containingClass=MyClass, delegateField=FirFieldSymbol /MyClass.$$delegate_0] fun anotherFunction([ResolvedTo(STATUS)] [SubstitutedOverrideOriginalKey=/name] name: R|kotlin/CharSequence|): R|kotlin/Boolean| +public open [ResolvedTo(STATUS)] [DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /BaseInterface.anotherFunction, containingClass=MyClass, delegateField=FirFieldSymbol /MyClass.$$delegate_0] fun anotherFunction([ResolvedTo(STATUS)] name: R|kotlin/CharSequence|): R|kotlin/Boolean| public open [ResolvedTo(STATUS)] fun anotherFunction([ResolvedTo(STATUS)] name: R|kotlin/CharSequence|): R|kotlin/Boolean| { LAZY_BLOCK } diff --git a/analysis/low-level-api-fir/testData/lazyResolveScopes/intersectionOverride.after.txt b/analysis/low-level-api-fir/testData/lazyResolveScopes/intersectionOverride.after.txt index 26eea70946d..47067890eda 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveScopes/intersectionOverride.after.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveScopes/intersectionOverride.after.txt @@ -1,7 +1,7 @@ public open override [ResolvedTo(BODY_RESOLVE)] fun foo([ResolvedTo(BODY_RESOLVE)] x: R|kotlin/Int|): R|kotlin/Unit| { } -public abstract [ResolvedTo(BODY_RESOLVE)] [IntersectionOverrideOriginalKey=/C.foo] fun foo([ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=/x] x: R|kotlin/Int|): R|kotlin/Unit| +public abstract [ResolvedTo(BODY_RESOLVE)] [IntersectionOverrideOriginalKey=/C.foo] fun foo([ResolvedTo(BODY_RESOLVE)] [IntersectionOverrideOriginalKey=/x] x: R|kotlin/Int|): R|kotlin/Unit| public abstract [ResolvedTo(BODY_RESOLVE)] fun foo([ResolvedTo(BODY_RESOLVE)] x: R|kotlin/Int|): R|kotlin/Unit| @@ -10,7 +10,7 @@ public abstract [ResolvedTo(BODY_RESOLVE)] fun foo([ResolvedTo(BODY_RESOLVE)] x: public open override [ResolvedTo(BODY_RESOLVE)] fun foo([ResolvedTo(BODY_RESOLVE)] x: R|kotlin/String|): R|kotlin/Unit| { } -public abstract [ResolvedTo(BODY_RESOLVE)] [IntersectionOverrideOriginalKey=/C.foo] fun foo([ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=/x] x: R|kotlin/String|): R|kotlin/Unit| +public abstract [ResolvedTo(BODY_RESOLVE)] [IntersectionOverrideOriginalKey=/C.foo] fun foo([ResolvedTo(BODY_RESOLVE)] [IntersectionOverrideOriginalKey=/x] x: R|kotlin/String|): R|kotlin/Unit| public abstract [ResolvedTo(BODY_RESOLVE)] fun foo([ResolvedTo(BODY_RESOLVE)] x: R|kotlin/String|): R|kotlin/Unit| diff --git a/analysis/low-level-api-fir/testData/lazyResolveScopes/intersectionOverride.before.txt b/analysis/low-level-api-fir/testData/lazyResolveScopes/intersectionOverride.before.txt index 95174014c1c..44c84accb4a 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveScopes/intersectionOverride.before.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveScopes/intersectionOverride.before.txt @@ -1,6 +1,6 @@ public open override [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] x: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK } -public abstract [ResolvedTo(STATUS)] [IntersectionOverrideOriginalKey=/C.foo] fun foo([ResolvedTo(STATUS)] [SubstitutedOverrideOriginalKey=/x] x: R|kotlin/Int|): R|kotlin/Unit| +public abstract [ResolvedTo(STATUS)] [IntersectionOverrideOriginalKey=/C.foo] fun foo([ResolvedTo(STATUS)] [IntersectionOverrideOriginalKey=/x] x: R|kotlin/Int|): R|kotlin/Unit| public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] x: R|kotlin/Int|): R|kotlin/Unit| @@ -8,7 +8,7 @@ public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] x: R|kotlin/In public open override [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] x: R|kotlin/String|): R|kotlin/Unit| { LAZY_BLOCK } -public abstract [ResolvedTo(STATUS)] [IntersectionOverrideOriginalKey=/C.foo] fun foo([ResolvedTo(STATUS)] [SubstitutedOverrideOriginalKey=/x] x: R|kotlin/String|): R|kotlin/Unit| +public abstract [ResolvedTo(STATUS)] [IntersectionOverrideOriginalKey=/C.foo] fun foo([ResolvedTo(STATUS)] [IntersectionOverrideOriginalKey=/x] x: R|kotlin/String|): R|kotlin/Unit| public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] x: R|kotlin/String|): R|kotlin/Unit| diff --git a/analysis/low-level-api-fir/testData/lazyResolveScopes/intersectionOverride2.after.txt b/analysis/low-level-api-fir/testData/lazyResolveScopes/intersectionOverride2.after.txt index 26eea70946d..47067890eda 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveScopes/intersectionOverride2.after.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveScopes/intersectionOverride2.after.txt @@ -1,7 +1,7 @@ public open override [ResolvedTo(BODY_RESOLVE)] fun foo([ResolvedTo(BODY_RESOLVE)] x: R|kotlin/Int|): R|kotlin/Unit| { } -public abstract [ResolvedTo(BODY_RESOLVE)] [IntersectionOverrideOriginalKey=/C.foo] fun foo([ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=/x] x: R|kotlin/Int|): R|kotlin/Unit| +public abstract [ResolvedTo(BODY_RESOLVE)] [IntersectionOverrideOriginalKey=/C.foo] fun foo([ResolvedTo(BODY_RESOLVE)] [IntersectionOverrideOriginalKey=/x] x: R|kotlin/Int|): R|kotlin/Unit| public abstract [ResolvedTo(BODY_RESOLVE)] fun foo([ResolvedTo(BODY_RESOLVE)] x: R|kotlin/Int|): R|kotlin/Unit| @@ -10,7 +10,7 @@ public abstract [ResolvedTo(BODY_RESOLVE)] fun foo([ResolvedTo(BODY_RESOLVE)] x: public open override [ResolvedTo(BODY_RESOLVE)] fun foo([ResolvedTo(BODY_RESOLVE)] x: R|kotlin/String|): R|kotlin/Unit| { } -public abstract [ResolvedTo(BODY_RESOLVE)] [IntersectionOverrideOriginalKey=/C.foo] fun foo([ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=/x] x: R|kotlin/String|): R|kotlin/Unit| +public abstract [ResolvedTo(BODY_RESOLVE)] [IntersectionOverrideOriginalKey=/C.foo] fun foo([ResolvedTo(BODY_RESOLVE)] [IntersectionOverrideOriginalKey=/x] x: R|kotlin/String|): R|kotlin/Unit| public abstract [ResolvedTo(BODY_RESOLVE)] fun foo([ResolvedTo(BODY_RESOLVE)] x: R|kotlin/String|): R|kotlin/Unit| diff --git a/analysis/low-level-api-fir/testData/lazyResolveScopes/intersectionOverride2.before.txt b/analysis/low-level-api-fir/testData/lazyResolveScopes/intersectionOverride2.before.txt index 95174014c1c..44c84accb4a 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveScopes/intersectionOverride2.before.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveScopes/intersectionOverride2.before.txt @@ -1,6 +1,6 @@ public open override [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] x: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK } -public abstract [ResolvedTo(STATUS)] [IntersectionOverrideOriginalKey=/C.foo] fun foo([ResolvedTo(STATUS)] [SubstitutedOverrideOriginalKey=/x] x: R|kotlin/Int|): R|kotlin/Unit| +public abstract [ResolvedTo(STATUS)] [IntersectionOverrideOriginalKey=/C.foo] fun foo([ResolvedTo(STATUS)] [IntersectionOverrideOriginalKey=/x] x: R|kotlin/Int|): R|kotlin/Unit| public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] x: R|kotlin/Int|): R|kotlin/Unit| @@ -8,7 +8,7 @@ public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] x: R|kotlin/In public open override [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] x: R|kotlin/String|): R|kotlin/Unit| { LAZY_BLOCK } -public abstract [ResolvedTo(STATUS)] [IntersectionOverrideOriginalKey=/C.foo] fun foo([ResolvedTo(STATUS)] [SubstitutedOverrideOriginalKey=/x] x: R|kotlin/String|): R|kotlin/Unit| +public abstract [ResolvedTo(STATUS)] [IntersectionOverrideOriginalKey=/C.foo] fun foo([ResolvedTo(STATUS)] [IntersectionOverrideOriginalKey=/x] x: R|kotlin/String|): R|kotlin/Unit| public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] x: R|kotlin/String|): R|kotlin/Unit| diff --git a/analysis/low-level-api-fir/testData/lazyResolveScopes/intersectionOverride2Script.after.txt b/analysis/low-level-api-fir/testData/lazyResolveScopes/intersectionOverride2Script.after.txt index 26eea70946d..47067890eda 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveScopes/intersectionOverride2Script.after.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveScopes/intersectionOverride2Script.after.txt @@ -1,7 +1,7 @@ public open override [ResolvedTo(BODY_RESOLVE)] fun foo([ResolvedTo(BODY_RESOLVE)] x: R|kotlin/Int|): R|kotlin/Unit| { } -public abstract [ResolvedTo(BODY_RESOLVE)] [IntersectionOverrideOriginalKey=/C.foo] fun foo([ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=/x] x: R|kotlin/Int|): R|kotlin/Unit| +public abstract [ResolvedTo(BODY_RESOLVE)] [IntersectionOverrideOriginalKey=/C.foo] fun foo([ResolvedTo(BODY_RESOLVE)] [IntersectionOverrideOriginalKey=/x] x: R|kotlin/Int|): R|kotlin/Unit| public abstract [ResolvedTo(BODY_RESOLVE)] fun foo([ResolvedTo(BODY_RESOLVE)] x: R|kotlin/Int|): R|kotlin/Unit| @@ -10,7 +10,7 @@ public abstract [ResolvedTo(BODY_RESOLVE)] fun foo([ResolvedTo(BODY_RESOLVE)] x: public open override [ResolvedTo(BODY_RESOLVE)] fun foo([ResolvedTo(BODY_RESOLVE)] x: R|kotlin/String|): R|kotlin/Unit| { } -public abstract [ResolvedTo(BODY_RESOLVE)] [IntersectionOverrideOriginalKey=/C.foo] fun foo([ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=/x] x: R|kotlin/String|): R|kotlin/Unit| +public abstract [ResolvedTo(BODY_RESOLVE)] [IntersectionOverrideOriginalKey=/C.foo] fun foo([ResolvedTo(BODY_RESOLVE)] [IntersectionOverrideOriginalKey=/x] x: R|kotlin/String|): R|kotlin/Unit| public abstract [ResolvedTo(BODY_RESOLVE)] fun foo([ResolvedTo(BODY_RESOLVE)] x: R|kotlin/String|): R|kotlin/Unit| diff --git a/analysis/low-level-api-fir/testData/lazyResolveScopes/intersectionOverride2Script.before.txt b/analysis/low-level-api-fir/testData/lazyResolveScopes/intersectionOverride2Script.before.txt index 95174014c1c..44c84accb4a 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveScopes/intersectionOverride2Script.before.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveScopes/intersectionOverride2Script.before.txt @@ -1,6 +1,6 @@ public open override [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] x: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK } -public abstract [ResolvedTo(STATUS)] [IntersectionOverrideOriginalKey=/C.foo] fun foo([ResolvedTo(STATUS)] [SubstitutedOverrideOriginalKey=/x] x: R|kotlin/Int|): R|kotlin/Unit| +public abstract [ResolvedTo(STATUS)] [IntersectionOverrideOriginalKey=/C.foo] fun foo([ResolvedTo(STATUS)] [IntersectionOverrideOriginalKey=/x] x: R|kotlin/Int|): R|kotlin/Unit| public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] x: R|kotlin/Int|): R|kotlin/Unit| @@ -8,7 +8,7 @@ public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] x: R|kotlin/In public open override [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] x: R|kotlin/String|): R|kotlin/Unit| { LAZY_BLOCK } -public abstract [ResolvedTo(STATUS)] [IntersectionOverrideOriginalKey=/C.foo] fun foo([ResolvedTo(STATUS)] [SubstitutedOverrideOriginalKey=/x] x: R|kotlin/String|): R|kotlin/Unit| +public abstract [ResolvedTo(STATUS)] [IntersectionOverrideOriginalKey=/C.foo] fun foo([ResolvedTo(STATUS)] [IntersectionOverrideOriginalKey=/x] x: R|kotlin/String|): R|kotlin/Unit| public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] x: R|kotlin/String|): R|kotlin/Unit| diff --git a/analysis/low-level-api-fir/testData/lazyResolveScopes/intersectionOverrideScript.after.txt b/analysis/low-level-api-fir/testData/lazyResolveScopes/intersectionOverrideScript.after.txt index 26eea70946d..47067890eda 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveScopes/intersectionOverrideScript.after.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveScopes/intersectionOverrideScript.after.txt @@ -1,7 +1,7 @@ public open override [ResolvedTo(BODY_RESOLVE)] fun foo([ResolvedTo(BODY_RESOLVE)] x: R|kotlin/Int|): R|kotlin/Unit| { } -public abstract [ResolvedTo(BODY_RESOLVE)] [IntersectionOverrideOriginalKey=/C.foo] fun foo([ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=/x] x: R|kotlin/Int|): R|kotlin/Unit| +public abstract [ResolvedTo(BODY_RESOLVE)] [IntersectionOverrideOriginalKey=/C.foo] fun foo([ResolvedTo(BODY_RESOLVE)] [IntersectionOverrideOriginalKey=/x] x: R|kotlin/Int|): R|kotlin/Unit| public abstract [ResolvedTo(BODY_RESOLVE)] fun foo([ResolvedTo(BODY_RESOLVE)] x: R|kotlin/Int|): R|kotlin/Unit| @@ -10,7 +10,7 @@ public abstract [ResolvedTo(BODY_RESOLVE)] fun foo([ResolvedTo(BODY_RESOLVE)] x: public open override [ResolvedTo(BODY_RESOLVE)] fun foo([ResolvedTo(BODY_RESOLVE)] x: R|kotlin/String|): R|kotlin/Unit| { } -public abstract [ResolvedTo(BODY_RESOLVE)] [IntersectionOverrideOriginalKey=/C.foo] fun foo([ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=/x] x: R|kotlin/String|): R|kotlin/Unit| +public abstract [ResolvedTo(BODY_RESOLVE)] [IntersectionOverrideOriginalKey=/C.foo] fun foo([ResolvedTo(BODY_RESOLVE)] [IntersectionOverrideOriginalKey=/x] x: R|kotlin/String|): R|kotlin/Unit| public abstract [ResolvedTo(BODY_RESOLVE)] fun foo([ResolvedTo(BODY_RESOLVE)] x: R|kotlin/String|): R|kotlin/Unit| diff --git a/analysis/low-level-api-fir/testData/lazyResolveScopes/intersectionOverrideScript.before.txt b/analysis/low-level-api-fir/testData/lazyResolveScopes/intersectionOverrideScript.before.txt index 95174014c1c..44c84accb4a 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveScopes/intersectionOverrideScript.before.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveScopes/intersectionOverrideScript.before.txt @@ -1,6 +1,6 @@ public open override [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] x: R|kotlin/Int|): R|kotlin/Unit| { LAZY_BLOCK } -public abstract [ResolvedTo(STATUS)] [IntersectionOverrideOriginalKey=/C.foo] fun foo([ResolvedTo(STATUS)] [SubstitutedOverrideOriginalKey=/x] x: R|kotlin/Int|): R|kotlin/Unit| +public abstract [ResolvedTo(STATUS)] [IntersectionOverrideOriginalKey=/C.foo] fun foo([ResolvedTo(STATUS)] [IntersectionOverrideOriginalKey=/x] x: R|kotlin/Int|): R|kotlin/Unit| public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] x: R|kotlin/Int|): R|kotlin/Unit| @@ -8,7 +8,7 @@ public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] x: R|kotlin/In public open override [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] x: R|kotlin/String|): R|kotlin/Unit| { LAZY_BLOCK } -public abstract [ResolvedTo(STATUS)] [IntersectionOverrideOriginalKey=/C.foo] fun foo([ResolvedTo(STATUS)] [SubstitutedOverrideOriginalKey=/x] x: R|kotlin/String|): R|kotlin/Unit| +public abstract [ResolvedTo(STATUS)] [IntersectionOverrideOriginalKey=/C.foo] fun foo([ResolvedTo(STATUS)] [IntersectionOverrideOriginalKey=/x] x: R|kotlin/String|): R|kotlin/Unit| public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] x: R|kotlin/String|): R|kotlin/Unit| diff --git a/analysis/low-level-api-fir/testData/lazyResolveScopes/intersectionOverrideWithImplicitTypeInsideAnonymousObject.after.txt b/analysis/low-level-api-fir/testData/lazyResolveScopes/intersectionOverrideWithImplicitTypeInsideAnonymousObject.after.txt index 761ef4813f9..d814bd7cf4e 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveScopes/intersectionOverrideWithImplicitTypeInsideAnonymousObject.after.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveScopes/intersectionOverrideWithImplicitTypeInsideAnonymousObject.after.txt @@ -2,9 +2,9 @@ public open override [ResolvedTo(BODY_RESOLVE)] fun foo([ResolvedTo(BODY_RESOLVE ^foo Q|kotlin/Unit| } -public open [ResolvedTo(STATUS)] [CallableCopySubstitutionKey=CallableCopySubstitution(substitutor={T -> @R|second/Anno|(str = (String(object ), R|second/constant|)) kotlin/String}, baseSymbol=FirIntersectionOverrideFunctionSymbol second/B.foo), IntersectionOverrideOriginalKey=second/B.foo, SubstitutedOverrideOriginalKey=second/B.foo] fun foo([ResolvedTo(STATUS)] [SubstitutedOverrideOriginalKey=/x] x: R|@R|second/Anno|(str = (String(object ), R|second/constant|)) kotlin/String| = LAZY_EXPRESSION): +public open [ResolvedTo(STATUS)] [CallableCopySubstitutionKey=CallableCopySubstitution(substitutor={T -> @R|second/Anno|(str = (String(object ), R|second/constant|)) kotlin/String}, baseSymbol=FirIntersectionOverrideFunctionSymbol second/B.foo), IntersectionOverrideOriginalKey=second/B.foo, SubstitutedOverrideOriginalKey=second/B.foo] fun foo([ResolvedTo(STATUS)] [IntersectionOverrideOriginalKey=/x, SubstitutedOverrideOriginalKey=/x] x: R|@R|second/Anno|(str = (String(object ), R|second/constant|)) kotlin/String| = LAZY_EXPRESSION): -public open [ResolvedTo(BODY_RESOLVE)] [IntersectionOverrideOriginalKey=second/B.foo, SubstitutedOverrideOriginalKey=second/C.foo] fun foo([ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=/x] x: R|T| = R|second/genericCall|()): R|kotlin/Unit| +public open [ResolvedTo(BODY_RESOLVE)] [IntersectionOverrideOriginalKey=second/B.foo, SubstitutedOverrideOriginalKey=second/C.foo] fun foo([ResolvedTo(BODY_RESOLVE)] [IntersectionOverrideOriginalKey=/x, SubstitutedOverrideOriginalKey=/x] x: R|T| = R|second/genericCall|()): R|kotlin/Unit| public open [ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=second/C.foo] fun foo([ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=/x] x: R|T| = R|second/genericCall|()): R|kotlin/Unit| diff --git a/analysis/low-level-api-fir/testData/lazyResolveScopes/intersectionOverrideWithImplicitTypeInsideAnonymousObject.before.txt b/analysis/low-level-api-fir/testData/lazyResolveScopes/intersectionOverrideWithImplicitTypeInsideAnonymousObject.before.txt index 8416081777c..612af6a7fd2 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveScopes/intersectionOverrideWithImplicitTypeInsideAnonymousObject.before.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveScopes/intersectionOverrideWithImplicitTypeInsideAnonymousObject.before.txt @@ -2,9 +2,9 @@ public open override [ResolvedTo(BODY_RESOLVE)] fun foo([ResolvedTo(BODY_RESOLVE ^foo Q|kotlin/Unit| } -public open [ResolvedTo(STATUS)] [CallableCopySubstitutionKey=CallableCopySubstitution(substitutor={T -> @R|second/Anno|(str = (String(object ), R|second/constant|)) kotlin/String}, baseSymbol=FirIntersectionOverrideFunctionSymbol second/B.foo), IntersectionOverrideOriginalKey=second/B.foo, SubstitutedOverrideOriginalKey=second/B.foo] fun foo([ResolvedTo(STATUS)] [SubstitutedOverrideOriginalKey=/x] x: R|@R|second/Anno|(str = (String(object ), R|second/constant|)) kotlin/String| = LAZY_EXPRESSION): +public open [ResolvedTo(STATUS)] [CallableCopySubstitutionKey=CallableCopySubstitution(substitutor={T -> @R|second/Anno|(str = (String(object ), R|second/constant|)) kotlin/String}, baseSymbol=FirIntersectionOverrideFunctionSymbol second/B.foo), IntersectionOverrideOriginalKey=second/B.foo, SubstitutedOverrideOriginalKey=second/B.foo] fun foo([ResolvedTo(STATUS)] [IntersectionOverrideOriginalKey=/x, SubstitutedOverrideOriginalKey=/x] x: R|@R|second/Anno|(str = (String(object ), R|second/constant|)) kotlin/String| = LAZY_EXPRESSION): -public open [ResolvedTo(STATUS)] [CallableCopySubstitutionKey=CallableCopySubstitution(substitutor=Empty, baseSymbol=FirNamedFunctionSymbol second/B.foo), IntersectionOverrideOriginalKey=second/B.foo, SubstitutedOverrideOriginalKey=second/C.foo] fun foo([ResolvedTo(STATUS)] [SubstitutedOverrideOriginalKey=/x] x: R|T| = LAZY_EXPRESSION): +public open [ResolvedTo(STATUS)] [CallableCopySubstitutionKey=CallableCopySubstitution(substitutor=Empty, baseSymbol=FirNamedFunctionSymbol second/B.foo), IntersectionOverrideOriginalKey=second/B.foo, SubstitutedOverrideOriginalKey=second/C.foo] fun foo([ResolvedTo(STATUS)] [IntersectionOverrideOriginalKey=/x, SubstitutedOverrideOriginalKey=/x] x: R|T| = LAZY_EXPRESSION): public open [ResolvedTo(STATUS)] [CallableCopySubstitutionKey=CallableCopySubstitution(substitutor={T -> T}, baseSymbol=FirNamedFunctionSymbol second/C.foo), SubstitutedOverrideOriginalKey=second/C.foo] fun foo([ResolvedTo(STATUS)] [SubstitutedOverrideOriginalKey=/x] x: R|T| = LAZY_EXPRESSION): diff --git a/analysis/low-level-api-fir/testData/lazyResolveScopes/intersectionOverrideWithImplicitTypeInsideAnonymousObjectScript.after.txt b/analysis/low-level-api-fir/testData/lazyResolveScopes/intersectionOverrideWithImplicitTypeInsideAnonymousObjectScript.after.txt index 761ef4813f9..d814bd7cf4e 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveScopes/intersectionOverrideWithImplicitTypeInsideAnonymousObjectScript.after.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveScopes/intersectionOverrideWithImplicitTypeInsideAnonymousObjectScript.after.txt @@ -2,9 +2,9 @@ public open override [ResolvedTo(BODY_RESOLVE)] fun foo([ResolvedTo(BODY_RESOLVE ^foo Q|kotlin/Unit| } -public open [ResolvedTo(STATUS)] [CallableCopySubstitutionKey=CallableCopySubstitution(substitutor={T -> @R|second/Anno|(str = (String(object ), R|second/constant|)) kotlin/String}, baseSymbol=FirIntersectionOverrideFunctionSymbol second/B.foo), IntersectionOverrideOriginalKey=second/B.foo, SubstitutedOverrideOriginalKey=second/B.foo] fun foo([ResolvedTo(STATUS)] [SubstitutedOverrideOriginalKey=/x] x: R|@R|second/Anno|(str = (String(object ), R|second/constant|)) kotlin/String| = LAZY_EXPRESSION): +public open [ResolvedTo(STATUS)] [CallableCopySubstitutionKey=CallableCopySubstitution(substitutor={T -> @R|second/Anno|(str = (String(object ), R|second/constant|)) kotlin/String}, baseSymbol=FirIntersectionOverrideFunctionSymbol second/B.foo), IntersectionOverrideOriginalKey=second/B.foo, SubstitutedOverrideOriginalKey=second/B.foo] fun foo([ResolvedTo(STATUS)] [IntersectionOverrideOriginalKey=/x, SubstitutedOverrideOriginalKey=/x] x: R|@R|second/Anno|(str = (String(object ), R|second/constant|)) kotlin/String| = LAZY_EXPRESSION): -public open [ResolvedTo(BODY_RESOLVE)] [IntersectionOverrideOriginalKey=second/B.foo, SubstitutedOverrideOriginalKey=second/C.foo] fun foo([ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=/x] x: R|T| = R|second/genericCall|()): R|kotlin/Unit| +public open [ResolvedTo(BODY_RESOLVE)] [IntersectionOverrideOriginalKey=second/B.foo, SubstitutedOverrideOriginalKey=second/C.foo] fun foo([ResolvedTo(BODY_RESOLVE)] [IntersectionOverrideOriginalKey=/x, SubstitutedOverrideOriginalKey=/x] x: R|T| = R|second/genericCall|()): R|kotlin/Unit| public open [ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=second/C.foo] fun foo([ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=/x] x: R|T| = R|second/genericCall|()): R|kotlin/Unit| diff --git a/analysis/low-level-api-fir/testData/lazyResolveScopes/intersectionOverrideWithImplicitTypeInsideAnonymousObjectScript.before.txt b/analysis/low-level-api-fir/testData/lazyResolveScopes/intersectionOverrideWithImplicitTypeInsideAnonymousObjectScript.before.txt index 8416081777c..612af6a7fd2 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveScopes/intersectionOverrideWithImplicitTypeInsideAnonymousObjectScript.before.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveScopes/intersectionOverrideWithImplicitTypeInsideAnonymousObjectScript.before.txt @@ -2,9 +2,9 @@ public open override [ResolvedTo(BODY_RESOLVE)] fun foo([ResolvedTo(BODY_RESOLVE ^foo Q|kotlin/Unit| } -public open [ResolvedTo(STATUS)] [CallableCopySubstitutionKey=CallableCopySubstitution(substitutor={T -> @R|second/Anno|(str = (String(object ), R|second/constant|)) kotlin/String}, baseSymbol=FirIntersectionOverrideFunctionSymbol second/B.foo), IntersectionOverrideOriginalKey=second/B.foo, SubstitutedOverrideOriginalKey=second/B.foo] fun foo([ResolvedTo(STATUS)] [SubstitutedOverrideOriginalKey=/x] x: R|@R|second/Anno|(str = (String(object ), R|second/constant|)) kotlin/String| = LAZY_EXPRESSION): +public open [ResolvedTo(STATUS)] [CallableCopySubstitutionKey=CallableCopySubstitution(substitutor={T -> @R|second/Anno|(str = (String(object ), R|second/constant|)) kotlin/String}, baseSymbol=FirIntersectionOverrideFunctionSymbol second/B.foo), IntersectionOverrideOriginalKey=second/B.foo, SubstitutedOverrideOriginalKey=second/B.foo] fun foo([ResolvedTo(STATUS)] [IntersectionOverrideOriginalKey=/x, SubstitutedOverrideOriginalKey=/x] x: R|@R|second/Anno|(str = (String(object ), R|second/constant|)) kotlin/String| = LAZY_EXPRESSION): -public open [ResolvedTo(STATUS)] [CallableCopySubstitutionKey=CallableCopySubstitution(substitutor=Empty, baseSymbol=FirNamedFunctionSymbol second/B.foo), IntersectionOverrideOriginalKey=second/B.foo, SubstitutedOverrideOriginalKey=second/C.foo] fun foo([ResolvedTo(STATUS)] [SubstitutedOverrideOriginalKey=/x] x: R|T| = LAZY_EXPRESSION): +public open [ResolvedTo(STATUS)] [CallableCopySubstitutionKey=CallableCopySubstitution(substitutor=Empty, baseSymbol=FirNamedFunctionSymbol second/B.foo), IntersectionOverrideOriginalKey=second/B.foo, SubstitutedOverrideOriginalKey=second/C.foo] fun foo([ResolvedTo(STATUS)] [IntersectionOverrideOriginalKey=/x, SubstitutedOverrideOriginalKey=/x] x: R|T| = LAZY_EXPRESSION): public open [ResolvedTo(STATUS)] [CallableCopySubstitutionKey=CallableCopySubstitution(substitutor={T -> T}, baseSymbol=FirNamedFunctionSymbol second/C.foo), SubstitutedOverrideOriginalKey=second/C.foo] fun foo([ResolvedTo(STATUS)] [SubstitutedOverrideOriginalKey=/x] x: R|T| = LAZY_EXPRESSION): diff --git a/analysis/low-level-api-fir/testData/lazyResolveScopes/intersectionOverrideWithoutImplicitTypeInsideAnonymousObject.after.txt b/analysis/low-level-api-fir/testData/lazyResolveScopes/intersectionOverrideWithoutImplicitTypeInsideAnonymousObject.after.txt index 6b01f930cbc..1eb14cce3a1 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveScopes/intersectionOverrideWithoutImplicitTypeInsideAnonymousObject.after.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveScopes/intersectionOverrideWithoutImplicitTypeInsideAnonymousObject.after.txt @@ -2,9 +2,9 @@ public open override [ResolvedTo(BODY_RESOLVE)] fun foo([ResolvedTo(BODY_RESOLVE ^foo Q|kotlin/Unit| } -public open [ResolvedTo(STATUS)] [IntersectionOverrideOriginalKey=second/B.foo, SubstitutedOverrideOriginalKey=second/B.foo] fun foo([ResolvedTo(STATUS)] [SubstitutedOverrideOriginalKey=/x] x: R|@R|second/Anno|(str = (String(super ), R|second/constant|)) kotlin/String|): R|kotlin/Unit| +public open [ResolvedTo(STATUS)] [IntersectionOverrideOriginalKey=second/B.foo, SubstitutedOverrideOriginalKey=second/B.foo] fun foo([ResolvedTo(STATUS)] [IntersectionOverrideOriginalKey=/x, SubstitutedOverrideOriginalKey=/x] x: R|@R|second/Anno|(str = (String(super ), R|second/constant|)) kotlin/String|): R|kotlin/Unit| -public open [ResolvedTo(BODY_RESOLVE)] [IntersectionOverrideOriginalKey=second/B.foo, SubstitutedOverrideOriginalKey=second/C.foo] fun foo([ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=/x] x: R|T|): R|kotlin/Unit| +public open [ResolvedTo(BODY_RESOLVE)] [IntersectionOverrideOriginalKey=second/B.foo, SubstitutedOverrideOriginalKey=second/C.foo] fun foo([ResolvedTo(BODY_RESOLVE)] [IntersectionOverrideOriginalKey=/x, SubstitutedOverrideOriginalKey=/x] x: R|T|): R|kotlin/Unit| public open [ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=second/C.foo] fun foo([ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=/x] x: R|T|): R|kotlin/Unit| diff --git a/analysis/low-level-api-fir/testData/lazyResolveScopes/intersectionOverrideWithoutImplicitTypeInsideAnonymousObject.before.txt b/analysis/low-level-api-fir/testData/lazyResolveScopes/intersectionOverrideWithoutImplicitTypeInsideAnonymousObject.before.txt index 84870b268c6..0816b616a64 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveScopes/intersectionOverrideWithoutImplicitTypeInsideAnonymousObject.before.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveScopes/intersectionOverrideWithoutImplicitTypeInsideAnonymousObject.before.txt @@ -2,9 +2,9 @@ public open override [ResolvedTo(BODY_RESOLVE)] fun foo([ResolvedTo(BODY_RESOLVE ^foo Q|kotlin/Unit| } -public open [ResolvedTo(STATUS)] [IntersectionOverrideOriginalKey=second/B.foo, SubstitutedOverrideOriginalKey=second/B.foo] fun foo([ResolvedTo(STATUS)] [SubstitutedOverrideOriginalKey=/x] x: R|@R|second/Anno|(str = (String(super ), R|second/constant|)) kotlin/String|): R|kotlin/Unit| +public open [ResolvedTo(STATUS)] [IntersectionOverrideOriginalKey=second/B.foo, SubstitutedOverrideOriginalKey=second/B.foo] fun foo([ResolvedTo(STATUS)] [IntersectionOverrideOriginalKey=/x, SubstitutedOverrideOriginalKey=/x] x: R|@R|second/Anno|(str = (String(super ), R|second/constant|)) kotlin/String|): R|kotlin/Unit| -public open [ResolvedTo(STATUS)] [IntersectionOverrideOriginalKey=second/B.foo, SubstitutedOverrideOriginalKey=second/C.foo] fun foo([ResolvedTo(STATUS)] [SubstitutedOverrideOriginalKey=/x] x: R|T|): R|kotlin/Unit| +public open [ResolvedTo(STATUS)] [IntersectionOverrideOriginalKey=second/B.foo, SubstitutedOverrideOriginalKey=second/C.foo] fun foo([ResolvedTo(STATUS)] [IntersectionOverrideOriginalKey=/x, SubstitutedOverrideOriginalKey=/x] x: R|T|): R|kotlin/Unit| public open [ResolvedTo(STATUS)] [SubstitutedOverrideOriginalKey=second/C.foo] fun foo([ResolvedTo(STATUS)] [SubstitutedOverrideOriginalKey=/x] x: R|T|): R|kotlin/Unit| diff --git a/analysis/low-level-api-fir/testData/lazyResolveScopes/intersectionOverrideWithoutImplicitTypeInsideAnonymousObjectScript.after.txt b/analysis/low-level-api-fir/testData/lazyResolveScopes/intersectionOverrideWithoutImplicitTypeInsideAnonymousObjectScript.after.txt index 6b01f930cbc..1eb14cce3a1 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveScopes/intersectionOverrideWithoutImplicitTypeInsideAnonymousObjectScript.after.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveScopes/intersectionOverrideWithoutImplicitTypeInsideAnonymousObjectScript.after.txt @@ -2,9 +2,9 @@ public open override [ResolvedTo(BODY_RESOLVE)] fun foo([ResolvedTo(BODY_RESOLVE ^foo Q|kotlin/Unit| } -public open [ResolvedTo(STATUS)] [IntersectionOverrideOriginalKey=second/B.foo, SubstitutedOverrideOriginalKey=second/B.foo] fun foo([ResolvedTo(STATUS)] [SubstitutedOverrideOriginalKey=/x] x: R|@R|second/Anno|(str = (String(super ), R|second/constant|)) kotlin/String|): R|kotlin/Unit| +public open [ResolvedTo(STATUS)] [IntersectionOverrideOriginalKey=second/B.foo, SubstitutedOverrideOriginalKey=second/B.foo] fun foo([ResolvedTo(STATUS)] [IntersectionOverrideOriginalKey=/x, SubstitutedOverrideOriginalKey=/x] x: R|@R|second/Anno|(str = (String(super ), R|second/constant|)) kotlin/String|): R|kotlin/Unit| -public open [ResolvedTo(BODY_RESOLVE)] [IntersectionOverrideOriginalKey=second/B.foo, SubstitutedOverrideOriginalKey=second/C.foo] fun foo([ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=/x] x: R|T|): R|kotlin/Unit| +public open [ResolvedTo(BODY_RESOLVE)] [IntersectionOverrideOriginalKey=second/B.foo, SubstitutedOverrideOriginalKey=second/C.foo] fun foo([ResolvedTo(BODY_RESOLVE)] [IntersectionOverrideOriginalKey=/x, SubstitutedOverrideOriginalKey=/x] x: R|T|): R|kotlin/Unit| public open [ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=second/C.foo] fun foo([ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=/x] x: R|T|): R|kotlin/Unit| diff --git a/analysis/low-level-api-fir/testData/lazyResolveScopes/intersectionOverrideWithoutImplicitTypeInsideAnonymousObjectScript.before.txt b/analysis/low-level-api-fir/testData/lazyResolveScopes/intersectionOverrideWithoutImplicitTypeInsideAnonymousObjectScript.before.txt index 84870b268c6..0816b616a64 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveScopes/intersectionOverrideWithoutImplicitTypeInsideAnonymousObjectScript.before.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveScopes/intersectionOverrideWithoutImplicitTypeInsideAnonymousObjectScript.before.txt @@ -2,9 +2,9 @@ public open override [ResolvedTo(BODY_RESOLVE)] fun foo([ResolvedTo(BODY_RESOLVE ^foo Q|kotlin/Unit| } -public open [ResolvedTo(STATUS)] [IntersectionOverrideOriginalKey=second/B.foo, SubstitutedOverrideOriginalKey=second/B.foo] fun foo([ResolvedTo(STATUS)] [SubstitutedOverrideOriginalKey=/x] x: R|@R|second/Anno|(str = (String(super ), R|second/constant|)) kotlin/String|): R|kotlin/Unit| +public open [ResolvedTo(STATUS)] [IntersectionOverrideOriginalKey=second/B.foo, SubstitutedOverrideOriginalKey=second/B.foo] fun foo([ResolvedTo(STATUS)] [IntersectionOverrideOriginalKey=/x, SubstitutedOverrideOriginalKey=/x] x: R|@R|second/Anno|(str = (String(super ), R|second/constant|)) kotlin/String|): R|kotlin/Unit| -public open [ResolvedTo(STATUS)] [IntersectionOverrideOriginalKey=second/B.foo, SubstitutedOverrideOriginalKey=second/C.foo] fun foo([ResolvedTo(STATUS)] [SubstitutedOverrideOriginalKey=/x] x: R|T|): R|kotlin/Unit| +public open [ResolvedTo(STATUS)] [IntersectionOverrideOriginalKey=second/B.foo, SubstitutedOverrideOriginalKey=second/C.foo] fun foo([ResolvedTo(STATUS)] [IntersectionOverrideOriginalKey=/x, SubstitutedOverrideOriginalKey=/x] x: R|T|): R|kotlin/Unit| public open [ResolvedTo(STATUS)] [SubstitutedOverrideOriginalKey=second/C.foo] fun foo([ResolvedTo(STATUS)] [SubstitutedOverrideOriginalKey=/x] x: R|T|): R|kotlin/Unit| diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateWithExplicitType.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateWithExplicitType.after.txt index 19021a77bd2..d9ab66dabd5 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateWithExplicitType.after.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateWithExplicitType.after.txt @@ -47,7 +47,7 @@ anchor -> [FirNamedFunctionSymbol /OriginalInterface.explicitType] -TARGET: @R|Anno|[Types](position = (String(explicitType ), R|/prop|)) public open [ResolvedTo(STATUS)] [DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /OriginalInterface.explicitType, containingClass=Derived, delegateField=FirFieldSymbol /Derived.$$delegate_0] fun <@R|Anno|[Types](position = (String(type param ), R|/prop|)) [ResolvedTo(STATUS)] F : R|@R|Anno|(position = (String(bound ), R|/prop|)) kotlin/collections/List<@R|Anno|(position = (String(nested bound ), R|/prop|)) kotlin/collections/List<@R|Anno|(position = (String(nested nested bound ), R|/prop|)) kotlin/String>>|> @RECEIVER:R|Anno|[Types](position = (String(receiver annotation: ), R|/prop|)) R|@R|Anno|(position = (String(receiver type ), R|/prop|)) kotlin/collections/Collection<@R|Anno|(position = (String(nested receiver type ), R|/prop|)) kotlin/collections/List<@R|Anno|(position = (String(nested nested receiver type ), R|/prop|)) kotlin/String>>|.explicitType([ResolvedTo(STATUS)] [SubstitutedOverrideOriginalKey=/param] @R|Anno|[Types](position = (String(parameter annotation ), R|/prop|)) param: R|@R|Anno|(position = (String(parameter type ), R|/prop|)) kotlin/collections/ListIterator<@R|Anno|(position = (String(nested parameter type ), R|/prop|)) kotlin/collections/List<@R|Anno|(position = (String(nested nested parameter type ), R|/prop|)) kotlin/String>>|): R|@R|Anno|(position = (String(explicitType return type ), R|/prop|)) kotlin/collections/List<@R|Anno|(position = (String(explicitType nested return type ), R|/prop|)) kotlin/collections/List<@R|Anno|(position = (String(explicitType nested nested return type ), R|/prop|)) kotlin/Int>>| +TARGET: @R|Anno|[Types](position = (String(explicitType ), R|/prop|)) public open [ResolvedTo(STATUS)] [DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /OriginalInterface.explicitType, containingClass=Derived, delegateField=FirFieldSymbol /Derived.$$delegate_0] fun <@R|Anno|[Types](position = (String(type param ), R|/prop|)) [ResolvedTo(STATUS)] F : R|@R|Anno|(position = (String(bound ), R|/prop|)) kotlin/collections/List<@R|Anno|(position = (String(nested bound ), R|/prop|)) kotlin/collections/List<@R|Anno|(position = (String(nested nested bound ), R|/prop|)) kotlin/String>>|> @RECEIVER:R|Anno|[Types](position = (String(receiver annotation: ), R|/prop|)) R|@R|Anno|(position = (String(receiver type ), R|/prop|)) kotlin/collections/Collection<@R|Anno|(position = (String(nested receiver type ), R|/prop|)) kotlin/collections/List<@R|Anno|(position = (String(nested nested receiver type ), R|/prop|)) kotlin/String>>|.explicitType([ResolvedTo(STATUS)] @R|Anno|[Types](position = (String(parameter annotation ), R|/prop|)) param: R|@R|Anno|(position = (String(parameter type ), R|/prop|)) kotlin/collections/ListIterator<@R|Anno|(position = (String(nested parameter type ), R|/prop|)) kotlin/collections/List<@R|Anno|(position = (String(nested nested parameter type ), R|/prop|)) kotlin/String>>|): R|@R|Anno|(position = (String(explicitType return type ), R|/prop|)) kotlin/collections/List<@R|Anno|(position = (String(explicitType nested return type ), R|/prop|)) kotlin/collections/List<@R|Anno|(position = (String(explicitType nested nested return type ), R|/prop|)) kotlin/Int>>| FILE: [ResolvedTo(IMPORTS)] delegateWithExplicitType.kt @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.FUNCTION|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.VALUE_PARAMETER|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE_PARAMETER|) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| { public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.position] position: R|kotlin/String|): R|Anno| { diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateWithExplicitType.before.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateWithExplicitType.before.txt index dc64a757e3f..21a92985536 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateWithExplicitType.before.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateWithExplicitType.before.txt @@ -47,7 +47,7 @@ anchor -> [FirNamedFunctionSymbol /OriginalInterface.explicitType] -TARGET: @R|Anno|[Types](LAZY_EXPRESSION) public open [ResolvedTo(STATUS)] [DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /OriginalInterface.explicitType, containingClass=Derived, delegateField=FirFieldSymbol /Derived.$$delegate_0] fun <@R|Anno|[Types](LAZY_EXPRESSION) [ResolvedTo(STATUS)] F : R|@R|Anno|((String(bound ), prop#)) kotlin/collections/List<@R|Anno|((String(nested bound ), prop#)) kotlin/collections/List<@R|Anno|((String(nested nested bound ), prop#)) kotlin/String>>|> @RECEIVER:R|Anno|[Types](LAZY_EXPRESSION) R|@R|Anno|((String(receiver type ), prop#)) kotlin/collections/Collection<@R|Anno|((String(nested receiver type ), prop#)) kotlin/collections/List<@R|Anno|((String(nested nested receiver type ), prop#)) kotlin/String>>|.explicitType([ResolvedTo(STATUS)] [SubstitutedOverrideOriginalKey=/param] @R|Anno|[Types](LAZY_EXPRESSION) param: R|@R|Anno|((String(parameter type ), prop#)) kotlin/collections/ListIterator<@R|Anno|((String(nested parameter type ), prop#)) kotlin/collections/List<@R|Anno|((String(nested nested parameter type ), prop#)) kotlin/String>>|): R|@R|Anno|((String(explicitType return type ), prop#)) kotlin/collections/List<@R|Anno|((String(explicitType nested return type ), prop#)) kotlin/collections/List<@R|Anno|((String(explicitType nested nested return type ), prop#)) kotlin/Int>>| +TARGET: @R|Anno|[Types](LAZY_EXPRESSION) public open [ResolvedTo(STATUS)] [DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /OriginalInterface.explicitType, containingClass=Derived, delegateField=FirFieldSymbol /Derived.$$delegate_0] fun <@R|Anno|[Types](LAZY_EXPRESSION) [ResolvedTo(STATUS)] F : R|@R|Anno|((String(bound ), prop#)) kotlin/collections/List<@R|Anno|((String(nested bound ), prop#)) kotlin/collections/List<@R|Anno|((String(nested nested bound ), prop#)) kotlin/String>>|> @RECEIVER:R|Anno|[Types](LAZY_EXPRESSION) R|@R|Anno|((String(receiver type ), prop#)) kotlin/collections/Collection<@R|Anno|((String(nested receiver type ), prop#)) kotlin/collections/List<@R|Anno|((String(nested nested receiver type ), prop#)) kotlin/String>>|.explicitType([ResolvedTo(STATUS)] @R|Anno|[Types](LAZY_EXPRESSION) param: R|@R|Anno|((String(parameter type ), prop#)) kotlin/collections/ListIterator<@R|Anno|((String(nested parameter type ), prop#)) kotlin/collections/List<@R|Anno|((String(nested nested parameter type ), prop#)) kotlin/String>>|): R|@R|Anno|((String(explicitType return type ), prop#)) kotlin/collections/List<@R|Anno|((String(explicitType nested return type ), prop#)) kotlin/collections/List<@R|Anno|((String(explicitType nested nested return type ), prop#)) kotlin/Int>>| FILE: [ResolvedTo(IMPORTS)] delegateWithExplicitType.kt @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.FUNCTION|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.VALUE_PARAMETER|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE_PARAMETER|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Anno : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.position] position: String): R|Anno| { diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateWithExplicitType.lazyResolve.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateWithExplicitType.lazyResolve.txt index 79ec9cafd16..ed262da74b6 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateWithExplicitType.lazyResolve.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateWithExplicitType.lazyResolve.txt @@ -1,5 +1,5 @@ STATUS: -TARGET: @R|Anno|[Types](LAZY_EXPRESSION) public open [ResolvedTo(STATUS)] [DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /OriginalInterface.explicitType, containingClass=Derived, delegateField=FirFieldSymbol /Derived.$$delegate_0] fun <@R|Anno|[Types](LAZY_EXPRESSION) [ResolvedTo(STATUS)] F : R|@R|Anno|((String(bound ), prop#)) kotlin/collections/List<@R|Anno|((String(nested bound ), prop#)) kotlin/collections/List<@R|Anno|((String(nested nested bound ), prop#)) kotlin/String>>|> @RECEIVER:R|Anno|[Types](LAZY_EXPRESSION) R|@R|Anno|((String(receiver type ), prop#)) kotlin/collections/Collection<@R|Anno|((String(nested receiver type ), prop#)) kotlin/collections/List<@R|Anno|((String(nested nested receiver type ), prop#)) kotlin/String>>|.explicitType([ResolvedTo(STATUS)] [SubstitutedOverrideOriginalKey=/param] @R|Anno|[Types](LAZY_EXPRESSION) param: R|@R|Anno|((String(parameter type ), prop#)) kotlin/collections/ListIterator<@R|Anno|((String(nested parameter type ), prop#)) kotlin/collections/List<@R|Anno|((String(nested nested parameter type ), prop#)) kotlin/String>>|): R|@R|Anno|((String(explicitType return type ), prop#)) kotlin/collections/List<@R|Anno|((String(explicitType nested return type ), prop#)) kotlin/collections/List<@R|Anno|((String(explicitType nested nested return type ), prop#)) kotlin/Int>>| +TARGET: @R|Anno|[Types](LAZY_EXPRESSION) public open [ResolvedTo(STATUS)] [DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /OriginalInterface.explicitType, containingClass=Derived, delegateField=FirFieldSymbol /Derived.$$delegate_0] fun <@R|Anno|[Types](LAZY_EXPRESSION) [ResolvedTo(STATUS)] F : R|@R|Anno|((String(bound ), prop#)) kotlin/collections/List<@R|Anno|((String(nested bound ), prop#)) kotlin/collections/List<@R|Anno|((String(nested nested bound ), prop#)) kotlin/String>>|> @RECEIVER:R|Anno|[Types](LAZY_EXPRESSION) R|@R|Anno|((String(receiver type ), prop#)) kotlin/collections/Collection<@R|Anno|((String(nested receiver type ), prop#)) kotlin/collections/List<@R|Anno|((String(nested nested receiver type ), prop#)) kotlin/String>>|.explicitType([ResolvedTo(STATUS)] @R|Anno|[Types](LAZY_EXPRESSION) param: R|@R|Anno|((String(parameter type ), prop#)) kotlin/collections/ListIterator<@R|Anno|((String(nested parameter type ), prop#)) kotlin/collections/List<@R|Anno|((String(nested nested parameter type ), prop#)) kotlin/String>>|): R|@R|Anno|((String(explicitType return type ), prop#)) kotlin/collections/List<@R|Anno|((String(explicitType nested return type ), prop#)) kotlin/collections/List<@R|Anno|((String(explicitType nested nested return type ), prop#)) kotlin/Int>>| FILE: [ResolvedTo(IMPORTS)] delegateWithExplicitType.kt @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.FUNCTION|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.VALUE_PARAMETER|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE_PARAMETER|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Anno : R|kotlin/Annotation| { @@ -27,7 +27,7 @@ FILE: [ResolvedTo(IMPORTS)] delegateWithExplicitType.kt } EXPECT_ACTUAL_MATCHING: -TARGET: @R|Anno|[Types](LAZY_EXPRESSION) public open [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /OriginalInterface.explicitType, containingClass=Derived, delegateField=FirFieldSymbol /Derived.$$delegate_0] fun <@R|Anno|[Types](LAZY_EXPRESSION) [ResolvedTo(EXPECT_ACTUAL_MATCHING)] F : R|@R|Anno|((String(bound ), prop#)) kotlin/collections/List<@R|Anno|((String(nested bound ), prop#)) kotlin/collections/List<@R|Anno|((String(nested nested bound ), prop#)) kotlin/String>>|> @RECEIVER:R|Anno|[Types](LAZY_EXPRESSION) R|@R|Anno|((String(receiver type ), prop#)) kotlin/collections/Collection<@R|Anno|((String(nested receiver type ), prop#)) kotlin/collections/List<@R|Anno|((String(nested nested receiver type ), prop#)) kotlin/String>>|.explicitType([ResolvedTo(EXPECT_ACTUAL_MATCHING)] [SubstitutedOverrideOriginalKey=/param] @R|Anno|[Types](LAZY_EXPRESSION) param: R|@R|Anno|((String(parameter type ), prop#)) kotlin/collections/ListIterator<@R|Anno|((String(nested parameter type ), prop#)) kotlin/collections/List<@R|Anno|((String(nested nested parameter type ), prop#)) kotlin/String>>|): R|@R|Anno|((String(explicitType return type ), prop#)) kotlin/collections/List<@R|Anno|((String(explicitType nested return type ), prop#)) kotlin/collections/List<@R|Anno|((String(explicitType nested nested return type ), prop#)) kotlin/Int>>| +TARGET: @R|Anno|[Types](LAZY_EXPRESSION) public open [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /OriginalInterface.explicitType, containingClass=Derived, delegateField=FirFieldSymbol /Derived.$$delegate_0] fun <@R|Anno|[Types](LAZY_EXPRESSION) [ResolvedTo(EXPECT_ACTUAL_MATCHING)] F : R|@R|Anno|((String(bound ), prop#)) kotlin/collections/List<@R|Anno|((String(nested bound ), prop#)) kotlin/collections/List<@R|Anno|((String(nested nested bound ), prop#)) kotlin/String>>|> @RECEIVER:R|Anno|[Types](LAZY_EXPRESSION) R|@R|Anno|((String(receiver type ), prop#)) kotlin/collections/Collection<@R|Anno|((String(nested receiver type ), prop#)) kotlin/collections/List<@R|Anno|((String(nested nested receiver type ), prop#)) kotlin/String>>|.explicitType([ResolvedTo(EXPECT_ACTUAL_MATCHING)] @R|Anno|[Types](LAZY_EXPRESSION) param: R|@R|Anno|((String(parameter type ), prop#)) kotlin/collections/ListIterator<@R|Anno|((String(nested parameter type ), prop#)) kotlin/collections/List<@R|Anno|((String(nested nested parameter type ), prop#)) kotlin/String>>|): R|@R|Anno|((String(explicitType return type ), prop#)) kotlin/collections/List<@R|Anno|((String(explicitType nested return type ), prop#)) kotlin/collections/List<@R|Anno|((String(explicitType nested nested return type ), prop#)) kotlin/Int>>| FILE: [ResolvedTo(IMPORTS)] delegateWithExplicitType.kt @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.FUNCTION|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.VALUE_PARAMETER|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE_PARAMETER|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Anno : R|kotlin/Annotation| { @@ -55,7 +55,7 @@ FILE: [ResolvedTo(IMPORTS)] delegateWithExplicitType.kt } CONTRACTS: -TARGET: @R|Anno|[Types](LAZY_EXPRESSION) public open [ResolvedTo(CONTRACTS)] [DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /OriginalInterface.explicitType, containingClass=Derived, delegateField=FirFieldSymbol /Derived.$$delegate_0] fun <@R|Anno|[Types](LAZY_EXPRESSION) [ResolvedTo(CONTRACTS)] F : R|@R|Anno|((String(bound ), prop#)) kotlin/collections/List<@R|Anno|((String(nested bound ), prop#)) kotlin/collections/List<@R|Anno|((String(nested nested bound ), prop#)) kotlin/String>>|> @RECEIVER:R|Anno|[Types](LAZY_EXPRESSION) R|@R|Anno|((String(receiver type ), prop#)) kotlin/collections/Collection<@R|Anno|((String(nested receiver type ), prop#)) kotlin/collections/List<@R|Anno|((String(nested nested receiver type ), prop#)) kotlin/String>>|.explicitType([ResolvedTo(CONTRACTS)] [SubstitutedOverrideOriginalKey=/param] @R|Anno|[Types](LAZY_EXPRESSION) param: R|@R|Anno|((String(parameter type ), prop#)) kotlin/collections/ListIterator<@R|Anno|((String(nested parameter type ), prop#)) kotlin/collections/List<@R|Anno|((String(nested nested parameter type ), prop#)) kotlin/String>>|): R|@R|Anno|((String(explicitType return type ), prop#)) kotlin/collections/List<@R|Anno|((String(explicitType nested return type ), prop#)) kotlin/collections/List<@R|Anno|((String(explicitType nested nested return type ), prop#)) kotlin/Int>>| +TARGET: @R|Anno|[Types](LAZY_EXPRESSION) public open [ResolvedTo(CONTRACTS)] [DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /OriginalInterface.explicitType, containingClass=Derived, delegateField=FirFieldSymbol /Derived.$$delegate_0] fun <@R|Anno|[Types](LAZY_EXPRESSION) [ResolvedTo(CONTRACTS)] F : R|@R|Anno|((String(bound ), prop#)) kotlin/collections/List<@R|Anno|((String(nested bound ), prop#)) kotlin/collections/List<@R|Anno|((String(nested nested bound ), prop#)) kotlin/String>>|> @RECEIVER:R|Anno|[Types](LAZY_EXPRESSION) R|@R|Anno|((String(receiver type ), prop#)) kotlin/collections/Collection<@R|Anno|((String(nested receiver type ), prop#)) kotlin/collections/List<@R|Anno|((String(nested nested receiver type ), prop#)) kotlin/String>>|.explicitType([ResolvedTo(CONTRACTS)] @R|Anno|[Types](LAZY_EXPRESSION) param: R|@R|Anno|((String(parameter type ), prop#)) kotlin/collections/ListIterator<@R|Anno|((String(nested parameter type ), prop#)) kotlin/collections/List<@R|Anno|((String(nested nested parameter type ), prop#)) kotlin/String>>|): R|@R|Anno|((String(explicitType return type ), prop#)) kotlin/collections/List<@R|Anno|((String(explicitType nested return type ), prop#)) kotlin/collections/List<@R|Anno|((String(explicitType nested nested return type ), prop#)) kotlin/Int>>| FILE: [ResolvedTo(IMPORTS)] delegateWithExplicitType.kt @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.FUNCTION|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.VALUE_PARAMETER|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE_PARAMETER|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Anno : R|kotlin/Annotation| { @@ -85,7 +85,7 @@ FILE: [ResolvedTo(IMPORTS)] delegateWithExplicitType.kt } IMPLICIT_TYPES_BODY_RESOLVE: -TARGET: @R|Anno|[Types](LAZY_EXPRESSION) public open [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /OriginalInterface.explicitType, containingClass=Derived, delegateField=FirFieldSymbol /Derived.$$delegate_0] fun <@R|Anno|[Types](LAZY_EXPRESSION) [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] F : R|@R|Anno|((String(bound ), prop#)) kotlin/collections/List<@R|Anno|((String(nested bound ), prop#)) kotlin/collections/List<@R|Anno|((String(nested nested bound ), prop#)) kotlin/String>>|> @RECEIVER:R|Anno|[Types](LAZY_EXPRESSION) R|@R|Anno|((String(receiver type ), prop#)) kotlin/collections/Collection<@R|Anno|((String(nested receiver type ), prop#)) kotlin/collections/List<@R|Anno|((String(nested nested receiver type ), prop#)) kotlin/String>>|.explicitType([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=/param] @R|Anno|[Types](LAZY_EXPRESSION) param: R|@R|Anno|((String(parameter type ), prop#)) kotlin/collections/ListIterator<@R|Anno|((String(nested parameter type ), prop#)) kotlin/collections/List<@R|Anno|((String(nested nested parameter type ), prop#)) kotlin/String>>|): R|@R|Anno|((String(explicitType return type ), prop#)) kotlin/collections/List<@R|Anno|((String(explicitType nested return type ), prop#)) kotlin/collections/List<@R|Anno|((String(explicitType nested nested return type ), prop#)) kotlin/Int>>| +TARGET: @R|Anno|[Types](LAZY_EXPRESSION) public open [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /OriginalInterface.explicitType, containingClass=Derived, delegateField=FirFieldSymbol /Derived.$$delegate_0] fun <@R|Anno|[Types](LAZY_EXPRESSION) [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] F : R|@R|Anno|((String(bound ), prop#)) kotlin/collections/List<@R|Anno|((String(nested bound ), prop#)) kotlin/collections/List<@R|Anno|((String(nested nested bound ), prop#)) kotlin/String>>|> @RECEIVER:R|Anno|[Types](LAZY_EXPRESSION) R|@R|Anno|((String(receiver type ), prop#)) kotlin/collections/Collection<@R|Anno|((String(nested receiver type ), prop#)) kotlin/collections/List<@R|Anno|((String(nested nested receiver type ), prop#)) kotlin/String>>|.explicitType([ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] @R|Anno|[Types](LAZY_EXPRESSION) param: R|@R|Anno|((String(parameter type ), prop#)) kotlin/collections/ListIterator<@R|Anno|((String(nested parameter type ), prop#)) kotlin/collections/List<@R|Anno|((String(nested nested parameter type ), prop#)) kotlin/String>>|): R|@R|Anno|((String(explicitType return type ), prop#)) kotlin/collections/List<@R|Anno|((String(explicitType nested return type ), prop#)) kotlin/collections/List<@R|Anno|((String(explicitType nested nested return type ), prop#)) kotlin/Int>>| FILE: [ResolvedTo(IMPORTS)] delegateWithExplicitType.kt @R|kotlin/annotation/Target|[CompilerRequiredAnnotations](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.FUNCTION|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.VALUE_PARAMETER|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE_PARAMETER|) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class Anno : R|kotlin/Annotation| { @@ -115,7 +115,7 @@ FILE: [ResolvedTo(IMPORTS)] delegateWithExplicitType.kt } ANNOTATION_ARGUMENTS: -TARGET: @R|Anno|[Types](position = (String(explicitType ), R|/prop|)) public open [ResolvedTo(ANNOTATION_ARGUMENTS)] [DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /OriginalInterface.explicitType, containingClass=Derived, delegateField=FirFieldSymbol /Derived.$$delegate_0] fun <@R|Anno|[Types](position = (String(type param ), R|/prop|)) [ResolvedTo(ANNOTATION_ARGUMENTS)] F : R|@R|Anno|(position = (String(bound ), R|/prop|)) kotlin/collections/List<@R|Anno|(position = (String(nested bound ), R|/prop|)) kotlin/collections/List<@R|Anno|(position = (String(nested nested bound ), R|/prop|)) kotlin/String>>|> @RECEIVER:R|Anno|[Types](position = (String(receiver annotation: ), R|/prop|)) R|@R|Anno|(position = (String(receiver type ), R|/prop|)) kotlin/collections/Collection<@R|Anno|(position = (String(nested receiver type ), R|/prop|)) kotlin/collections/List<@R|Anno|(position = (String(nested nested receiver type ), R|/prop|)) kotlin/String>>|.explicitType([ResolvedTo(ANNOTATION_ARGUMENTS)] [SubstitutedOverrideOriginalKey=/param] @R|Anno|[Types](position = (String(parameter annotation ), R|/prop|)) param: R|@R|Anno|(position = (String(parameter type ), R|/prop|)) kotlin/collections/ListIterator<@R|Anno|(position = (String(nested parameter type ), R|/prop|)) kotlin/collections/List<@R|Anno|(position = (String(nested nested parameter type ), R|/prop|)) kotlin/String>>|): R|@R|Anno|(position = (String(explicitType return type ), R|/prop|)) kotlin/collections/List<@R|Anno|(position = (String(explicitType nested return type ), R|/prop|)) kotlin/collections/List<@R|Anno|(position = (String(explicitType nested nested return type ), R|/prop|)) kotlin/Int>>| +TARGET: @R|Anno|[Types](position = (String(explicitType ), R|/prop|)) public open [ResolvedTo(ANNOTATION_ARGUMENTS)] [DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /OriginalInterface.explicitType, containingClass=Derived, delegateField=FirFieldSymbol /Derived.$$delegate_0] fun <@R|Anno|[Types](position = (String(type param ), R|/prop|)) [ResolvedTo(ANNOTATION_ARGUMENTS)] F : R|@R|Anno|(position = (String(bound ), R|/prop|)) kotlin/collections/List<@R|Anno|(position = (String(nested bound ), R|/prop|)) kotlin/collections/List<@R|Anno|(position = (String(nested nested bound ), R|/prop|)) kotlin/String>>|> @RECEIVER:R|Anno|[Types](position = (String(receiver annotation: ), R|/prop|)) R|@R|Anno|(position = (String(receiver type ), R|/prop|)) kotlin/collections/Collection<@R|Anno|(position = (String(nested receiver type ), R|/prop|)) kotlin/collections/List<@R|Anno|(position = (String(nested nested receiver type ), R|/prop|)) kotlin/String>>|.explicitType([ResolvedTo(ANNOTATION_ARGUMENTS)] @R|Anno|[Types](position = (String(parameter annotation ), R|/prop|)) param: R|@R|Anno|(position = (String(parameter type ), R|/prop|)) kotlin/collections/ListIterator<@R|Anno|(position = (String(nested parameter type ), R|/prop|)) kotlin/collections/List<@R|Anno|(position = (String(nested nested parameter type ), R|/prop|)) kotlin/String>>|): R|@R|Anno|(position = (String(explicitType return type ), R|/prop|)) kotlin/collections/List<@R|Anno|(position = (String(explicitType nested return type ), R|/prop|)) kotlin/collections/List<@R|Anno|(position = (String(explicitType nested nested return type ), R|/prop|)) kotlin/Int>>| FILE: [ResolvedTo(IMPORTS)] delegateWithExplicitType.kt @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.FUNCTION|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.VALUE_PARAMETER|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE_PARAMETER|) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| { @@ -145,7 +145,7 @@ FILE: [ResolvedTo(IMPORTS)] delegateWithExplicitType.kt } BODY_RESOLVE: -TARGET: @R|Anno|[Types](position = (String(explicitType ), R|/prop|)) public open [ResolvedTo(BODY_RESOLVE)] [DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /OriginalInterface.explicitType, containingClass=Derived, delegateField=FirFieldSymbol /Derived.$$delegate_0] fun <@R|Anno|[Types](position = (String(type param ), R|/prop|)) [ResolvedTo(BODY_RESOLVE)] F : R|@R|Anno|(position = (String(bound ), R|/prop|)) kotlin/collections/List<@R|Anno|(position = (String(nested bound ), R|/prop|)) kotlin/collections/List<@R|Anno|(position = (String(nested nested bound ), R|/prop|)) kotlin/String>>|> @RECEIVER:R|Anno|[Types](position = (String(receiver annotation: ), R|/prop|)) R|@R|Anno|(position = (String(receiver type ), R|/prop|)) kotlin/collections/Collection<@R|Anno|(position = (String(nested receiver type ), R|/prop|)) kotlin/collections/List<@R|Anno|(position = (String(nested nested receiver type ), R|/prop|)) kotlin/String>>|.explicitType([ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=/param] @R|Anno|[Types](position = (String(parameter annotation ), R|/prop|)) param: R|@R|Anno|(position = (String(parameter type ), R|/prop|)) kotlin/collections/ListIterator<@R|Anno|(position = (String(nested parameter type ), R|/prop|)) kotlin/collections/List<@R|Anno|(position = (String(nested nested parameter type ), R|/prop|)) kotlin/String>>|): R|@R|Anno|(position = (String(explicitType return type ), R|/prop|)) kotlin/collections/List<@R|Anno|(position = (String(explicitType nested return type ), R|/prop|)) kotlin/collections/List<@R|Anno|(position = (String(explicitType nested nested return type ), R|/prop|)) kotlin/Int>>| +TARGET: @R|Anno|[Types](position = (String(explicitType ), R|/prop|)) public open [ResolvedTo(BODY_RESOLVE)] [DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /OriginalInterface.explicitType, containingClass=Derived, delegateField=FirFieldSymbol /Derived.$$delegate_0] fun <@R|Anno|[Types](position = (String(type param ), R|/prop|)) [ResolvedTo(BODY_RESOLVE)] F : R|@R|Anno|(position = (String(bound ), R|/prop|)) kotlin/collections/List<@R|Anno|(position = (String(nested bound ), R|/prop|)) kotlin/collections/List<@R|Anno|(position = (String(nested nested bound ), R|/prop|)) kotlin/String>>|> @RECEIVER:R|Anno|[Types](position = (String(receiver annotation: ), R|/prop|)) R|@R|Anno|(position = (String(receiver type ), R|/prop|)) kotlin/collections/Collection<@R|Anno|(position = (String(nested receiver type ), R|/prop|)) kotlin/collections/List<@R|Anno|(position = (String(nested nested receiver type ), R|/prop|)) kotlin/String>>|.explicitType([ResolvedTo(BODY_RESOLVE)] @R|Anno|[Types](position = (String(parameter annotation ), R|/prop|)) param: R|@R|Anno|(position = (String(parameter type ), R|/prop|)) kotlin/collections/ListIterator<@R|Anno|(position = (String(nested parameter type ), R|/prop|)) kotlin/collections/List<@R|Anno|(position = (String(nested nested parameter type ), R|/prop|)) kotlin/String>>|): R|@R|Anno|(position = (String(explicitType return type ), R|/prop|)) kotlin/collections/List<@R|Anno|(position = (String(explicitType nested return type ), R|/prop|)) kotlin/collections/List<@R|Anno|(position = (String(explicitType nested nested return type ), R|/prop|)) kotlin/Int>>| FILE: [ResolvedTo(IMPORTS)] delegateWithExplicitType.kt @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.FUNCTION|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.VALUE_PARAMETER|, Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE_PARAMETER|) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| { diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateWithExplicitTypeScript.after.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateWithExplicitTypeScript.after.txt index 3ba44029492..fbef76708e1 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateWithExplicitTypeScript.after.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateWithExplicitTypeScript.after.txt @@ -47,7 +47,7 @@ anchor -> [FirNamedFunctionSymbol /OriginalInterface.explicitType] -TARGET: @R|Anno|[Types](position = (String(explicitType ), R|/prop|)) public open [ResolvedTo(STATUS)] [DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /OriginalInterface.explicitType, containingClass=Derived, delegateField=FirFieldSymbol /Derived.$$delegate_0] fun <@R|Anno|[Types](position = (String(type param ), R|/prop|)) [ResolvedTo(STATUS)] F : R|@R|Anno|(position = (String(bound ), R|/prop|)) kotlin/collections/List<@R|Anno|(position = (String(nested bound ), R|/prop|)) kotlin/collections/List<@R|Anno|(position = (String(nested nested bound ), R|/prop|)) kotlin/String>>|> @RECEIVER:R|Anno|[Types](position = (String(receiver annotation: ), R|/prop|)) R|@R|Anno|(position = (String(receiver type ), R|/prop|)) kotlin/collections/Collection<@R|Anno|(position = (String(nested receiver type ), R|/prop|)) kotlin/collections/List<@R|Anno|(position = (String(nested nested receiver type ), R|/prop|)) kotlin/String>>|.explicitType([ResolvedTo(STATUS)] [SubstitutedOverrideOriginalKey=/param] @R|Anno|[Types](position = (String(parameter annotation ), R|/prop|)) param: R|@R|Anno|(position = (String(parameter type ), R|/prop|)) kotlin/collections/ListIterator<@R|Anno|(position = (String(nested parameter type ), R|/prop|)) kotlin/collections/List<@R|Anno|(position = (String(nested nested parameter type ), R|/prop|)) kotlin/String>>|): R|@R|Anno|(position = (String(explicitType return type ), R|/prop|)) kotlin/collections/List<@R|Anno|(position = (String(explicitType nested return type ), R|/prop|)) kotlin/collections/List<@R|Anno|(position = (String(explicitType nested nested return type ), R|/prop|)) kotlin/Int>>| +TARGET: @R|Anno|[Types](position = (String(explicitType ), R|/prop|)) public open [ResolvedTo(STATUS)] [DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /OriginalInterface.explicitType, containingClass=Derived, delegateField=FirFieldSymbol /Derived.$$delegate_0] fun <@R|Anno|[Types](position = (String(type param ), R|/prop|)) [ResolvedTo(STATUS)] F : R|@R|Anno|(position = (String(bound ), R|/prop|)) kotlin/collections/List<@R|Anno|(position = (String(nested bound ), R|/prop|)) kotlin/collections/List<@R|Anno|(position = (String(nested nested bound ), R|/prop|)) kotlin/String>>|> @RECEIVER:R|Anno|[Types](position = (String(receiver annotation: ), R|/prop|)) R|@R|Anno|(position = (String(receiver type ), R|/prop|)) kotlin/collections/Collection<@R|Anno|(position = (String(nested receiver type ), R|/prop|)) kotlin/collections/List<@R|Anno|(position = (String(nested nested receiver type ), R|/prop|)) kotlin/String>>|.explicitType([ResolvedTo(STATUS)] @R|Anno|[Types](position = (String(parameter annotation ), R|/prop|)) param: R|@R|Anno|(position = (String(parameter type ), R|/prop|)) kotlin/collections/ListIterator<@R|Anno|(position = (String(nested parameter type ), R|/prop|)) kotlin/collections/List<@R|Anno|(position = (String(nested nested parameter type ), R|/prop|)) kotlin/String>>|): R|@R|Anno|(position = (String(explicitType return type ), R|/prop|)) kotlin/collections/List<@R|Anno|(position = (String(explicitType nested return type ), R|/prop|)) kotlin/collections/List<@R|Anno|(position = (String(explicitType nested nested return type ), R|/prop|)) kotlin/Int>>| FILE: [ResolvedTo(IMPORTS)] delegateWithExplicitTypeScript.kts context(