diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirTargetResolver.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirTargetResolver.kt index b9cea756b8c..f96ccfc88bf 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirTargetResolver.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirTargetResolver.kt @@ -13,6 +13,7 @@ import org.jetbrains.kotlin.fir.FirElementWithResolveState import org.jetbrains.kotlin.fir.FirFileAnnotationsContainer import org.jetbrains.kotlin.fir.declarations.FirCallableDeclaration import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin +import org.jetbrains.kotlin.fir.declarations.FirField import org.jetbrains.kotlin.fir.declarations.FirFile import org.jetbrains.kotlin.fir.declarations.FirProperty import org.jetbrains.kotlin.fir.declarations.FirRegularClass @@ -83,6 +84,11 @@ internal abstract class LLFirTargetResolver( target is FirSimpleFunction && target.origin == FirDeclarationOrigin.Synthetic.DataClassMember -> { resolveDataClassMemberDependencies(target) } + + // delegate field shares the return type with the containing class + target is FirField && target.origin == FirDeclarationOrigin.Synthetic.DelegateField -> { + containingClass(target).lazyResolveToPhase(resolverPhase) + } } } diff --git a/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeDelegatedExpression.txt b/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeDelegatedExpression.txt index cda800e0ae9..c137e01d2fb 100644 --- a/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeDelegatedExpression.txt +++ b/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeDelegatedExpression.txt @@ -39,7 +39,7 @@ FILE: [ResolvedTo(IMPORTS)] superTypeDelegatedExpression.kt } } - public final [ResolvedTo(STATUS)] class Child : R|test/Base|, R|test/MyInterface| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class Child : R|test/Base|, R|test/MyInterface| { public [ResolvedTo(BODY_RESOLVE)] constructor([ResolvedTo(BODY_RESOLVE)] constructorParam: R|test/MyInterface|): R|test/Child| { super() } diff --git a/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeDelegatedTypeRef.txt b/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeDelegatedTypeRef.txt index 946038f0d06..db5f0836927 100644 --- a/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeDelegatedTypeRef.txt +++ b/analysis/low-level-api-fir/testData/contextCollector/classHeaderPositions/superTypeDelegatedTypeRef.txt @@ -30,11 +30,11 @@ FILE: [ResolvedTo(IMPORTS)] superTypeDelegatedTypeRef.kt } } - public final [ResolvedTo(STATUS)] class Child : R|test/Base|, R|test/MyInterface| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] class Child : R|test/Base|, R|test/MyInterface| { private final [ResolvedTo(BODY_RESOLVE)] field $$delegate_0: R|test/MyInterface| = R|test/Base.Nested.Nested|() public [ResolvedTo(BODY_RESOLVE)] constructor(): R|test/Child| { super() } - } + } \ No newline at end of file diff --git a/analysis/low-level-api-fir/testData/lazyResolve/delegatedField.txt b/analysis/low-level-api-fir/testData/lazyResolve/delegatedField.txt index 41fec1d1043..a864c2accae 100644 --- a/analysis/low-level-api-fir/testData/lazyResolve/delegatedField.txt +++ b/analysis/low-level-api-fir/testData/lazyResolve/delegatedField.txt @@ -56,7 +56,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedField.kt public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] b: Boo): R|kotlin/Unit| } - public? final? [ResolvedTo(RAW_FIR)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : Foo { + public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : Foo { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] constructor([ResolvedTo(RAW_FIR)] prop: Foo): R|one/Usage| { LAZY_super<> } @@ -79,7 +79,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedField.kt public? final? [ResolvedTo(RAW_FIR)] fun foo([ResolvedTo(RAW_FIR)] b: Boo): R|kotlin/Unit| } - public? final? [ResolvedTo(RAW_FIR)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : Foo { + public? final? [ResolvedTo(COMPANION_GENERATION)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : Foo { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] constructor([ResolvedTo(RAW_FIR)] prop: Foo): R|one/Usage| { LAZY_super<> } @@ -171,7 +171,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedField.kt public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] b: R|one/Boo|): R|kotlin/Unit| } - public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : R|one/Foo| { + public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : R|one/Foo| { public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] constructor([ResolvedTo(STATUS)] prop: R|one/Foo|): R|one/Usage| { LAZY_super<> } @@ -194,7 +194,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedField.kt public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] b: R|one/Boo|): R|kotlin/Unit| } - public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : R|one/Foo| { + public final [ResolvedTo(CONTRACTS)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : R|one/Foo| { public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] constructor([ResolvedTo(STATUS)] prop: R|one/Foo|): R|one/Usage| { LAZY_super<> } @@ -217,7 +217,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedField.kt public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] b: R|one/Boo|): R|kotlin/Unit| } - public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : R|one/Foo| { + public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : R|one/Foo| { public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] constructor([ResolvedTo(STATUS)] prop: R|one/Foo|): R|one/Usage| { LAZY_super<> } @@ -240,7 +240,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedField.kt public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] b: R|one/Boo|): R|kotlin/Unit| } - public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : R|one/Foo| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : R|one/Foo| { public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] constructor([ResolvedTo(STATUS)] prop: R|one/Foo|): R|one/Usage| { LAZY_super<> } @@ -263,7 +263,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedField.kt public abstract [ResolvedTo(STATUS)] fun foo([ResolvedTo(STATUS)] b: R|one/Boo|): R|kotlin/Unit| } - public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : R|one/Foo| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : R|one/Foo| { public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] constructor([ResolvedTo(STATUS)] prop: R|one/Foo|): R|one/Usage| { LAZY_super<> } diff --git a/analysis/low-level-api-fir/testData/lazyResolve/delegatedFieldNestedNameClash.txt b/analysis/low-level-api-fir/testData/lazyResolve/delegatedFieldNestedNameClash.txt index e05712ab4f3..701d62b1f53 100644 --- a/analysis/low-level-api-fir/testData/lazyResolve/delegatedFieldNestedNameClash.txt +++ b/analysis/low-level-api-fir/testData/lazyResolve/delegatedFieldNestedNameClash.txt @@ -46,7 +46,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClash.kt public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK } } - public? final? [ResolvedTo(RAW_FIR)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : Base { + public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : Base { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=second/MyClass.prop] prop: second.Base): R|second/MyClass| { LAZY_super<> } @@ -67,7 +67,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClash.kt public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK } } - public? final? [ResolvedTo(RAW_FIR)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : Base { + public? final? [ResolvedTo(COMPANION_GENERATION)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : Base { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=second/MyClass.prop] prop: second.Base): R|second/MyClass| { LAZY_super<> } @@ -151,7 +151,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClash.kt public open [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK } } - public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|second/Base| { + public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|second/Base| { public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=second/MyClass.prop] prop: R|second/Base|): R|second/MyClass| { LAZY_super<> } @@ -172,7 +172,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClash.kt public open [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK } } - public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|second/Base| { + public final [ResolvedTo(CONTRACTS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|second/Base| { public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=second/MyClass.prop] prop: R|second/Base|): R|second/MyClass| { LAZY_super<> } @@ -193,7 +193,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClash.kt public open [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK } } - public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|second/Base| { + public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|second/Base| { public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=second/MyClass.prop] prop: R|second/Base|): R|second/MyClass| { LAZY_super<> } @@ -214,7 +214,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClash.kt public open [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK } } - public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|second/Base| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|second/Base| { public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=second/MyClass.prop] prop: R|second/Base|): R|second/MyClass| { LAZY_super<> } @@ -235,7 +235,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClash.kt public open [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK } } - public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|second/Base| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|second/Base| { public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=second/MyClass.prop] prop: R|second/Base|): R|second/MyClass| { LAZY_super<> } diff --git a/analysis/low-level-api-fir/testData/lazyResolve/delegatedFieldNestedNameClashScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/delegatedFieldNestedNameClashScript.txt index 92797d322c6..d1974f4b0a8 100644 --- a/analysis/low-level-api-fir/testData/lazyResolve/delegatedFieldNestedNameClashScript.txt +++ b/analysis/low-level-api-fir/testData/lazyResolve/delegatedFieldNestedNameClashScript.txt @@ -63,7 +63,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClashScript.kts } - public? final? [ResolvedTo(RAW_FIR)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : Base { + public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : Base { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=second/MyClass.prop] prop: second.Base): R|second/MyClass| { LAZY_super<> } @@ -90,7 +90,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClashScript.kts } - public? final? [ResolvedTo(RAW_FIR)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : Base { + public? final? [ResolvedTo(COMPANION_GENERATION)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : Base { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=second/MyClass.prop] prop: second.Base): R|second/MyClass| { LAZY_super<> } @@ -198,7 +198,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClashScript.kts } - public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|second/Base| { + public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|second/Base| { public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=second/MyClass.prop] prop: R|second/Base|): R|second/MyClass| { LAZY_super<> } @@ -225,7 +225,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClashScript.kts } - public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|second/Base| { + public final [ResolvedTo(CONTRACTS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|second/Base| { public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=second/MyClass.prop] prop: R|second/Base|): R|second/MyClass| { LAZY_super<> } @@ -252,7 +252,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClashScript.kts } - public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|second/Base| { + public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|second/Base| { public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=second/MyClass.prop] prop: R|second/Base|): R|second/MyClass| { LAZY_super<> } @@ -279,7 +279,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClashScript.kts } - public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|second/Base| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|second/Base| { public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=second/MyClass.prop] prop: R|second/Base|): R|second/MyClass| { LAZY_super<> } @@ -306,7 +306,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClashScript.kts } - public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|second/Base| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|second/Base| { public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=second/MyClass.prop] prop: R|second/Base|): R|second/MyClass| { LAZY_super<> } diff --git a/analysis/low-level-api-fir/testData/lazyResolve/delegatedFieldNestedNameClashWithNestedTypes.txt b/analysis/low-level-api-fir/testData/lazyResolve/delegatedFieldNestedNameClashWithNestedTypes.txt index ceafd752eab..615af8847f4 100644 --- a/analysis/low-level-api-fir/testData/lazyResolve/delegatedFieldNestedNameClashWithNestedTypes.txt +++ b/analysis/low-level-api-fir/testData/lazyResolve/delegatedFieldNestedNameClashWithNestedTypes.txt @@ -46,7 +46,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClashWithNestedTypes.kt public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK } } - public? final? [ResolvedTo(RAW_FIR)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : Base> { + public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : Base> { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=second/MyClass.prop] prop: second.Base>): R|second/MyClass| { LAZY_super<> } @@ -67,7 +67,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClashWithNestedTypes.kt public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK } } - public? final? [ResolvedTo(RAW_FIR)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : Base> { + public? final? [ResolvedTo(COMPANION_GENERATION)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : Base> { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=second/MyClass.prop] prop: second.Base>): R|second/MyClass| { LAZY_super<> } @@ -151,7 +151,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClashWithNestedTypes.kt public open [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK } } - public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|second/Base>| { + public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|second/Base>| { public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=second/MyClass.prop] prop: R|second/Base>|): R|second/MyClass| { LAZY_super<> } @@ -172,7 +172,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClashWithNestedTypes.kt public open [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK } } - public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|second/Base>| { + public final [ResolvedTo(CONTRACTS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|second/Base>| { public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=second/MyClass.prop] prop: R|second/Base>|): R|second/MyClass| { LAZY_super<> } @@ -193,7 +193,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClashWithNestedTypes.kt public open [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK } } - public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|second/Base>| { + public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|second/Base>| { public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=second/MyClass.prop] prop: R|second/Base>|): R|second/MyClass| { LAZY_super<> } @@ -214,7 +214,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClashWithNestedTypes.kt public open [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK } } - public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|second/Base>| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|second/Base>| { public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=second/MyClass.prop] prop: R|second/Base>|): R|second/MyClass| { LAZY_super<> } @@ -235,7 +235,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClashWithNestedTypes.kt public open [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK } } - public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|second/Base>| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|second/Base>| { public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=second/MyClass.prop] prop: R|second/Base>|): R|second/MyClass| { LAZY_super<> } diff --git a/analysis/low-level-api-fir/testData/lazyResolve/delegatedFieldNestedNameClashWithNestedTypesScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/delegatedFieldNestedNameClashWithNestedTypesScript.txt index bb1b53f8965..9bf7bc16446 100644 --- a/analysis/low-level-api-fir/testData/lazyResolve/delegatedFieldNestedNameClashWithNestedTypesScript.txt +++ b/analysis/low-level-api-fir/testData/lazyResolve/delegatedFieldNestedNameClashWithNestedTypesScript.txt @@ -63,7 +63,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClashWithNestedTypesScript.k } - public? final? [ResolvedTo(RAW_FIR)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : Base> { + public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : Base> { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=second/MyClass.prop] prop: second.Base>): R|second/MyClass| { LAZY_super<> } @@ -90,7 +90,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClashWithNestedTypesScript.k } - public? final? [ResolvedTo(RAW_FIR)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : Base> { + public? final? [ResolvedTo(COMPANION_GENERATION)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : Base> { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=second/MyClass.prop] prop: second.Base>): R|second/MyClass| { LAZY_super<> } @@ -198,7 +198,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClashWithNestedTypesScript.k } - public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|second/Base>| { + public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|second/Base>| { public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=second/MyClass.prop] prop: R|second/Base>|): R|second/MyClass| { LAZY_super<> } @@ -225,7 +225,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClashWithNestedTypesScript.k } - public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|second/Base>| { + public final [ResolvedTo(CONTRACTS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|second/Base>| { public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=second/MyClass.prop] prop: R|second/Base>|): R|second/MyClass| { LAZY_super<> } @@ -252,7 +252,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClashWithNestedTypesScript.k } - public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|second/Base>| { + public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|second/Base>| { public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=second/MyClass.prop] prop: R|second/Base>|): R|second/MyClass| { LAZY_super<> } @@ -279,7 +279,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClashWithNestedTypesScript.k } - public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|second/Base>| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|second/Base>| { public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=second/MyClass.prop] prop: R|second/Base>|): R|second/MyClass| { LAZY_super<> } @@ -306,7 +306,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClashWithNestedTypesScript.k } - public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|second/Base>| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|second/Base>| { public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=second/MyClass.prop] prop: R|second/Base>|): R|second/MyClass| { LAZY_super<> } diff --git a/analysis/low-level-api-fir/testData/lazyResolve/delegatedFieldScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/delegatedFieldScript.txt index 498fbe58aaa..cde530617cd 100644 --- a/analysis/low-level-api-fir/testData/lazyResolve/delegatedFieldScript.txt +++ b/analysis/low-level-api-fir/testData/lazyResolve/delegatedFieldScript.txt @@ -76,7 +76,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldScript.kts } - public? final? [ResolvedTo(RAW_FIR)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : Foo { + public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : Foo { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] constructor([ResolvedTo(RAW_FIR)] prop: Foo): R|one/Usage| { LAZY_super<> } @@ -106,7 +106,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldScript.kts } - public? final? [ResolvedTo(RAW_FIR)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : Foo { + public? final? [ResolvedTo(COMPANION_GENERATION)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : Foo { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] constructor([ResolvedTo(RAW_FIR)] prop: Foo): R|one/Usage| { LAZY_super<> } @@ -226,7 +226,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldScript.kts } - public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : R|one/Foo| { + public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : R|one/Foo| { public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] constructor([ResolvedTo(STATUS)] prop: R|one/Foo|): R|one/Usage| { LAZY_super<> } @@ -256,7 +256,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldScript.kts } - public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : R|one/Foo| { + public final [ResolvedTo(CONTRACTS)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : R|one/Foo| { public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] constructor([ResolvedTo(STATUS)] prop: R|one/Foo|): R|one/Usage| { LAZY_super<> } @@ -286,7 +286,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldScript.kts } - public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : R|one/Foo| { + public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : R|one/Foo| { public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] constructor([ResolvedTo(STATUS)] prop: R|one/Foo|): R|one/Usage| { LAZY_super<> } @@ -316,7 +316,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldScript.kts } - public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : R|one/Foo| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : R|one/Foo| { public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] constructor([ResolvedTo(STATUS)] prop: R|one/Foo|): R|one/Usage| { LAZY_super<> } @@ -346,7 +346,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldScript.kts } - public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : R|one/Foo| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : R|one/Foo| { public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] constructor([ResolvedTo(STATUS)] prop: R|one/Foo|): R|one/Usage| { LAZY_super<> } @@ -387,3 +387,4 @@ FILE: [ResolvedTo(BODY_RESOLVE)] delegatedFieldScript.kts } } + diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateFieldWithAnnotationClash.lazyResolve.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateFieldWithAnnotationClash.lazyResolve.txt index 4cb7cf91415..4d8b97a3482 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateFieldWithAnnotationClash.lazyResolve.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateFieldWithAnnotationClash.lazyResolve.txt @@ -84,7 +84,7 @@ FILE: [ResolvedTo(IMPORTS)] delegateFieldWithAnnotationClash.kt public? final? [ResolvedTo(RAW_FIR)] fun bar(): Base { LAZY_BLOCK } public? final? const [ResolvedTo(RAW_FIR)] val constant: = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): - public? final? [ResolvedTo(RAW_FIR)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : @Anno[Unresolved](LAZY_EXPRESSION) Base { + public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : @Anno[Unresolved](LAZY_EXPRESSION) Base { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { LAZY_super<> } @@ -119,7 +119,7 @@ FILE: [ResolvedTo(IMPORTS)] delegateFieldWithAnnotationClash.kt public? final? [ResolvedTo(RAW_FIR)] fun bar(): Base { LAZY_BLOCK } public? final? const [ResolvedTo(RAW_FIR)] val constant: = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): - public? final? [ResolvedTo(RAW_FIR)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : @Anno[Unresolved](LAZY_EXPRESSION) Base { + public? final? [ResolvedTo(COMPANION_GENERATION)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : @Anno[Unresolved](LAZY_EXPRESSION) Base { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { LAZY_super<> } @@ -259,7 +259,7 @@ FILE: [ResolvedTo(IMPORTS)] delegateFieldWithAnnotationClash.kt public? final? [ResolvedTo(RAW_FIR)] fun bar(): Base { LAZY_BLOCK } public? final? const [ResolvedTo(RAW_FIR)] val constant: = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): - public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|@R|second/Anno|(constant#) second/Base| { + public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|@R|second/Anno|(constant#) second/Base| { public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { LAZY_super<> } @@ -294,7 +294,7 @@ FILE: [ResolvedTo(IMPORTS)] delegateFieldWithAnnotationClash.kt public? final? [ResolvedTo(RAW_FIR)] fun bar(): Base { LAZY_BLOCK } public? final? const [ResolvedTo(RAW_FIR)] val constant: = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): - public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|@R|second/Anno|(constant#) second/Base| { + public final [ResolvedTo(CONTRACTS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|@R|second/Anno|(constant#) second/Base| { public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { LAZY_super<> } @@ -329,7 +329,7 @@ FILE: [ResolvedTo(IMPORTS)] delegateFieldWithAnnotationClash.kt public? final? [ResolvedTo(RAW_FIR)] fun bar(): Base { LAZY_BLOCK } public? final? const [ResolvedTo(RAW_FIR)] val constant: = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): - public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|@R|second/Anno|(constant#) second/Base| { + public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|@R|second/Anno|(constant#) second/Base| { public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { LAZY_super<> } @@ -364,7 +364,7 @@ FILE: [ResolvedTo(IMPORTS)] delegateFieldWithAnnotationClash.kt public? final? [ResolvedTo(RAW_FIR)] fun bar(): Base { LAZY_BLOCK } public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val constant: R|kotlin/Int| = Int(0) public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int| - public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|@R|second/Anno|(int = R|second/constant|) second/Base| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|@R|second/Anno|(int = R|second/constant|) second/Base| { public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { LAZY_super<> } @@ -400,7 +400,7 @@ FILE: [ResolvedTo(IMPORTS)] delegateFieldWithAnnotationClash.kt } public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val constant: R|kotlin/Int| = Int(0) public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int| - public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|@R|second/Anno|(int = R|second/constant|) second/Base| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|@R|second/Anno|(int = R|second/constant|) second/Base| { public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { LAZY_super<> } diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateFieldWithAnnotationClashScript.lazyResolve.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateFieldWithAnnotationClashScript.lazyResolve.txt index 41e5e60bd71..8c342c2cf71 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateFieldWithAnnotationClashScript.lazyResolve.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegateFieldWithAnnotationClashScript.lazyResolve.txt @@ -110,7 +110,7 @@ FILE: [ResolvedTo(IMPORTS)] delegateFieldWithAnnotationClashScript.kts public? final? const [ResolvedTo(RAW_FIR)] val constant: = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): - public? final? [ResolvedTo(RAW_FIR)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : @Anno[Unresolved](LAZY_EXPRESSION) Base { + public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : @Anno[Unresolved](LAZY_EXPRESSION) Base { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { LAZY_super<> } @@ -154,7 +154,7 @@ FILE: [ResolvedTo(IMPORTS)] delegateFieldWithAnnotationClashScript.kts public? final? const [ResolvedTo(RAW_FIR)] val constant: = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): - public? final? [ResolvedTo(RAW_FIR)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : @Anno[Unresolved](LAZY_EXPRESSION) Base { + public? final? [ResolvedTo(COMPANION_GENERATION)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : @Anno[Unresolved](LAZY_EXPRESSION) Base { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { LAZY_super<> } @@ -330,7 +330,7 @@ FILE: [ResolvedTo(IMPORTS)] delegateFieldWithAnnotationClashScript.kts public? final? const [ResolvedTo(RAW_FIR)] val constant: = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): - public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|@R|second/Anno|(constant#) second/Base| { + public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|@R|second/Anno|(constant#) second/Base| { public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { LAZY_super<> } @@ -374,7 +374,7 @@ FILE: [ResolvedTo(IMPORTS)] delegateFieldWithAnnotationClashScript.kts public? final? const [ResolvedTo(RAW_FIR)] val constant: = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): - public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|@R|second/Anno|(constant#) second/Base| { + public final [ResolvedTo(CONTRACTS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|@R|second/Anno|(constant#) second/Base| { public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { LAZY_super<> } @@ -418,7 +418,7 @@ FILE: [ResolvedTo(IMPORTS)] delegateFieldWithAnnotationClashScript.kts public? final? const [ResolvedTo(RAW_FIR)] val constant: = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): - public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|@R|second/Anno|(constant#) second/Base| { + public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|@R|second/Anno|(constant#) second/Base| { public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { LAZY_super<> } @@ -462,7 +462,7 @@ FILE: [ResolvedTo(IMPORTS)] delegateFieldWithAnnotationClashScript.kts public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val constant: R|kotlin/Int| = Int(0) public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int| - public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|@R|second/Anno|(int = R|second/constant|) second/Base| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|@R|second/Anno|(int = R|second/constant|) second/Base| { public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { LAZY_super<> } @@ -507,7 +507,7 @@ FILE: [ResolvedTo(IMPORTS)] delegateFieldWithAnnotationClashScript.kts public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val constant: R|kotlin/Int| = Int(0) public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int| - public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|@R|second/Anno|(int = R|second/constant|) second/Base| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|@R|second/Anno|(int = R|second/constant|) second/Base| { public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { LAZY_super<> } diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegatedFieldNestedName.lazyResolve.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegatedFieldNestedName.lazyResolve.txt index a3e00edd5a8..e8db9e6c284 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegatedFieldNestedName.lazyResolve.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegatedFieldNestedName.lazyResolve.txt @@ -123,7 +123,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedName.kt public? [ResolvedTo(RAW_FIR)] get(): public? final? const [ResolvedTo(RAW_FIR)] val inner: = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): - public? final? [ResolvedTo(RAW_FIR)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0, 1=FirFieldSymbol second/MyClass.$$delegate_1}] class MyClass : @Anno[Unresolved](LAZY_EXPRESSION) Base<@Anno[Unresolved](LAZY_EXPRESSION) Base<@Anno[Unresolved](LAZY_EXPRESSION) Int>>, @Anno[Unresolved](LAZY_EXPRESSION) Second<@Anno[Unresolved](LAZY_EXPRESSION) String> { + public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0, 1=FirFieldSymbol second/MyClass.$$delegate_1}] class MyClass : @Anno[Unresolved](LAZY_EXPRESSION) Base<@Anno[Unresolved](LAZY_EXPRESSION) Base<@Anno[Unresolved](LAZY_EXPRESSION) Int>>, @Anno[Unresolved](LAZY_EXPRESSION) Second<@Anno[Unresolved](LAZY_EXPRESSION) String> { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { LAZY_super<> } @@ -175,7 +175,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedName.kt public? [ResolvedTo(RAW_FIR)] get(): public? final? const [ResolvedTo(RAW_FIR)] val inner: = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): - public? final? [ResolvedTo(RAW_FIR)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0, 1=FirFieldSymbol second/MyClass.$$delegate_1}] class MyClass : @Anno[Unresolved](LAZY_EXPRESSION) Base<@Anno[Unresolved](LAZY_EXPRESSION) Base<@Anno[Unresolved](LAZY_EXPRESSION) Int>>, @Anno[Unresolved](LAZY_EXPRESSION) Second<@Anno[Unresolved](LAZY_EXPRESSION) String> { + public? final? [ResolvedTo(COMPANION_GENERATION)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0, 1=FirFieldSymbol second/MyClass.$$delegate_1}] class MyClass : @Anno[Unresolved](LAZY_EXPRESSION) Base<@Anno[Unresolved](LAZY_EXPRESSION) Base<@Anno[Unresolved](LAZY_EXPRESSION) Int>>, @Anno[Unresolved](LAZY_EXPRESSION) Second<@Anno[Unresolved](LAZY_EXPRESSION) String> { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { LAZY_super<> } @@ -383,7 +383,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedName.kt public? [ResolvedTo(RAW_FIR)] get(): public? final? const [ResolvedTo(RAW_FIR)] val inner: = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): - public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0, 1=FirFieldSymbol second/MyClass.$$delegate_1}] class MyClass : R|@R|second/Anno|(IntegerLiteral(0).plus#(outer#)) second/Base<@R|second/Anno|(IntegerLiteral(1).plus#(outer#)) second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#)) kotlin/Int>>|, R|@R|second/Anno|(IntegerLiteral(4).plus#(outer#)) second/Second<@R|second/Anno|(IntegerLiteral(5).plus#(outer#)) kotlin/String>| { + public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0, 1=FirFieldSymbol second/MyClass.$$delegate_1}] class MyClass : R|@R|second/Anno|(IntegerLiteral(0).plus#(outer#)) second/Base<@R|second/Anno|(IntegerLiteral(1).plus#(outer#)) second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#)) kotlin/Int>>|, R|@R|second/Anno|(IntegerLiteral(4).plus#(outer#)) second/Second<@R|second/Anno|(IntegerLiteral(5).plus#(outer#)) kotlin/String>| { public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { LAZY_super<> } @@ -435,7 +435,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedName.kt public? [ResolvedTo(RAW_FIR)] get(): public? final? const [ResolvedTo(RAW_FIR)] val inner: = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): - public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0, 1=FirFieldSymbol second/MyClass.$$delegate_1}] class MyClass : R|@R|second/Anno|(IntegerLiteral(0).plus#(outer#)) second/Base<@R|second/Anno|(IntegerLiteral(1).plus#(outer#)) second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#)) kotlin/Int>>|, R|@R|second/Anno|(IntegerLiteral(4).plus#(outer#)) second/Second<@R|second/Anno|(IntegerLiteral(5).plus#(outer#)) kotlin/String>| { + public final [ResolvedTo(CONTRACTS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0, 1=FirFieldSymbol second/MyClass.$$delegate_1}] class MyClass : R|@R|second/Anno|(IntegerLiteral(0).plus#(outer#)) second/Base<@R|second/Anno|(IntegerLiteral(1).plus#(outer#)) second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#)) kotlin/Int>>|, R|@R|second/Anno|(IntegerLiteral(4).plus#(outer#)) second/Second<@R|second/Anno|(IntegerLiteral(5).plus#(outer#)) kotlin/String>| { public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { LAZY_super<> } @@ -487,7 +487,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedName.kt public? [ResolvedTo(RAW_FIR)] get(): public? final? const [ResolvedTo(RAW_FIR)] val inner: = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): - public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0, 1=FirFieldSymbol second/MyClass.$$delegate_1}] class MyClass : R|@R|second/Anno|(IntegerLiteral(0).plus#(outer#)) second/Base<@R|second/Anno|(IntegerLiteral(1).plus#(outer#)) second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#)) kotlin/Int>>|, R|@R|second/Anno|(IntegerLiteral(4).plus#(outer#)) second/Second<@R|second/Anno|(IntegerLiteral(5).plus#(outer#)) kotlin/String>| { + public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0, 1=FirFieldSymbol second/MyClass.$$delegate_1}] class MyClass : R|@R|second/Anno|(IntegerLiteral(0).plus#(outer#)) second/Base<@R|second/Anno|(IntegerLiteral(1).plus#(outer#)) second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#)) kotlin/Int>>|, R|@R|second/Anno|(IntegerLiteral(4).plus#(outer#)) second/Second<@R|second/Anno|(IntegerLiteral(5).plus#(outer#)) kotlin/String>| { public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { LAZY_super<> } @@ -535,26 +535,26 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedName.kt } public abstract [ResolvedTo(STATUS)] interface Second<[ResolvedTo(STATUS)] T> : R|kotlin/Any| { } - public? final? const [ResolvedTo(RAW_FIR)] val outer: = LAZY_EXPRESSION - public? [ResolvedTo(RAW_FIR)] get(): + public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val outer: R|kotlin/Int| = Int(0) + public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int| public? final? const [ResolvedTo(RAW_FIR)] val inner: = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): - public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0, 1=FirFieldSymbol second/MyClass.$$delegate_1}] class MyClass : R|@R|second/Anno|(i = IntegerLiteral(0).#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|)) second/Base<@R|second/Anno|(i = IntegerLiteral(1).#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|)) second/Base<@R|second/Anno|(i = IntegerLiteral(2).#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|)) kotlin/Int>>|, R|@R|second/Anno|(IntegerLiteral(4).plus#(outer#)) second/Second<@R|second/Anno|(IntegerLiteral(5).plus#(outer#)) kotlin/String>| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0, 1=FirFieldSymbol second/MyClass.$$delegate_1}] class MyClass : R|@R|second/Anno|(i = Int(0).R|kotlin/Int.plus|(R|second/outer|)) second/Base<@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|)) second/Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|)) kotlin/Int>>|, R|@R|second/Anno|(i = Int(4).R|kotlin/Int.plus|(R|second/outer|)) second/Second<@R|second/Anno|(i = Int(5).R|kotlin/Int.plus|(R|second/outer|)) kotlin/String>| { public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { LAZY_super<> } - private final [ResolvedTo(ANNOTATION_ARGUMENTS)] field $$delegate_0: R|@R|second/Anno|(i = IntegerLiteral(0).#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|)) second/Base<@R|second/Anno|(i = IntegerLiteral(1).#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|)) second/Base<@R|second/Anno|(i = IntegerLiteral(2).#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|)) kotlin/Int>>| = LAZY_EXPRESSION + private final [ResolvedTo(ANNOTATION_ARGUMENTS)] field $$delegate_0: R|@R|second/Anno|(i = Int(0).R|kotlin/Int.plus|(R|second/outer|)) second/Base<@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|)) second/Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|)) kotlin/Int>>| = LAZY_EXPRESSION - private final [ResolvedTo(STATUS)] field $$delegate_1: R|@R|second/Anno|(IntegerLiteral(4).plus#(outer#)) second/Second<@R|second/Anno|(IntegerLiteral(5).plus#(outer#)) kotlin/String>| = LAZY_EXPRESSION + private final [ResolvedTo(STATUS)] field $$delegate_1: R|@R|second/Anno|(i = Int(4).R|kotlin/Int.plus|(R|second/outer|)) second/Second<@R|second/Anno|(i = Int(5).R|kotlin/Int.plus|(R|second/outer|)) kotlin/String>| = LAZY_EXPRESSION public final companion [ResolvedTo(STATUS)] object Companion : R|@R|second/Anno|(LAZY_EXPRESSION) second/Base<@R|second/Anno|(LAZY_EXPRESSION) second/Base<@R|second/Anno|(LAZY_EXPRESSION) kotlin/Int>>| { private [ResolvedTo(STATUS)] [ContainingClassKey=Companion] constructor(): R|second/MyClass.Companion| { LAZY_super<> } - public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val outer: R|kotlin/String| = String() - public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=Companion] get(): R|kotlin/String| + public final const [ResolvedTo(STATUS)] val outer: = LAZY_EXPRESSION + public [ResolvedTo(STATUS)] [ContainingClassKey=Companion] get(): public final const [ResolvedTo(STATUS)] val inner: = LAZY_EXPRESSION public [ResolvedTo(STATUS)] [ContainingClassKey=Companion] get(): @@ -587,26 +587,26 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedName.kt } public abstract [ResolvedTo(STATUS)] interface Second<[ResolvedTo(STATUS)] T> : R|kotlin/Any| { } - public? final? const [ResolvedTo(RAW_FIR)] val outer: = LAZY_EXPRESSION - public? [ResolvedTo(RAW_FIR)] get(): + public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val outer: R|kotlin/Int| = Int(0) + public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int| public? final? const [ResolvedTo(RAW_FIR)] val inner: = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): - public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0, 1=FirFieldSymbol second/MyClass.$$delegate_1}] class MyClass : R|@R|second/Anno|(i = IntegerLiteral(0).#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|)) second/Base<@R|second/Anno|(i = IntegerLiteral(1).#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|)) second/Base<@R|second/Anno|(i = IntegerLiteral(2).#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|)) kotlin/Int>>|, R|@R|second/Anno|(IntegerLiteral(4).plus#(outer#)) second/Second<@R|second/Anno|(IntegerLiteral(5).plus#(outer#)) kotlin/String>| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0, 1=FirFieldSymbol second/MyClass.$$delegate_1}] class MyClass : R|@R|second/Anno|(i = Int(0).R|kotlin/Int.plus|(R|second/outer|)) second/Base<@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|)) second/Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|)) kotlin/Int>>|, R|@R|second/Anno|(i = Int(4).R|kotlin/Int.plus|(R|second/outer|)) second/Second<@R|second/Anno|(i = Int(5).R|kotlin/Int.plus|(R|second/outer|)) kotlin/String>| { public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { LAZY_super<> } - private final [ResolvedTo(BODY_RESOLVE)] field $$delegate_0: R|@R|second/Anno|(i = IntegerLiteral(0).#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|)) second/Base<@R|second/Anno|(i = IntegerLiteral(1).#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|)) second/Base<@R|second/Anno|(i = IntegerLiteral(2).#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|)) kotlin/Int>>| = Q|second/MyClass.Companion| + private final [ResolvedTo(BODY_RESOLVE)] field $$delegate_0: R|@R|second/Anno|(i = Int(0).R|kotlin/Int.plus|(R|second/outer|)) second/Base<@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|)) second/Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|)) kotlin/Int>>| = Q|second/MyClass.Companion| - private final [ResolvedTo(STATUS)] field $$delegate_1: R|@R|second/Anno|(IntegerLiteral(4).plus#(outer#)) second/Second<@R|second/Anno|(IntegerLiteral(5).plus#(outer#)) kotlin/String>| = LAZY_EXPRESSION + private final [ResolvedTo(STATUS)] field $$delegate_1: R|@R|second/Anno|(i = Int(4).R|kotlin/Int.plus|(R|second/outer|)) second/Second<@R|second/Anno|(i = Int(5).R|kotlin/Int.plus|(R|second/outer|)) kotlin/String>| = LAZY_EXPRESSION public final companion [ResolvedTo(STATUS)] object Companion : R|@R|second/Anno|(LAZY_EXPRESSION) second/Base<@R|second/Anno|(LAZY_EXPRESSION) second/Base<@R|second/Anno|(LAZY_EXPRESSION) kotlin/Int>>| { private [ResolvedTo(STATUS)] [ContainingClassKey=Companion] constructor(): R|second/MyClass.Companion| { LAZY_super<> } - public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val outer: R|kotlin/String| = String() - public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=Companion] get(): R|kotlin/String| + public final const [ResolvedTo(STATUS)] val outer: = LAZY_EXPRESSION + public [ResolvedTo(STATUS)] [ContainingClassKey=Companion] get(): public final const [ResolvedTo(STATUS)] val inner: = LAZY_EXPRESSION public [ResolvedTo(STATUS)] [ContainingClassKey=Companion] get(): diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegatedFieldNestedNameClashAndAnnotations.lazyResolve.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegatedFieldNestedNameClashAndAnnotations.lazyResolve.txt index e71fc6da2ab..c3cb0e38cc5 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegatedFieldNestedNameClashAndAnnotations.lazyResolve.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegatedFieldNestedNameClashAndAnnotations.lazyResolve.txt @@ -111,7 +111,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClashAndAnnotations.kt public? [ResolvedTo(RAW_FIR)] get(): public? final? const [ResolvedTo(RAW_FIR)] val inner: = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): - public? final? [ResolvedTo(RAW_FIR)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : @Anno[Unresolved](LAZY_EXPRESSION) Base { + public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : @Anno[Unresolved](LAZY_EXPRESSION) Base { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=second/MyClass.prop] prop: @Anno[Unresolved](LAZY_EXPRESSION) second.Base): R|second/MyClass| { LAZY_super<> } @@ -158,7 +158,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClashAndAnnotations.kt public? [ResolvedTo(RAW_FIR)] get(): public? final? const [ResolvedTo(RAW_FIR)] val inner: = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): - public? final? [ResolvedTo(RAW_FIR)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : @Anno[Unresolved](LAZY_EXPRESSION) Base { + public? final? [ResolvedTo(COMPANION_GENERATION)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : @Anno[Unresolved](LAZY_EXPRESSION) Base { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=second/MyClass.prop] prop: @Anno[Unresolved](LAZY_EXPRESSION) second.Base): R|second/MyClass| { LAZY_super<> } @@ -346,7 +346,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClashAndAnnotations.kt public? [ResolvedTo(RAW_FIR)] get(): public? final? const [ResolvedTo(RAW_FIR)] val inner: = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): - public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#)) second/Base| { + public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#)) second/Base| { public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=second/MyClass.prop] prop: R|@R|second/Anno|(IntegerLiteral(0).plus#(inner#)) second/Base|): R|second/MyClass| { LAZY_super<> } @@ -393,7 +393,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClashAndAnnotations.kt public? [ResolvedTo(RAW_FIR)] get(): public? final? const [ResolvedTo(RAW_FIR)] val inner: = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): - public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#)) second/Base| { + public final [ResolvedTo(CONTRACTS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#)) second/Base| { public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=second/MyClass.prop] prop: R|@R|second/Anno|(IntegerLiteral(0).plus#(inner#)) second/Base|): R|second/MyClass| { LAZY_super<> } @@ -440,7 +440,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClashAndAnnotations.kt public? [ResolvedTo(RAW_FIR)] get(): public? final? const [ResolvedTo(RAW_FIR)] val inner: = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): - public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#)) second/Base| { + public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#)) second/Base| { public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=second/MyClass.prop] prop: R|@R|second/Anno|(IntegerLiteral(0).plus#(inner#)) second/Base|): R|second/MyClass| { LAZY_super<> } @@ -483,16 +483,16 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClashAndAnnotations.kt public open [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK } } - public? final? const [ResolvedTo(RAW_FIR)] val outer: = LAZY_EXPRESSION - public? [ResolvedTo(RAW_FIR)] get(): + public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val outer: R|kotlin/Int| = Int(0) + public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int| public? final? const [ResolvedTo(RAW_FIR)] val inner: = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): - public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|@R|second/Anno|(i = IntegerLiteral(1).#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|)) second/Base| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|)) second/Base| { public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=second/MyClass.prop] prop: R|@R|second/Anno|(IntegerLiteral(0).plus#(inner#)) second/Base|): R|second/MyClass| { LAZY_super<> } - private final [ResolvedTo(ANNOTATION_ARGUMENTS)] field $$delegate_0: R|@R|second/Anno|(i = IntegerLiteral(1).#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|)) second/Base| = LAZY_EXPRESSION + private final [ResolvedTo(ANNOTATION_ARGUMENTS)] field $$delegate_0: R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|)) second/Base| = LAZY_EXPRESSION public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val prop: R|@R|second/Anno|(IntegerLiteral(0).plus#(inner#)) second/Base| = R|/prop| public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] get(): R|@R|second/Anno|(IntegerLiteral(0).plus#(inner#)) second/Base| @@ -505,8 +505,8 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClashAndAnnotations.kt LAZY_super } - public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val outer: R|kotlin/String| = String() - public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=Companion] get(): R|kotlin/String| + public final const [ResolvedTo(STATUS)] val outer: = LAZY_EXPRESSION + public [ResolvedTo(STATUS)] [ContainingClassKey=Companion] get(): public final const [ResolvedTo(STATUS)] val inner: = LAZY_EXPRESSION public [ResolvedTo(STATUS)] [ContainingClassKey=Companion] get(): @@ -530,16 +530,16 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClashAndAnnotations.kt public open [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK } } - public? final? const [ResolvedTo(RAW_FIR)] val outer: = LAZY_EXPRESSION - public? [ResolvedTo(RAW_FIR)] get(): + public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val outer: R|kotlin/Int| = Int(0) + public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int| public? final? const [ResolvedTo(RAW_FIR)] val inner: = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): - public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|@R|second/Anno|(i = IntegerLiteral(1).#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|)) second/Base| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|)) second/Base| { public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=second/MyClass.prop] prop: R|@R|second/Anno|(IntegerLiteral(0).plus#(inner#)) second/Base|): R|second/MyClass| { LAZY_super<> } - private final [ResolvedTo(BODY_RESOLVE)] field $$delegate_0: R|@R|second/Anno|(i = IntegerLiteral(1).#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|)) second/Base| = R|/prop| + private final [ResolvedTo(BODY_RESOLVE)] field $$delegate_0: R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|)) second/Base| = R|/prop| public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val prop: R|@R|second/Anno|(IntegerLiteral(0).plus#(inner#)) second/Base| = R|/prop| public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] get(): R|@R|second/Anno|(IntegerLiteral(0).plus#(inner#)) second/Base| @@ -552,8 +552,8 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClashAndAnnotations.kt LAZY_super } - public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val outer: R|kotlin/String| = String() - public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=Companion] get(): R|kotlin/String| + public final const [ResolvedTo(STATUS)] val outer: = LAZY_EXPRESSION + public [ResolvedTo(STATUS)] [ContainingClassKey=Companion] get(): public final const [ResolvedTo(STATUS)] val inner: = LAZY_EXPRESSION public [ResolvedTo(STATUS)] [ContainingClassKey=Companion] get(): diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegatedFieldNestedNameClashAndAnnotationsScript.lazyResolve.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegatedFieldNestedNameClashAndAnnotationsScript.lazyResolve.txt index 486f914ff3a..69d16acb7b9 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegatedFieldNestedNameClashAndAnnotationsScript.lazyResolve.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegatedFieldNestedNameClashAndAnnotationsScript.lazyResolve.txt @@ -137,7 +137,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClashAndAnnotationsScript.kt public? final? const [ResolvedTo(RAW_FIR)] val inner: = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): - public? final? [ResolvedTo(RAW_FIR)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : @Anno[Unresolved](LAZY_EXPRESSION) Base { + public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : @Anno[Unresolved](LAZY_EXPRESSION) Base { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=second/MyClass.prop] prop: @Anno[Unresolved](LAZY_EXPRESSION) second.Base): R|second/MyClass| { LAZY_super<> } @@ -193,7 +193,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClashAndAnnotationsScript.kt public? final? const [ResolvedTo(RAW_FIR)] val inner: = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): - public? final? [ResolvedTo(RAW_FIR)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : @Anno[Unresolved](LAZY_EXPRESSION) Base { + public? final? [ResolvedTo(COMPANION_GENERATION)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : @Anno[Unresolved](LAZY_EXPRESSION) Base { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=second/MyClass.prop] prop: @Anno[Unresolved](LAZY_EXPRESSION) second.Base): R|second/MyClass| { LAZY_super<> } @@ -417,7 +417,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClashAndAnnotationsScript.kt public? final? const [ResolvedTo(RAW_FIR)] val inner: = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): - public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#)) second/Base| { + public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#)) second/Base| { public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=second/MyClass.prop] prop: R|@R|second/Anno|(IntegerLiteral(0).plus#(inner#)) second/Base|): R|second/MyClass| { LAZY_super<> } @@ -473,7 +473,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClashAndAnnotationsScript.kt public? final? const [ResolvedTo(RAW_FIR)] val inner: = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): - public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#)) second/Base| { + public final [ResolvedTo(CONTRACTS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#)) second/Base| { public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=second/MyClass.prop] prop: R|@R|second/Anno|(IntegerLiteral(0).plus#(inner#)) second/Base|): R|second/MyClass| { LAZY_super<> } @@ -529,7 +529,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClashAndAnnotationsScript.kt public? final? const [ResolvedTo(RAW_FIR)] val inner: = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): - public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#)) second/Base| { + public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|@R|second/Anno|(IntegerLiteral(1).plus#(outer#)) second/Base| { public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=second/MyClass.prop] prop: R|@R|second/Anno|(IntegerLiteral(0).plus#(inner#)) second/Base|): R|second/MyClass| { LAZY_super<> } @@ -579,18 +579,18 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClashAndAnnotationsScript.kt } - public? final? const [ResolvedTo(RAW_FIR)] val outer: = LAZY_EXPRESSION - public? [ResolvedTo(RAW_FIR)] get(): + public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val outer: R|kotlin/Int| = Int(0) + public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int| public? final? const [ResolvedTo(RAW_FIR)] val inner: = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): - public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|@R|second/Anno|(i = IntegerLiteral(1).#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|)) second/Base| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|)) second/Base| { public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=second/MyClass.prop] prop: R|@R|second/Anno|(IntegerLiteral(0).plus#(inner#)) second/Base|): R|second/MyClass| { LAZY_super<> } - private final [ResolvedTo(ANNOTATION_ARGUMENTS)] field $$delegate_0: R|@R|second/Anno|(i = IntegerLiteral(1).#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|)) second/Base| = LAZY_EXPRESSION + private final [ResolvedTo(ANNOTATION_ARGUMENTS)] field $$delegate_0: R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|)) second/Base| = LAZY_EXPRESSION public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val prop: R|@R|second/Anno|(IntegerLiteral(0).plus#(inner#)) second/Base| = R|/prop| public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] get(): R|@R|second/Anno|(IntegerLiteral(0).plus#(inner#)) second/Base| @@ -603,8 +603,8 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClashAndAnnotationsScript.kt LAZY_super } - public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val outer: R|kotlin/String| = String() - public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=Companion] get(): R|kotlin/String| + public final const [ResolvedTo(STATUS)] val outer: = LAZY_EXPRESSION + public [ResolvedTo(STATUS)] [ContainingClassKey=Companion] get(): public final const [ResolvedTo(STATUS)] val inner: = LAZY_EXPRESSION public [ResolvedTo(STATUS)] [ContainingClassKey=Companion] get(): @@ -635,18 +635,18 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClashAndAnnotationsScript.kt } - public? final? const [ResolvedTo(RAW_FIR)] val outer: = LAZY_EXPRESSION - public? [ResolvedTo(RAW_FIR)] get(): + public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val outer: R|kotlin/Int| = Int(0) + public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int| public? final? const [ResolvedTo(RAW_FIR)] val inner: = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): - public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|@R|second/Anno|(i = IntegerLiteral(1).#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|)) second/Base| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|)) second/Base| { public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=second/MyClass.prop] prop: R|@R|second/Anno|(IntegerLiteral(0).plus#(inner#)) second/Base|): R|second/MyClass| { LAZY_super<> } - private final [ResolvedTo(BODY_RESOLVE)] field $$delegate_0: R|@R|second/Anno|(i = IntegerLiteral(1).#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|)) second/Base| = R|/prop| + private final [ResolvedTo(BODY_RESOLVE)] field $$delegate_0: R|@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|)) second/Base| = R|/prop| public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val prop: R|@R|second/Anno|(IntegerLiteral(0).plus#(inner#)) second/Base| = R|/prop| public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] get(): R|@R|second/Anno|(IntegerLiteral(0).plus#(inner#)) second/Base| @@ -659,8 +659,8 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClashAndAnnotationsScript.kt LAZY_super } - public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val outer: R|kotlin/String| = String() - public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=Companion] get(): R|kotlin/String| + public final const [ResolvedTo(STATUS)] val outer: = LAZY_EXPRESSION + public [ResolvedTo(STATUS)] [ContainingClassKey=Companion] get(): public final const [ResolvedTo(STATUS)] val inner: = LAZY_EXPRESSION public [ResolvedTo(STATUS)] [ContainingClassKey=Companion] get(): diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegatedFieldNestedNameClashWithNestedTypesAndAnnotations.lazyResolve.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegatedFieldNestedNameClashWithNestedTypesAndAnnotations.lazyResolve.txt index 7b91395d223..56457e7a94b 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegatedFieldNestedNameClashWithNestedTypesAndAnnotations.lazyResolve.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegatedFieldNestedNameClashWithNestedTypesAndAnnotations.lazyResolve.txt @@ -111,7 +111,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClashWithNestedTypesAndAnnot public? [ResolvedTo(RAW_FIR)] get(): public? final? const [ResolvedTo(RAW_FIR)] val inner: = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): - public? final? [ResolvedTo(RAW_FIR)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : @Anno[Unresolved](LAZY_EXPRESSION) Base<@Anno[Unresolved](LAZY_EXPRESSION) Base<@Anno[Unresolved](LAZY_EXPRESSION) Int>> { + public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : @Anno[Unresolved](LAZY_EXPRESSION) Base<@Anno[Unresolved](LAZY_EXPRESSION) Base<@Anno[Unresolved](LAZY_EXPRESSION) Int>> { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=second/MyClass.prop] prop: @Anno[Unresolved](LAZY_EXPRESSION) second.Base<@Anno[Unresolved](LAZY_EXPRESSION) second.Base<@Anno[Unresolved](LAZY_EXPRESSION) Int>>): R|second/MyClass| { LAZY_super<> } @@ -158,7 +158,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClashWithNestedTypesAndAnnot public? [ResolvedTo(RAW_FIR)] get(): public? final? const [ResolvedTo(RAW_FIR)] val inner: = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): - public? final? [ResolvedTo(RAW_FIR)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : @Anno[Unresolved](LAZY_EXPRESSION) Base<@Anno[Unresolved](LAZY_EXPRESSION) Base<@Anno[Unresolved](LAZY_EXPRESSION) Int>> { + public? final? [ResolvedTo(COMPANION_GENERATION)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : @Anno[Unresolved](LAZY_EXPRESSION) Base<@Anno[Unresolved](LAZY_EXPRESSION) Base<@Anno[Unresolved](LAZY_EXPRESSION) Int>> { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=second/MyClass.prop] prop: @Anno[Unresolved](LAZY_EXPRESSION) second.Base<@Anno[Unresolved](LAZY_EXPRESSION) second.Base<@Anno[Unresolved](LAZY_EXPRESSION) Int>>): R|second/MyClass| { LAZY_super<> } @@ -346,7 +346,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClashWithNestedTypesAndAnnot public? [ResolvedTo(RAW_FIR)] get(): public? final? const [ResolvedTo(RAW_FIR)] val inner: = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): - public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|@R|second/Anno|(IntegerLiteral(3).plus#(outer#)) second/Base<@R|second/Anno|(IntegerLiteral(4).plus#(outer#)) second/Base<@R|second/Anno|(IntegerLiteral(5).plus#(outer#)) kotlin/Int>>| { + public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|@R|second/Anno|(IntegerLiteral(3).plus#(outer#)) second/Base<@R|second/Anno|(IntegerLiteral(4).plus#(outer#)) second/Base<@R|second/Anno|(IntegerLiteral(5).plus#(outer#)) kotlin/Int>>| { public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=second/MyClass.prop] prop: R|@R|second/Anno|(IntegerLiteral(0).plus#(inner#)) second/Base<@R|second/Anno|(IntegerLiteral(1).plus#(inner#)) second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(inner#)) kotlin/Int>>|): R|second/MyClass| { LAZY_super<> } @@ -393,7 +393,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClashWithNestedTypesAndAnnot public? [ResolvedTo(RAW_FIR)] get(): public? final? const [ResolvedTo(RAW_FIR)] val inner: = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): - public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|@R|second/Anno|(IntegerLiteral(3).plus#(outer#)) second/Base<@R|second/Anno|(IntegerLiteral(4).plus#(outer#)) second/Base<@R|second/Anno|(IntegerLiteral(5).plus#(outer#)) kotlin/Int>>| { + public final [ResolvedTo(CONTRACTS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|@R|second/Anno|(IntegerLiteral(3).plus#(outer#)) second/Base<@R|second/Anno|(IntegerLiteral(4).plus#(outer#)) second/Base<@R|second/Anno|(IntegerLiteral(5).plus#(outer#)) kotlin/Int>>| { public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=second/MyClass.prop] prop: R|@R|second/Anno|(IntegerLiteral(0).plus#(inner#)) second/Base<@R|second/Anno|(IntegerLiteral(1).plus#(inner#)) second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(inner#)) kotlin/Int>>|): R|second/MyClass| { LAZY_super<> } @@ -440,7 +440,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClashWithNestedTypesAndAnnot public? [ResolvedTo(RAW_FIR)] get(): public? final? const [ResolvedTo(RAW_FIR)] val inner: = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): - public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|@R|second/Anno|(IntegerLiteral(3).plus#(outer#)) second/Base<@R|second/Anno|(IntegerLiteral(4).plus#(outer#)) second/Base<@R|second/Anno|(IntegerLiteral(5).plus#(outer#)) kotlin/Int>>| { + public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|@R|second/Anno|(IntegerLiteral(3).plus#(outer#)) second/Base<@R|second/Anno|(IntegerLiteral(4).plus#(outer#)) second/Base<@R|second/Anno|(IntegerLiteral(5).plus#(outer#)) kotlin/Int>>| { public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=second/MyClass.prop] prop: R|@R|second/Anno|(IntegerLiteral(0).plus#(inner#)) second/Base<@R|second/Anno|(IntegerLiteral(1).plus#(inner#)) second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(inner#)) kotlin/Int>>|): R|second/MyClass| { LAZY_super<> } @@ -483,16 +483,16 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClashWithNestedTypesAndAnnot public open [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK } } - public? final? const [ResolvedTo(RAW_FIR)] val outer: = LAZY_EXPRESSION - public? [ResolvedTo(RAW_FIR)] get(): + public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val outer: R|kotlin/Int| = Int(0) + public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int| public? final? const [ResolvedTo(RAW_FIR)] val inner: = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): - public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|@R|second/Anno|(i = IntegerLiteral(3).#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|)) second/Base<@R|second/Anno|(i = IntegerLiteral(4).#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|)) second/Base<@R|second/Anno|(i = IntegerLiteral(5).#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|)) kotlin/Int>>| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|)) second/Base<@R|second/Anno|(i = Int(4).R|kotlin/Int.plus|(R|second/outer|)) second/Base<@R|second/Anno|(i = Int(5).R|kotlin/Int.plus|(R|second/outer|)) kotlin/Int>>| { public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=second/MyClass.prop] prop: R|@R|second/Anno|(IntegerLiteral(0).plus#(inner#)) second/Base<@R|second/Anno|(IntegerLiteral(1).plus#(inner#)) second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(inner#)) kotlin/Int>>|): R|second/MyClass| { LAZY_super<> } - private final [ResolvedTo(ANNOTATION_ARGUMENTS)] field $$delegate_0: R|@R|second/Anno|(i = IntegerLiteral(3).#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|)) second/Base<@R|second/Anno|(i = IntegerLiteral(4).#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|)) second/Base<@R|second/Anno|(i = IntegerLiteral(5).#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|)) kotlin/Int>>| = LAZY_EXPRESSION + private final [ResolvedTo(ANNOTATION_ARGUMENTS)] field $$delegate_0: R|@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|)) second/Base<@R|second/Anno|(i = Int(4).R|kotlin/Int.plus|(R|second/outer|)) second/Base<@R|second/Anno|(i = Int(5).R|kotlin/Int.plus|(R|second/outer|)) kotlin/Int>>| = LAZY_EXPRESSION public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val prop: R|@R|second/Anno|(IntegerLiteral(0).plus#(inner#)) second/Base<@R|second/Anno|(IntegerLiteral(1).plus#(inner#)) second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(inner#)) kotlin/Int>>| = R|/prop| public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] get(): R|@R|second/Anno|(IntegerLiteral(0).plus#(inner#)) second/Base<@R|second/Anno|(IntegerLiteral(1).plus#(inner#)) second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(inner#)) kotlin/Int>>| @@ -505,8 +505,8 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClashWithNestedTypesAndAnnot LAZY_super } - public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val outer: R|kotlin/String| = String() - public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=Companion] get(): R|kotlin/String| + public final const [ResolvedTo(STATUS)] val outer: = LAZY_EXPRESSION + public [ResolvedTo(STATUS)] [ContainingClassKey=Companion] get(): public final const [ResolvedTo(STATUS)] val inner: = LAZY_EXPRESSION public [ResolvedTo(STATUS)] [ContainingClassKey=Companion] get(): @@ -530,16 +530,16 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClashWithNestedTypesAndAnnot public open [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK } } - public? final? const [ResolvedTo(RAW_FIR)] val outer: = LAZY_EXPRESSION - public? [ResolvedTo(RAW_FIR)] get(): + public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val outer: R|kotlin/Int| = Int(0) + public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int| public? final? const [ResolvedTo(RAW_FIR)] val inner: = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): - public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|@R|second/Anno|(i = IntegerLiteral(3).#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|)) second/Base<@R|second/Anno|(i = IntegerLiteral(4).#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|)) second/Base<@R|second/Anno|(i = IntegerLiteral(5).#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|)) kotlin/Int>>| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|)) second/Base<@R|second/Anno|(i = Int(4).R|kotlin/Int.plus|(R|second/outer|)) second/Base<@R|second/Anno|(i = Int(5).R|kotlin/Int.plus|(R|second/outer|)) kotlin/Int>>| { public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=second/MyClass.prop] prop: R|@R|second/Anno|(IntegerLiteral(0).plus#(inner#)) second/Base<@R|second/Anno|(IntegerLiteral(1).plus#(inner#)) second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(inner#)) kotlin/Int>>|): R|second/MyClass| { LAZY_super<> } - private final [ResolvedTo(BODY_RESOLVE)] field $$delegate_0: R|@R|second/Anno|(i = IntegerLiteral(3).#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|)) second/Base<@R|second/Anno|(i = IntegerLiteral(4).#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|)) second/Base<@R|second/Anno|(i = IntegerLiteral(5).#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|)) kotlin/Int>>| = R|/prop| + private final [ResolvedTo(BODY_RESOLVE)] field $$delegate_0: R|@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|)) second/Base<@R|second/Anno|(i = Int(4).R|kotlin/Int.plus|(R|second/outer|)) second/Base<@R|second/Anno|(i = Int(5).R|kotlin/Int.plus|(R|second/outer|)) kotlin/Int>>| = R|/prop| public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val prop: R|@R|second/Anno|(IntegerLiteral(0).plus#(inner#)) second/Base<@R|second/Anno|(IntegerLiteral(1).plus#(inner#)) second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(inner#)) kotlin/Int>>| = R|/prop| public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] get(): R|@R|second/Anno|(IntegerLiteral(0).plus#(inner#)) second/Base<@R|second/Anno|(IntegerLiteral(1).plus#(inner#)) second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(inner#)) kotlin/Int>>| @@ -552,8 +552,8 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClashWithNestedTypesAndAnnot LAZY_super } - public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val outer: R|kotlin/String| = String() - public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=Companion] get(): R|kotlin/String| + public final const [ResolvedTo(STATUS)] val outer: = LAZY_EXPRESSION + public [ResolvedTo(STATUS)] [ContainingClassKey=Companion] get(): public final const [ResolvedTo(STATUS)] val inner: = LAZY_EXPRESSION public [ResolvedTo(STATUS)] [ContainingClassKey=Companion] get(): diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegatedFieldNestedNameClashWithNestedTypesAndAnnotationsScript.lazyResolve.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegatedFieldNestedNameClashWithNestedTypesAndAnnotationsScript.lazyResolve.txt index c4a9ca31882..83b0b932dd4 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegatedFieldNestedNameClashWithNestedTypesAndAnnotationsScript.lazyResolve.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegatedFieldNestedNameClashWithNestedTypesAndAnnotationsScript.lazyResolve.txt @@ -137,7 +137,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClashWithNestedTypesAndAnnot public? final? const [ResolvedTo(RAW_FIR)] val inner: = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): - public? final? [ResolvedTo(RAW_FIR)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : @Anno[Unresolved](LAZY_EXPRESSION) Base<@Anno[Unresolved](LAZY_EXPRESSION) Base<@Anno[Unresolved](LAZY_EXPRESSION) Int>> { + public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : @Anno[Unresolved](LAZY_EXPRESSION) Base<@Anno[Unresolved](LAZY_EXPRESSION) Base<@Anno[Unresolved](LAZY_EXPRESSION) Int>> { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=second/MyClass.prop] prop: @Anno[Unresolved](LAZY_EXPRESSION) second.Base<@Anno[Unresolved](LAZY_EXPRESSION) second.Base<@Anno[Unresolved](LAZY_EXPRESSION) Int>>): R|second/MyClass| { LAZY_super<> } @@ -193,7 +193,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClashWithNestedTypesAndAnnot public? final? const [ResolvedTo(RAW_FIR)] val inner: = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): - public? final? [ResolvedTo(RAW_FIR)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : @Anno[Unresolved](LAZY_EXPRESSION) Base<@Anno[Unresolved](LAZY_EXPRESSION) Base<@Anno[Unresolved](LAZY_EXPRESSION) Int>> { + public? final? [ResolvedTo(COMPANION_GENERATION)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : @Anno[Unresolved](LAZY_EXPRESSION) Base<@Anno[Unresolved](LAZY_EXPRESSION) Base<@Anno[Unresolved](LAZY_EXPRESSION) Int>> { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=second/MyClass.prop] prop: @Anno[Unresolved](LAZY_EXPRESSION) second.Base<@Anno[Unresolved](LAZY_EXPRESSION) second.Base<@Anno[Unresolved](LAZY_EXPRESSION) Int>>): R|second/MyClass| { LAZY_super<> } @@ -417,7 +417,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClashWithNestedTypesAndAnnot public? final? const [ResolvedTo(RAW_FIR)] val inner: = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): - public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|@R|second/Anno|(IntegerLiteral(3).plus#(outer#)) second/Base<@R|second/Anno|(IntegerLiteral(4).plus#(outer#)) second/Base<@R|second/Anno|(IntegerLiteral(5).plus#(outer#)) kotlin/Int>>| { + public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|@R|second/Anno|(IntegerLiteral(3).plus#(outer#)) second/Base<@R|second/Anno|(IntegerLiteral(4).plus#(outer#)) second/Base<@R|second/Anno|(IntegerLiteral(5).plus#(outer#)) kotlin/Int>>| { public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=second/MyClass.prop] prop: R|@R|second/Anno|(IntegerLiteral(0).plus#(inner#)) second/Base<@R|second/Anno|(IntegerLiteral(1).plus#(inner#)) second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(inner#)) kotlin/Int>>|): R|second/MyClass| { LAZY_super<> } @@ -473,7 +473,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClashWithNestedTypesAndAnnot public? final? const [ResolvedTo(RAW_FIR)] val inner: = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): - public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|@R|second/Anno|(IntegerLiteral(3).plus#(outer#)) second/Base<@R|second/Anno|(IntegerLiteral(4).plus#(outer#)) second/Base<@R|second/Anno|(IntegerLiteral(5).plus#(outer#)) kotlin/Int>>| { + public final [ResolvedTo(CONTRACTS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|@R|second/Anno|(IntegerLiteral(3).plus#(outer#)) second/Base<@R|second/Anno|(IntegerLiteral(4).plus#(outer#)) second/Base<@R|second/Anno|(IntegerLiteral(5).plus#(outer#)) kotlin/Int>>| { public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=second/MyClass.prop] prop: R|@R|second/Anno|(IntegerLiteral(0).plus#(inner#)) second/Base<@R|second/Anno|(IntegerLiteral(1).plus#(inner#)) second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(inner#)) kotlin/Int>>|): R|second/MyClass| { LAZY_super<> } @@ -529,7 +529,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClashWithNestedTypesAndAnnot public? final? const [ResolvedTo(RAW_FIR)] val inner: = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): - public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|@R|second/Anno|(IntegerLiteral(3).plus#(outer#)) second/Base<@R|second/Anno|(IntegerLiteral(4).plus#(outer#)) second/Base<@R|second/Anno|(IntegerLiteral(5).plus#(outer#)) kotlin/Int>>| { + public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|@R|second/Anno|(IntegerLiteral(3).plus#(outer#)) second/Base<@R|second/Anno|(IntegerLiteral(4).plus#(outer#)) second/Base<@R|second/Anno|(IntegerLiteral(5).plus#(outer#)) kotlin/Int>>| { public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=second/MyClass.prop] prop: R|@R|second/Anno|(IntegerLiteral(0).plus#(inner#)) second/Base<@R|second/Anno|(IntegerLiteral(1).plus#(inner#)) second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(inner#)) kotlin/Int>>|): R|second/MyClass| { LAZY_super<> } @@ -579,18 +579,18 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClashWithNestedTypesAndAnnot } - public? final? const [ResolvedTo(RAW_FIR)] val outer: = LAZY_EXPRESSION - public? [ResolvedTo(RAW_FIR)] get(): + public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val outer: R|kotlin/Int| = Int(0) + public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int| public? final? const [ResolvedTo(RAW_FIR)] val inner: = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): - public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|@R|second/Anno|(i = IntegerLiteral(3).#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|)) second/Base<@R|second/Anno|(i = IntegerLiteral(4).#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|)) second/Base<@R|second/Anno|(i = IntegerLiteral(5).#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|)) kotlin/Int>>| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|)) second/Base<@R|second/Anno|(i = Int(4).R|kotlin/Int.plus|(R|second/outer|)) second/Base<@R|second/Anno|(i = Int(5).R|kotlin/Int.plus|(R|second/outer|)) kotlin/Int>>| { public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=second/MyClass.prop] prop: R|@R|second/Anno|(IntegerLiteral(0).plus#(inner#)) second/Base<@R|second/Anno|(IntegerLiteral(1).plus#(inner#)) second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(inner#)) kotlin/Int>>|): R|second/MyClass| { LAZY_super<> } - private final [ResolvedTo(ANNOTATION_ARGUMENTS)] field $$delegate_0: R|@R|second/Anno|(i = IntegerLiteral(3).#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|)) second/Base<@R|second/Anno|(i = IntegerLiteral(4).#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|)) second/Base<@R|second/Anno|(i = IntegerLiteral(5).#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|)) kotlin/Int>>| = LAZY_EXPRESSION + private final [ResolvedTo(ANNOTATION_ARGUMENTS)] field $$delegate_0: R|@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|)) second/Base<@R|second/Anno|(i = Int(4).R|kotlin/Int.plus|(R|second/outer|)) second/Base<@R|second/Anno|(i = Int(5).R|kotlin/Int.plus|(R|second/outer|)) kotlin/Int>>| = LAZY_EXPRESSION public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val prop: R|@R|second/Anno|(IntegerLiteral(0).plus#(inner#)) second/Base<@R|second/Anno|(IntegerLiteral(1).plus#(inner#)) second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(inner#)) kotlin/Int>>| = R|/prop| public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] get(): R|@R|second/Anno|(IntegerLiteral(0).plus#(inner#)) second/Base<@R|second/Anno|(IntegerLiteral(1).plus#(inner#)) second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(inner#)) kotlin/Int>>| @@ -603,8 +603,8 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClashWithNestedTypesAndAnnot LAZY_super } - public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val outer: R|kotlin/String| = String() - public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=Companion] get(): R|kotlin/String| + public final const [ResolvedTo(STATUS)] val outer: = LAZY_EXPRESSION + public [ResolvedTo(STATUS)] [ContainingClassKey=Companion] get(): public final const [ResolvedTo(STATUS)] val inner: = LAZY_EXPRESSION public [ResolvedTo(STATUS)] [ContainingClassKey=Companion] get(): @@ -635,18 +635,18 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClashWithNestedTypesAndAnnot } - public? final? const [ResolvedTo(RAW_FIR)] val outer: = LAZY_EXPRESSION - public? [ResolvedTo(RAW_FIR)] get(): + public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val outer: R|kotlin/Int| = Int(0) + public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int| public? final? const [ResolvedTo(RAW_FIR)] val inner: = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): - public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|@R|second/Anno|(i = IntegerLiteral(3).#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|)) second/Base<@R|second/Anno|(i = IntegerLiteral(4).#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|)) second/Base<@R|second/Anno|(i = IntegerLiteral(5).#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|)) kotlin/Int>>| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0}] class MyClass : R|@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|)) second/Base<@R|second/Anno|(i = Int(4).R|kotlin/Int.plus|(R|second/outer|)) second/Base<@R|second/Anno|(i = Int(5).R|kotlin/Int.plus|(R|second/outer|)) kotlin/Int>>| { public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=second/MyClass.prop] prop: R|@R|second/Anno|(IntegerLiteral(0).plus#(inner#)) second/Base<@R|second/Anno|(IntegerLiteral(1).plus#(inner#)) second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(inner#)) kotlin/Int>>|): R|second/MyClass| { LAZY_super<> } - private final [ResolvedTo(BODY_RESOLVE)] field $$delegate_0: R|@R|second/Anno|(i = IntegerLiteral(3).#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|)) second/Base<@R|second/Anno|(i = IntegerLiteral(4).#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|)) second/Base<@R|second/Anno|(i = IntegerLiteral(5).#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|)) kotlin/Int>>| = R|/prop| + private final [ResolvedTo(BODY_RESOLVE)] field $$delegate_0: R|@R|second/Anno|(i = Int(3).R|kotlin/Int.plus|(R|second/outer|)) second/Base<@R|second/Anno|(i = Int(4).R|kotlin/Int.plus|(R|second/outer|)) second/Base<@R|second/Anno|(i = Int(5).R|kotlin/Int.plus|(R|second/outer|)) kotlin/Int>>| = R|/prop| public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val prop: R|@R|second/Anno|(IntegerLiteral(0).plus#(inner#)) second/Base<@R|second/Anno|(IntegerLiteral(1).plus#(inner#)) second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(inner#)) kotlin/Int>>| = R|/prop| public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] get(): R|@R|second/Anno|(IntegerLiteral(0).plus#(inner#)) second/Base<@R|second/Anno|(IntegerLiteral(1).plus#(inner#)) second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(inner#)) kotlin/Int>>| @@ -659,8 +659,8 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameClashWithNestedTypesAndAnnot LAZY_super } - public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val outer: R|kotlin/String| = String() - public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=Companion] get(): R|kotlin/String| + public final const [ResolvedTo(STATUS)] val outer: = LAZY_EXPRESSION + public [ResolvedTo(STATUS)] [ContainingClassKey=Companion] get(): public final const [ResolvedTo(STATUS)] val inner: = LAZY_EXPRESSION public [ResolvedTo(STATUS)] [ContainingClassKey=Companion] get(): diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegatedFieldNestedNameScript.lazyResolve.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegatedFieldNestedNameScript.lazyResolve.txt index f59f929532b..2d3fe73449b 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegatedFieldNestedNameScript.lazyResolve.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/delegatedFieldNestedNameScript.lazyResolve.txt @@ -152,7 +152,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameScript.kts public? final? const [ResolvedTo(RAW_FIR)] val inner: = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): - public? final? [ResolvedTo(RAW_FIR)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0, 1=FirFieldSymbol second/MyClass.$$delegate_1}] class MyClass : @Anno[Unresolved](LAZY_EXPRESSION) Base<@Anno[Unresolved](LAZY_EXPRESSION) Base<@Anno[Unresolved](LAZY_EXPRESSION) Int>>, @Anno[Unresolved](LAZY_EXPRESSION) Second<@Anno[Unresolved](LAZY_EXPRESSION) String> { + public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0, 1=FirFieldSymbol second/MyClass.$$delegate_1}] class MyClass : @Anno[Unresolved](LAZY_EXPRESSION) Base<@Anno[Unresolved](LAZY_EXPRESSION) Base<@Anno[Unresolved](LAZY_EXPRESSION) Int>>, @Anno[Unresolved](LAZY_EXPRESSION) Second<@Anno[Unresolved](LAZY_EXPRESSION) String> { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { LAZY_super<> } @@ -214,7 +214,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameScript.kts public? final? const [ResolvedTo(RAW_FIR)] val inner: = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): - public? final? [ResolvedTo(RAW_FIR)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0, 1=FirFieldSymbol second/MyClass.$$delegate_1}] class MyClass : @Anno[Unresolved](LAZY_EXPRESSION) Base<@Anno[Unresolved](LAZY_EXPRESSION) Base<@Anno[Unresolved](LAZY_EXPRESSION) Int>>, @Anno[Unresolved](LAZY_EXPRESSION) Second<@Anno[Unresolved](LAZY_EXPRESSION) String> { + public? final? [ResolvedTo(COMPANION_GENERATION)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0, 1=FirFieldSymbol second/MyClass.$$delegate_1}] class MyClass : @Anno[Unresolved](LAZY_EXPRESSION) Base<@Anno[Unresolved](LAZY_EXPRESSION) Base<@Anno[Unresolved](LAZY_EXPRESSION) Int>>, @Anno[Unresolved](LAZY_EXPRESSION) Second<@Anno[Unresolved](LAZY_EXPRESSION) String> { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { LAZY_super<> } @@ -462,7 +462,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameScript.kts public? final? const [ResolvedTo(RAW_FIR)] val inner: = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): - public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0, 1=FirFieldSymbol second/MyClass.$$delegate_1}] class MyClass : R|@R|second/Anno|(IntegerLiteral(0).plus#(outer#)) second/Base<@R|second/Anno|(IntegerLiteral(1).plus#(outer#)) second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#)) kotlin/Int>>|, R|@R|second/Anno|(IntegerLiteral(4).plus#(outer#)) second/Second<@R|second/Anno|(IntegerLiteral(5).plus#(outer#)) kotlin/String>| { + public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0, 1=FirFieldSymbol second/MyClass.$$delegate_1}] class MyClass : R|@R|second/Anno|(IntegerLiteral(0).plus#(outer#)) second/Base<@R|second/Anno|(IntegerLiteral(1).plus#(outer#)) second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#)) kotlin/Int>>|, R|@R|second/Anno|(IntegerLiteral(4).plus#(outer#)) second/Second<@R|second/Anno|(IntegerLiteral(5).plus#(outer#)) kotlin/String>| { public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { LAZY_super<> } @@ -524,7 +524,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameScript.kts public? final? const [ResolvedTo(RAW_FIR)] val inner: = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): - public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0, 1=FirFieldSymbol second/MyClass.$$delegate_1}] class MyClass : R|@R|second/Anno|(IntegerLiteral(0).plus#(outer#)) second/Base<@R|second/Anno|(IntegerLiteral(1).plus#(outer#)) second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#)) kotlin/Int>>|, R|@R|second/Anno|(IntegerLiteral(4).plus#(outer#)) second/Second<@R|second/Anno|(IntegerLiteral(5).plus#(outer#)) kotlin/String>| { + public final [ResolvedTo(CONTRACTS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0, 1=FirFieldSymbol second/MyClass.$$delegate_1}] class MyClass : R|@R|second/Anno|(IntegerLiteral(0).plus#(outer#)) second/Base<@R|second/Anno|(IntegerLiteral(1).plus#(outer#)) second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#)) kotlin/Int>>|, R|@R|second/Anno|(IntegerLiteral(4).plus#(outer#)) second/Second<@R|second/Anno|(IntegerLiteral(5).plus#(outer#)) kotlin/String>| { public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { LAZY_super<> } @@ -586,7 +586,7 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameScript.kts public? final? const [ResolvedTo(RAW_FIR)] val inner: = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): - public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0, 1=FirFieldSymbol second/MyClass.$$delegate_1}] class MyClass : R|@R|second/Anno|(IntegerLiteral(0).plus#(outer#)) second/Base<@R|second/Anno|(IntegerLiteral(1).plus#(outer#)) second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#)) kotlin/Int>>|, R|@R|second/Anno|(IntegerLiteral(4).plus#(outer#)) second/Second<@R|second/Anno|(IntegerLiteral(5).plus#(outer#)) kotlin/String>| { + public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0, 1=FirFieldSymbol second/MyClass.$$delegate_1}] class MyClass : R|@R|second/Anno|(IntegerLiteral(0).plus#(outer#)) second/Base<@R|second/Anno|(IntegerLiteral(1).plus#(outer#)) second/Base<@R|second/Anno|(IntegerLiteral(2).plus#(outer#)) kotlin/Int>>|, R|@R|second/Anno|(IntegerLiteral(4).plus#(outer#)) second/Second<@R|second/Anno|(IntegerLiteral(5).plus#(outer#)) kotlin/String>| { public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { LAZY_super<> } @@ -642,28 +642,28 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameScript.kts public abstract [ResolvedTo(STATUS)] interface Second<[ResolvedTo(STATUS)] T> : R|kotlin/Any| { } - public? final? const [ResolvedTo(RAW_FIR)] val outer: = LAZY_EXPRESSION - public? [ResolvedTo(RAW_FIR)] get(): + public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val outer: R|kotlin/Int| = Int(0) + public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int| public? final? const [ResolvedTo(RAW_FIR)] val inner: = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): - public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0, 1=FirFieldSymbol second/MyClass.$$delegate_1}] class MyClass : R|@R|second/Anno|(i = IntegerLiteral(0).#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|)) second/Base<@R|second/Anno|(i = IntegerLiteral(1).#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|)) second/Base<@R|second/Anno|(i = IntegerLiteral(2).#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|)) kotlin/Int>>|, R|@R|second/Anno|(IntegerLiteral(4).plus#(outer#)) second/Second<@R|second/Anno|(IntegerLiteral(5).plus#(outer#)) kotlin/String>| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0, 1=FirFieldSymbol second/MyClass.$$delegate_1}] class MyClass : R|@R|second/Anno|(i = Int(0).R|kotlin/Int.plus|(R|second/outer|)) second/Base<@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|)) second/Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|)) kotlin/Int>>|, R|@R|second/Anno|(i = Int(4).R|kotlin/Int.plus|(R|second/outer|)) second/Second<@R|second/Anno|(i = Int(5).R|kotlin/Int.plus|(R|second/outer|)) kotlin/String>| { public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { LAZY_super<> } - private final [ResolvedTo(ANNOTATION_ARGUMENTS)] field $$delegate_0: R|@R|second/Anno|(i = IntegerLiteral(0).#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|)) second/Base<@R|second/Anno|(i = IntegerLiteral(1).#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|)) second/Base<@R|second/Anno|(i = IntegerLiteral(2).#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|)) kotlin/Int>>| = LAZY_EXPRESSION + private final [ResolvedTo(ANNOTATION_ARGUMENTS)] field $$delegate_0: R|@R|second/Anno|(i = Int(0).R|kotlin/Int.plus|(R|second/outer|)) second/Base<@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|)) second/Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|)) kotlin/Int>>| = LAZY_EXPRESSION - private final [ResolvedTo(STATUS)] field $$delegate_1: R|@R|second/Anno|(IntegerLiteral(4).plus#(outer#)) second/Second<@R|second/Anno|(IntegerLiteral(5).plus#(outer#)) kotlin/String>| = LAZY_EXPRESSION + private final [ResolvedTo(STATUS)] field $$delegate_1: R|@R|second/Anno|(i = Int(4).R|kotlin/Int.plus|(R|second/outer|)) second/Second<@R|second/Anno|(i = Int(5).R|kotlin/Int.plus|(R|second/outer|)) kotlin/String>| = LAZY_EXPRESSION public final companion [ResolvedTo(STATUS)] object Companion : R|@R|second/Anno|(LAZY_EXPRESSION) second/Base<@R|second/Anno|(LAZY_EXPRESSION) second/Base<@R|second/Anno|(LAZY_EXPRESSION) kotlin/Int>>| { private [ResolvedTo(STATUS)] [ContainingClassKey=Companion] constructor(): R|second/MyClass.Companion| { LAZY_super<> } - public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val outer: R|kotlin/String| = String() - public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=Companion] get(): R|kotlin/String| + public final const [ResolvedTo(STATUS)] val outer: = LAZY_EXPRESSION + public [ResolvedTo(STATUS)] [ContainingClassKey=Companion] get(): public final const [ResolvedTo(STATUS)] val inner: = LAZY_EXPRESSION public [ResolvedTo(STATUS)] [ContainingClassKey=Companion] get(): @@ -704,28 +704,28 @@ FILE: [ResolvedTo(IMPORTS)] delegatedFieldNestedNameScript.kts public abstract [ResolvedTo(STATUS)] interface Second<[ResolvedTo(STATUS)] T> : R|kotlin/Any| { } - public? final? const [ResolvedTo(RAW_FIR)] val outer: = LAZY_EXPRESSION - public? [ResolvedTo(RAW_FIR)] get(): + public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val outer: R|kotlin/Int| = Int(0) + public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/Int| public? final? const [ResolvedTo(RAW_FIR)] val inner: = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): - public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0, 1=FirFieldSymbol second/MyClass.$$delegate_1}] class MyClass : R|@R|second/Anno|(i = IntegerLiteral(0).#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|)) second/Base<@R|second/Anno|(i = IntegerLiteral(1).#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|)) second/Base<@R|second/Anno|(i = IntegerLiteral(2).#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|)) kotlin/Int>>|, R|@R|second/Anno|(IntegerLiteral(4).plus#(outer#)) second/Second<@R|second/Anno|(IntegerLiteral(5).plus#(outer#)) kotlin/String>| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] [DelegateFieldsMapKey={0=FirFieldSymbol second/MyClass.$$delegate_0, 1=FirFieldSymbol second/MyClass.$$delegate_1}] class MyClass : R|@R|second/Anno|(i = Int(0).R|kotlin/Int.plus|(R|second/outer|)) second/Base<@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|)) second/Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|)) kotlin/Int>>|, R|@R|second/Anno|(i = Int(4).R|kotlin/Int.plus|(R|second/outer|)) second/Second<@R|second/Anno|(i = Int(5).R|kotlin/Int.plus|(R|second/outer|)) kotlin/String>| { public [ResolvedTo(STATUS)] [ContainingClassKey=MyClass] constructor(): R|second/MyClass| { LAZY_super<> } - private final [ResolvedTo(BODY_RESOLVE)] field $$delegate_0: R|@R|second/Anno|(i = IntegerLiteral(0).#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|)) second/Base<@R|second/Anno|(i = IntegerLiteral(1).#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|)) second/Base<@R|second/Anno|(i = IntegerLiteral(2).#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|)) kotlin/Int>>| = Q|second/MyClass.Companion| + private final [ResolvedTo(BODY_RESOLVE)] field $$delegate_0: R|@R|second/Anno|(i = Int(0).R|kotlin/Int.plus|(R|second/outer|)) second/Base<@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(R|second/outer|)) second/Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(R|second/outer|)) kotlin/Int>>| = Q|second/MyClass.Companion| - private final [ResolvedTo(STATUS)] field $$delegate_1: R|@R|second/Anno|(IntegerLiteral(4).plus#(outer#)) second/Second<@R|second/Anno|(IntegerLiteral(5).plus#(outer#)) kotlin/String>| = LAZY_EXPRESSION + private final [ResolvedTo(STATUS)] field $$delegate_1: R|@R|second/Anno|(i = Int(4).R|kotlin/Int.plus|(R|second/outer|)) second/Second<@R|second/Anno|(i = Int(5).R|kotlin/Int.plus|(R|second/outer|)) kotlin/String>| = LAZY_EXPRESSION public final companion [ResolvedTo(STATUS)] object Companion : R|@R|second/Anno|(LAZY_EXPRESSION) second/Base<@R|second/Anno|(LAZY_EXPRESSION) second/Base<@R|second/Anno|(LAZY_EXPRESSION) kotlin/Int>>| { private [ResolvedTo(STATUS)] [ContainingClassKey=Companion] constructor(): R|second/MyClass.Companion| { LAZY_super<> } - public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val outer: R|kotlin/String| = String() - public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=Companion] get(): R|kotlin/String| + public final const [ResolvedTo(STATUS)] val outer: = LAZY_EXPRESSION + public [ResolvedTo(STATUS)] [ContainingClassKey=Companion] get(): public final const [ResolvedTo(STATUS)] val inner: = LAZY_EXPRESSION public [ResolvedTo(STATUS)] [ContainingClassKey=Companion] get(): diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/field.lazyResolve.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/field.lazyResolve.txt index 829c50d01b9..e90f0835a1d 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/field.lazyResolve.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/field.lazyResolve.txt @@ -55,7 +55,7 @@ FILE: [ResolvedTo(IMPORTS)] field.kt } public? final? const [ResolvedTo(RAW_FIR)] val prop: = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): - public? final? [ResolvedTo(RAW_FIR)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : @Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) Int>> { + public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : @Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) Int>> { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] constructor([ResolvedTo(RAW_FIR)] prop: List>): R|one/Usage| { LAZY_super<> } @@ -77,7 +77,7 @@ FILE: [ResolvedTo(IMPORTS)] field.kt } public? final? const [ResolvedTo(RAW_FIR)] val prop: = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): - public? final? [ResolvedTo(RAW_FIR)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : @Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) Int>> { + public? final? [ResolvedTo(COMPANION_GENERATION)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : @Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) Int>> { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] constructor([ResolvedTo(RAW_FIR)] prop: List>): R|one/Usage| { LAZY_super<> } @@ -165,7 +165,7 @@ FILE: [ResolvedTo(IMPORTS)] field.kt } public? final? const [ResolvedTo(RAW_FIR)] val prop: = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): - public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : R|@R|one/Anno|((String(super type ref ), prop#)) kotlin/collections/List<@R|one/Anno|((String(nested super type ref ), prop#)) kotlin/collections/List<@R|one/Anno|((String(nested nested super type ref ), prop#)) kotlin/Int>>| { + public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : R|@R|one/Anno|((String(super type ref ), prop#)) kotlin/collections/List<@R|one/Anno|((String(nested super type ref ), prop#)) kotlin/collections/List<@R|one/Anno|((String(nested nested super type ref ), prop#)) kotlin/Int>>| { public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] constructor([ResolvedTo(STATUS)] prop: R|kotlin/collections/List>|): R|one/Usage| { LAZY_super<> } @@ -187,7 +187,7 @@ FILE: [ResolvedTo(IMPORTS)] field.kt } public? final? const [ResolvedTo(RAW_FIR)] val prop: = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): - public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : R|@R|one/Anno|((String(super type ref ), prop#)) kotlin/collections/List<@R|one/Anno|((String(nested super type ref ), prop#)) kotlin/collections/List<@R|one/Anno|((String(nested nested super type ref ), prop#)) kotlin/Int>>| { + public final [ResolvedTo(CONTRACTS)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : R|@R|one/Anno|((String(super type ref ), prop#)) kotlin/collections/List<@R|one/Anno|((String(nested super type ref ), prop#)) kotlin/collections/List<@R|one/Anno|((String(nested nested super type ref ), prop#)) kotlin/Int>>| { public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] constructor([ResolvedTo(STATUS)] prop: R|kotlin/collections/List>|): R|one/Usage| { LAZY_super<> } @@ -209,7 +209,7 @@ FILE: [ResolvedTo(IMPORTS)] field.kt } public? final? const [ResolvedTo(RAW_FIR)] val prop: = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): - public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : R|@R|one/Anno|((String(super type ref ), prop#)) kotlin/collections/List<@R|one/Anno|((String(nested super type ref ), prop#)) kotlin/collections/List<@R|one/Anno|((String(nested nested super type ref ), prop#)) kotlin/Int>>| { + public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : R|@R|one/Anno|((String(super type ref ), prop#)) kotlin/collections/List<@R|one/Anno|((String(nested super type ref ), prop#)) kotlin/collections/List<@R|one/Anno|((String(nested nested super type ref ), prop#)) kotlin/Int>>| { public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] constructor([ResolvedTo(STATUS)] prop: R|kotlin/collections/List>|): R|one/Usage| { LAZY_super<> } @@ -229,14 +229,14 @@ FILE: [ResolvedTo(IMPORTS)] field.kt public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String| } - public? final? const [ResolvedTo(RAW_FIR)] val prop: = LAZY_EXPRESSION - public? [ResolvedTo(RAW_FIR)] get(): - public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : R|@R|one/Anno|(position = (String(super type ref ), R|/prop|)) kotlin/collections/List<@R|one/Anno|(position = (String(nested super type ref ), R|/prop|)) kotlin/collections/List<@R|one/Anno|(position = (String(nested nested super type ref ), R|/prop|)) kotlin/Int>>| { + public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val prop: R|kotlin/String| = String(str) + public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/String| + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : R|@R|one/Anno|(position = (String(super type ref ), R|one/prop|)) kotlin/collections/List<@R|one/Anno|(position = (String(nested super type ref ), R|one/prop|)) kotlin/collections/List<@R|one/Anno|(position = (String(nested nested super type ref ), R|one/prop|)) kotlin/Int>>| { public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] constructor([ResolvedTo(STATUS)] prop: R|kotlin/collections/List>|): R|one/Usage| { LAZY_super<> } - private final [ResolvedTo(ANNOTATION_ARGUMENTS)] field $$delegate_0: R|@R|one/Anno|(position = (String(super type ref ), R|/prop|)) kotlin/collections/List<@R|one/Anno|(position = (String(nested super type ref ), R|/prop|)) kotlin/collections/List<@R|one/Anno|(position = (String(nested nested super type ref ), R|/prop|)) kotlin/Int>>| = LAZY_EXPRESSION + private final [ResolvedTo(ANNOTATION_ARGUMENTS)] field $$delegate_0: R|@R|one/Anno|(position = (String(super type ref ), R|one/prop|)) kotlin/collections/List<@R|one/Anno|(position = (String(nested super type ref ), R|one/prop|)) kotlin/collections/List<@R|one/Anno|(position = (String(nested nested super type ref ), R|one/prop|)) kotlin/Int>>| = LAZY_EXPRESSION } @@ -251,14 +251,14 @@ FILE: [ResolvedTo(IMPORTS)] field.kt public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] get(): R|kotlin/String| } - public? final? const [ResolvedTo(RAW_FIR)] val prop: = LAZY_EXPRESSION - public? [ResolvedTo(RAW_FIR)] get(): - public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : R|@R|one/Anno|(position = (String(super type ref ), R|/prop|)) kotlin/collections/List<@R|one/Anno|(position = (String(nested super type ref ), R|/prop|)) kotlin/collections/List<@R|one/Anno|(position = (String(nested nested super type ref ), R|/prop|)) kotlin/Int>>| { + public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val prop: R|kotlin/String| = String(str) + public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/String| + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : R|@R|one/Anno|(position = (String(super type ref ), R|one/prop|)) kotlin/collections/List<@R|one/Anno|(position = (String(nested super type ref ), R|one/prop|)) kotlin/collections/List<@R|one/Anno|(position = (String(nested nested super type ref ), R|one/prop|)) kotlin/Int>>| { public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] constructor([ResolvedTo(STATUS)] prop: R|kotlin/collections/List>|): R|one/Usage| { LAZY_super<> } - private final [ResolvedTo(BODY_RESOLVE)] field $$delegate_0: R|@R|one/Anno|(position = (String(super type ref ), R|/prop|)) kotlin/collections/List<@R|one/Anno|(position = (String(nested super type ref ), R|/prop|)) kotlin/collections/List<@R|one/Anno|(position = (String(nested nested super type ref ), R|/prop|)) kotlin/Int>>| = R|/prop| + private final [ResolvedTo(BODY_RESOLVE)] field $$delegate_0: R|@R|one/Anno|(position = (String(super type ref ), R|one/prop|)) kotlin/collections/List<@R|one/Anno|(position = (String(nested super type ref ), R|one/prop|)) kotlin/collections/List<@R|one/Anno|(position = (String(nested nested super type ref ), R|one/prop|)) kotlin/Int>>| = R|/prop| } diff --git a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/fieldScript.lazyResolve.txt b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/fieldScript.lazyResolve.txt index 6b5df977cbb..3851a4d5887 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/fieldScript.lazyResolve.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveTypeAnnotations/delegate/fieldScript.lazyResolve.txt @@ -75,7 +75,7 @@ FILE: [ResolvedTo(IMPORTS)] fieldScript.kts public? final? const [ResolvedTo(RAW_FIR)] val prop: = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): - public? final? [ResolvedTo(RAW_FIR)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : @Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) Int>> { + public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : @Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) Int>> { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] constructor([ResolvedTo(RAW_FIR)] prop: List>): R|one/Usage| { LAZY_super<> } @@ -104,7 +104,7 @@ FILE: [ResolvedTo(IMPORTS)] fieldScript.kts public? final? const [ResolvedTo(RAW_FIR)] val prop: = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): - public? final? [ResolvedTo(RAW_FIR)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : @Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) Int>> { + public? final? [ResolvedTo(COMPANION_GENERATION)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : @Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) List<@Anno[Unresolved](LAZY_EXPRESSION) Int>> { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Usage] constructor([ResolvedTo(RAW_FIR)] prop: List>): R|one/Usage| { LAZY_super<> } @@ -220,7 +220,7 @@ FILE: [ResolvedTo(IMPORTS)] fieldScript.kts public? final? const [ResolvedTo(RAW_FIR)] val prop: = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): - public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : R|@R|one/Anno|((String(super type ref ), prop#)) kotlin/collections/List<@R|one/Anno|((String(nested super type ref ), prop#)) kotlin/collections/List<@R|one/Anno|((String(nested nested super type ref ), prop#)) kotlin/Int>>| { + public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : R|@R|one/Anno|((String(super type ref ), prop#)) kotlin/collections/List<@R|one/Anno|((String(nested super type ref ), prop#)) kotlin/collections/List<@R|one/Anno|((String(nested nested super type ref ), prop#)) kotlin/Int>>| { public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] constructor([ResolvedTo(STATUS)] prop: R|kotlin/collections/List>|): R|one/Usage| { LAZY_super<> } @@ -249,7 +249,7 @@ FILE: [ResolvedTo(IMPORTS)] fieldScript.kts public? final? const [ResolvedTo(RAW_FIR)] val prop: = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): - public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : R|@R|one/Anno|((String(super type ref ), prop#)) kotlin/collections/List<@R|one/Anno|((String(nested super type ref ), prop#)) kotlin/collections/List<@R|one/Anno|((String(nested nested super type ref ), prop#)) kotlin/Int>>| { + public final [ResolvedTo(CONTRACTS)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : R|@R|one/Anno|((String(super type ref ), prop#)) kotlin/collections/List<@R|one/Anno|((String(nested super type ref ), prop#)) kotlin/collections/List<@R|one/Anno|((String(nested nested super type ref ), prop#)) kotlin/Int>>| { public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] constructor([ResolvedTo(STATUS)] prop: R|kotlin/collections/List>|): R|one/Usage| { LAZY_super<> } @@ -278,7 +278,7 @@ FILE: [ResolvedTo(IMPORTS)] fieldScript.kts public? final? const [ResolvedTo(RAW_FIR)] val prop: = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): - public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : R|@R|one/Anno|((String(super type ref ), prop#)) kotlin/collections/List<@R|one/Anno|((String(nested super type ref ), prop#)) kotlin/collections/List<@R|one/Anno|((String(nested nested super type ref ), prop#)) kotlin/Int>>| { + public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : R|@R|one/Anno|((String(super type ref ), prop#)) kotlin/collections/List<@R|one/Anno|((String(nested super type ref ), prop#)) kotlin/collections/List<@R|one/Anno|((String(nested nested super type ref ), prop#)) kotlin/Int>>| { public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] constructor([ResolvedTo(STATUS)] prop: R|kotlin/collections/List>|): R|one/Usage| { LAZY_super<> } @@ -304,15 +304,15 @@ FILE: [ResolvedTo(IMPORTS)] fieldScript.kts } - public? final? const [ResolvedTo(RAW_FIR)] val prop: = LAZY_EXPRESSION - public? [ResolvedTo(RAW_FIR)] get(): + public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val prop: R|kotlin/String| = String(str) + public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/String| - public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : R|@R|one/Anno|(position = (String(super type ref ), R|/prop|)) kotlin/collections/List<@R|one/Anno|(position = (String(nested super type ref ), R|/prop|)) kotlin/collections/List<@R|one/Anno|(position = (String(nested nested super type ref ), R|/prop|)) kotlin/Int>>| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : R|@R|one/Anno|(position = (String(super type ref ), R|one/prop|)) kotlin/collections/List<@R|one/Anno|(position = (String(nested super type ref ), R|one/prop|)) kotlin/collections/List<@R|one/Anno|(position = (String(nested nested super type ref ), R|one/prop|)) kotlin/Int>>| { public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] constructor([ResolvedTo(STATUS)] prop: R|kotlin/collections/List>|): R|one/Usage| { LAZY_super<> } - private final [ResolvedTo(ANNOTATION_ARGUMENTS)] field $$delegate_0: R|@R|one/Anno|(position = (String(super type ref ), R|/prop|)) kotlin/collections/List<@R|one/Anno|(position = (String(nested super type ref ), R|/prop|)) kotlin/collections/List<@R|one/Anno|(position = (String(nested nested super type ref ), R|/prop|)) kotlin/Int>>| = LAZY_EXPRESSION + private final [ResolvedTo(ANNOTATION_ARGUMENTS)] field $$delegate_0: R|@R|one/Anno|(position = (String(super type ref ), R|one/prop|)) kotlin/collections/List<@R|one/Anno|(position = (String(nested super type ref ), R|one/prop|)) kotlin/collections/List<@R|one/Anno|(position = (String(nested nested super type ref ), R|one/prop|)) kotlin/Int>>| = LAZY_EXPRESSION } @@ -333,15 +333,15 @@ FILE: [ResolvedTo(IMPORTS)] fieldScript.kts } - public? final? const [ResolvedTo(RAW_FIR)] val prop: = LAZY_EXPRESSION - public? [ResolvedTo(RAW_FIR)] get(): + public final const [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val prop: R|kotlin/String| = String(str) + public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] get(): R|kotlin/String| - public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : R|@R|one/Anno|(position = (String(super type ref ), R|/prop|)) kotlin/collections/List<@R|one/Anno|(position = (String(nested super type ref ), R|/prop|)) kotlin/collections/List<@R|one/Anno|(position = (String(nested nested super type ref ), R|/prop|)) kotlin/Int>>| { + public final [ResolvedTo(ANNOTATION_ARGUMENTS)] [DelegateFieldsMapKey={0=FirFieldSymbol one/Usage.$$delegate_0}] class Usage : R|@R|one/Anno|(position = (String(super type ref ), R|one/prop|)) kotlin/collections/List<@R|one/Anno|(position = (String(nested super type ref ), R|one/prop|)) kotlin/collections/List<@R|one/Anno|(position = (String(nested nested super type ref ), R|one/prop|)) kotlin/Int>>| { public [ResolvedTo(STATUS)] [ContainingClassKey=Usage] constructor([ResolvedTo(STATUS)] prop: R|kotlin/collections/List>|): R|one/Usage| { LAZY_super<> } - private final [ResolvedTo(BODY_RESOLVE)] field $$delegate_0: R|@R|one/Anno|(position = (String(super type ref ), R|/prop|)) kotlin/collections/List<@R|one/Anno|(position = (String(nested super type ref ), R|/prop|)) kotlin/collections/List<@R|one/Anno|(position = (String(nested nested super type ref ), R|/prop|)) kotlin/Int>>| = R|/prop| + private final [ResolvedTo(BODY_RESOLVE)] field $$delegate_0: R|@R|one/Anno|(position = (String(super type ref ), R|one/prop|)) kotlin/collections/List<@R|one/Anno|(position = (String(nested super type ref ), R|one/prop|)) kotlin/collections/List<@R|one/Anno|(position = (String(nested nested super type ref ), R|one/prop|)) kotlin/Int>>| = R|/prop| } diff --git a/compiler/testData/diagnostics/tests/delegation/clashes/nestedNameClashAndAnnotations.reversed.fir.txt b/compiler/testData/diagnostics/tests/delegation/clashes/nestedNameClashAndAnnotations.reversed.fir.txt deleted file mode 100644 index 16918976d78..00000000000 --- a/compiler/testData/diagnostics/tests/delegation/clashes/nestedNameClashAndAnnotations.reversed.fir.txt +++ /dev/null @@ -1,48 +0,0 @@ -FILE: nestedNameClashAndAnnotations.reversed.kt - package second - - @R|kotlin/annotation/Target|(allowedTargets = vararg(Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|)) public final annotation class Anno : R|kotlin/Annotation| { - public constructor(i: R|kotlin/Int|): R|second/Anno| { - super() - } - - public final val i: R|kotlin/Int| = R|/i| - public get(): R|kotlin/Int| - - } - public abstract interface Base : R|kotlin/Any| { - public open fun foo(): R|kotlin/Unit| { - } - - } - public final const val outer: R|kotlin/Int| = Int(0) - public get(): R|kotlin/Int| - public final const val inner: R|kotlin/String| = String() - public get(): R|kotlin/String| - public final class MyClass : R|@R|second/Anno|(i = IntegerLiteral(3).#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|)) second/Base<@R|second/Anno|(i = IntegerLiteral(4).#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|)) second/Base<@R|second/Anno|(i = IntegerLiteral(5).#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|)) kotlin/Int>>| { - public constructor(prop: R|@R|second/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.inner|)) second/Base<@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.inner|)) second/Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.inner|)) kotlin/Int>>|): R|second/MyClass| { - super() - } - - private final field $$delegate_0: R|@R|second/Anno|(i = IntegerLiteral(3).#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|)) second/Base<@R|second/Anno|(i = IntegerLiteral(4).#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|)) second/Base<@R|second/Anno|(i = IntegerLiteral(5).#(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.outer|)) kotlin/Int>>| = R|/prop| - - public final val prop: R|@R|second/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.inner|)) second/Base<@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.inner|)) second/Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.inner|)) kotlin/Int>>| = R|/prop| - public get(): R|@R|second/Anno|(i = Int(0).R|kotlin/Int.plus|(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.inner|)) second/Base<@R|second/Anno|(i = Int(1).R|kotlin/Int.plus|(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.inner|)) second/Base<@R|second/Anno|(i = Int(2).R|kotlin/Int.plus|(this@R|second/MyClass.Companion|.R|second/MyClass.Companion.inner|)) kotlin/Int>>| - - public abstract interface Base : R|kotlin/Any| { - } - - public final companion object Companion : R|kotlin/Any| { - private constructor(): R|second/MyClass.Companion| { - super() - } - - public final const val outer: R|kotlin/String| = String() - public get(): R|kotlin/String| - - public final const val inner: R|kotlin/Int| = Int(0) - public get(): R|kotlin/Int| - - } - - } diff --git a/compiler/testData/diagnostics/tests/delegation/clashes/nestedNameClashAndAnnotations.reversed.kt b/compiler/testData/diagnostics/tests/delegation/clashes/nestedNameClashAndAnnotations.reversed.kt deleted file mode 100644 index 8a74b305dc5..00000000000 --- a/compiler/testData/diagnostics/tests/delegation/clashes/nestedNameClashAndAnnotations.reversed.kt +++ /dev/null @@ -1,22 +0,0 @@ -// FIR_IDENTICAL -// FIR_DUMP -package second - -@Target(AnnotationTarget.TYPE) -annotation class Anno(val i: Int) - -interface Base { - fun foo() {} -} - -const val outer = 0 -const val inner = "" - -class MyClass(val prop: @Anno(0 + inner) second.Base<@Anno(1 + inner) second.Base<@Anno(2 + inner) Int>>): @Anno(3 + outer) Base<@Anno(4 + outer) Base<@Anno(5 + outer) Int>> by prop { - interface Base - - companion object { - const val outer = "" - const val inner = 0 - } -}