diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirReferenceShortener.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirReferenceShortener.kt index 5d77634d4f7..13d2fe6ac74 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirReferenceShortener.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirReferenceShortener.kt @@ -95,15 +95,12 @@ internal class KtFirReferenceShortener( kDocQualifiersToShorten = emptyList(), ) - val towerContext = - if (declarationToVisit !is KtFile || declarationToVisit.isScript()) { - LowLevelFirApiFacadeForResolveOnAir.getOnAirGetTowerContextProvider(firResolveSession, declarationToVisit) - } else { - LowLevelFirApiFacadeForResolveOnAir.getOnAirTowerDataContextProviderForTheWholeFile( - firResolveSession, - declarationToVisit - ) - } + val towerContext = if (declarationToVisit is KtFile) { + LowLevelFirApiFacadeForResolveOnAir.getOnAirTowerDataContextProviderForTheWholeFile(firResolveSession, declarationToVisit) + } else { + LowLevelFirApiFacadeForResolveOnAir.getOnAirGetTowerContextProvider(firResolveSession, declarationToVisit) + } + //TODO: collect all usages of available symbols in the file and prevent importing symbols that could introduce name clashes, which // may alter the meaning of existing code. val collector = ElementsToShortenCollector( diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/file/builder/LLFirFileBuilder.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/file/builder/LLFirFileBuilder.kt index 8ef8b6d97a7..769194fdc8d 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/file/builder/LLFirFileBuilder.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/file/builder/LLFirFileBuilder.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ @@ -34,22 +34,11 @@ internal class LLFirFileBuilder(val moduleComponents: LLFirModuleResolveComponen it.toString() } } - val bodyBuildingMode = when { - ktFile.isScript() -> { - // As 'FirScript' content is never transformed, lazy bodies are not replaced with calculated ones even on BODY_RESOLVE. - // Such behavior breaks file structure mapping computation. - // TODO: remove this clause when proper support for scripts is implemented in K2. - BodyBuildingMode.NORMAL - } - else -> BodyBuildingMode.LAZY_BODIES - } PsiRawFirBuilder( moduleComponents.session, moduleComponents.scopeProvider, - bodyBuildingMode = bodyBuildingMode + bodyBuildingMode = BodyBuildingMode.LAZY_BODIES ).buildFirFile(ktFile) } } - - diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/FirLazyBodiesCalculator.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/FirLazyBodiesCalculator.kt index c337dc94ca5..6016f62ff9f 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/FirLazyBodiesCalculator.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/FirLazyBodiesCalculator.kt @@ -68,6 +68,11 @@ internal object FirLazyBodiesCalculator { return newAnnotationCall.argumentList } + fun createStatementsForScript(script: FirScript): List { + val newScript = revive(FirDesignation(emptyList(), script)) + return newScript.statements + } + fun needCalculatingAnnotationCall(firAnnotationCall: FirAnnotationCall): Boolean = firAnnotationCall.argumentList.arguments.any { it is FirLazyExpression } } diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirBodyLazyResolver.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirBodyLazyResolver.kt index 4fbebbb4444..e76abb23218 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirBodyLazyResolver.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirBodyLazyResolver.kt @@ -9,6 +9,7 @@ import org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirDesignationWithFil import org.jetbrains.kotlin.analysis.low.level.api.fir.api.targets.LLFirResolveTarget import org.jetbrains.kotlin.analysis.low.level.api.fir.api.throwUnexpectedFirElementError import org.jetbrains.kotlin.analysis.low.level.api.fir.file.builder.LLFirLockProvider +import org.jetbrains.kotlin.analysis.low.level.api.fir.lazy.resolve.FirLazyBodiesCalculator import org.jetbrains.kotlin.analysis.low.level.api.fir.util.checkDelegatedConstructorIsResolved import org.jetbrains.kotlin.analysis.low.level.api.fir.util.* import org.jetbrains.kotlin.fir.utils.exceptions.withFirEntry @@ -29,7 +30,6 @@ import org.jetbrains.kotlin.fir.references.FirSuperReference import org.jetbrains.kotlin.fir.references.FirThisReference import org.jetbrains.kotlin.fir.references.builder.buildExplicitSuperReference import org.jetbrains.kotlin.fir.references.builder.buildExplicitThisReference -import org.jetbrains.kotlin.fir.resolve.ResolutionMode import org.jetbrains.kotlin.fir.resolve.ScopeSession import org.jetbrains.kotlin.fir.resolve.dfa.FirControlFlowGraphReferenceImpl import org.jetbrains.kotlin.fir.resolve.transformers.body.resolve.FirBodyResolveTransformer @@ -38,7 +38,8 @@ import org.jetbrains.kotlin.fir.resolve.transformers.contracts.FirContractsDslNa import org.jetbrains.kotlin.fir.symbols.lazyResolveToPhase import org.jetbrains.kotlin.fir.types.FirResolvedTypeRef import org.jetbrains.kotlin.fir.resolve.dfa.cfg.isUsedInControlFlowGraphBuilderForClass -import org.jetbrains.kotlin.fir.visitors.transformSingle +import org.jetbrains.kotlin.utils.exceptions.requireWithAttachment +import org.jetbrains.kotlin.utils.findIsInstanceAnd internal object LLFirBodyLazyResolver : LLFirLazyResolver(FirResolvePhase.BODY_RESOLVE) { override fun resolve( @@ -155,15 +156,56 @@ private class LLFirBodyTargetResolver( } } - override fun rawResolve(target: FirElementWithResolveState) = when (target) { - is FirScript -> resolveScript(target) - else -> super.rawResolve(target) + override fun rawResolve(target: FirElementWithResolveState) { + when (target) { + is FirScript -> target.takeUnless(FirScript::isCertainlyResolved)?.let(::resolveScript) + else -> super.rawResolve(target) + } } } internal object BodyStateKeepers { - val SCRIPT: StateKeeper = stateKeeper { _, _ -> - // TODO Lazy body is not supported for scripts yet + val SCRIPT: StateKeeper = stateKeeper { script, designation -> + val oldStatements = script.statements + if (oldStatements.none { it.isScriptStatement } || script.isCertainlyResolved) return@stateKeeper + + add(RESULT_PROPERTY, designation) + add(FirScript::statements, FirScript::replaceStatements) { + val recreatedStatements = FirLazyBodiesCalculator.createStatementsForScript(script) + requireSameSize(oldStatements, recreatedStatements) + + ArrayList(oldStatements.size).apply { + oldStatements.zip(recreatedStatements).mapTo(this) { (old, new) -> + when { + !old.isScriptStatement -> old + old is FirProperty && old.origin == FirDeclarationOrigin.ScriptCustomization.ResultProperty -> { + old.replaceInitializer((new as FirProperty).initializer) + old + } + + else -> new + } + } + } + } + } + + private val RESULT_PROPERTY: StateKeeper = stateKeeper { script, _ -> + val resultedProperty = script.findResultProperty() ?: return@stateKeeper + add( + provider = { resultedProperty.bodyResolveState }, + mutator = { _, value -> resultedProperty.replaceBodyResolveState(value) }, + ) + + add( + provider = { resultedProperty.returnTypeRef }, + mutator = { _, value -> resultedProperty.replaceReturnTypeRef(value) }, + ) + + add( + provider = { resultedProperty.controlFlowGraphReference }, + mutator = { _, value -> resultedProperty.replaceControlFlowGraphReference(value) }, + ) } val ANONYMOUS_INITIALIZER: StateKeeper = stateKeeper { _, _ -> @@ -272,6 +314,18 @@ private fun StateKeeperScope.preserveContra } } +private fun FirScript.findResultProperty(): FirProperty? = statements.findIsInstanceAnd { + it.origin == FirDeclarationOrigin.ScriptCustomization.ResultProperty +} + +private val FirScript.isCertainlyResolved: Boolean + get() { + val dependentProperty = findResultProperty() ?: return false + + // This meant that we already resolve the entire script on implicit body phase + return dependentProperty.bodyResolveState == FirPropertyBodyResolveState.EVERYTHING_RESOLVED + } + private val FirFunction.isCertainlyResolved: Boolean get() { if (this is FirPropertyAccessor) { @@ -339,4 +393,19 @@ private fun delegatedConstructorCallGuard(fir: FirDelegatedConstructorCall): Fir } } } +} + +private fun requireSameSize(old: List, new: List) { + requireWithAttachment( + condition = old.size == new.size, + message = { "The number of statements are different" } + ) { + withEntryGroup("originalStatements") { + old.forEachIndexed { index, statement -> withFirEntry("statement$index", statement) } + } + + withEntryGroup("newStatements") { + new.forEachIndexed { index, statement -> withFirEntry("statement$index", statement) } + } + } } \ No newline at end of file diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationApplicationArgumentOnStatement.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationApplicationArgumentOnStatement.txt index 6a5b75b6b86..e42c08da2cc 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationApplicationArgumentOnStatement.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationApplicationArgumentOnStatement.txt @@ -13,7 +13,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationApplicationArgumentOnStatement.kts @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.EXPRESSION|) @R|kotlin/annotation/Retention|[Types](AnnotationRetention#.SOURCE#) public final [ResolvedTo(STATUS)] annotation class Annotation : R|kotlin/Annotation| { public [ResolvedTo(STATUS)] [ContainingClassKey=Annotation] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Annotation.name] name: R|kotlin/String|): R|Annotation| { - super() + LAZY_super } public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val name: R|kotlin/String| = R|/name| diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationApplicationArgumentScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationApplicationArgumentScript.txt index 67f20e8658b..2a5a634a65c 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationApplicationArgumentScript.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/annotationApplicationArgumentScript.txt @@ -13,7 +13,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationApplicationArgumentScript.kts public final [ResolvedTo(STATUS)] annotation class Annotation : R|kotlin/Annotation| { public [ResolvedTo(STATUS)] [ContainingClassKey=Annotation] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Annotation.name] name: R|kotlin/String|): R|Annotation| { - super() + LAZY_super } public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val name: R|kotlin/String| = R|/name| diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/retentionValueScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/retentionValueScript.txt index f0773e18efb..0b4db408ec3 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/retentionValueScript.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/retentionValueScript.txt @@ -13,7 +13,7 @@ FILE: [ResolvedTo(IMPORTS)] retentionValueScript.kts @R|kotlin/annotation/Retention|[Types](value = Q|kotlin/annotation/AnnotationRetention|.R|kotlin/annotation/AnnotationRetention.SOURCE|) public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] annotation class Anno : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor(): R|Anno| { - super() + LAZY_super } } \ No newline at end of file diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/superCallAnnotationScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/superCallAnnotationScript.txt index 6bd7fc0d0d5..a3da3e6bec5 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/superCallAnnotationScript.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/superCallAnnotationScript.txt @@ -13,14 +13,14 @@ FILE: [ResolvedTo(IMPORTS)] superCallAnnotationScript.kts @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| { public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor(): R|Anno| { - super() + LAZY_super } } public open [ResolvedTo(STATUS)] class A : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| { - super() + LAZY_super } } diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnConstructorParameterExpressionScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnConstructorParameterExpressionScript.txt index 95002b13a32..df6aabf78e3 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnConstructorParameterExpressionScript.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnConstructorParameterExpressionScript.txt @@ -20,7 +20,7 @@ FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnConstructorParameterExpressionScri @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| { public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| { - super() + LAZY_super } public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|/s| diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnConstructorParameterScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnConstructorParameterScript.txt index d1e9d7a2e39..3738f409206 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnConstructorParameterScript.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnConstructorParameterScript.txt @@ -20,14 +20,14 @@ FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnConstructorParameterScript.kts public open [ResolvedTo(STATUS)] class A : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| { - super() + LAZY_super } } @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| { public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor(): R|Anno| { - super() + LAZY_super } } \ No newline at end of file diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnConstructorPropertyScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnConstructorPropertyScript.txt index 7c78fc5881c..76e54d8b909 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnConstructorPropertyScript.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnConstructorPropertyScript.txt @@ -24,14 +24,14 @@ FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnConstructorPropertyScript.kts public open [ResolvedTo(STATUS)] class A : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| { - super() + LAZY_super } } @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| { public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor(): R|Anno| { - super() + LAZY_super } } \ No newline at end of file diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnConstructorPropertyWithArgumentsScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnConstructorPropertyWithArgumentsScript.txt index 9b0c0b7d07b..fecd87036df 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnConstructorPropertyWithArgumentsScript.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnConstructorPropertyWithArgumentsScript.txt @@ -24,14 +24,14 @@ FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnConstructorPropertyWithArgumentsSc public open [ResolvedTo(STATUS)] class A : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| { - super() + LAZY_super } } @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| { public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.value] value: R|kotlin/String|): R|Anno| { - super() + LAZY_super } public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val value: R|kotlin/String| = R|/value| diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnFunctionParameterScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnFunctionParameterScript.txt index d2ebc1b41ff..4d42866aec1 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnFunctionParameterScript.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnFunctionParameterScript.txt @@ -16,14 +16,14 @@ FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnFunctionParameterScript.kts public? open [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| { - super() + LAZY_super } } @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| { public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor(): R|Anno| { - super() + LAZY_super } } \ No newline at end of file diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnFunctionParameterWithArgumentsScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnFunctionParameterWithArgumentsScript.txt index 879664ba44a..858f85018d9 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnFunctionParameterWithArgumentsScript.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnFunctionParameterWithArgumentsScript.txt @@ -16,14 +16,14 @@ FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnFunctionParameterWithArgumentsScri public? open [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| { - super() + LAZY_super } } @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| { public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.value] value: R|kotlin/String|): R|Anno| { - super() + LAZY_super } public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val value: R|kotlin/String| = R|/value| diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReceiverFunctionScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReceiverFunctionScript.txt index 952391dc4be..2f2d4c21984 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReceiverFunctionScript.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReceiverFunctionScript.txt @@ -17,7 +17,7 @@ FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnReceiverFunctionScript.kts @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| { public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| { - super() + LAZY_super } public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|/s| diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReceiverParameterScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReceiverParameterScript.txt index 154715a97ee..266167b26f9 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReceiverParameterScript.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReceiverParameterScript.txt @@ -17,7 +17,7 @@ FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnReceiverParameterScript.kts @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| { public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| { - super() + LAZY_super } public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|/s| diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReceiverPropertyCallScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReceiverPropertyCallScript.txt index 60dc8f042d5..452530cd311 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReceiverPropertyCallScript.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReceiverPropertyCallScript.txt @@ -18,7 +18,7 @@ FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnReceiverPropertyCallScript.kts @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| { public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| { - super() + LAZY_super } public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|/s| diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReceiverPropertyScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReceiverPropertyScript.txt index 9b561eb1864..6e2ecc84052 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReceiverPropertyScript.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReceiverPropertyScript.txt @@ -18,7 +18,7 @@ FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnReceiverPropertyScript.kts @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| { public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| { - super() + LAZY_super } public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|/s| diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReturnFunctionScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReturnFunctionScript.txt index 06edd96dd47..28f8d343665 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReturnFunctionScript.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReturnFunctionScript.txt @@ -17,7 +17,7 @@ FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnReturnFunctionScript.kts @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| { public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| { - super() + LAZY_super } public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|/s| diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReturnPropertyScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReturnPropertyScript.txt index 5f15fbcfbf0..191a1aaca51 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReturnPropertyScript.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/typeOnAnnotationOnReturnPropertyScript.txt @@ -16,7 +16,7 @@ FILE: [ResolvedTo(IMPORTS)] typeOnAnnotationOnReturnPropertyScript.kts @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE|) public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| { public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.s] s: R|kotlin/String|): R|Anno| { - super() + LAZY_super } public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|kotlin/String| = R|/s| diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/useSite/delegateScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/useSite/delegateScript.txt index 4c14aa8df1a..f6bf53eda08 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/useSite/delegateScript.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/useSite/delegateScript.txt @@ -13,14 +13,14 @@ FILE: [ResolvedTo(IMPORTS)] delegateScript.kts public final [ResolvedTo(STATUS)] annotation class Ann : R|kotlin/Annotation| { public [ResolvedTo(STATUS)] [ContainingClassKey=Ann] constructor(): R|Ann| { - super() + LAZY_super } } public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor(): R|X| { - super() + LAZY_super } field:@PROPERTY_DELEGATE_FIELD:R|Ann|[Types]() public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] val a: by #( = [ResolvedTo(RAW_FIR)] lazy@fun (): R|kotlin/Int| { diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/useSite/fieldScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/useSite/fieldScript.txt index 97fd201ff91..0c252c2f82a 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/useSite/fieldScript.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/useSite/fieldScript.txt @@ -13,7 +13,7 @@ FILE: [ResolvedTo(IMPORTS)] fieldScript.kts public final [ResolvedTo(STATUS)] annotation class Ann : R|kotlin/Annotation| { public [ResolvedTo(STATUS)] [ContainingClassKey=Ann] constructor(): R|Ann| { - super() + LAZY_super } } diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/useSite/fileScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/useSite/fileScript.txt index 1ea60b06c6a..382814f11d3 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/useSite/fileScript.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/useSite/fileScript.txt @@ -15,7 +15,7 @@ FILE: [ResolvedTo(IMPORTS)] fileScript.kts public final [ResolvedTo(STATUS)] annotation class Ann : R|kotlin/Annotation| { public [ResolvedTo(STATUS)] [ContainingClassKey=Ann] constructor(): R|Ann| { - super() + LAZY_super } } \ No newline at end of file diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/useSite/getterScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/useSite/getterScript.txt index 377281c0e07..668aa139acc 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/useSite/getterScript.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/useSite/getterScript.txt @@ -13,7 +13,7 @@ FILE: [ResolvedTo(IMPORTS)] getterScript.kts public final [ResolvedTo(STATUS)] annotation class Ann : R|kotlin/Annotation| { public [ResolvedTo(STATUS)] [ContainingClassKey=Ann] constructor(): R|Ann| { - super() + LAZY_super } } diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/useSite/paramScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/useSite/paramScript.txt index beafdf6960f..2ec57a65c23 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/useSite/paramScript.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/useSite/paramScript.txt @@ -13,7 +13,7 @@ FILE: [ResolvedTo(IMPORTS)] paramScript.kts public final [ResolvedTo(STATUS)] annotation class Ann : R|kotlin/Annotation| { public [ResolvedTo(STATUS)] [ContainingClassKey=Ann] constructor(): R|Ann| { - super() + LAZY_super } } diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/useSite/propertyScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/useSite/propertyScript.txt index d4948fed92d..182f54b06d0 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/useSite/propertyScript.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/useSite/propertyScript.txt @@ -13,7 +13,7 @@ FILE: [ResolvedTo(IMPORTS)] propertyScript.kts public final [ResolvedTo(STATUS)] annotation class Ann : R|kotlin/Annotation| { public [ResolvedTo(STATUS)] [ContainingClassKey=Ann] constructor(): R|Ann| { - super() + LAZY_super } } diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/useSite/setParamScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/useSite/setParamScript.txt index e2b8796a8dc..e1e3e877c28 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/useSite/setParamScript.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/useSite/setParamScript.txt @@ -13,7 +13,7 @@ FILE: [ResolvedTo(IMPORTS)] setParamScript.kts public final [ResolvedTo(STATUS)] annotation class Ann : R|kotlin/Annotation| { public [ResolvedTo(STATUS)] [ContainingClassKey=Ann] constructor(): R|Ann| { - super() + LAZY_super } } diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/useSite/setterScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/useSite/setterScript.txt index 79a53b0b2b6..1ac55fa48a2 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/useSite/setterScript.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/annotations/useSite/setterScript.txt @@ -13,7 +13,7 @@ FILE: [ResolvedTo(IMPORTS)] setterScript.kts public final [ResolvedTo(STATUS)] annotation class Ann : R|kotlin/Annotation| { public [ResolvedTo(STATUS)] [ContainingClassKey=Ann] constructor(): R|Ann| { - super() + LAZY_super } } diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/argsFromInit.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/argsFromInit.txt index 83bcff3339c..e2876ac271a 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/argsFromInit.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/argsFromInit.txt @@ -15,7 +15,7 @@ FILE: [ResolvedTo(IMPORTS)] argsFromInit.kts public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| { - super() + LAZY_super } init { diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/argsFromMemberFunction.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/argsFromMemberFunction.txt index cfe6bf0cf34..1fff4697443 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/argsFromMemberFunction.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/argsFromMemberFunction.txt @@ -13,7 +13,7 @@ FILE: [ResolvedTo(IMPORTS)] argsFromMemberFunction.kts public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| { - super() + LAZY_super } public final [ResolvedTo(BODY_RESOLVE)] fun foo(): R|kotlin/Unit| { diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/argsFromMemberProperty.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/argsFromMemberProperty.txt index c51249567d9..8d8fdf90d7d 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/argsFromMemberProperty.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/argsFromMemberProperty.txt @@ -13,7 +13,7 @@ FILE: [ResolvedTo(IMPORTS)] argsFromMemberProperty.kts public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| { - super() + LAZY_super } public final [ResolvedTo(BODY_RESOLVE)] val i: R|kotlin/Int| diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/callInsideLambdaInsideSuperCallAndExplicitConstructorScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/callInsideLambdaInsideSuperCallAndExplicitConstructorScript.txt index 22cc2307f2b..2a24e258682 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/callInsideLambdaInsideSuperCallAndExplicitConstructorScript.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/callInsideLambdaInsideSuperCallAndExplicitConstructorScript.txt @@ -13,7 +13,7 @@ FILE: [ResolvedTo(IMPORTS)] callInsideLambdaInsideSuperCallAndExplicitConstructo public open [ResolvedTo(STATUS)] class B : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=B] constructor([ResolvedTo(STATUS)] x: R|() -> kotlin/Unit|): R|B| { - super() + LAZY_super } } diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/constructorDelegationSuperCallScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/constructorDelegationSuperCallScript.txt index c7e3eae22d3..04bacc56448 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/constructorDelegationSuperCallScript.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/constructorDelegationSuperCallScript.txt @@ -13,7 +13,7 @@ FILE: [ResolvedTo(IMPORTS)] constructorDelegationSuperCallScript.kts public open [ResolvedTo(STATUS)] class B : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=B] constructor([ResolvedTo(STATUS)] x: R|kotlin/Int|): R|B| { - super() + LAZY_super } } diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/qualifiedCallInsideSuperCallScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/qualifiedCallInsideSuperCallScript.txt index 7a861e7d1fc..e2886e81b41 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/qualifiedCallInsideSuperCallScript.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/qualifiedCallInsideSuperCallScript.txt @@ -13,7 +13,7 @@ FILE: [ResolvedTo(IMPORTS)] qualifiedCallInsideSuperCallScript.kts public open [ResolvedTo(STATUS)] class A : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor([ResolvedTo(STATUS)] init: R|A.() -> kotlin/Unit|): R|A| { - super() + LAZY_super } public final [ResolvedTo(CONTRACTS)] val prop: R|kotlin/String| = String() @@ -23,10 +23,7 @@ FILE: [ResolvedTo(IMPORTS)] qualifiedCallInsideSuperCallScript.kts public final [ResolvedTo(STATUS)] object B : R|A| { private [ResolvedTo(STATUS)] [ContainingClassKey=B] constructor(): R|B| { - super([ResolvedTo(RAW_FIR)] fun .(): { - ^ Unit - } - ) + LAZY_super } } diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/setOperatorScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/setOperatorScript.txt index 7ae28b1b3be..f8622464eea 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/setOperatorScript.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/calls/setOperatorScript.txt @@ -15,7 +15,7 @@ FILE: [ResolvedTo(IMPORTS)] setOperatorScript.kts public final [ResolvedTo(STATUS)] class B : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=B] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=test/B.n] n: R|kotlin/Int|): R|test/B| { - super() + LAZY_super } public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val n: R|kotlin/Int| = R|/n| diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/destructuringScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/destructuringScript.txt index 6c8233e6270..4ed3bc508fb 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/destructuringScript.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/declarations/destructuringScript.txt @@ -11,15 +11,15 @@ FILE: [ResolvedTo(IMPORTS)] destructuringScript.kts SCRIPT: [ResolvedTo(RAW_FIR)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - public? final? [ResolvedTo(RAW_FIR)] var a: = IntegerLiteral(-1) + public? final? [ResolvedTo(RAW_FIR)] var a: = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: ): R|kotlin/Unit| - public? final? [ResolvedTo(RAW_FIR)] var b: = IntegerLiteral(0) + public? final? [ResolvedTo(RAW_FIR)] var b: = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): public? [ResolvedTo(RAW_FIR)] set([ResolvedTo(RAW_FIR)] value: ): R|kotlin/Unit| - public? final? [ResolvedTo(RAW_FIR)] val pair: = Pair#(a#, b#) + public? final? [ResolvedTo(RAW_FIR)] val pair: = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): [ResolvedTo(RAW_FIR)] [DestructuringDeclarationContainerVariableMarkerKey=true] lval : = pair# diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/assignment.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/assignment.txt index eacd42e4e4b..e890851468c 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/assignment.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/assignment.txt @@ -13,7 +13,7 @@ FILE: [ResolvedTo(IMPORTS)] assignment.kts public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| { - super() + LAZY_super } public final [ResolvedTo(CONTRACTS)] var version: R|kotlin/String| = String() diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/callInsideFunction.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/callInsideFunction.txt index 698a5a38dbd..bdbbf201538 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/callInsideFunction.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/callInsideFunction.txt @@ -13,16 +13,14 @@ FILE: [ResolvedTo(IMPORTS)] callInsideFunction.kts public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| { - super() + LAZY_super } - public final [ResolvedTo(STATUS)] var version: R|kotlin/String| = String() + public final [ResolvedTo(STATUS)] var version: R|kotlin/String| = LAZY_EXPRESSION public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] get(): R|kotlin/String| public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] set([ResolvedTo(STATUS)] value: R|kotlin/String|): R|kotlin/Unit| - public final [ResolvedTo(STATUS)] fun execute(): R|kotlin/Unit| { - println#(version#) - } + public final [ResolvedTo(STATUS)] fun execute(): R|kotlin/Unit| { LAZY_BLOCK } } @@ -30,25 +28,8 @@ FILE: [ResolvedTo(IMPORTS)] callInsideFunction.kts ^build R|/Builder.Builder|().R|kotlin/apply|(R|/action|) } - build#( = [ResolvedTo(RAW_FIR)] build@fun .(): { - version# = String(123) - local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| { - super() - } - - public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| { - } - - } - - execute#() - } - ) - public? final? [ResolvedTo(RAW_FIR)] val builder: = build#( = [ResolvedTo(RAW_FIR)] build@fun .(): { - version# = String(321) - } - ) + build#( = LAZY_EXPRESSION) + public? final? [ResolvedTo(RAW_FIR)] val builder: = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): builder#.execute#() diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/callInsideStatement.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/callInsideStatement.txt index b9e2a5f62e8..081677d7703 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/callInsideStatement.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/expressions/callInsideStatement.txt @@ -13,7 +13,7 @@ FILE: [ResolvedTo(IMPORTS)] callInsideStatement.kts public final [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| { - super() + LAZY_super } public final [ResolvedTo(CONTRACTS)] var version: R|kotlin/String| = String() diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/qualifiedExpressions/firstPartOfQualifiedCallWithNestedClassesScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/qualifiedExpressions/firstPartOfQualifiedCallWithNestedClassesScript.txt index 0c07b8604a3..4c7f751a188 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/qualifiedExpressions/firstPartOfQualifiedCallWithNestedClassesScript.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/qualifiedExpressions/firstPartOfQualifiedCallWithNestedClassesScript.txt @@ -13,17 +13,17 @@ FILE: [ResolvedTo(IMPORTS)] firstPartOfQualifiedCallWithNestedClassesScript.kts public final [ResolvedTo(STATUS)] class A : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| { - super() + LAZY_super } public final [ResolvedTo(STATUS)] class B : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=B] constructor(): R|A.B| { - super() + LAZY_super } public final [ResolvedTo(STATUS)] class C : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=C] constructor(): R|A.B.C| { - super() + LAZY_super } public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] val x: R|kotlin/Int| = Int(10) diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/qualifiedExpressions/qualifiedPartOfQualifiedCallUnresolvedScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/qualifiedExpressions/qualifiedPartOfQualifiedCallUnresolvedScript.txt index 4d144938154..85f10d0ade0 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/qualifiedExpressions/qualifiedPartOfQualifiedCallUnresolvedScript.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/qualifiedExpressions/qualifiedPartOfQualifiedCallUnresolvedScript.txt @@ -13,7 +13,7 @@ FILE: [ResolvedTo(IMPORTS)] qualifiedPartOfQualifiedCallUnresolvedScript.kts public final [ResolvedTo(STATUS)] class FF : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=FF] constructor(): R|FF| { - super() + LAZY_super } public final [ResolvedTo(BODY_RESOLVE)] fun handleLeftBracketInFragment(): R|kotlin/Unit| { diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/types/nestedClassTypeScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/types/nestedClassTypeScript.txt index 6bd6d6bcaf0..5429464fcea 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/types/nestedClassTypeScript.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/types/nestedClassTypeScript.txt @@ -13,12 +13,12 @@ FILE: [ResolvedTo(IMPORTS)] nestedClassTypeScript.kts public open [ResolvedTo(STATUS)] class Foo : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=Foo] constructor(): R|Foo| { - super() + LAZY_super } public? final? [ResolvedTo(RAW_FIR)] class Nested : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Nested] constructor(): R|Foo.Nested| { - super() + LAZY_super } } @@ -27,7 +27,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedClassTypeScript.kts public final [ResolvedTo(STATUS)] class Bar : R|Foo| { public [ResolvedTo(STATUS)] [ContainingClassKey=Bar] constructor(): R|Bar| { - super() + LAZY_super } public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun create(): R|Foo.Nested| { diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/types/receiverTypeScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/types/receiverTypeScript.txt index f46b62e54d0..a6a27c2b8b2 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/types/receiverTypeScript.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/types/receiverTypeScript.txt @@ -16,7 +16,7 @@ FILE: [ResolvedTo(IMPORTS)] receiverTypeScript.kts @R|kotlin/annotation/Target|[Types](Q|kotlin/annotation/AnnotationTarget|.R|kotlin/annotation/AnnotationTarget.TYPE_PARAMETER|) public final [ResolvedTo(STATUS)] annotation class A : R|kotlin/Annotation| { public [ResolvedTo(STATUS)] [ContainingClassKey=A] constructor(): R|A| { - super() + LAZY_super } } \ No newline at end of file diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/assignmentStatement.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/assignmentStatement.txt index 62db42ed84e..18c3a9fdf6e 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/assignmentStatement.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/assignmentStatement.txt @@ -13,7 +13,7 @@ FILE: [ResolvedTo(IMPORTS)] assignmentStatement.kts public open [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| { - super() + LAZY_super } public final [ResolvedTo(CONTRACTS)] var version: R|kotlin/String| = String() @@ -26,7 +26,7 @@ FILE: [ResolvedTo(IMPORTS)] assignmentStatement.kts public? final? [ResolvedTo(RAW_FIR)] class NestedBuilder : Builder { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedBuilder] constructor(): R|Builder.NestedBuilder| { - super() + LAZY_super } } diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/class.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/class.txt index 4d152afbddc..75931691ece 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/class.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/class.txt @@ -12,13 +12,11 @@ public open [ResolvedTo(BODY_RESOLVE)] class Builder : R|kotlin/Any| { public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Builder] get(): R|kotlin/String| public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Builder] set([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/String|): R|kotlin/Unit| - public final [ResolvedTo(STATUS)] fun execute(): R|kotlin/Unit| { - println#(version#) - } + public final [ResolvedTo(STATUS)] fun execute(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] class NestedBuilder : Builder { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedBuilder] constructor(): R|Builder.NestedBuilder| { - super() + LAZY_super } } @@ -40,42 +38,21 @@ FILE: [ResolvedTo(IMPORTS)] class.kts public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Builder] get(): R|kotlin/String| public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Builder] set([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/String|): R|kotlin/Unit| - public final [ResolvedTo(STATUS)] fun execute(): R|kotlin/Unit| { - println#(version#) - } + public final [ResolvedTo(STATUS)] fun execute(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] class NestedBuilder : Builder { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedBuilder] constructor(): R|Builder.NestedBuilder| { - super() + LAZY_super } } } - public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): { - ^build Builder#().apply#(action#) - } + public? final? [ResolvedTo(RAW_FIR)] fun build([ResolvedTo(RAW_FIR)] action: ( Builder.() -> Unit )): { LAZY_BLOCK } - build#( = [ResolvedTo(RAW_FIR)] build@fun .(): { - version# = String(123) - local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| { - super() - } - - public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| { - } - - } - - execute#() - } - ) - public? final? [ResolvedTo(RAW_FIR)] val builder: = build#( = [ResolvedTo(RAW_FIR)] build@fun .(): { - version# = String(321) - } - ) + build#( = LAZY_EXPRESSION) + public? final? [ResolvedTo(RAW_FIR)] val builder: = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): builder#.execute#() diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/enumEntryScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/enumEntryScript.txt index 0b5b54622f3..8322f967f93 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/enumEntryScript.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/enumEntryScript.txt @@ -13,7 +13,7 @@ FILE: [ResolvedTo(IMPORTS)] enumEntryScript.kts public final [ResolvedTo(STATUS)] enum class X : R|kotlin/Enum| { private [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor(): R|X| { - super|>() + LAZY_super|> } public final static [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=X] enum entry ENTRY: R|X| diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/function.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/function.txt index 731c6a4d05b..88d7f77834a 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/function.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/function.txt @@ -15,20 +15,18 @@ FILE: [ResolvedTo(IMPORTS)] function.kts public open [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| { - super() + LAZY_super } - public final [ResolvedTo(STATUS)] var version: R|kotlin/String| = String() + public final [ResolvedTo(STATUS)] var version: R|kotlin/String| = LAZY_EXPRESSION public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] get(): R|kotlin/String| public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] set([ResolvedTo(STATUS)] value: R|kotlin/String|): R|kotlin/Unit| - public final [ResolvedTo(STATUS)] fun execute(): R|kotlin/Unit| { - println#(version#) - } + public final [ResolvedTo(STATUS)] fun execute(): R|kotlin/Unit| { LAZY_BLOCK } public? final? [ResolvedTo(RAW_FIR)] class NestedBuilder : Builder { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedBuilder] constructor(): R|Builder.NestedBuilder| { - super() + LAZY_super } } @@ -39,25 +37,8 @@ FILE: [ResolvedTo(IMPORTS)] function.kts ^build R|/Builder.Builder|().R|kotlin/apply|(R|/action|) } - build#( = [ResolvedTo(RAW_FIR)] build@fun .(): { - version# = String(123) - local final? [ResolvedTo(RAW_FIR)] class A : R|kotlin/Any| { - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=A] constructor(): R|A| { - super() - } - - public? final? [ResolvedTo(RAW_FIR)] fun doo(): R|kotlin/Unit| { - } - - } - - execute#() - } - ) - public? final? [ResolvedTo(RAW_FIR)] val builder: = build#( = [ResolvedTo(RAW_FIR)] build@fun .(): { - version# = String(321) - } - ) + build#( = LAZY_EXPRESSION) + public? final? [ResolvedTo(RAW_FIR)] val builder: = LAZY_EXPRESSION public? [ResolvedTo(RAW_FIR)] get(): builder#.execute#() diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/memberFunctionScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/memberFunctionScript.txt index e74e8ff45b2..c3148b42abb 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/memberFunctionScript.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/memberFunctionScript.txt @@ -15,7 +15,7 @@ FILE: [ResolvedTo(IMPORTS)] memberFunctionScript.kts public final [ResolvedTo(STATUS)] class Y : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=Y] constructor(): R|Y| { - super() + LAZY_super } public final [ResolvedTo(BODY_RESOLVE)] fun x(): R|kotlin/String| { diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/memberPropertyScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/memberPropertyScript.txt index 2e253b1d0c5..dd6a1eb860b 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/memberPropertyScript.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/memberPropertyScript.txt @@ -14,7 +14,7 @@ FILE: [ResolvedTo(IMPORTS)] memberPropertyScript.kts public final [ResolvedTo(STATUS)] class Y : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=Y] constructor(): R|Y| { - super() + LAZY_super } public final [ResolvedTo(BODY_RESOLVE)] val x: R|kotlin/String| = String() diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/memberTypeAliasScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/memberTypeAliasScript.txt index 014a1a9020e..1ce7320e107 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/memberTypeAliasScript.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/memberTypeAliasScript.txt @@ -13,7 +13,7 @@ FILE: [ResolvedTo(IMPORTS)] memberTypeAliasScript.kts public final [ResolvedTo(STATUS)] class Y : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=Y] constructor(): R|Y| { - super() + LAZY_super } public final [ResolvedTo(BODY_RESOLVE)] typealias Str = R|kotlin/String| diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/nestedClassScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/nestedClassScript.txt index a4a8ffaefc3..c6f9f4a6278 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/nestedClassScript.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/nestedClassScript.txt @@ -20,7 +20,7 @@ FILE: [ResolvedTo(IMPORTS)] nestedClassScript.kts public final [ResolvedTo(STATUS)] class Y : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=Y] constructor(): R|Y| { - super() + LAZY_super } public final [ResolvedTo(BODY_RESOLVE)] class X : R|kotlin/Any| { diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/scriptInitializer.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/scriptInitializer.txt index 3eac5ab3d30..3a6a8966813 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/scriptInitializer.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/scriptInitializer.txt @@ -9,7 +9,7 @@ SCRIPT: [ResolvedTo(BODY_RESOLVE)] public open [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| { - super() + LAZY_super } public final [ResolvedTo(CONTRACTS)] var version: R|kotlin/String| = String() @@ -22,7 +22,7 @@ SCRIPT: [ResolvedTo(BODY_RESOLVE)] public? final? [ResolvedTo(RAW_FIR)] class NestedBuilder : Builder { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedBuilder] constructor(): R|Builder.NestedBuilder| { - super() + LAZY_super } } @@ -65,7 +65,7 @@ FILE: [ResolvedTo(IMPORTS)] scriptInitializer.kts public open [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| { - super() + LAZY_super } public final [ResolvedTo(CONTRACTS)] var version: R|kotlin/String| = String() @@ -78,7 +78,7 @@ FILE: [ResolvedTo(IMPORTS)] scriptInitializer.kts public? final? [ResolvedTo(RAW_FIR)] class NestedBuilder : Builder { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedBuilder] constructor(): R|Builder.NestedBuilder| { - super() + LAZY_super } } diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/secondaryConstructorValueParameterScript.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/secondaryConstructorValueParameterScript.txt index 89b9fd3ddc6..a46e3ebdf98 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/secondaryConstructorValueParameterScript.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/secondaryConstructorValueParameterScript.txt @@ -13,7 +13,7 @@ FILE: [ResolvedTo(IMPORTS)] secondaryConstructorValueParameterScript.kts public final [ResolvedTo(STATUS)] class X : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor([ResolvedTo(STATUS)] x: R|kotlin/Int|): R|X| { - super() + LAZY_super } public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=X] constructor([ResolvedTo(BODY_RESOLVE)] y: R|kotlin/String|): R|X| { diff --git a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/statement.txt b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/statement.txt index 1c26ea5eb5f..9f8d790f22d 100644 --- a/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/statement.txt +++ b/analysis/low-level-api-fir/testdata/getOrBuildFir/wholeDeclaration/statement.txt @@ -9,7 +9,7 @@ SCRIPT: [ResolvedTo(BODY_RESOLVE)] public open [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| { - super() + LAZY_super } public final [ResolvedTo(CONTRACTS)] var version: R|kotlin/String| = String() @@ -22,7 +22,7 @@ SCRIPT: [ResolvedTo(BODY_RESOLVE)] public? final? [ResolvedTo(RAW_FIR)] class NestedBuilder : Builder { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedBuilder] constructor(): R|Builder.NestedBuilder| { - super() + LAZY_super } } @@ -65,7 +65,7 @@ FILE: [ResolvedTo(IMPORTS)] statement.kts public open [ResolvedTo(STATUS)] class Builder : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=Builder] constructor(): R|Builder| { - super() + LAZY_super } public final [ResolvedTo(CONTRACTS)] var version: R|kotlin/String| = String() @@ -78,7 +78,7 @@ FILE: [ResolvedTo(IMPORTS)] statement.kts public? final? [ResolvedTo(RAW_FIR)] class NestedBuilder : Builder { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=NestedBuilder] constructor(): R|Builder.NestedBuilder| { - super() + LAZY_super } } diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/annotationArgumentsMixScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/annotationArgumentsMixScript.txt index d6c7ce393a5..b6b525a691b 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/annotationArgumentsMixScript.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/annotationArgumentsMixScript.txt @@ -6,14 +6,14 @@ FILE: [ResolvedTo(RAW_FIR)] annotationArgumentsMixScript.kts public? final? [ResolvedTo(RAW_FIR)] annotation class AnotherAnnotation : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherAnnotation] constructor(): R|AnotherAnnotation| { - super() + LAZY_super } } public? final? [ResolvedTo(RAW_FIR)] enum class EnumClass : R|kotlin/Enum| { private [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] constructor(): R|EnumClass| { - super|>() + LAZY_super|> } public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] enum entry First: R|EnumClass| @@ -31,7 +31,7 @@ FILE: [ResolvedTo(RAW_FIR)] annotationArgumentsMixScript.kts public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.str] str: String, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.ann] ann: AnotherAnnotation, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.c] c: KClass<*>, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.entry] entry: EnumClass): R|Anno| { - super() + LAZY_super } public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val str: String = R|/str| @@ -48,8 +48,7 @@ FILE: [ResolvedTo(RAW_FIR)] annotationArgumentsMixScript.kts } - @Deprecated[Unresolved](boo#()) @Anno[Unresolved](String(123), AnotherAnnotation#(), (AnotherAnnotation#), EnumClass#.Second#) public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| { - } + @Deprecated[Unresolved](LAZY_EXPRESSION) @Anno[Unresolved](LAZY_EXPRESSION, LAZY_EXPRESSION, LAZY_EXPRESSION, LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK } IMPORTS: @@ -60,14 +59,14 @@ FILE: [ResolvedTo(IMPORTS)] annotationArgumentsMixScript.kts public? final? [ResolvedTo(RAW_FIR)] annotation class AnotherAnnotation : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherAnnotation] constructor(): R|AnotherAnnotation| { - super() + LAZY_super } } public? final? [ResolvedTo(RAW_FIR)] enum class EnumClass : R|kotlin/Enum| { private [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] constructor(): R|EnumClass| { - super|>() + LAZY_super|> } public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] enum entry First: R|EnumClass| @@ -85,7 +84,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationArgumentsMixScript.kts public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.str] str: String, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.ann] ann: AnotherAnnotation, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.c] c: KClass<*>, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.entry] entry: EnumClass): R|Anno| { - super() + LAZY_super } public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val str: String = R|/str| @@ -102,8 +101,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationArgumentsMixScript.kts } - @Deprecated[Unresolved](boo#()) @Anno[Unresolved](String(123), AnotherAnnotation#(), (AnotherAnnotation#), EnumClass#.Second#) public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| { - } + @Deprecated[Unresolved](LAZY_EXPRESSION) @Anno[Unresolved](LAZY_EXPRESSION, LAZY_EXPRESSION, LAZY_EXPRESSION, LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK } COMPILER_REQUIRED_ANNOTATIONS: @@ -114,14 +112,14 @@ FILE: [ResolvedTo(IMPORTS)] annotationArgumentsMixScript.kts public? final? [ResolvedTo(RAW_FIR)] annotation class AnotherAnnotation : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherAnnotation] constructor(): R|AnotherAnnotation| { - super() + LAZY_super } } public? final? [ResolvedTo(RAW_FIR)] enum class EnumClass : R|kotlin/Enum| { private [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] constructor(): R|EnumClass| { - super|>() + LAZY_super|> } public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] enum entry First: R|EnumClass| @@ -139,7 +137,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationArgumentsMixScript.kts public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.str] str: String, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.ann] ann: AnotherAnnotation, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.c] c: KClass<*>, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.entry] entry: EnumClass): R|Anno| { - super() + LAZY_super } public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val str: String = R|/str| @@ -156,8 +154,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationArgumentsMixScript.kts } - @R|kotlin/Deprecated|[CompilerRequiredAnnotations](boo#()) @Anno[Unresolved](String(123), AnotherAnnotation#(), (AnotherAnnotation#), EnumClass#.Second#) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] fun foo(): R|kotlin/Unit| { - } + @R|kotlin/Deprecated|[CompilerRequiredAnnotations](boo#()) @Anno[Unresolved](LAZY_EXPRESSION, LAZY_EXPRESSION, LAZY_EXPRESSION, LAZY_EXPRESSION) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK } COMPANION_GENERATION: @@ -168,14 +165,14 @@ FILE: [ResolvedTo(IMPORTS)] annotationArgumentsMixScript.kts public? final? [ResolvedTo(RAW_FIR)] annotation class AnotherAnnotation : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherAnnotation] constructor(): R|AnotherAnnotation| { - super() + LAZY_super } } public? final? [ResolvedTo(RAW_FIR)] enum class EnumClass : R|kotlin/Enum| { private [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] constructor(): R|EnumClass| { - super|>() + LAZY_super|> } public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] enum entry First: R|EnumClass| @@ -193,7 +190,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationArgumentsMixScript.kts public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.str] str: String, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.ann] ann: AnotherAnnotation, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.c] c: KClass<*>, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.entry] entry: EnumClass): R|Anno| { - super() + LAZY_super } public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val str: String = R|/str| @@ -210,8 +207,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationArgumentsMixScript.kts } - @R|kotlin/Deprecated|[CompilerRequiredAnnotations](boo#()) @Anno[Unresolved](String(123), AnotherAnnotation#(), (AnotherAnnotation#), EnumClass#.Second#) public? final? [ResolvedTo(COMPANION_GENERATION)] fun foo(): R|kotlin/Unit| { - } + @R|kotlin/Deprecated|[CompilerRequiredAnnotations](boo#()) @Anno[Unresolved](LAZY_EXPRESSION, LAZY_EXPRESSION, LAZY_EXPRESSION, LAZY_EXPRESSION) public? final? [ResolvedTo(COMPANION_GENERATION)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK } SUPER_TYPES: @@ -222,14 +218,14 @@ FILE: [ResolvedTo(IMPORTS)] annotationArgumentsMixScript.kts public? final? [ResolvedTo(RAW_FIR)] annotation class AnotherAnnotation : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherAnnotation] constructor(): R|AnotherAnnotation| { - super() + LAZY_super } } public? final? [ResolvedTo(RAW_FIR)] enum class EnumClass : R|kotlin/Enum| { private [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] constructor(): R|EnumClass| { - super|>() + LAZY_super|> } public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] enum entry First: R|EnumClass| @@ -247,7 +243,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationArgumentsMixScript.kts public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.str] str: String, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.ann] ann: AnotherAnnotation, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.c] c: KClass<*>, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.entry] entry: EnumClass): R|Anno| { - super() + LAZY_super } public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val str: String = R|/str| @@ -264,8 +260,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationArgumentsMixScript.kts } - @R|kotlin/Deprecated|[CompilerRequiredAnnotations](boo#()) @Anno[Unresolved](String(123), AnotherAnnotation#(), (AnotherAnnotation#), EnumClass#.Second#) public? final? [ResolvedTo(SUPER_TYPES)] fun foo(): R|kotlin/Unit| { - } + @R|kotlin/Deprecated|[CompilerRequiredAnnotations](boo#()) @Anno[Unresolved](LAZY_EXPRESSION, LAZY_EXPRESSION, LAZY_EXPRESSION, LAZY_EXPRESSION) public? final? [ResolvedTo(SUPER_TYPES)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK } TYPES: @@ -276,14 +271,14 @@ FILE: [ResolvedTo(IMPORTS)] annotationArgumentsMixScript.kts public? final? [ResolvedTo(RAW_FIR)] annotation class AnotherAnnotation : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherAnnotation] constructor(): R|AnotherAnnotation| { - super() + LAZY_super } } public? final? [ResolvedTo(RAW_FIR)] enum class EnumClass : R|kotlin/Enum| { private [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] constructor(): R|EnumClass| { - super|>() + LAZY_super|> } public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] enum entry First: R|EnumClass| @@ -301,7 +296,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationArgumentsMixScript.kts public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.str] str: String, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.ann] ann: AnotherAnnotation, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.c] c: KClass<*>, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.entry] entry: EnumClass): R|Anno| { - super() + LAZY_super } public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val str: String = R|/str| @@ -318,8 +313,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationArgumentsMixScript.kts } - @R|kotlin/Deprecated|[Types](boo#()) @R|Anno|[Types](String(123), AnotherAnnotation#(), (AnotherAnnotation#), EnumClass#.Second#) public? final? [ResolvedTo(TYPES)] fun foo(): R|kotlin/Unit| { - } + @R|kotlin/Deprecated|[Types](boo#()) @R|Anno|[Types](LAZY_EXPRESSION, LAZY_EXPRESSION, LAZY_EXPRESSION, LAZY_EXPRESSION) public? final? [ResolvedTo(TYPES)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK } STATUS: @@ -330,14 +324,14 @@ FILE: [ResolvedTo(IMPORTS)] annotationArgumentsMixScript.kts public? final? [ResolvedTo(RAW_FIR)] annotation class AnotherAnnotation : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherAnnotation] constructor(): R|AnotherAnnotation| { - super() + LAZY_super } } public? final? [ResolvedTo(RAW_FIR)] enum class EnumClass : R|kotlin/Enum| { private [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] constructor(): R|EnumClass| { - super|>() + LAZY_super|> } public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] enum entry First: R|EnumClass| @@ -355,7 +349,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationArgumentsMixScript.kts public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.str] str: String, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.ann] ann: AnotherAnnotation, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.c] c: KClass<*>, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.entry] entry: EnumClass): R|Anno| { - super() + LAZY_super } public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val str: String = R|/str| @@ -372,8 +366,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationArgumentsMixScript.kts } - @R|kotlin/Deprecated|[Types](boo#()) @R|Anno|[Types](String(123), AnotherAnnotation#(), (AnotherAnnotation#), EnumClass#.Second#) public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| { - } + @R|kotlin/Deprecated|[Types](boo#()) @R|Anno|[Types](LAZY_EXPRESSION, LAZY_EXPRESSION, LAZY_EXPRESSION, LAZY_EXPRESSION) public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK } EXPECT_ACTUAL_MATCHING: @@ -384,14 +377,14 @@ FILE: [ResolvedTo(IMPORTS)] annotationArgumentsMixScript.kts public? final? [ResolvedTo(RAW_FIR)] annotation class AnotherAnnotation : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherAnnotation] constructor(): R|AnotherAnnotation| { - super() + LAZY_super } } public? final? [ResolvedTo(RAW_FIR)] enum class EnumClass : R|kotlin/Enum| { private [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] constructor(): R|EnumClass| { - super|>() + LAZY_super|> } public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=EnumClass] enum entry First: R|EnumClass| @@ -409,7 +402,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationArgumentsMixScript.kts public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.str] str: String, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.ann] ann: AnotherAnnotation, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.c] c: KClass<*>, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.entry] entry: EnumClass): R|Anno| { - super() + LAZY_super } public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val str: String = R|/str| @@ -426,8 +419,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationArgumentsMixScript.kts } - @R|kotlin/Deprecated|[Types](boo#()) @R|Anno|[Types](String(123), AnotherAnnotation#(), (AnotherAnnotation#), EnumClass#.Second#) public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun foo(): R|kotlin/Unit| { - } + @R|kotlin/Deprecated|[Types](boo#()) @R|Anno|[Types](LAZY_EXPRESSION, LAZY_EXPRESSION, LAZY_EXPRESSION, LAZY_EXPRESSION) public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK } ARGUMENTS_OF_ANNOTATIONS: @@ -438,14 +430,14 @@ FILE: [ResolvedTo(IMPORTS)] annotationArgumentsMixScript.kts public final [ResolvedTo(STATUS)] annotation class AnotherAnnotation : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherAnnotation] constructor(): R|AnotherAnnotation| { - super() + LAZY_super } } public final [ResolvedTo(STATUS)] enum class EnumClass : R|kotlin/Enum| { private [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] constructor(): R|EnumClass| { - super|>() + LAZY_super|> } public final static [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] enum entry First: R|EnumClass| @@ -463,7 +455,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationArgumentsMixScript.kts public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.str] str: String, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.ann] ann: AnotherAnnotation, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.c] c: KClass<*>, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.entry] entry: EnumClass): R|Anno| { - super() + LAZY_super } public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val str: String = R|/str| @@ -480,8 +472,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationArgumentsMixScript.kts } - @R|kotlin/Deprecated|[Types](boo#()) @R|Anno|[Types](String(123), AnotherAnnotation#(), (Q|AnotherAnnotation|), Q|EnumClass|.R|/EnumClass.Second|) public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun foo(): R|kotlin/Unit| { - } + @R|kotlin/Deprecated|[Types](boo#()) @R|Anno|[Types](String(123), AnotherAnnotation#(), (Q|AnotherAnnotation|), Q|EnumClass|.R|/EnumClass.Second|) public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK } CONTRACTS: @@ -492,14 +483,14 @@ FILE: [ResolvedTo(IMPORTS)] annotationArgumentsMixScript.kts public final [ResolvedTo(STATUS)] annotation class AnotherAnnotation : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherAnnotation] constructor(): R|AnotherAnnotation| { - super() + LAZY_super } } public final [ResolvedTo(STATUS)] enum class EnumClass : R|kotlin/Enum| { private [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] constructor(): R|EnumClass| { - super|>() + LAZY_super|> } public final static [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] enum entry First: R|EnumClass| @@ -517,7 +508,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationArgumentsMixScript.kts public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.str] str: String, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.ann] ann: AnotherAnnotation, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.c] c: KClass<*>, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.entry] entry: EnumClass): R|Anno| { - super() + LAZY_super } public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val str: String = R|/str| @@ -546,14 +537,14 @@ FILE: [ResolvedTo(IMPORTS)] annotationArgumentsMixScript.kts public final [ResolvedTo(STATUS)] annotation class AnotherAnnotation : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherAnnotation] constructor(): R|AnotherAnnotation| { - super() + LAZY_super } } public final [ResolvedTo(STATUS)] enum class EnumClass : R|kotlin/Enum| { private [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] constructor(): R|EnumClass| { - super|>() + LAZY_super|> } public final static [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] enum entry First: R|EnumClass| @@ -571,7 +562,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationArgumentsMixScript.kts public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.str] str: String, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.ann] ann: AnotherAnnotation, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.c] c: KClass<*>, [ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.entry] entry: EnumClass): R|Anno| { - super() + LAZY_super } public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val str: String = R|/str| @@ -600,14 +591,14 @@ FILE: [ResolvedTo(IMPORTS)] annotationArgumentsMixScript.kts public final [ResolvedTo(STATUS)] annotation class AnotherAnnotation : R|kotlin/Annotation| { public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherAnnotation] constructor(): R|AnotherAnnotation| { - super() + LAZY_super } } public final [ResolvedTo(STATUS)] enum class EnumClass : R|kotlin/Enum| { private [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] constructor(): R|EnumClass| { - super|>() + LAZY_super|> } public final static [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] enum entry First: R|EnumClass| @@ -625,7 +616,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationArgumentsMixScript.kts public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| { public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.str] str: R|kotlin/String|, [ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.ann] ann: R|AnotherAnnotation|, [ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.c] c: R|kotlin/reflect/KClass<*>|, [ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.entry] entry: R|EnumClass|): R|Anno| { - super() + LAZY_super } public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val str: R|kotlin/String| = R|/str| @@ -654,14 +645,14 @@ FILE: [ResolvedTo(IMPORTS)] annotationArgumentsMixScript.kts public final [ResolvedTo(STATUS)] annotation class AnotherAnnotation : R|kotlin/Annotation| { public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherAnnotation] constructor(): R|AnotherAnnotation| { - super() + LAZY_super } } public final [ResolvedTo(STATUS)] enum class EnumClass : R|kotlin/Enum| { private [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] constructor(): R|EnumClass| { - super|>() + LAZY_super|> } public final static [ResolvedTo(STATUS)] [ContainingClassKey=EnumClass] enum entry First: R|EnumClass| @@ -679,7 +670,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationArgumentsMixScript.kts public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| { public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.str] str: R|kotlin/String|, [ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.ann] ann: R|AnotherAnnotation|, [ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.c] c: R|kotlin/reflect/KClass<*>|, [ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.entry] entry: R|EnumClass|): R|Anno| { - super() + LAZY_super } public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val str: R|kotlin/String| = R|/str| diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/annotationClassWithJavaTargetScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/annotationClassWithJavaTargetScript.txt index ebb6959c50f..a81567e00d5 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/annotationClassWithJavaTargetScript.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/annotationClassWithJavaTargetScript.txt @@ -4,9 +4,9 @@ FILE: [ResolvedTo(RAW_FIR)] annotationClassWithJavaTargetScript.kts SCRIPT: [ResolvedTo(RAW_FIR)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - @java.lang.annotation.Target[Unresolved](ElementType#.TYPE_USE#) public? final? [ResolvedTo(RAW_FIR)] annotation class ResolveMe : R|kotlin/Annotation| { + @java.lang.annotation.Target[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] annotation class ResolveMe : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor(): R|ResolveMe| { - super() + LAZY_super } } @@ -18,9 +18,9 @@ FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTargetScript.kts SCRIPT: [ResolvedTo(RAW_FIR)] [ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array| - @java.lang.annotation.Target[Unresolved](ElementType#.TYPE_USE#) public? final? [ResolvedTo(RAW_FIR)] annotation class ResolveMe : R|kotlin/Annotation| { + @java.lang.annotation.Target[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] annotation class ResolveMe : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor(): R|ResolveMe| { - super() + LAZY_super } } @@ -34,7 +34,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTargetScript.kts @R|java/lang/annotation/Target|[CompilerRequiredAnnotations](ElementType#.TYPE_USE#) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] annotation class ResolveMe : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor(): R|ResolveMe| { - super() + LAZY_super } } @@ -48,7 +48,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTargetScript.kts @R|java/lang/annotation/Target|[CompilerRequiredAnnotations](ElementType#.TYPE_USE#) public? final? [ResolvedTo(COMPANION_GENERATION)] annotation class ResolveMe : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor(): R|ResolveMe| { - super() + LAZY_super } } @@ -62,7 +62,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTargetScript.kts @R|java/lang/annotation/Target|[CompilerRequiredAnnotations](ElementType#.TYPE_USE#) public? final? [ResolvedTo(SUPER_TYPES)] annotation class ResolveMe : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor(): R|ResolveMe| { - super() + LAZY_super } } @@ -76,7 +76,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTargetScript.kts @R|java/lang/annotation/Target|[Types](ElementType#.TYPE_USE#) public? final? [ResolvedTo(TYPES)] annotation class ResolveMe : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor(): R|ResolveMe| { - super() + LAZY_super } } @@ -90,7 +90,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTargetScript.kts @R|java/lang/annotation/Target|[Types](ElementType#.TYPE_USE#) public final [ResolvedTo(STATUS)] annotation class ResolveMe : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor(): R|ResolveMe| { - super() + LAZY_super } } @@ -104,7 +104,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTargetScript.kts @R|java/lang/annotation/Target|[Types](ElementType#.TYPE_USE#) public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] annotation class ResolveMe : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor(): R|ResolveMe| { - super() + LAZY_super } } @@ -118,7 +118,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTargetScript.kts @R|java/lang/annotation/Target|[Types](Q|java/lang/annotation/ElementType|.TYPE_USE#) public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] annotation class ResolveMe : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor(): R|ResolveMe| { - super() + LAZY_super } } @@ -132,7 +132,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTargetScript.kts @R|java/lang/annotation/Target|[Types](Q|java/lang/annotation/ElementType|.TYPE_USE#) public final [ResolvedTo(CONTRACTS)] annotation class ResolveMe : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor(): R|ResolveMe| { - super() + LAZY_super } } @@ -146,7 +146,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTargetScript.kts @R|java/lang/annotation/Target|[Types](Q|java/lang/annotation/ElementType|.TYPE_USE#) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] annotation class ResolveMe : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor(): R|ResolveMe| { - super() + LAZY_super } } @@ -160,7 +160,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationClassWithJavaTargetScript.kts @R|java/lang/annotation/Target|[Types](value = vararg(Q|java/lang/annotation/ElementType|.#)) public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] annotation class ResolveMe : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=ResolveMe] constructor(): R|ResolveMe| { - super() + LAZY_super } } diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/annotationOnLocalClassScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/annotationOnLocalClassScript.txt index 43920a37754..b5053e28ac3 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/annotationOnLocalClassScript.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/annotationOnLocalClassScript.txt @@ -6,14 +6,14 @@ FILE: [ResolvedTo(RAW_FIR)] annotationOnLocalClassScript.kts public? final? [ResolvedTo(RAW_FIR)] annotation class AnotherAnnotation : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherAnnotation] constructor(): R|one/two/AnotherAnnotation| { - super() + LAZY_super } } public? final? [ResolvedTo(RAW_FIR)] annotation class KotlinAnnotation : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=KotlinAnnotation] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/two/KotlinAnnotation.s] s: AnotherAnnotation): R|one/two/KotlinAnnotation| { - super() + LAZY_super } public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: AnotherAnnotation = R|/s| @@ -21,15 +21,7 @@ FILE: [ResolvedTo(RAW_FIR)] annotationOnLocalClassScript.kts } - public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| { - @KotlinAnnotation[Unresolved](AnotherAnnotation#()) local final? [ResolvedTo(RAW_FIR)] class LocalClass : R|kotlin/Any| { - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|one/two/LocalClass| { - super() - } - - } - - } + public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } IMPORTS: @@ -40,14 +32,14 @@ FILE: [ResolvedTo(IMPORTS)] annotationOnLocalClassScript.kts public? final? [ResolvedTo(RAW_FIR)] annotation class AnotherAnnotation : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherAnnotation] constructor(): R|one/two/AnotherAnnotation| { - super() + LAZY_super } } public? final? [ResolvedTo(RAW_FIR)] annotation class KotlinAnnotation : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=KotlinAnnotation] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/two/KotlinAnnotation.s] s: AnotherAnnotation): R|one/two/KotlinAnnotation| { - super() + LAZY_super } public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: AnotherAnnotation = R|/s| @@ -55,15 +47,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationOnLocalClassScript.kts } - public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| { - @KotlinAnnotation[Unresolved](AnotherAnnotation#()) local final? [ResolvedTo(RAW_FIR)] class LocalClass : R|kotlin/Any| { - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|one/two/LocalClass| { - super() - } - - } - - } + public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } COMPILER_REQUIRED_ANNOTATIONS: @@ -74,14 +58,14 @@ FILE: [ResolvedTo(IMPORTS)] annotationOnLocalClassScript.kts public? final? [ResolvedTo(RAW_FIR)] annotation class AnotherAnnotation : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherAnnotation] constructor(): R|one/two/AnotherAnnotation| { - super() + LAZY_super } } public? final? [ResolvedTo(RAW_FIR)] annotation class KotlinAnnotation : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=KotlinAnnotation] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/two/KotlinAnnotation.s] s: AnotherAnnotation): R|one/two/KotlinAnnotation| { - super() + LAZY_super } public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: AnotherAnnotation = R|/s| @@ -89,15 +73,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationOnLocalClassScript.kts } - public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { - @KotlinAnnotation[Unresolved](AnotherAnnotation#()) local final? [ResolvedTo(RAW_FIR)] class LocalClass : R|kotlin/Any| { - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|one/two/LocalClass| { - super() - } - - } - - } + public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } COMPANION_GENERATION: @@ -108,14 +84,14 @@ FILE: [ResolvedTo(IMPORTS)] annotationOnLocalClassScript.kts public? final? [ResolvedTo(RAW_FIR)] annotation class AnotherAnnotation : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherAnnotation] constructor(): R|one/two/AnotherAnnotation| { - super() + LAZY_super } } public? final? [ResolvedTo(RAW_FIR)] annotation class KotlinAnnotation : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=KotlinAnnotation] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/two/KotlinAnnotation.s] s: AnotherAnnotation): R|one/two/KotlinAnnotation| { - super() + LAZY_super } public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: AnotherAnnotation = R|/s| @@ -123,15 +99,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationOnLocalClassScript.kts } - public? final? [ResolvedTo(COMPANION_GENERATION)] fun resolveMe(): R|kotlin/Unit| { - @KotlinAnnotation[Unresolved](AnotherAnnotation#()) local final? [ResolvedTo(RAW_FIR)] class LocalClass : R|kotlin/Any| { - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|one/two/LocalClass| { - super() - } - - } - - } + public? final? [ResolvedTo(COMPANION_GENERATION)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } SUPER_TYPES: @@ -142,14 +110,14 @@ FILE: [ResolvedTo(IMPORTS)] annotationOnLocalClassScript.kts public? final? [ResolvedTo(RAW_FIR)] annotation class AnotherAnnotation : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherAnnotation] constructor(): R|one/two/AnotherAnnotation| { - super() + LAZY_super } } public? final? [ResolvedTo(RAW_FIR)] annotation class KotlinAnnotation : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=KotlinAnnotation] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/two/KotlinAnnotation.s] s: AnotherAnnotation): R|one/two/KotlinAnnotation| { - super() + LAZY_super } public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: AnotherAnnotation = R|/s| @@ -157,15 +125,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationOnLocalClassScript.kts } - public? final? [ResolvedTo(SUPER_TYPES)] fun resolveMe(): R|kotlin/Unit| { - @KotlinAnnotation[Unresolved](AnotherAnnotation#()) local final? [ResolvedTo(RAW_FIR)] class LocalClass : R|kotlin/Any| { - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|one/two/LocalClass| { - super() - } - - } - - } + public? final? [ResolvedTo(SUPER_TYPES)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } TYPES: @@ -176,14 +136,14 @@ FILE: [ResolvedTo(IMPORTS)] annotationOnLocalClassScript.kts public? final? [ResolvedTo(RAW_FIR)] annotation class AnotherAnnotation : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherAnnotation] constructor(): R|one/two/AnotherAnnotation| { - super() + LAZY_super } } public? final? [ResolvedTo(RAW_FIR)] annotation class KotlinAnnotation : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=KotlinAnnotation] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/two/KotlinAnnotation.s] s: AnotherAnnotation): R|one/two/KotlinAnnotation| { - super() + LAZY_super } public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: AnotherAnnotation = R|/s| @@ -191,15 +151,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationOnLocalClassScript.kts } - public? final? [ResolvedTo(TYPES)] fun resolveMe(): R|kotlin/Unit| { - @KotlinAnnotation[Unresolved](AnotherAnnotation#()) local final? [ResolvedTo(RAW_FIR)] class LocalClass : R|kotlin/Any| { - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|one/two/LocalClass| { - super() - } - - } - - } + public? final? [ResolvedTo(TYPES)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } STATUS: @@ -210,14 +162,14 @@ FILE: [ResolvedTo(IMPORTS)] annotationOnLocalClassScript.kts public? final? [ResolvedTo(RAW_FIR)] annotation class AnotherAnnotation : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherAnnotation] constructor(): R|one/two/AnotherAnnotation| { - super() + LAZY_super } } public? final? [ResolvedTo(RAW_FIR)] annotation class KotlinAnnotation : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=KotlinAnnotation] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/two/KotlinAnnotation.s] s: AnotherAnnotation): R|one/two/KotlinAnnotation| { - super() + LAZY_super } public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: AnotherAnnotation = R|/s| @@ -225,15 +177,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationOnLocalClassScript.kts } - public final [ResolvedTo(STATUS)] fun resolveMe(): R|kotlin/Unit| { - @KotlinAnnotation[Unresolved](AnotherAnnotation#()) local final? [ResolvedTo(RAW_FIR)] class LocalClass : R|kotlin/Any| { - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|one/two/LocalClass| { - super() - } - - } - - } + public final [ResolvedTo(STATUS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } EXPECT_ACTUAL_MATCHING: @@ -244,14 +188,14 @@ FILE: [ResolvedTo(IMPORTS)] annotationOnLocalClassScript.kts public? final? [ResolvedTo(RAW_FIR)] annotation class AnotherAnnotation : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherAnnotation] constructor(): R|one/two/AnotherAnnotation| { - super() + LAZY_super } } public? final? [ResolvedTo(RAW_FIR)] annotation class KotlinAnnotation : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=KotlinAnnotation] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/two/KotlinAnnotation.s] s: AnotherAnnotation): R|one/two/KotlinAnnotation| { - super() + LAZY_super } public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: AnotherAnnotation = R|/s| @@ -259,15 +203,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationOnLocalClassScript.kts } - public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun resolveMe(): R|kotlin/Unit| { - @KotlinAnnotation[Unresolved](AnotherAnnotation#()) local final? [ResolvedTo(RAW_FIR)] class LocalClass : R|kotlin/Any| { - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|one/two/LocalClass| { - super() - } - - } - - } + public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } ARGUMENTS_OF_ANNOTATIONS: @@ -278,14 +214,14 @@ FILE: [ResolvedTo(IMPORTS)] annotationOnLocalClassScript.kts public? final? [ResolvedTo(RAW_FIR)] annotation class AnotherAnnotation : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherAnnotation] constructor(): R|one/two/AnotherAnnotation| { - super() + LAZY_super } } public? final? [ResolvedTo(RAW_FIR)] annotation class KotlinAnnotation : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=KotlinAnnotation] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/two/KotlinAnnotation.s] s: AnotherAnnotation): R|one/two/KotlinAnnotation| { - super() + LAZY_super } public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: AnotherAnnotation = R|/s| @@ -293,15 +229,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationOnLocalClassScript.kts } - public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { - @KotlinAnnotation[Unresolved](AnotherAnnotation#()) local final? [ResolvedTo(RAW_FIR)] class LocalClass : R|kotlin/Any| { - public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=LocalClass] constructor(): R|one/two/LocalClass| { - super() - } - - } - - } + public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } CONTRACTS: @@ -312,14 +240,14 @@ FILE: [ResolvedTo(IMPORTS)] annotationOnLocalClassScript.kts public? final? [ResolvedTo(RAW_FIR)] annotation class AnotherAnnotation : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherAnnotation] constructor(): R|one/two/AnotherAnnotation| { - super() + LAZY_super } } public? final? [ResolvedTo(RAW_FIR)] annotation class KotlinAnnotation : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=KotlinAnnotation] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/two/KotlinAnnotation.s] s: AnotherAnnotation): R|one/two/KotlinAnnotation| { - super() + LAZY_super } public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: AnotherAnnotation = R|/s| @@ -346,14 +274,14 @@ FILE: [ResolvedTo(IMPORTS)] annotationOnLocalClassScript.kts public? final? [ResolvedTo(RAW_FIR)] annotation class AnotherAnnotation : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherAnnotation] constructor(): R|one/two/AnotherAnnotation| { - super() + LAZY_super } } public? final? [ResolvedTo(RAW_FIR)] annotation class KotlinAnnotation : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=KotlinAnnotation] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/two/KotlinAnnotation.s] s: AnotherAnnotation): R|one/two/KotlinAnnotation| { - super() + LAZY_super } public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: AnotherAnnotation = R|/s| @@ -380,14 +308,14 @@ FILE: [ResolvedTo(IMPORTS)] annotationOnLocalClassScript.kts public? final? [ResolvedTo(RAW_FIR)] annotation class AnotherAnnotation : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=AnotherAnnotation] constructor(): R|one/two/AnotherAnnotation| { - super() + LAZY_super } } public? final? [ResolvedTo(RAW_FIR)] annotation class KotlinAnnotation : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=KotlinAnnotation] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/two/KotlinAnnotation.s] s: AnotherAnnotation): R|one/two/KotlinAnnotation| { - super() + LAZY_super } public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val s: AnotherAnnotation = R|/s| @@ -414,14 +342,14 @@ FILE: [ResolvedTo(IMPORTS)] annotationOnLocalClassScript.kts public final [ResolvedTo(STATUS)] annotation class AnotherAnnotation : R|kotlin/Annotation| { public [ResolvedTo(STATUS)] [ContainingClassKey=AnotherAnnotation] constructor(): R|one/two/AnotherAnnotation| { - super() + LAZY_super } } public final [ResolvedTo(STATUS)] annotation class KotlinAnnotation : R|kotlin/Annotation| { public [ResolvedTo(STATUS)] [ContainingClassKey=KotlinAnnotation] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=one/two/KotlinAnnotation.s] s: R|one/two/AnotherAnnotation|): R|one/two/KotlinAnnotation| { - super() + LAZY_super } public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val s: R|one/two/AnotherAnnotation| = R|/s| diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/annotationParametersScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/annotationParametersScript.txt index 291ee339855..ec407cf9d2d 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/annotationParametersScript.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/annotationParametersScript.txt @@ -6,7 +6,7 @@ FILE: [ResolvedTo(RAW_FIR)] annotationParametersScript.kts public? final? [ResolvedTo(RAW_FIR)] enum class X : R|kotlin/Enum| { private [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor(): R|X| { - super|>() + LAZY_super|> } public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] enum entry A: R|X| @@ -23,7 +23,7 @@ FILE: [ResolvedTo(RAW_FIR)] annotationParametersScript.kts public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.args] args: A.X): R|Anno| { - super() + LAZY_super } public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val args: A.X = R|/args| @@ -33,14 +33,12 @@ FILE: [ResolvedTo(RAW_FIR)] annotationParametersScript.kts public? final? [ResolvedTo(RAW_FIR)] class B : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|B| { - super() + LAZY_super } - @Anno[Unresolved](X#.A#) public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| { - } + @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } - @Anno[Unresolved](X#.A#) public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| { - } + @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK } } @@ -53,7 +51,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationParametersScript.kts public? final? [ResolvedTo(RAW_FIR)] enum class X : R|kotlin/Enum| { private [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor(): R|X| { - super|>() + LAZY_super|> } public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] enum entry A: R|X| @@ -70,7 +68,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationParametersScript.kts public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.args] args: A.X): R|Anno| { - super() + LAZY_super } public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val args: A.X = R|/args| @@ -80,14 +78,12 @@ FILE: [ResolvedTo(IMPORTS)] annotationParametersScript.kts public? final? [ResolvedTo(RAW_FIR)] class B : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|B| { - super() + LAZY_super } - @Anno[Unresolved](X#.A#) public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| { - } + @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } - @Anno[Unresolved](X#.A#) public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| { - } + @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK } } @@ -100,7 +96,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationParametersScript.kts public? final? [ResolvedTo(RAW_FIR)] enum class X : R|kotlin/Enum| { private [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor(): R|X| { - super|>() + LAZY_super|> } public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] enum entry A: R|X| @@ -117,7 +113,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationParametersScript.kts public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.args] args: A.X): R|Anno| { - super() + LAZY_super } public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val args: A.X = R|/args| @@ -127,14 +123,12 @@ FILE: [ResolvedTo(IMPORTS)] annotationParametersScript.kts public? final? [ResolvedTo(RAW_FIR)] class B : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|B| { - super() + LAZY_super } - @Anno[Unresolved](X#.A#) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { - } + @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } - @Anno[Unresolved](X#.A#) public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| { - } + @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK } } @@ -147,7 +141,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationParametersScript.kts public? final? [ResolvedTo(RAW_FIR)] enum class X : R|kotlin/Enum| { private [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor(): R|X| { - super|>() + LAZY_super|> } public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] enum entry A: R|X| @@ -164,7 +158,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationParametersScript.kts public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.args] args: A.X): R|Anno| { - super() + LAZY_super } public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val args: A.X = R|/args| @@ -174,14 +168,12 @@ FILE: [ResolvedTo(IMPORTS)] annotationParametersScript.kts public? final? [ResolvedTo(RAW_FIR)] class B : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|B| { - super() + LAZY_super } - @Anno[Unresolved](X#.A#) public? final? [ResolvedTo(COMPANION_GENERATION)] fun resolveMe(): R|kotlin/Unit| { - } + @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(COMPANION_GENERATION)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } - @Anno[Unresolved](X#.A#) public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| { - } + @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK } } @@ -194,7 +186,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationParametersScript.kts public? final? [ResolvedTo(RAW_FIR)] enum class X : R|kotlin/Enum| { private [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor(): R|X| { - super|>() + LAZY_super|> } public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] enum entry A: R|X| @@ -211,7 +203,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationParametersScript.kts public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.args] args: A.X): R|Anno| { - super() + LAZY_super } public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val args: A.X = R|/args| @@ -221,14 +213,12 @@ FILE: [ResolvedTo(IMPORTS)] annotationParametersScript.kts public? final? [ResolvedTo(SUPER_TYPES)] class B : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|B| { - super() + LAZY_super } - @Anno[Unresolved](X#.A#) public? final? [ResolvedTo(SUPER_TYPES)] fun resolveMe(): R|kotlin/Unit| { - } + @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(SUPER_TYPES)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } - @Anno[Unresolved](X#.A#) public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| { - } + @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK } } @@ -241,7 +231,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationParametersScript.kts public? final? [ResolvedTo(RAW_FIR)] enum class X : R|kotlin/Enum| { private [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor(): R|X| { - super|>() + LAZY_super|> } public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] enum entry A: R|X| @@ -258,7 +248,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationParametersScript.kts public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.args] args: A.X): R|Anno| { - super() + LAZY_super } public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val args: A.X = R|/args| @@ -268,14 +258,12 @@ FILE: [ResolvedTo(IMPORTS)] annotationParametersScript.kts public? final? [ResolvedTo(TYPES)] class B : R|kotlin/Any| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=B] constructor(): R|B| { - super() + LAZY_super } - @R|Anno|[Types](X#.A#) public? final? [ResolvedTo(TYPES)] fun resolveMe(): R|kotlin/Unit| { - } + @R|Anno|[Types](LAZY_EXPRESSION) public? final? [ResolvedTo(TYPES)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } - @Anno[Unresolved](X#.A#) public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| { - } + @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK } } @@ -288,7 +276,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationParametersScript.kts public? final? [ResolvedTo(RAW_FIR)] enum class X : R|kotlin/Enum| { private [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor(): R|X| { - super|>() + LAZY_super|> } public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] enum entry A: R|X| @@ -305,7 +293,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationParametersScript.kts public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.args] args: A.X): R|Anno| { - super() + LAZY_super } public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val args: A.X = R|/args| @@ -315,14 +303,12 @@ FILE: [ResolvedTo(IMPORTS)] annotationParametersScript.kts public final [ResolvedTo(STATUS)] class B : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=B] constructor(): R|B| { - super() + LAZY_super } - @R|Anno|[Types](X#.A#) public final [ResolvedTo(STATUS)] fun resolveMe(): R|kotlin/Unit| { - } + @R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(STATUS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } - @R|Anno|[Types](X#.A#) public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| { - } + @R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK } } @@ -335,7 +321,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationParametersScript.kts public? final? [ResolvedTo(RAW_FIR)] enum class X : R|kotlin/Enum| { private [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] constructor(): R|X| { - super|>() + LAZY_super|> } public final static [ResolvedTo(RAW_FIR)] [ContainingClassKey=X] enum entry A: R|X| @@ -352,7 +338,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationParametersScript.kts public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.args] args: A.X): R|Anno| { - super() + LAZY_super } public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val args: A.X = R|/args| @@ -362,14 +348,12 @@ FILE: [ResolvedTo(IMPORTS)] annotationParametersScript.kts public final [ResolvedTo(STATUS)] class B : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=B] constructor(): R|B| { - super() + LAZY_super } - @R|Anno|[Types](X#.A#) public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun resolveMe(): R|kotlin/Unit| { - } + @R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } - @R|Anno|[Types](X#.A#) public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| { - } + @R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK } } @@ -382,7 +366,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationParametersScript.kts public final [ResolvedTo(STATUS)] enum class X : R|kotlin/Enum| { private [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor(): R|X| { - super|>() + LAZY_super|> } public final static [ResolvedTo(STATUS)] [ContainingClassKey=X] enum entry A: R|X| @@ -399,7 +383,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationParametersScript.kts public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.args] args: A.X): R|Anno| { - super() + LAZY_super } public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val args: A.X = R|/args| @@ -409,14 +393,12 @@ FILE: [ResolvedTo(IMPORTS)] annotationParametersScript.kts public final [ResolvedTo(STATUS)] class B : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=B] constructor(): R|B| { - super() + LAZY_super } - @R|Anno|[Types](Q|X|.R|/X.A|) public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { - } + @R|Anno|[Types](Q|X|.R|/X.A|) public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } - @R|Anno|[Types](X#.A#) public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| { - } + @R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK } } @@ -429,7 +411,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationParametersScript.kts public final [ResolvedTo(STATUS)] enum class X : R|kotlin/Enum| { private [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor(): R|X| { - super|>() + LAZY_super|> } public final static [ResolvedTo(STATUS)] [ContainingClassKey=X] enum entry A: R|X| @@ -446,7 +428,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationParametersScript.kts public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.args] args: A.X): R|Anno| { - super() + LAZY_super } public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val args: A.X = R|/args| @@ -456,14 +438,13 @@ FILE: [ResolvedTo(IMPORTS)] annotationParametersScript.kts public final [ResolvedTo(STATUS)] class B : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=B] constructor(): R|B| { - super() + LAZY_super } @R|Anno|[Types](Q|X|.R|/X.A|) public final [ResolvedTo(CONTRACTS)] fun resolveMe(): R|kotlin/Unit| { } - @R|Anno|[Types](X#.A#) public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| { - } + @R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK } } @@ -476,7 +457,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationParametersScript.kts public final [ResolvedTo(STATUS)] enum class X : R|kotlin/Enum| { private [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor(): R|X| { - super|>() + LAZY_super|> } public final static [ResolvedTo(STATUS)] [ContainingClassKey=X] enum entry A: R|X| @@ -493,7 +474,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationParametersScript.kts public? final? [ResolvedTo(RAW_FIR)] annotation class Anno : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor([ResolvedTo(RAW_FIR)] [CorrespondingProperty=/Anno.args] args: A.X): R|Anno| { - super() + LAZY_super } public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val args: A.X = R|/args| @@ -503,14 +484,13 @@ FILE: [ResolvedTo(IMPORTS)] annotationParametersScript.kts public final [ResolvedTo(STATUS)] class B : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=B] constructor(): R|B| { - super() + LAZY_super } @R|Anno|[Types](Q|X|.R|/X.A|) public final [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] fun resolveMe(): R|kotlin/Unit| { } - @R|Anno|[Types](X#.A#) public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| { - } + @R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK } } @@ -523,7 +503,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationParametersScript.kts public final [ResolvedTo(STATUS)] enum class X : R|kotlin/Enum| { private [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor(): R|X| { - super|>() + LAZY_super|> } public final static [ResolvedTo(STATUS)] [ContainingClassKey=X] enum entry A: R|X| @@ -540,7 +520,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationParametersScript.kts public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| { public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.args] args: ): R|Anno| { - super() + LAZY_super } public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val args: = R|/args| @@ -550,14 +530,13 @@ FILE: [ResolvedTo(IMPORTS)] annotationParametersScript.kts public final [ResolvedTo(STATUS)] class B : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=B] constructor(): R|B| { - super() + LAZY_super } @R|Anno|[Types](args = Q|X|.R|/X.A|) public final [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] fun resolveMe(): R|kotlin/Unit| { } - @R|Anno|[Types](X#.A#) public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| { - } + @R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK } } @@ -570,7 +549,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationParametersScript.kts public final [ResolvedTo(STATUS)] enum class X : R|kotlin/Enum| { private [ResolvedTo(STATUS)] [ContainingClassKey=X] constructor(): R|X| { - super|>() + LAZY_super|> } public final static [ResolvedTo(STATUS)] [ContainingClassKey=X] enum entry A: R|X| @@ -587,7 +566,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationParametersScript.kts public final [ResolvedTo(STATUS)] annotation class Anno : R|kotlin/Annotation| { public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor([ResolvedTo(STATUS)] [CorrespondingProperty=/Anno.args] args: ): R|Anno| { - super() + LAZY_super } public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val args: = R|/args| @@ -597,14 +576,13 @@ FILE: [ResolvedTo(IMPORTS)] annotationParametersScript.kts public final [ResolvedTo(STATUS)] class B : R|kotlin/Any| { public [ResolvedTo(STATUS)] [ContainingClassKey=B] constructor(): R|B| { - super() + LAZY_super } @R|Anno|[Types](args = Q|X|.R|/X.A|) public final [ResolvedTo(BODY_RESOLVE)] fun resolveMe(): R|kotlin/Unit| { } - @R|Anno|[Types](X#.A#) public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| { - } + @R|Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(STATUS)] fun foo(): R|kotlin/Unit| { LAZY_BLOCK } } diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/annotationWithTypeArgumentScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/annotationWithTypeArgumentScript.txt index fb54df0b5f8..4be649990dd 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/annotationWithTypeArgumentScript.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/annotationWithTypeArgumentScript.txt @@ -6,7 +6,7 @@ FILE: [ResolvedTo(RAW_FIR)] annotationWithTypeArgumentScript.kts public? final? [ResolvedTo(RAW_FIR)] annotation class Anno<[ResolvedTo(RAW_FIR)] T : Number> : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor<[ResolvedTo(RAW_FIR)] T : Number>([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/Anno.value] value: KClass): R|one/Anno| { - super() + LAZY_super } public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val value: KClass = R|/value| @@ -14,8 +14,7 @@ FILE: [ResolvedTo(RAW_FIR)] annotationWithTypeArgumentScript.kts } - @Anno[Unresolved]((Int#)) public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| { - } + @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } IMPORTS: @@ -26,7 +25,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithTypeArgumentScript.kts public? final? [ResolvedTo(RAW_FIR)] annotation class Anno<[ResolvedTo(RAW_FIR)] T : Number> : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor<[ResolvedTo(RAW_FIR)] T : Number>([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/Anno.value] value: KClass): R|one/Anno| { - super() + LAZY_super } public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val value: KClass = R|/value| @@ -34,8 +33,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithTypeArgumentScript.kts } - @Anno[Unresolved]((Int#)) public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| { - } + @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(RAW_FIR)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } COMPILER_REQUIRED_ANNOTATIONS: @@ -46,7 +44,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithTypeArgumentScript.kts public? final? [ResolvedTo(RAW_FIR)] annotation class Anno<[ResolvedTo(RAW_FIR)] T : Number> : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor<[ResolvedTo(RAW_FIR)] T : Number>([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/Anno.value] value: KClass): R|one/Anno| { - super() + LAZY_super } public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val value: KClass = R|/value| @@ -54,8 +52,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithTypeArgumentScript.kts } - @Anno[Unresolved]((Int#)) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { - } + @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(COMPILER_REQUIRED_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } COMPANION_GENERATION: @@ -66,7 +63,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithTypeArgumentScript.kts public? final? [ResolvedTo(RAW_FIR)] annotation class Anno<[ResolvedTo(RAW_FIR)] T : Number> : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor<[ResolvedTo(RAW_FIR)] T : Number>([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/Anno.value] value: KClass): R|one/Anno| { - super() + LAZY_super } public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val value: KClass = R|/value| @@ -74,8 +71,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithTypeArgumentScript.kts } - @Anno[Unresolved]((Int#)) public? final? [ResolvedTo(COMPANION_GENERATION)] fun resolveMe(): R|kotlin/Unit| { - } + @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(COMPANION_GENERATION)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } SUPER_TYPES: @@ -86,7 +82,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithTypeArgumentScript.kts public? final? [ResolvedTo(RAW_FIR)] annotation class Anno<[ResolvedTo(RAW_FIR)] T : Number> : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor<[ResolvedTo(RAW_FIR)] T : Number>([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/Anno.value] value: KClass): R|one/Anno| { - super() + LAZY_super } public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val value: KClass = R|/value| @@ -94,8 +90,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithTypeArgumentScript.kts } - @Anno[Unresolved]((Int#)) public? final? [ResolvedTo(SUPER_TYPES)] fun resolveMe(): R|kotlin/Unit| { - } + @Anno[Unresolved](LAZY_EXPRESSION) public? final? [ResolvedTo(SUPER_TYPES)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } TYPES: @@ -106,7 +101,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithTypeArgumentScript.kts public? final? [ResolvedTo(RAW_FIR)] annotation class Anno<[ResolvedTo(RAW_FIR)] T : Number> : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor<[ResolvedTo(RAW_FIR)] T : Number>([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/Anno.value] value: KClass): R|one/Anno| { - super() + LAZY_super } public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val value: KClass = R|/value| @@ -114,8 +109,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithTypeArgumentScript.kts } - @R|one/Anno|[Types]((Int#)) public? final? [ResolvedTo(TYPES)] fun resolveMe(): R|kotlin/Unit| { - } + @R|one/Anno|[Types](LAZY_EXPRESSION) public? final? [ResolvedTo(TYPES)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } STATUS: @@ -126,7 +120,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithTypeArgumentScript.kts public? final? [ResolvedTo(RAW_FIR)] annotation class Anno<[ResolvedTo(RAW_FIR)] T : Number> : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor<[ResolvedTo(RAW_FIR)] T : Number>([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/Anno.value] value: KClass): R|one/Anno| { - super() + LAZY_super } public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val value: KClass = R|/value| @@ -134,8 +128,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithTypeArgumentScript.kts } - @R|one/Anno|[Types]((Int#)) public final [ResolvedTo(STATUS)] fun resolveMe(): R|kotlin/Unit| { - } + @R|one/Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(STATUS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } EXPECT_ACTUAL_MATCHING: @@ -146,7 +139,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithTypeArgumentScript.kts public? final? [ResolvedTo(RAW_FIR)] annotation class Anno<[ResolvedTo(RAW_FIR)] T : Number> : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor<[ResolvedTo(RAW_FIR)] T : Number>([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/Anno.value] value: KClass): R|one/Anno| { - super() + LAZY_super } public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val value: KClass = R|/value| @@ -154,8 +147,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithTypeArgumentScript.kts } - @R|one/Anno|[Types]((Int#)) public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun resolveMe(): R|kotlin/Unit| { - } + @R|one/Anno|[Types](LAZY_EXPRESSION) public final [ResolvedTo(EXPECT_ACTUAL_MATCHING)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } ARGUMENTS_OF_ANNOTATIONS: @@ -166,7 +158,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithTypeArgumentScript.kts public? final? [ResolvedTo(RAW_FIR)] annotation class Anno<[ResolvedTo(RAW_FIR)] T : Number> : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor<[ResolvedTo(RAW_FIR)] T : Number>([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/Anno.value] value: KClass): R|one/Anno| { - super() + LAZY_super } public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val value: KClass = R|/value| @@ -174,8 +166,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithTypeArgumentScript.kts } - @R|one/Anno|[Types]((Q|kotlin/Int|)) public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { - } + @R|one/Anno|[Types]((Q|kotlin/Int|)) public final [ResolvedTo(ARGUMENTS_OF_ANNOTATIONS)] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK } CONTRACTS: @@ -186,7 +177,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithTypeArgumentScript.kts public? final? [ResolvedTo(RAW_FIR)] annotation class Anno<[ResolvedTo(RAW_FIR)] T : Number> : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor<[ResolvedTo(RAW_FIR)] T : Number>([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/Anno.value] value: KClass): R|one/Anno| { - super() + LAZY_super } public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val value: KClass = R|/value| @@ -206,7 +197,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithTypeArgumentScript.kts public? final? [ResolvedTo(RAW_FIR)] annotation class Anno<[ResolvedTo(RAW_FIR)] T : Number> : R|kotlin/Annotation| { public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Anno] constructor<[ResolvedTo(RAW_FIR)] T : Number>([ResolvedTo(RAW_FIR)] [CorrespondingProperty=one/Anno.value] value: KClass): R|one/Anno| { - super() + LAZY_super } public? final? [ResolvedTo(RAW_FIR)] [IsFromPrimaryConstructor=true] val value: KClass = R|/value| @@ -226,7 +217,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithTypeArgumentScript.kts public final [ResolvedTo(STATUS)] annotation class Anno<[ResolvedTo(STATUS)] T : R|kotlin/Number|> : R|kotlin/Annotation| { public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor<[ResolvedTo(STATUS)] T : R|kotlin/Number|>([ResolvedTo(STATUS)] [CorrespondingProperty=one/Anno.value] value: ): R|one/Anno| { - super() + LAZY_super } public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val value: = R|/value| @@ -246,7 +237,7 @@ FILE: [ResolvedTo(IMPORTS)] annotationWithTypeArgumentScript.kts public final [ResolvedTo(STATUS)] annotation class Anno<[ResolvedTo(STATUS)] T : R|kotlin/Number|> : R|kotlin/Annotation| { public [ResolvedTo(STATUS)] [ContainingClassKey=Anno] constructor<[ResolvedTo(STATUS)] T : R|kotlin/Number|>([ResolvedTo(STATUS)] [CorrespondingProperty=one/Anno.value] value: ): R|one/Anno| { - super() + LAZY_super } public final [ResolvedTo(STATUS)] [IsFromPrimaryConstructor=true] val value: = R|/value| diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/annotationsScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/annotationsScript.txt index 2fb85719d9a..dca67aaf176 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/annotationsScript.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/annotationsScript.txt @@ -1,97 +1,89 @@ RAW_FIR: FILE: [ResolvedTo(RAW_FIR)] annotationsScript.kts - @FILE:Suppress[Unresolved](String(1)) + @FILE:Suppress[Unresolved](LAZY_EXPRESSION) [ResolvedTo(RAW_FIR)] annotations container context(