diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirContractsLazyResolver.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirContractsLazyResolver.kt index 47aa85f9816..48b1d31df9b 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirContractsLazyResolver.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirContractsLazyResolver.kt @@ -18,11 +18,9 @@ import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.contracts.FirRawContractDescription import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.impl.FirPrimaryConstructor -import org.jetbrains.kotlin.fir.declarations.synthetic.FirSyntheticProperty import org.jetbrains.kotlin.fir.resolve.ScopeSession import org.jetbrains.kotlin.fir.resolve.transformers.body.resolve.FirResolveContextCollector import org.jetbrains.kotlin.fir.resolve.transformers.contracts.FirContractResolveTransformer -import org.jetbrains.kotlin.fir.symbols.lazyResolveToPhase import org.jetbrains.kotlin.fir.types.FirImplicitTypeRef internal object LLFirContractsLazyResolver : LLFirLazyResolver(FirResolvePhase.CONTRACTS) { @@ -56,20 +54,6 @@ private class LLFirContractsTargetResolver( ) { override val transformer = FirContractResolveTransformer(session, scopeSession) - override fun doResolveWithoutLock(target: FirElementWithResolveState): Boolean { - if (target is FirSyntheticProperty) { - target.getter.delegate.lazyResolveToPhase(resolverPhase) - - performCustomResolveUnderLock(target) { - // just update phase - } - - return true - } - - return super.doResolveWithoutLock(target) - } - override fun doLazyResolveUnderLock(target: FirElementWithResolveState) { when (target) { is FirPrimaryConstructor, is FirErrorPrimaryConstructor -> { diff --git a/analysis/low-level-api-fir/testData/lazyResolve/syntheticProperties/explicitReturnType.txt b/analysis/low-level-api-fir/testData/lazyResolve/syntheticProperties/explicitReturnType.txt index a1255eb6c6c..9d4f92d0899 100644 --- a/analysis/low-level-api-fir/testData/lazyResolve/syntheticProperties/explicitReturnType.txt +++ b/analysis/low-level-api-fir/testData/lazyResolve/syntheticProperties/explicitReturnType.txt @@ -1,5 +1,5 @@ RAW_FIR: -TARGET: public open override [ResolvedTo(STATUS)] val something: R|kotlin/String| +TARGET: public open override [ STATUS] val something: R|kotlin/String| public [ ResolvedTo(STATUS)] get(): R|kotlin/String| { LAZY_BLOCK } FILE: [ResolvedTo(IMPORTS)] Derived.kt @@ -13,7 +13,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt } IMPORTS: -TARGET: public open override [ResolvedTo(STATUS)] val something: R|kotlin/String| +TARGET: public open override [ STATUS] val something: R|kotlin/String| public [ ResolvedTo(STATUS)] get(): R|kotlin/String| { LAZY_BLOCK } FILE: [ResolvedTo(IMPORTS)] Derived.kt @@ -27,7 +27,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt } COMPILER_REQUIRED_ANNOTATIONS: -TARGET: public open override [ResolvedTo(STATUS)] val something: R|kotlin/String| +TARGET: public open override [ STATUS] val something: R|kotlin/String| public [ ResolvedTo(STATUS)] get(): R|kotlin/String| { LAZY_BLOCK } FILE: [ResolvedTo(IMPORTS)] Derived.kt @@ -41,7 +41,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt } COMPANION_GENERATION: -TARGET: public open override [ResolvedTo(STATUS)] val something: R|kotlin/String| +TARGET: public open override [ STATUS] val something: R|kotlin/String| public [ ResolvedTo(STATUS)] get(): R|kotlin/String| { LAZY_BLOCK } FILE: [ResolvedTo(IMPORTS)] Derived.kt @@ -55,7 +55,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt } SUPER_TYPES: -TARGET: public open override [ResolvedTo(STATUS)] val something: R|kotlin/String| +TARGET: public open override [ STATUS] val something: R|kotlin/String| public [ ResolvedTo(STATUS)] get(): R|kotlin/String| { LAZY_BLOCK } FILE: [ResolvedTo(IMPORTS)] Derived.kt @@ -69,7 +69,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt } TYPES: -TARGET: public open override [ResolvedTo(STATUS)] val something: R|kotlin/String| +TARGET: public open override [ STATUS] val something: R|kotlin/String| public [ ResolvedTo(STATUS)] get(): R|kotlin/String| { LAZY_BLOCK } FILE: [ResolvedTo(IMPORTS)] Derived.kt @@ -83,7 +83,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt } STATUS: -TARGET: public open override [ResolvedTo(STATUS)] val something: R|kotlin/String| +TARGET: public open override [ STATUS] val something: R|kotlin/String| public [ ResolvedTo(STATUS)] get(): R|kotlin/String| { LAZY_BLOCK } FILE: [ResolvedTo(IMPORTS)] Derived.kt @@ -97,7 +97,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt } EXPECT_ACTUAL_MATCHING: -TARGET: public open override [ResolvedTo(STATUS)] val something: R|kotlin/String| +TARGET: public open override [ STATUS] val something: R|kotlin/String| public [ ResolvedTo(STATUS)] get(): R|kotlin/String| { LAZY_BLOCK } FILE: [ResolvedTo(IMPORTS)] Derived.kt @@ -111,7 +111,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt } ARGUMENTS_OF_ANNOTATIONS: -TARGET: public open override [ResolvedTo(STATUS)] val something: R|kotlin/String| +TARGET: public open override [ STATUS] val something: R|kotlin/String| public [ ResolvedTo(STATUS)] get(): R|kotlin/String| { LAZY_BLOCK } FILE: [ResolvedTo(IMPORTS)] Derived.kt @@ -125,7 +125,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt } CONTRACTS: -TARGET: public open override [ResolvedTo(STATUS)] val something: R|kotlin/String| +TARGET: public open override [ STATUS] val something: R|kotlin/String| public [ ResolvedTo(STATUS)] get(): R|kotlin/String| { LAZY_BLOCK } FILE: [ResolvedTo(IMPORTS)] Derived.kt @@ -139,7 +139,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt } IMPLICIT_TYPES_BODY_RESOLVE: -TARGET: public open override [ResolvedTo(STATUS)] val something: R|kotlin/String| +TARGET: public open override [ STATUS] val something: R|kotlin/String| public [ ResolvedTo(STATUS)] get(): R|kotlin/String| { LAZY_BLOCK } FILE: [ResolvedTo(IMPORTS)] Derived.kt @@ -153,7 +153,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt } ANNOTATIONS_ARGUMENTS_MAPPING: -TARGET: public open override [ResolvedTo(STATUS)] val something: R|kotlin/String| +TARGET: public open override [ STATUS] val something: R|kotlin/String| public [ ResolvedTo(STATUS)] get(): R|kotlin/String| { LAZY_BLOCK } FILE: [ResolvedTo(IMPORTS)] Derived.kt @@ -167,7 +167,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt } BODY_RESOLVE: -TARGET: public open override [ResolvedTo(STATUS)] val something: R|kotlin/String| +TARGET: public open override [ STATUS] val something: R|kotlin/String| public [ ResolvedTo(STATUS)] get(): R|kotlin/String| { LAZY_BLOCK } FILE: [ResolvedTo(IMPORTS)] Derived.kt diff --git a/analysis/low-level-api-fir/testData/lazyResolve/syntheticProperties/explicitReturnTypeAndAnnotations.txt b/analysis/low-level-api-fir/testData/lazyResolve/syntheticProperties/explicitReturnTypeAndAnnotations.txt index 2346201dd51..60c5f92a399 100644 --- a/analysis/low-level-api-fir/testData/lazyResolve/syntheticProperties/explicitReturnTypeAndAnnotations.txt +++ b/analysis/low-level-api-fir/testData/lazyResolve/syntheticProperties/explicitReturnTypeAndAnnotations.txt @@ -1,5 +1,5 @@ RAW_FIR: -TARGET: public open override [ResolvedTo(STATUS)] val something: R|@R|Anno|((String(type: ), prop#)) kotlin/String| +TARGET: public open override [ STATUS] val something: R|@R|Anno|((String(type: ), prop#)) kotlin/String| @R|Anno|[Types](LAZY_EXPRESSION) public [ ResolvedTo(STATUS)] get(): R|@R|Anno|((String(type: ), prop#)) kotlin/String| { LAZY_BLOCK } FILE: [ResolvedTo(IMPORTS)] Derived.kt @@ -24,7 +24,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt public? [ResolvedTo(RAW_FIR)] get(): IMPORTS: -TARGET: public open override [ResolvedTo(STATUS)] val something: R|@R|Anno|((String(type: ), prop#)) kotlin/String| +TARGET: public open override [ STATUS] val something: R|@R|Anno|((String(type: ), prop#)) kotlin/String| @R|Anno|[Types](LAZY_EXPRESSION) public [ ResolvedTo(STATUS)] get(): R|@R|Anno|((String(type: ), prop#)) kotlin/String| { LAZY_BLOCK } FILE: [ResolvedTo(IMPORTS)] Derived.kt @@ -49,7 +49,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt public? [ResolvedTo(RAW_FIR)] get(): COMPILER_REQUIRED_ANNOTATIONS: -TARGET: public open override [ResolvedTo(STATUS)] val something: R|@R|Anno|((String(type: ), prop#)) kotlin/String| +TARGET: public open override [ STATUS] val something: R|@R|Anno|((String(type: ), prop#)) kotlin/String| @R|Anno|[Types](LAZY_EXPRESSION) public [ ResolvedTo(STATUS)] get(): R|@R|Anno|((String(type: ), prop#)) kotlin/String| { LAZY_BLOCK } FILE: [ResolvedTo(IMPORTS)] Derived.kt @@ -74,7 +74,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt public? [ResolvedTo(RAW_FIR)] get(): COMPANION_GENERATION: -TARGET: public open override [ResolvedTo(STATUS)] val something: R|@R|Anno|((String(type: ), prop#)) kotlin/String| +TARGET: public open override [ STATUS] val something: R|@R|Anno|((String(type: ), prop#)) kotlin/String| @R|Anno|[Types](LAZY_EXPRESSION) public [ ResolvedTo(STATUS)] get(): R|@R|Anno|((String(type: ), prop#)) kotlin/String| { LAZY_BLOCK } FILE: [ResolvedTo(IMPORTS)] Derived.kt @@ -99,7 +99,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt public? [ResolvedTo(RAW_FIR)] get(): SUPER_TYPES: -TARGET: public open override [ResolvedTo(STATUS)] val something: R|@R|Anno|((String(type: ), prop#)) kotlin/String| +TARGET: public open override [ STATUS] val something: R|@R|Anno|((String(type: ), prop#)) kotlin/String| @R|Anno|[Types](LAZY_EXPRESSION) public [ ResolvedTo(STATUS)] get(): R|@R|Anno|((String(type: ), prop#)) kotlin/String| { LAZY_BLOCK } FILE: [ResolvedTo(IMPORTS)] Derived.kt @@ -124,7 +124,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt public? [ResolvedTo(RAW_FIR)] get(): TYPES: -TARGET: public open override [ResolvedTo(STATUS)] val something: R|@R|Anno|((String(type: ), prop#)) kotlin/String| +TARGET: public open override [ STATUS] val something: R|@R|Anno|((String(type: ), prop#)) kotlin/String| @R|Anno|[Types](LAZY_EXPRESSION) public [ ResolvedTo(STATUS)] get(): R|@R|Anno|((String(type: ), prop#)) kotlin/String| { LAZY_BLOCK } FILE: [ResolvedTo(IMPORTS)] Derived.kt @@ -149,7 +149,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt public? [ResolvedTo(RAW_FIR)] get(): STATUS: -TARGET: public open override [ResolvedTo(STATUS)] val something: R|@R|Anno|((String(type: ), prop#)) kotlin/String| +TARGET: public open override [ STATUS] val something: R|@R|Anno|((String(type: ), prop#)) kotlin/String| @R|Anno|[Types](LAZY_EXPRESSION) public [ ResolvedTo(STATUS)] get(): R|@R|Anno|((String(type: ), prop#)) kotlin/String| { LAZY_BLOCK } FILE: [ResolvedTo(IMPORTS)] Derived.kt @@ -174,7 +174,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt public? [ResolvedTo(RAW_FIR)] get(): EXPECT_ACTUAL_MATCHING: -TARGET: public open override [ResolvedTo(STATUS)] val something: R|@R|Anno|((String(type: ), prop#)) kotlin/String| +TARGET: public open override [ STATUS] val something: R|@R|Anno|((String(type: ), prop#)) kotlin/String| @R|Anno|[Types](LAZY_EXPRESSION) public [ ResolvedTo(STATUS)] get(): R|@R|Anno|((String(type: ), prop#)) kotlin/String| { LAZY_BLOCK } FILE: [ResolvedTo(IMPORTS)] Derived.kt @@ -199,7 +199,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt public? [ResolvedTo(RAW_FIR)] get(): ARGUMENTS_OF_ANNOTATIONS: -TARGET: public open override [ResolvedTo(STATUS)] val something: R|@R|Anno|((String(type: ), prop#)) kotlin/String| +TARGET: public open override [ STATUS] val something: R|@R|Anno|((String(type: ), prop#)) kotlin/String| @R|Anno|[Types](LAZY_EXPRESSION) public [ ResolvedTo(STATUS)] get(): R|@R|Anno|((String(type: ), prop#)) kotlin/String| { LAZY_BLOCK } FILE: [ResolvedTo(IMPORTS)] Derived.kt @@ -224,7 +224,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt public? [ResolvedTo(RAW_FIR)] get(): CONTRACTS: -TARGET: public open override [ResolvedTo(STATUS)] val something: R|@R|Anno|((String(type: ), prop#)) kotlin/String| +TARGET: public open override [ STATUS] val something: R|@R|Anno|((String(type: ), prop#)) kotlin/String| @R|Anno|[Types](LAZY_EXPRESSION) public [ ResolvedTo(STATUS)] get(): R|@R|Anno|((String(type: ), prop#)) kotlin/String| { LAZY_BLOCK } FILE: [ResolvedTo(IMPORTS)] Derived.kt @@ -249,7 +249,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt public? [ResolvedTo(RAW_FIR)] get(): IMPLICIT_TYPES_BODY_RESOLVE: -TARGET: public open override [ResolvedTo(STATUS)] val something: R|@R|Anno|((String(type: ), prop#)) kotlin/String| +TARGET: public open override [ STATUS] val something: R|@R|Anno|((String(type: ), prop#)) kotlin/String| @R|Anno|[Types](LAZY_EXPRESSION) public [ ResolvedTo(STATUS)] get(): R|@R|Anno|((String(type: ), prop#)) kotlin/String| { LAZY_BLOCK } FILE: [ResolvedTo(IMPORTS)] Derived.kt @@ -274,7 +274,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt public? [ResolvedTo(RAW_FIR)] get(): ANNOTATIONS_ARGUMENTS_MAPPING: -TARGET: public open override [ResolvedTo(STATUS)] val something: R|@R|Anno|((String(type: ), prop#)) kotlin/String| +TARGET: public open override [ STATUS] val something: R|@R|Anno|((String(type: ), prop#)) kotlin/String| @R|Anno|[Types](LAZY_EXPRESSION) public [ ResolvedTo(STATUS)] get(): R|@R|Anno|((String(type: ), prop#)) kotlin/String| { LAZY_BLOCK } FILE: [ResolvedTo(IMPORTS)] Derived.kt @@ -299,7 +299,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt public? [ResolvedTo(RAW_FIR)] get(): BODY_RESOLVE: -TARGET: public open override [ResolvedTo(STATUS)] val something: R|@R|Anno|((String(type: ), prop#)) kotlin/String| +TARGET: public open override [ STATUS] val something: R|@R|Anno|((String(type: ), prop#)) kotlin/String| @R|Anno|[Types](LAZY_EXPRESSION) public [ ResolvedTo(STATUS)] get(): R|@R|Anno|((String(type: ), prop#)) kotlin/String| { LAZY_BLOCK } FILE: [ResolvedTo(IMPORTS)] Derived.kt diff --git a/analysis/low-level-api-fir/testData/lazyResolve/syntheticProperties/implicitReturnType.txt b/analysis/low-level-api-fir/testData/lazyResolve/syntheticProperties/implicitReturnType.txt index 072a11e498c..65471578598 100644 --- a/analysis/low-level-api-fir/testData/lazyResolve/syntheticProperties/implicitReturnType.txt +++ b/analysis/low-level-api-fir/testData/lazyResolve/syntheticProperties/implicitReturnType.txt @@ -1,5 +1,5 @@ RAW_FIR: -TARGET: public open override [ResolvedTo(STATUS)] val something: +TARGET: public open override [ STATUS] val something: public [ ResolvedTo(STATUS)] get(): { LAZY_BLOCK } FILE: [ResolvedTo(IMPORTS)] Derived.kt @@ -13,7 +13,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt } IMPORTS: -TARGET: public open override [ResolvedTo(STATUS)] val something: +TARGET: public open override [ STATUS] val something: public [ ResolvedTo(STATUS)] get(): { LAZY_BLOCK } FILE: [ResolvedTo(IMPORTS)] Derived.kt @@ -27,7 +27,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt } COMPILER_REQUIRED_ANNOTATIONS: -TARGET: public open override [ResolvedTo(STATUS)] val something: +TARGET: public open override [ STATUS] val something: public [ ResolvedTo(STATUS)] get(): { LAZY_BLOCK } FILE: [ResolvedTo(IMPORTS)] Derived.kt @@ -41,7 +41,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt } COMPANION_GENERATION: -TARGET: public open override [ResolvedTo(STATUS)] val something: +TARGET: public open override [ STATUS] val something: public [ ResolvedTo(STATUS)] get(): { LAZY_BLOCK } FILE: [ResolvedTo(IMPORTS)] Derived.kt @@ -55,7 +55,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt } SUPER_TYPES: -TARGET: public open override [ResolvedTo(STATUS)] val something: +TARGET: public open override [ STATUS] val something: public [ ResolvedTo(STATUS)] get(): { LAZY_BLOCK } FILE: [ResolvedTo(IMPORTS)] Derived.kt @@ -69,7 +69,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt } TYPES: -TARGET: public open override [ResolvedTo(STATUS)] val something: +TARGET: public open override [ STATUS] val something: public [ ResolvedTo(STATUS)] get(): { LAZY_BLOCK } FILE: [ResolvedTo(IMPORTS)] Derived.kt @@ -83,7 +83,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt } STATUS: -TARGET: public open override [ResolvedTo(STATUS)] val something: +TARGET: public open override [ STATUS] val something: public [ ResolvedTo(STATUS)] get(): { LAZY_BLOCK } FILE: [ResolvedTo(IMPORTS)] Derived.kt @@ -97,7 +97,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt } EXPECT_ACTUAL_MATCHING: -TARGET: public open override [ResolvedTo(STATUS)] val something: +TARGET: public open override [ STATUS] val something: public [ ResolvedTo(STATUS)] get(): { LAZY_BLOCK } FILE: [ResolvedTo(IMPORTS)] Derived.kt @@ -111,7 +111,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt } ARGUMENTS_OF_ANNOTATIONS: -TARGET: public open override [ResolvedTo(STATUS)] val something: +TARGET: public open override [ STATUS] val something: public [ ResolvedTo(STATUS)] get(): { LAZY_BLOCK } FILE: [ResolvedTo(IMPORTS)] Derived.kt @@ -125,7 +125,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt } CONTRACTS: -TARGET: public open override [ResolvedTo(STATUS)] val something: +TARGET: public open override [ STATUS] val something: public [ ResolvedTo(STATUS)] get(): { LAZY_BLOCK } FILE: [ResolvedTo(IMPORTS)] Derived.kt @@ -139,7 +139,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt } IMPLICIT_TYPES_BODY_RESOLVE: -TARGET: public open override [ResolvedTo(STATUS)] val something: +TARGET: public open override [ STATUS] val something: public [ ResolvedTo(STATUS)] get(): { LAZY_BLOCK } FILE: [ResolvedTo(IMPORTS)] Derived.kt @@ -153,7 +153,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt } ANNOTATIONS_ARGUMENTS_MAPPING: -TARGET: public open override [ResolvedTo(STATUS)] val something: +TARGET: public open override [ STATUS] val something: public [ ResolvedTo(STATUS)] get(): { LAZY_BLOCK } FILE: [ResolvedTo(IMPORTS)] Derived.kt @@ -167,7 +167,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt } BODY_RESOLVE: -TARGET: public open override [ResolvedTo(STATUS)] val something: +TARGET: public open override [ STATUS] val something: public [ ResolvedTo(STATUS)] get(): { LAZY_BLOCK } FILE: [ResolvedTo(IMPORTS)] Derived.kt diff --git a/analysis/low-level-api-fir/testData/lazyResolve/syntheticProperties/implicitReturnTypeAndAnnotations.txt b/analysis/low-level-api-fir/testData/lazyResolve/syntheticProperties/implicitReturnTypeAndAnnotations.txt index 382002f2dc5..da00d68767d 100644 --- a/analysis/low-level-api-fir/testData/lazyResolve/syntheticProperties/implicitReturnTypeAndAnnotations.txt +++ b/analysis/low-level-api-fir/testData/lazyResolve/syntheticProperties/implicitReturnTypeAndAnnotations.txt @@ -1,5 +1,5 @@ RAW_FIR: -TARGET: public open override [ResolvedTo(STATUS)] val something: +TARGET: public open override [ STATUS] val something: @R|Anno|[Types](LAZY_EXPRESSION) public [ ResolvedTo(STATUS)] get(): { LAZY_BLOCK } FILE: [ResolvedTo(IMPORTS)] Derived.kt @@ -26,7 +26,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt public? [ResolvedTo(RAW_FIR)] get(): IMPORTS: -TARGET: public open override [ResolvedTo(STATUS)] val something: +TARGET: public open override [ STATUS] val something: @R|Anno|[Types](LAZY_EXPRESSION) public [ ResolvedTo(STATUS)] get(): { LAZY_BLOCK } FILE: [ResolvedTo(IMPORTS)] Derived.kt @@ -53,7 +53,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt public? [ResolvedTo(RAW_FIR)] get(): COMPILER_REQUIRED_ANNOTATIONS: -TARGET: public open override [ResolvedTo(STATUS)] val something: +TARGET: public open override [ STATUS] val something: @R|Anno|[Types](LAZY_EXPRESSION) public [ ResolvedTo(STATUS)] get(): { LAZY_BLOCK } FILE: [ResolvedTo(IMPORTS)] Derived.kt @@ -80,7 +80,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt public? [ResolvedTo(RAW_FIR)] get(): COMPANION_GENERATION: -TARGET: public open override [ResolvedTo(STATUS)] val something: +TARGET: public open override [ STATUS] val something: @R|Anno|[Types](LAZY_EXPRESSION) public [ ResolvedTo(STATUS)] get(): { LAZY_BLOCK } FILE: [ResolvedTo(IMPORTS)] Derived.kt @@ -107,7 +107,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt public? [ResolvedTo(RAW_FIR)] get(): SUPER_TYPES: -TARGET: public open override [ResolvedTo(STATUS)] val something: +TARGET: public open override [ STATUS] val something: @R|Anno|[Types](LAZY_EXPRESSION) public [ ResolvedTo(STATUS)] get(): { LAZY_BLOCK } FILE: [ResolvedTo(IMPORTS)] Derived.kt @@ -134,7 +134,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt public? [ResolvedTo(RAW_FIR)] get(): TYPES: -TARGET: public open override [ResolvedTo(STATUS)] val something: +TARGET: public open override [ STATUS] val something: @R|Anno|[Types](LAZY_EXPRESSION) public [ ResolvedTo(STATUS)] get(): { LAZY_BLOCK } FILE: [ResolvedTo(IMPORTS)] Derived.kt @@ -161,7 +161,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt public? [ResolvedTo(RAW_FIR)] get(): STATUS: -TARGET: public open override [ResolvedTo(STATUS)] val something: +TARGET: public open override [ STATUS] val something: @R|Anno|[Types](LAZY_EXPRESSION) public [ ResolvedTo(STATUS)] get(): { LAZY_BLOCK } FILE: [ResolvedTo(IMPORTS)] Derived.kt @@ -188,7 +188,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt public? [ResolvedTo(RAW_FIR)] get(): EXPECT_ACTUAL_MATCHING: -TARGET: public open override [ResolvedTo(STATUS)] val something: +TARGET: public open override [ STATUS] val something: @R|Anno|[Types](LAZY_EXPRESSION) public [ ResolvedTo(STATUS)] get(): { LAZY_BLOCK } FILE: [ResolvedTo(IMPORTS)] Derived.kt @@ -215,7 +215,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt public? [ResolvedTo(RAW_FIR)] get(): ARGUMENTS_OF_ANNOTATIONS: -TARGET: public open override [ResolvedTo(STATUS)] val something: +TARGET: public open override [ STATUS] val something: @R|Anno|[Types](LAZY_EXPRESSION) public [ ResolvedTo(STATUS)] get(): { LAZY_BLOCK } FILE: [ResolvedTo(IMPORTS)] Derived.kt @@ -242,7 +242,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt public? [ResolvedTo(RAW_FIR)] get(): CONTRACTS: -TARGET: public open override [ResolvedTo(STATUS)] val something: +TARGET: public open override [ STATUS] val something: @R|Anno|[Types](LAZY_EXPRESSION) public [ ResolvedTo(STATUS)] get(): { LAZY_BLOCK } FILE: [ResolvedTo(IMPORTS)] Derived.kt @@ -269,7 +269,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt public? [ResolvedTo(RAW_FIR)] get(): IMPLICIT_TYPES_BODY_RESOLVE: -TARGET: public open override [ResolvedTo(STATUS)] val something: +TARGET: public open override [ STATUS] val something: @R|Anno|[Types](LAZY_EXPRESSION) public [ ResolvedTo(STATUS)] get(): { LAZY_BLOCK } FILE: [ResolvedTo(IMPORTS)] Derived.kt @@ -296,7 +296,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt public? [ResolvedTo(RAW_FIR)] get(): ANNOTATIONS_ARGUMENTS_MAPPING: -TARGET: public open override [ResolvedTo(STATUS)] val something: +TARGET: public open override [ STATUS] val something: @R|Anno|[Types](LAZY_EXPRESSION) public [ ResolvedTo(STATUS)] get(): { LAZY_BLOCK } FILE: [ResolvedTo(IMPORTS)] Derived.kt @@ -323,7 +323,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt public? [ResolvedTo(RAW_FIR)] get(): BODY_RESOLVE: -TARGET: public open override [ResolvedTo(STATUS)] val something: +TARGET: public open override [ STATUS] val something: @R|Anno|[Types](LAZY_EXPRESSION) public [ ResolvedTo(STATUS)] get(): { LAZY_BLOCK } FILE: [ResolvedTo(IMPORTS)] Derived.kt diff --git a/analysis/low-level-api-fir/testData/lazyResolve/syntheticProperties/secondGenerationOverride.txt b/analysis/low-level-api-fir/testData/lazyResolve/syntheticProperties/secondGenerationOverride.txt index 8dcfcd4a200..5311f095919 100644 --- a/analysis/low-level-api-fir/testData/lazyResolve/syntheticProperties/secondGenerationOverride.txt +++ b/analysis/low-level-api-fir/testData/lazyResolve/syntheticProperties/secondGenerationOverride.txt @@ -1,5 +1,5 @@ RAW_FIR: -TARGET: public open override [ResolvedTo(STATUS)] var something: R|kotlin/String| +TARGET: public open override [ STATUS] var something: R|kotlin/String| @R|Anno|[Types](LAZY_EXPRESSION) public [ ResolvedTo(STATUS)] get(): R|kotlin/String| { LAZY_BLOCK } @R|Anno|[Types](LAZY_EXPRESSION) public [ ResolvedTo(STATUS)] set([ResolvedTo(STATUS)] s: R|@R|Anno|((String(setter type ), propertyFromSetter#)) kotlin/String|): { LAZY_BLOCK } @@ -43,7 +43,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt public? [ResolvedTo(RAW_FIR)] get(): IMPORTS: -TARGET: public open override [ResolvedTo(STATUS)] var something: R|kotlin/String| +TARGET: public open override [ STATUS] var something: R|kotlin/String| @R|Anno|[Types](LAZY_EXPRESSION) public [ ResolvedTo(STATUS)] get(): R|kotlin/String| { LAZY_BLOCK } @R|Anno|[Types](LAZY_EXPRESSION) public [ ResolvedTo(STATUS)] set([ResolvedTo(STATUS)] s: R|@R|Anno|((String(setter type ), propertyFromSetter#)) kotlin/String|): { LAZY_BLOCK } @@ -87,7 +87,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt public? [ResolvedTo(RAW_FIR)] get(): COMPILER_REQUIRED_ANNOTATIONS: -TARGET: public open override [ResolvedTo(STATUS)] var something: R|kotlin/String| +TARGET: public open override [ STATUS] var something: R|kotlin/String| @R|Anno|[Types](LAZY_EXPRESSION) public [ ResolvedTo(STATUS)] get(): R|kotlin/String| { LAZY_BLOCK } @R|Anno|[Types](LAZY_EXPRESSION) public [ ResolvedTo(STATUS)] set([ResolvedTo(STATUS)] s: R|@R|Anno|((String(setter type ), propertyFromSetter#)) kotlin/String|): { LAZY_BLOCK } @@ -131,7 +131,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt public? [ResolvedTo(RAW_FIR)] get(): COMPANION_GENERATION: -TARGET: public open override [ResolvedTo(STATUS)] var something: R|kotlin/String| +TARGET: public open override [ STATUS] var something: R|kotlin/String| @R|Anno|[Types](LAZY_EXPRESSION) public [ ResolvedTo(STATUS)] get(): R|kotlin/String| { LAZY_BLOCK } @R|Anno|[Types](LAZY_EXPRESSION) public [ ResolvedTo(STATUS)] set([ResolvedTo(STATUS)] s: R|@R|Anno|((String(setter type ), propertyFromSetter#)) kotlin/String|): { LAZY_BLOCK } @@ -175,7 +175,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt public? [ResolvedTo(RAW_FIR)] get(): SUPER_TYPES: -TARGET: public open override [ResolvedTo(STATUS)] var something: R|kotlin/String| +TARGET: public open override [ STATUS] var something: R|kotlin/String| @R|Anno|[Types](LAZY_EXPRESSION) public [ ResolvedTo(STATUS)] get(): R|kotlin/String| { LAZY_BLOCK } @R|Anno|[Types](LAZY_EXPRESSION) public [ ResolvedTo(STATUS)] set([ResolvedTo(STATUS)] s: R|@R|Anno|((String(setter type ), propertyFromSetter#)) kotlin/String|): { LAZY_BLOCK } @@ -219,7 +219,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt public? [ResolvedTo(RAW_FIR)] get(): TYPES: -TARGET: public open override [ResolvedTo(STATUS)] var something: R|kotlin/String| +TARGET: public open override [ STATUS] var something: R|kotlin/String| @R|Anno|[Types](LAZY_EXPRESSION) public [ ResolvedTo(STATUS)] get(): R|kotlin/String| { LAZY_BLOCK } @R|Anno|[Types](LAZY_EXPRESSION) public [ ResolvedTo(STATUS)] set([ResolvedTo(STATUS)] s: R|@R|Anno|((String(setter type ), propertyFromSetter#)) kotlin/String|): { LAZY_BLOCK } @@ -263,7 +263,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt public? [ResolvedTo(RAW_FIR)] get(): STATUS: -TARGET: public open override [ResolvedTo(STATUS)] var something: R|kotlin/String| +TARGET: public open override [ STATUS] var something: R|kotlin/String| @R|Anno|[Types](LAZY_EXPRESSION) public [ ResolvedTo(STATUS)] get(): R|kotlin/String| { LAZY_BLOCK } @R|Anno|[Types](LAZY_EXPRESSION) public [ ResolvedTo(STATUS)] set([ResolvedTo(STATUS)] s: R|@R|Anno|((String(setter type ), propertyFromSetter#)) kotlin/String|): { LAZY_BLOCK } @@ -307,7 +307,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt public? [ResolvedTo(RAW_FIR)] get(): EXPECT_ACTUAL_MATCHING: -TARGET: public open override [ResolvedTo(STATUS)] var something: R|kotlin/String| +TARGET: public open override [ STATUS] var something: R|kotlin/String| @R|Anno|[Types](LAZY_EXPRESSION) public [ ResolvedTo(STATUS)] get(): R|kotlin/String| { LAZY_BLOCK } @R|Anno|[Types](LAZY_EXPRESSION) public [ ResolvedTo(STATUS)] set([ResolvedTo(STATUS)] s: R|@R|Anno|((String(setter type ), propertyFromSetter#)) kotlin/String|): { LAZY_BLOCK } @@ -351,7 +351,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt public? [ResolvedTo(RAW_FIR)] get(): ARGUMENTS_OF_ANNOTATIONS: -TARGET: public open override [ResolvedTo(STATUS)] var something: R|kotlin/String| +TARGET: public open override [ STATUS] var something: R|kotlin/String| @R|Anno|[Types](LAZY_EXPRESSION) public [ ResolvedTo(STATUS)] get(): R|kotlin/String| { LAZY_BLOCK } @R|Anno|[Types](LAZY_EXPRESSION) public [ ResolvedTo(STATUS)] set([ResolvedTo(STATUS)] s: R|@R|Anno|((String(setter type ), propertyFromSetter#)) kotlin/String|): { LAZY_BLOCK } @@ -395,7 +395,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt public? [ResolvedTo(RAW_FIR)] get(): CONTRACTS: -TARGET: public open override [ResolvedTo(STATUS)] var something: R|kotlin/String| +TARGET: public open override [ STATUS] var something: R|kotlin/String| @R|Anno|[Types](LAZY_EXPRESSION) public [ ResolvedTo(STATUS)] get(): R|kotlin/String| { LAZY_BLOCK } @R|Anno|[Types](LAZY_EXPRESSION) public [ ResolvedTo(STATUS)] set([ResolvedTo(STATUS)] s: R|@R|Anno|((String(setter type ), propertyFromSetter#)) kotlin/String|): { LAZY_BLOCK } @@ -439,7 +439,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt public? [ResolvedTo(RAW_FIR)] get(): IMPLICIT_TYPES_BODY_RESOLVE: -TARGET: public open override [ResolvedTo(STATUS)] var something: R|kotlin/String| +TARGET: public open override [ STATUS] var something: R|kotlin/String| @R|Anno|[Types](LAZY_EXPRESSION) public [ ResolvedTo(STATUS)] get(): R|kotlin/String| { LAZY_BLOCK } @R|Anno|[Types](LAZY_EXPRESSION) public [ ResolvedTo(STATUS)] set([ResolvedTo(STATUS)] s: R|@R|Anno|((String(setter type ), propertyFromSetter#)) kotlin/String|): { LAZY_BLOCK } @@ -483,7 +483,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt public? [ResolvedTo(RAW_FIR)] get(): ANNOTATIONS_ARGUMENTS_MAPPING: -TARGET: public open override [ResolvedTo(STATUS)] var something: R|kotlin/String| +TARGET: public open override [ STATUS] var something: R|kotlin/String| @R|Anno|[Types](LAZY_EXPRESSION) public [ ResolvedTo(STATUS)] get(): R|kotlin/String| { LAZY_BLOCK } @R|Anno|[Types](LAZY_EXPRESSION) public [ ResolvedTo(STATUS)] set([ResolvedTo(STATUS)] s: R|@R|Anno|((String(setter type ), propertyFromSetter#)) kotlin/String|): { LAZY_BLOCK } @@ -527,7 +527,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt public? [ResolvedTo(RAW_FIR)] get(): BODY_RESOLVE: -TARGET: public open override [ResolvedTo(STATUS)] var something: R|kotlin/String| +TARGET: public open override [ STATUS] var something: R|kotlin/String| @R|Anno|[Types](LAZY_EXPRESSION) public [ ResolvedTo(STATUS)] get(): R|kotlin/String| { LAZY_BLOCK } @R|Anno|[Types](LAZY_EXPRESSION) public [ ResolvedTo(STATUS)] set([ResolvedTo(STATUS)] s: R|@R|Anno|((String(setter type ), propertyFromSetter#)) kotlin/String|): { LAZY_BLOCK } diff --git a/analysis/low-level-api-fir/testData/lazyResolve/syntheticProperties/setterAndExplicitReturnType.txt b/analysis/low-level-api-fir/testData/lazyResolve/syntheticProperties/setterAndExplicitReturnType.txt index d1cfafccd00..698d68b2f8e 100644 --- a/analysis/low-level-api-fir/testData/lazyResolve/syntheticProperties/setterAndExplicitReturnType.txt +++ b/analysis/low-level-api-fir/testData/lazyResolve/syntheticProperties/setterAndExplicitReturnType.txt @@ -1,5 +1,5 @@ RAW_FIR: -TARGET: public open override [ResolvedTo(STATUS)] var something: R|kotlin/String| +TARGET: public open override [ STATUS] var something: R|kotlin/String| public [ ResolvedTo(STATUS)] get(): R|kotlin/String| { LAZY_BLOCK } public [ ResolvedTo(STATUS)] set([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| { LAZY_BLOCK } @@ -16,7 +16,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt } IMPORTS: -TARGET: public open override [ResolvedTo(STATUS)] var something: R|kotlin/String| +TARGET: public open override [ STATUS] var something: R|kotlin/String| public [ ResolvedTo(STATUS)] get(): R|kotlin/String| { LAZY_BLOCK } public [ ResolvedTo(STATUS)] set([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| { LAZY_BLOCK } @@ -33,7 +33,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt } COMPILER_REQUIRED_ANNOTATIONS: -TARGET: public open override [ResolvedTo(STATUS)] var something: R|kotlin/String| +TARGET: public open override [ STATUS] var something: R|kotlin/String| public [ ResolvedTo(STATUS)] get(): R|kotlin/String| { LAZY_BLOCK } public [ ResolvedTo(STATUS)] set([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| { LAZY_BLOCK } @@ -50,7 +50,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt } COMPANION_GENERATION: -TARGET: public open override [ResolvedTo(STATUS)] var something: R|kotlin/String| +TARGET: public open override [ STATUS] var something: R|kotlin/String| public [ ResolvedTo(STATUS)] get(): R|kotlin/String| { LAZY_BLOCK } public [ ResolvedTo(STATUS)] set([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| { LAZY_BLOCK } @@ -67,7 +67,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt } SUPER_TYPES: -TARGET: public open override [ResolvedTo(STATUS)] var something: R|kotlin/String| +TARGET: public open override [ STATUS] var something: R|kotlin/String| public [ ResolvedTo(STATUS)] get(): R|kotlin/String| { LAZY_BLOCK } public [ ResolvedTo(STATUS)] set([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| { LAZY_BLOCK } @@ -84,7 +84,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt } TYPES: -TARGET: public open override [ResolvedTo(STATUS)] var something: R|kotlin/String| +TARGET: public open override [ STATUS] var something: R|kotlin/String| public [ ResolvedTo(STATUS)] get(): R|kotlin/String| { LAZY_BLOCK } public [ ResolvedTo(STATUS)] set([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| { LAZY_BLOCK } @@ -101,7 +101,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt } STATUS: -TARGET: public open override [ResolvedTo(STATUS)] var something: R|kotlin/String| +TARGET: public open override [ STATUS] var something: R|kotlin/String| public [ ResolvedTo(STATUS)] get(): R|kotlin/String| { LAZY_BLOCK } public [ ResolvedTo(STATUS)] set([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| { LAZY_BLOCK } @@ -118,7 +118,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt } EXPECT_ACTUAL_MATCHING: -TARGET: public open override [ResolvedTo(STATUS)] var something: R|kotlin/String| +TARGET: public open override [ STATUS] var something: R|kotlin/String| public [ ResolvedTo(STATUS)] get(): R|kotlin/String| { LAZY_BLOCK } public [ ResolvedTo(STATUS)] set([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| { LAZY_BLOCK } @@ -135,7 +135,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt } ARGUMENTS_OF_ANNOTATIONS: -TARGET: public open override [ResolvedTo(STATUS)] var something: R|kotlin/String| +TARGET: public open override [ STATUS] var something: R|kotlin/String| public [ ResolvedTo(STATUS)] get(): R|kotlin/String| { LAZY_BLOCK } public [ ResolvedTo(STATUS)] set([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| { LAZY_BLOCK } @@ -152,7 +152,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt } CONTRACTS: -TARGET: public open override [ResolvedTo(STATUS)] var something: R|kotlin/String| +TARGET: public open override [ STATUS] var something: R|kotlin/String| public [ ResolvedTo(STATUS)] get(): R|kotlin/String| { LAZY_BLOCK } public [ ResolvedTo(STATUS)] set([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| { LAZY_BLOCK } @@ -169,7 +169,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt } IMPLICIT_TYPES_BODY_RESOLVE: -TARGET: public open override [ResolvedTo(STATUS)] var something: R|kotlin/String| +TARGET: public open override [ STATUS] var something: R|kotlin/String| public [ ResolvedTo(STATUS)] get(): R|kotlin/String| { LAZY_BLOCK } public [ ResolvedTo(STATUS)] set([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| { LAZY_BLOCK } @@ -186,7 +186,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt } ANNOTATIONS_ARGUMENTS_MAPPING: -TARGET: public open override [ResolvedTo(STATUS)] var something: R|kotlin/String| +TARGET: public open override [ STATUS] var something: R|kotlin/String| public [ ResolvedTo(STATUS)] get(): R|kotlin/String| { LAZY_BLOCK } public [ ResolvedTo(STATUS)] set([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| { LAZY_BLOCK } @@ -203,7 +203,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt } BODY_RESOLVE: -TARGET: public open override [ResolvedTo(STATUS)] var something: R|kotlin/String| +TARGET: public open override [ STATUS] var something: R|kotlin/String| public [ ResolvedTo(STATUS)] get(): R|kotlin/String| { LAZY_BLOCK } public [ ResolvedTo(STATUS)] set([ResolvedTo(STATUS)] s: R|kotlin/String|): R|kotlin/Unit| { LAZY_BLOCK } diff --git a/analysis/low-level-api-fir/testData/lazyResolve/syntheticProperties/setterAndExplicitReturnTypeAndAnnotations.txt b/analysis/low-level-api-fir/testData/lazyResolve/syntheticProperties/setterAndExplicitReturnTypeAndAnnotations.txt index 0cf9fd97e63..1b7a33e1ab8 100644 --- a/analysis/low-level-api-fir/testData/lazyResolve/syntheticProperties/setterAndExplicitReturnTypeAndAnnotations.txt +++ b/analysis/low-level-api-fir/testData/lazyResolve/syntheticProperties/setterAndExplicitReturnTypeAndAnnotations.txt @@ -1,5 +1,5 @@ RAW_FIR: -TARGET: public open override [ResolvedTo(STATUS)] var something: R|kotlin/String| +TARGET: public open override [ STATUS] var something: R|kotlin/String| @R|Anno|[Types](LAZY_EXPRESSION) public [ ResolvedTo(STATUS)] get(): R|kotlin/String| { LAZY_BLOCK } @R|Anno|[Types](LAZY_EXPRESSION) public [ ResolvedTo(STATUS)] set([ResolvedTo(STATUS)] s: R|@R|Anno|((String(setter type ), propertyFromSetter#)) kotlin/String|): R|kotlin/Unit| { LAZY_BLOCK } @@ -33,7 +33,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt public? [ResolvedTo(RAW_FIR)] get(): IMPORTS: -TARGET: public open override [ResolvedTo(STATUS)] var something: R|kotlin/String| +TARGET: public open override [ STATUS] var something: R|kotlin/String| @R|Anno|[Types](LAZY_EXPRESSION) public [ ResolvedTo(STATUS)] get(): R|kotlin/String| { LAZY_BLOCK } @R|Anno|[Types](LAZY_EXPRESSION) public [ ResolvedTo(STATUS)] set([ResolvedTo(STATUS)] s: R|@R|Anno|((String(setter type ), propertyFromSetter#)) kotlin/String|): R|kotlin/Unit| { LAZY_BLOCK } @@ -67,7 +67,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt public? [ResolvedTo(RAW_FIR)] get(): COMPILER_REQUIRED_ANNOTATIONS: -TARGET: public open override [ResolvedTo(STATUS)] var something: R|kotlin/String| +TARGET: public open override [ STATUS] var something: R|kotlin/String| @R|Anno|[Types](LAZY_EXPRESSION) public [ ResolvedTo(STATUS)] get(): R|kotlin/String| { LAZY_BLOCK } @R|Anno|[Types](LAZY_EXPRESSION) public [ ResolvedTo(STATUS)] set([ResolvedTo(STATUS)] s: R|@R|Anno|((String(setter type ), propertyFromSetter#)) kotlin/String|): R|kotlin/Unit| { LAZY_BLOCK } @@ -101,7 +101,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt public? [ResolvedTo(RAW_FIR)] get(): COMPANION_GENERATION: -TARGET: public open override [ResolvedTo(STATUS)] var something: R|kotlin/String| +TARGET: public open override [ STATUS] var something: R|kotlin/String| @R|Anno|[Types](LAZY_EXPRESSION) public [ ResolvedTo(STATUS)] get(): R|kotlin/String| { LAZY_BLOCK } @R|Anno|[Types](LAZY_EXPRESSION) public [ ResolvedTo(STATUS)] set([ResolvedTo(STATUS)] s: R|@R|Anno|((String(setter type ), propertyFromSetter#)) kotlin/String|): R|kotlin/Unit| { LAZY_BLOCK } @@ -135,7 +135,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt public? [ResolvedTo(RAW_FIR)] get(): SUPER_TYPES: -TARGET: public open override [ResolvedTo(STATUS)] var something: R|kotlin/String| +TARGET: public open override [ STATUS] var something: R|kotlin/String| @R|Anno|[Types](LAZY_EXPRESSION) public [ ResolvedTo(STATUS)] get(): R|kotlin/String| { LAZY_BLOCK } @R|Anno|[Types](LAZY_EXPRESSION) public [ ResolvedTo(STATUS)] set([ResolvedTo(STATUS)] s: R|@R|Anno|((String(setter type ), propertyFromSetter#)) kotlin/String|): R|kotlin/Unit| { LAZY_BLOCK } @@ -169,7 +169,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt public? [ResolvedTo(RAW_FIR)] get(): TYPES: -TARGET: public open override [ResolvedTo(STATUS)] var something: R|kotlin/String| +TARGET: public open override [ STATUS] var something: R|kotlin/String| @R|Anno|[Types](LAZY_EXPRESSION) public [ ResolvedTo(STATUS)] get(): R|kotlin/String| { LAZY_BLOCK } @R|Anno|[Types](LAZY_EXPRESSION) public [ ResolvedTo(STATUS)] set([ResolvedTo(STATUS)] s: R|@R|Anno|((String(setter type ), propertyFromSetter#)) kotlin/String|): R|kotlin/Unit| { LAZY_BLOCK } @@ -203,7 +203,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt public? [ResolvedTo(RAW_FIR)] get(): STATUS: -TARGET: public open override [ResolvedTo(STATUS)] var something: R|kotlin/String| +TARGET: public open override [ STATUS] var something: R|kotlin/String| @R|Anno|[Types](LAZY_EXPRESSION) public [ ResolvedTo(STATUS)] get(): R|kotlin/String| { LAZY_BLOCK } @R|Anno|[Types](LAZY_EXPRESSION) public [ ResolvedTo(STATUS)] set([ResolvedTo(STATUS)] s: R|@R|Anno|((String(setter type ), propertyFromSetter#)) kotlin/String|): R|kotlin/Unit| { LAZY_BLOCK } @@ -237,7 +237,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt public? [ResolvedTo(RAW_FIR)] get(): EXPECT_ACTUAL_MATCHING: -TARGET: public open override [ResolvedTo(STATUS)] var something: R|kotlin/String| +TARGET: public open override [ STATUS] var something: R|kotlin/String| @R|Anno|[Types](LAZY_EXPRESSION) public [ ResolvedTo(STATUS)] get(): R|kotlin/String| { LAZY_BLOCK } @R|Anno|[Types](LAZY_EXPRESSION) public [ ResolvedTo(STATUS)] set([ResolvedTo(STATUS)] s: R|@R|Anno|((String(setter type ), propertyFromSetter#)) kotlin/String|): R|kotlin/Unit| { LAZY_BLOCK } @@ -271,7 +271,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt public? [ResolvedTo(RAW_FIR)] get(): ARGUMENTS_OF_ANNOTATIONS: -TARGET: public open override [ResolvedTo(STATUS)] var something: R|kotlin/String| +TARGET: public open override [ STATUS] var something: R|kotlin/String| @R|Anno|[Types](LAZY_EXPRESSION) public [ ResolvedTo(STATUS)] get(): R|kotlin/String| { LAZY_BLOCK } @R|Anno|[Types](LAZY_EXPRESSION) public [ ResolvedTo(STATUS)] set([ResolvedTo(STATUS)] s: R|@R|Anno|((String(setter type ), propertyFromSetter#)) kotlin/String|): R|kotlin/Unit| { LAZY_BLOCK } @@ -305,7 +305,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt public? [ResolvedTo(RAW_FIR)] get(): CONTRACTS: -TARGET: public open override [ResolvedTo(STATUS)] var something: R|kotlin/String| +TARGET: public open override [ STATUS] var something: R|kotlin/String| @R|Anno|[Types](LAZY_EXPRESSION) public [ ResolvedTo(STATUS)] get(): R|kotlin/String| { LAZY_BLOCK } @R|Anno|[Types](LAZY_EXPRESSION) public [ ResolvedTo(STATUS)] set([ResolvedTo(STATUS)] s: R|@R|Anno|((String(setter type ), propertyFromSetter#)) kotlin/String|): R|kotlin/Unit| { LAZY_BLOCK } @@ -339,7 +339,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt public? [ResolvedTo(RAW_FIR)] get(): IMPLICIT_TYPES_BODY_RESOLVE: -TARGET: public open override [ResolvedTo(STATUS)] var something: R|kotlin/String| +TARGET: public open override [ STATUS] var something: R|kotlin/String| @R|Anno|[Types](LAZY_EXPRESSION) public [ ResolvedTo(STATUS)] get(): R|kotlin/String| { LAZY_BLOCK } @R|Anno|[Types](LAZY_EXPRESSION) public [ ResolvedTo(STATUS)] set([ResolvedTo(STATUS)] s: R|@R|Anno|((String(setter type ), propertyFromSetter#)) kotlin/String|): R|kotlin/Unit| { LAZY_BLOCK } @@ -373,7 +373,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt public? [ResolvedTo(RAW_FIR)] get(): ANNOTATIONS_ARGUMENTS_MAPPING: -TARGET: public open override [ResolvedTo(STATUS)] var something: R|kotlin/String| +TARGET: public open override [ STATUS] var something: R|kotlin/String| @R|Anno|[Types](LAZY_EXPRESSION) public [ ResolvedTo(STATUS)] get(): R|kotlin/String| { LAZY_BLOCK } @R|Anno|[Types](LAZY_EXPRESSION) public [ ResolvedTo(STATUS)] set([ResolvedTo(STATUS)] s: R|@R|Anno|((String(setter type ), propertyFromSetter#)) kotlin/String|): R|kotlin/Unit| { LAZY_BLOCK } @@ -407,7 +407,7 @@ FILE: [ResolvedTo(IMPORTS)] Derived.kt public? [ResolvedTo(RAW_FIR)] get(): BODY_RESOLVE: -TARGET: public open override [ResolvedTo(STATUS)] var something: R|kotlin/String| +TARGET: public open override [ STATUS] var something: R|kotlin/String| @R|Anno|[Types](LAZY_EXPRESSION) public [ ResolvedTo(STATUS)] get(): R|kotlin/String| { LAZY_BLOCK } @R|Anno|[Types](LAZY_EXPRESSION) public [ ResolvedTo(STATUS)] set([ResolvedTo(STATUS)] s: R|@R|Anno|((String(setter type ), propertyFromSetter#)) kotlin/String|): R|kotlin/Unit| { LAZY_BLOCK } diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirResolveState.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirResolveState.kt index add4c55b8fb..f1316a965e5 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirResolveState.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirResolveState.kt @@ -7,6 +7,7 @@ package org.jetbrains.kotlin.fir.declarations import java.util.concurrent.CountDownLatch import org.jetbrains.kotlin.fir.FirElementWithResolveState +import org.jetbrains.kotlin.fir.declarations.synthetic.FirSyntheticProperty import org.jetbrains.kotlin.fir.declarations.synthetic.FirSyntheticPropertyAccessor /** @@ -50,10 +51,10 @@ fun FirResolvePhase.asResolveState(): FirResolvedToPhaseState = FirResolvedToPha @OptIn(ResolveStateAccess::class) val FirElementWithResolveState.resolvePhase: FirResolvePhase - get() = if (this is FirSyntheticPropertyAccessor) { - delegate.resolvePhase - } else { - resolveState.resolvePhase + get() = when (this) { + is FirSyntheticProperty -> setter?.resolvePhase?.let { minOf(it, getter.resolvePhase) } ?: getter.resolvePhase + is FirSyntheticPropertyAccessor -> delegate.resolvePhase + else -> resolveState.resolvePhase } /** diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/synthetic/FirSyntheticProperty.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/synthetic/FirSyntheticProperty.kt index f30d81c17b0..6e37bb7fe0c 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/synthetic/FirSyntheticProperty.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/synthetic/FirSyntheticProperty.kt @@ -27,7 +27,6 @@ class FirSyntheticProperty @FirImplementationDetail internal constructor( override val isVar: Boolean, override val symbol: FirSyntheticPropertySymbol, override val status: FirDeclarationStatus, - resolvePhase: FirResolvePhase, override val getter: FirSyntheticPropertyAccessor, override val setter: FirSyntheticPropertyAccessor? = null, override val deprecationsProvider: DeprecationsProvider = UnresolvedDeprecationProvider @@ -36,11 +35,6 @@ class FirSyntheticProperty @FirImplementationDetail internal constructor( symbol.bind(this) } - init { - @OptIn(ResolveStateAccess::class) - this.resolveState = resolvePhase.asResolveState() - } - override val backingField: FirBackingField? get() = null override val returnTypeRef: FirTypeRef diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/synthetic/FirSyntheticPropertyBuilder.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/synthetic/FirSyntheticPropertyBuilder.kt index 5061109a62f..9890d80ce97 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/synthetic/FirSyntheticPropertyBuilder.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/synthetic/FirSyntheticPropertyBuilder.kt @@ -10,7 +10,6 @@ import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.declarations.DeprecationsProvider import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus import org.jetbrains.kotlin.fir.declarations.FirSimpleFunction -import org.jetbrains.kotlin.fir.declarations.resolvePhase import org.jetbrains.kotlin.fir.symbols.impl.FirSyntheticPropertySymbol import org.jetbrains.kotlin.name.Name @@ -29,7 +28,6 @@ class FirSyntheticPropertyBuilder { fun build(): FirSyntheticProperty = FirSyntheticProperty( moduleData, name, isVar = delegateSetter != null, symbol = symbol, status = status ?: delegateGetter.status, - resolvePhase = delegateGetter.resolvePhase, getter = FirSyntheticPropertyAccessor(delegateGetter, isGetter = true, symbol), setter = delegateSetter?.let { FirSyntheticPropertyAccessor(it, isGetter = false, symbol) }, deprecationsProvider = deprecationsProvider diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/renderer/FirResolvePhaseRenderer.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/renderer/FirResolvePhaseRenderer.kt index 3a91391ad08..b5818b8feac 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/renderer/FirResolvePhaseRenderer.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/renderer/FirResolvePhaseRenderer.kt @@ -7,6 +7,8 @@ package org.jetbrains.kotlin.fir.renderer import org.jetbrains.kotlin.fir.FirElementWithResolveState import org.jetbrains.kotlin.fir.declarations.ResolveStateAccess +import org.jetbrains.kotlin.fir.declarations.resolvePhase +import org.jetbrains.kotlin.fir.declarations.synthetic.FirSyntheticProperty import org.jetbrains.kotlin.fir.declarations.synthetic.FirSyntheticPropertyAccessor import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall @@ -16,10 +18,10 @@ class FirResolvePhaseRenderer { fun render(element: FirElementWithResolveState) { @OptIn(ResolveStateAccess::class) - val text = if (element is FirSyntheticPropertyAccessor) { - "[ ${element.delegate.resolveState}] " - } else { - "[${element.resolveState}] " + val text = when (element) { + is FirSyntheticProperty -> "[ ${element.resolvePhase}] " + is FirSyntheticPropertyAccessor -> "[ ${element.delegate.resolveState}] " + else -> "[${element.resolveState}] " } printer.print(text) @@ -28,4 +30,4 @@ class FirResolvePhaseRenderer { fun render(element: FirAnnotationCall) { printer.print("[${element.annotationResolvePhase}]") } -} \ No newline at end of file +}