diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/FirDesignation.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/FirDesignation.kt index c7f6ca09470..ca8efbd11a6 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/FirDesignation.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/FirDesignation.kt @@ -72,22 +72,15 @@ private fun collectDesignationPath(target: FirElementWithResolveState): List { requireIsInstance(target) + // We shouldn't try to build a designation path for such fake declarations as they + // do not depend on outer classes during resolution + if (target.isCopyCreatedInScope) return emptyList() if (target.symbol.callableId.isLocal || target.status.visibility == Visibilities.Local) { return null } val containingClassId = target.containingClassLookupTag()?.classId ?: return emptyList() - - if (target.origin is FirDeclarationOrigin.SubstitutionOverride) { - val originalContainingClassId = target.originalForSubstitutionOverride?.containingClassLookupTag()?.classId - if (containingClassId == originalContainingClassId) { - // Ugly temporary hack for call-site substitution overrides (KTIJ-24004). - // Containing class ID from the origin cannot be used, as the origin might be in a different module. - return emptyList() - } - } - return collectDesignationPathWithContainingClass(target, containingClassId) } diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/LLFirResolveMultiDesignationCollector.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/LLFirResolveMultiDesignationCollector.kt index 74b77d7bc06..93d210e8130 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/LLFirResolveMultiDesignationCollector.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/LLFirResolveMultiDesignationCollector.kt @@ -17,6 +17,7 @@ import org.jetbrains.kotlin.fir.FirFileAnnotationsContainer import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.synthetic.FirSyntheticProperty import org.jetbrains.kotlin.fir.declarations.synthetic.FirSyntheticPropertyAccessor +import org.jetbrains.kotlin.fir.isCopyCreatedInScope internal object LLFirResolveMultiDesignationCollector { fun getDesignationsToResolve(target: FirElementWithResolveState): List = when (target) { @@ -36,19 +37,24 @@ internal object LLFirResolveMultiDesignationCollector { if (target is FirFile) return listOf(LLFirWholeElementResolveTarget(target)) if (!target.shouldBeResolved()) return emptyList() + if (target is FirCallableDeclaration && target.isCopyCreatedInScope) { + return listOf(LLFirSingleResolveTarget(target)) + } + val designation = target.tryCollectDesignationWithFile() ?: return emptyList() val resolveTarget = LLFirWholeElementResolveTarget(designation.firFile, designation.path, target) return listOf(resolveTarget) } - private fun getMainDesignationToResolve(target: FirElementWithResolveState): LLFirResolveTarget? { + private fun getMainDesignationToResolve(target: FirElementWithResolveState): LLFirSingleResolveTarget? { require(target !is FirFile) if (!target.shouldBeResolved()) return null - return when (target) { - is FirPropertyAccessor -> getMainDesignationToResolve(target.propertySymbol.fir) - is FirBackingField -> getMainDesignationToResolve(target.propertySymbol.fir) - is FirTypeParameter -> getMainDesignationToResolve(target.containingDeclarationSymbol.fir) - is FirValueParameter -> getMainDesignationToResolve(target.containingFunctionSymbol.fir) + return when { + target is FirPropertyAccessor -> getMainDesignationToResolve(target.propertySymbol.fir) + target is FirBackingField -> getMainDesignationToResolve(target.propertySymbol.fir) + target is FirTypeParameter -> getMainDesignationToResolve(target.containingDeclarationSymbol.fir) + target is FirValueParameter -> getMainDesignationToResolve(target.containingFunctionSymbol.fir) + target is FirCallableDeclaration && target.isCopyCreatedInScope -> LLFirSingleResolveTarget(target) else -> target.tryCollectDesignationWithFile()?.asResolveTarget() } } diff --git a/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithImplicitTypeInsideAnonymousObject.after.txt b/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithImplicitTypeInsideAnonymousObject.after.txt index 94312b46df0..1f6c76b3a5f 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithImplicitTypeInsideAnonymousObject.after.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithImplicitTypeInsideAnonymousObject.after.txt @@ -6,21 +6,21 @@ public open [ResolvedTo(BODY_RESOLVE)] fun isSchemeFile([ResolvedTo(BODY_RESOLVE ^isSchemeFile Boolean(true) } -public open [ResolvedTo(STATUS)] [CallableCopySubstitutionKey=CallableCopySubstitution(substitutor=Empty, baseSymbol=FirNamedFunctionSymbol /BaseInterface.anotherFunction), DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /BaseInterface.anotherFunction, containingClass=, delegateField=FirFieldSymbol /.$$delegate_0] fun anotherFunction([ResolvedTo(STATUS)] name: R|kotlin/CharSequence| = STUB): +public open [ResolvedTo(BODY_RESOLVE)] [DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /BaseInterface.anotherFunction, containingClass=, delegateField=FirFieldSymbol /.$$delegate_0] fun anotherFunction([ResolvedTo(BODY_RESOLVE)] name: R|kotlin/CharSequence| = STUB): R|kotlin/Boolean| public open [ResolvedTo(BODY_RESOLVE)] fun anotherFunction([ResolvedTo(BODY_RESOLVE)] name: R|kotlin/CharSequence| = R|/genericCall|()): R|kotlin/Boolean| { ^anotherFunction Boolean(true) } -@R|Anno|[Types](str = (String(property ), R|/constant|)) public open [ResolvedTo(STATUS)] [DelegatedWrapperDataKey=[wrapped=FirPropertySymbol /BaseInterface.propertyWithAnnotations, containingClass=, delegateField=FirFieldSymbol /.$$delegate_0] var propertyWithAnnotations: R|kotlin/Int| - @PROPERTY_GETTER:R|Anno|[Types](str = (String(property ), R|/constant|)) public [ResolvedTo(STATUS)] [ContainingClassKey=] get(): R|kotlin/Int| - @PROPERTY_SETTER:R|Anno|[Types](str = (String(property ), R|/constant|)) public [ResolvedTo(STATUS)] [ContainingClassKey=] set([ResolvedTo(STATUS)] value: R|kotlin/Int|): R|kotlin/Unit| +@R|Anno|[Types](str = (String(property ), R|/constant|)) public open [ResolvedTo(BODY_RESOLVE)] [DelegatedWrapperDataKey=[wrapped=FirPropertySymbol /BaseInterface.propertyWithAnnotations, containingClass=, delegateField=FirFieldSymbol /.$$delegate_0] var propertyWithAnnotations: R|kotlin/Int| + @PROPERTY_GETTER:R|Anno|[Types](str = (String(property ), R|/constant|)) public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=] get(): R|kotlin/Int| + @PROPERTY_SETTER:R|Anno|[Types](str = (String(property ), R|/constant|)) public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=] set([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/Int|): R|kotlin/Unit| @R|Anno|[Types](str = (String(property ), R|/constant|)) public abstract [ResolvedTo(BODY_RESOLVE)] var propertyWithAnnotations: R|kotlin/Int| @PROPERTY_GETTER:R|Anno|[Types](str = (String(property ), R|/constant|)) public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=BaseInterface] get(): R|kotlin/Int| @PROPERTY_SETTER:R|Anno|[Types](str = (String(property ), R|/constant|)) public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=BaseInterface] set([ResolvedTo(BODY_RESOLVE)] @SETTER_PARAMETER:R|Anno|[Types](str = (String(property ), R|/constant|)) value: R|kotlin/Int|): R|kotlin/Unit| -public open [ResolvedTo(STATUS)] [DelegatedWrapperDataKey=[wrapped=FirPropertySymbol /BaseInterface.property, containingClass=, delegateField=FirFieldSymbol /.$$delegate_0] var property: R|kotlin/Int| +public open [ResolvedTo(BODY_RESOLVE)] [DelegatedWrapperDataKey=[wrapped=FirPropertySymbol /BaseInterface.property, containingClass=, delegateField=FirFieldSymbol /.$$delegate_0] var property: R|kotlin/Int| diff --git a/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithImplicitTypeInsideAnonymousObjectScript.after.txt b/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithImplicitTypeInsideAnonymousObjectScript.after.txt index 94312b46df0..1f6c76b3a5f 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithImplicitTypeInsideAnonymousObjectScript.after.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithImplicitTypeInsideAnonymousObjectScript.after.txt @@ -6,21 +6,21 @@ public open [ResolvedTo(BODY_RESOLVE)] fun isSchemeFile([ResolvedTo(BODY_RESOLVE ^isSchemeFile Boolean(true) } -public open [ResolvedTo(STATUS)] [CallableCopySubstitutionKey=CallableCopySubstitution(substitutor=Empty, baseSymbol=FirNamedFunctionSymbol /BaseInterface.anotherFunction), DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /BaseInterface.anotherFunction, containingClass=, delegateField=FirFieldSymbol /.$$delegate_0] fun anotherFunction([ResolvedTo(STATUS)] name: R|kotlin/CharSequence| = STUB): +public open [ResolvedTo(BODY_RESOLVE)] [DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /BaseInterface.anotherFunction, containingClass=, delegateField=FirFieldSymbol /.$$delegate_0] fun anotherFunction([ResolvedTo(BODY_RESOLVE)] name: R|kotlin/CharSequence| = STUB): R|kotlin/Boolean| public open [ResolvedTo(BODY_RESOLVE)] fun anotherFunction([ResolvedTo(BODY_RESOLVE)] name: R|kotlin/CharSequence| = R|/genericCall|()): R|kotlin/Boolean| { ^anotherFunction Boolean(true) } -@R|Anno|[Types](str = (String(property ), R|/constant|)) public open [ResolvedTo(STATUS)] [DelegatedWrapperDataKey=[wrapped=FirPropertySymbol /BaseInterface.propertyWithAnnotations, containingClass=, delegateField=FirFieldSymbol /.$$delegate_0] var propertyWithAnnotations: R|kotlin/Int| - @PROPERTY_GETTER:R|Anno|[Types](str = (String(property ), R|/constant|)) public [ResolvedTo(STATUS)] [ContainingClassKey=] get(): R|kotlin/Int| - @PROPERTY_SETTER:R|Anno|[Types](str = (String(property ), R|/constant|)) public [ResolvedTo(STATUS)] [ContainingClassKey=] set([ResolvedTo(STATUS)] value: R|kotlin/Int|): R|kotlin/Unit| +@R|Anno|[Types](str = (String(property ), R|/constant|)) public open [ResolvedTo(BODY_RESOLVE)] [DelegatedWrapperDataKey=[wrapped=FirPropertySymbol /BaseInterface.propertyWithAnnotations, containingClass=, delegateField=FirFieldSymbol /.$$delegate_0] var propertyWithAnnotations: R|kotlin/Int| + @PROPERTY_GETTER:R|Anno|[Types](str = (String(property ), R|/constant|)) public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=] get(): R|kotlin/Int| + @PROPERTY_SETTER:R|Anno|[Types](str = (String(property ), R|/constant|)) public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=] set([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/Int|): R|kotlin/Unit| @R|Anno|[Types](str = (String(property ), R|/constant|)) public abstract [ResolvedTo(BODY_RESOLVE)] var propertyWithAnnotations: R|kotlin/Int| @PROPERTY_GETTER:R|Anno|[Types](str = (String(property ), R|/constant|)) public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=BaseInterface] get(): R|kotlin/Int| @PROPERTY_SETTER:R|Anno|[Types](str = (String(property ), R|/constant|)) public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=BaseInterface] set([ResolvedTo(BODY_RESOLVE)] @SETTER_PARAMETER:R|Anno|[Types](str = (String(property ), R|/constant|)) value: R|kotlin/Int|): R|kotlin/Unit| -public open [ResolvedTo(STATUS)] [DelegatedWrapperDataKey=[wrapped=FirPropertySymbol /BaseInterface.property, containingClass=, delegateField=FirFieldSymbol /.$$delegate_0] var property: R|kotlin/Int| +public open [ResolvedTo(BODY_RESOLVE)] [DelegatedWrapperDataKey=[wrapped=FirPropertySymbol /BaseInterface.property, containingClass=, delegateField=FirFieldSymbol /.$$delegate_0] var property: R|kotlin/Int| diff --git a/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithImplicitTypeInsideAnonymousObjectWithSubstitution.after.txt b/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithImplicitTypeInsideAnonymousObjectWithSubstitution.after.txt index 4bd4e143b80..b3025533dfe 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithImplicitTypeInsideAnonymousObjectWithSubstitution.after.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithImplicitTypeInsideAnonymousObjectWithSubstitution.after.txt @@ -2,7 +2,7 @@ public open override [ResolvedTo(BODY_RESOLVE)] fun isSchemeFile([ResolvedTo(BOD ^isSchemeFile !=(R|/name|, String(str)) } -public open [ResolvedTo(STATUS)] [CallableCopySubstitutionKey=CallableCopySubstitution(substitutor={SCHEME -> @R|Anno|(str = (String(object ), R|/constant|)) kotlin/Int}, baseSymbol=FirNamedFunctionSymbol /IntermediateClass.isSchemeFile), SubstitutedOverrideOriginalKey=/IntermediateClass.isSchemeFile] fun isSchemeFile([ResolvedTo(STATUS)] [SubstitutedOverrideOriginalKey=/name] name: R|kotlin/CharSequence| = STUB): +public open [ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=/IntermediateClass.isSchemeFile] fun isSchemeFile([ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=/name] name: R|kotlin/CharSequence| = STUB): R|kotlin/Boolean| public open [ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=/BaseClass.isSchemeFile] fun isSchemeFile([ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=/name] name: R|kotlin/CharSequence| = STUB): R|kotlin/Boolean| @@ -10,9 +10,9 @@ public open [ResolvedTo(BODY_RESOLVE)] fun isSchemeFile([ResolvedTo(BODY_RESOLVE ^isSchemeFile Boolean(true) } -public open [ResolvedTo(STATUS)] [CallableCopySubstitutionKey=CallableCopySubstitution(substitutor=Empty, baseSymbol=FirNamedFunctionSymbol /IntermediateClass.anotherFunction), DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /IntermediateClass.anotherFunction, containingClass=, delegateField=FirFieldSymbol /.$$delegate_0, SubstitutedOverrideOriginalKey=/IntermediateClass.anotherFunction] fun anotherFunction([ResolvedTo(STATUS)] [SubstitutedOverrideOriginalKey=/name] name: R|kotlin/CharSequence| = STUB): +public open [ResolvedTo(BODY_RESOLVE)] [DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /IntermediateClass.anotherFunction, containingClass=, delegateField=FirFieldSymbol /.$$delegate_0, SubstitutedOverrideOriginalKey=/IntermediateClass.anotherFunction] fun anotherFunction([ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=/name] name: R|kotlin/CharSequence| = STUB): R|kotlin/Boolean| -public open [ResolvedTo(STATUS)] [CallableCopySubstitutionKey=CallableCopySubstitution(substitutor={SCHEME -> @R|Anno|(str = (String(object ), R|/constant|)) kotlin/Int}, baseSymbol=FirNamedFunctionSymbol /IntermediateClass.anotherFunction), SubstitutedOverrideOriginalKey=/IntermediateClass.anotherFunction] fun anotherFunction([ResolvedTo(STATUS)] [SubstitutedOverrideOriginalKey=/name] name: R|kotlin/CharSequence| = STUB): +public open [ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=/IntermediateClass.anotherFunction] fun anotherFunction([ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=/name] name: R|kotlin/CharSequence| = STUB): R|kotlin/Boolean| public open [ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=/BaseClass.anotherFunction] fun anotherFunction([ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=/name] name: R|kotlin/CharSequence| = STUB): R|kotlin/Boolean| @@ -20,13 +20,13 @@ public open [ResolvedTo(BODY_RESOLVE)] fun anotherFunction([ResolvedTo(BODY_RESO ^anotherFunction Boolean(true) } -@R|Anno|[Types](str = (String(property ), R|/constant|)) public open [ResolvedTo(STATUS)] [CallableCopySubstitutionKey=CallableCopySubstitution(substitutor=Empty, baseSymbol=FirPropertySymbol /IntermediateClass.propertyWithAnnotations), DelegatedWrapperDataKey=[wrapped=FirPropertySymbol /IntermediateClass.propertyWithAnnotations, containingClass=, delegateField=FirFieldSymbol /.$$delegate_0, SubstitutedOverrideOriginalKey=/IntermediateClass.propertyWithAnnotations] var propertyWithAnnotations: - @PROPERTY_GETTER:R|Anno|[Types](str = (String(property ), R|/constant|)) public [ResolvedTo(STATUS)] [ContainingClassKey=] get(): - @PROPERTY_SETTER:R|Anno|[Types](str = (String(property ), R|/constant|)) public [ResolvedTo(STATUS)] [ContainingClassKey=] set([ResolvedTo(STATUS)] value: ): R|kotlin/Unit| +@R|Anno|[Types](str = (String(property ), R|/constant|)) public open [ResolvedTo(BODY_RESOLVE)] [DelegatedWrapperDataKey=[wrapped=FirPropertySymbol /IntermediateClass.propertyWithAnnotations, containingClass=, delegateField=FirFieldSymbol /.$$delegate_0, SubstitutedOverrideOriginalKey=/IntermediateClass.propertyWithAnnotations] var propertyWithAnnotations: R|@R|Anno|(str = (String(object ), R|/constant|)) @R|Anno|(str = (String(super ), R|/constant|)) kotlin/Int| + @PROPERTY_GETTER:R|Anno|[Types](str = (String(property ), R|/constant|)) public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=] get(): R|@R|Anno|(str = (String(object ), R|/constant|)) @R|Anno|(str = (String(super ), R|/constant|)) kotlin/Int| + @PROPERTY_SETTER:R|Anno|[Types](str = (String(property ), R|/constant|)) public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=] set([ResolvedTo(BODY_RESOLVE)] value: R|@R|Anno|(str = (String(object ), R|/constant|)) @R|Anno|(str = (String(super ), R|/constant|)) kotlin/Int|): R|kotlin/Unit| -@R|Anno|[Types](str = (String(property ), R|/constant|)) public open [ResolvedTo(STATUS)] [CallableCopySubstitutionKey=CallableCopySubstitution(substitutor={SCHEME -> @R|Anno|(str = (String(object ), R|/constant|)) kotlin/Int}, baseSymbol=FirPropertySymbol /IntermediateClass.propertyWithAnnotations), SubstitutedOverrideOriginalKey=/IntermediateClass.propertyWithAnnotations] var propertyWithAnnotations: - @PROPERTY_GETTER:R|Anno|[Types](str = (String(property ), R|/constant|)) public [ResolvedTo(STATUS)] [ContainingClassKey=, SubstitutedOverrideOriginalKey=special/accessor] get(): - @PROPERTY_SETTER:R|Anno|[Types](str = (String(property ), R|/constant|)) public [ResolvedTo(STATUS)] [ContainingClassKey=, SubstitutedOverrideOriginalKey=special/accessor] set([ResolvedTo(STATUS)] value: ): R|kotlin/Unit| +@R|Anno|[Types](str = (String(property ), R|/constant|)) public open [ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=/IntermediateClass.propertyWithAnnotations] var propertyWithAnnotations: R|@R|Anno|(str = (String(object ), R|/constant|)) @R|Anno|(str = (String(super ), R|/constant|)) kotlin/Int| + @PROPERTY_GETTER:R|Anno|[Types](str = (String(property ), R|/constant|)) public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=, SubstitutedOverrideOriginalKey=special/accessor] get(): R|@R|Anno|(str = (String(object ), R|/constant|)) @R|Anno|(str = (String(super ), R|/constant|)) kotlin/Int| + @PROPERTY_SETTER:R|Anno|[Types](str = (String(property ), R|/constant|)) public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=, SubstitutedOverrideOriginalKey=special/accessor] set([ResolvedTo(BODY_RESOLVE)] value: R|@R|Anno|(str = (String(object ), R|/constant|)) @R|Anno|(str = (String(super ), R|/constant|)) kotlin/Int|): R|kotlin/Unit| @R|Anno|[Types](str = (String(property ), R|/constant|)) public open [ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=/BaseClass.propertyWithAnnotations] var propertyWithAnnotations: R|@R|Anno|(str = (String(super ), R|/constant|)) SCHEME| @PROPERTY_GETTER:R|Anno|[Types](str = (String(property ), R|/constant|)) public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=IntermediateClass, SubstitutedOverrideOriginalKey=special/accessor] get(): R|@R|Anno|(str = (String(super ), R|/constant|)) SCHEME| @@ -36,11 +36,11 @@ public open [ResolvedTo(BODY_RESOLVE)] fun anotherFunction([ResolvedTo(BODY_RESO @PROPERTY_GETTER:R|Anno|[Types](str = (String(property ), R|/constant|)) public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=BaseClass] get(): R|SCHEME| @PROPERTY_SETTER:R|Anno|[Types](str = (String(property ), R|/constant|)) public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=BaseClass] set([ResolvedTo(BODY_RESOLVE)] @SETTER_PARAMETER:R|Anno|[Types](str = (String(property ), R|/constant|)) value: R|SCHEME|): R|kotlin/Unit| -public open [ResolvedTo(STATUS)] [DelegatedWrapperDataKey=[wrapped=FirPropertySymbol /IntermediateClass.property, containingClass=, delegateField=FirFieldSymbol /.$$delegate_0, SubstitutedOverrideOriginalKey=/IntermediateClass.property] var property: R|@R|Anno|(str = (String(object ), R|/constant|)) @R|Anno|(str = (String(super ), R|/constant|)) kotlin/Int| +public open [ResolvedTo(BODY_RESOLVE)] [DelegatedWrapperDataKey=[wrapped=FirPropertySymbol /IntermediateClass.property, containingClass=, delegateField=FirFieldSymbol /.$$delegate_0, SubstitutedOverrideOriginalKey=/IntermediateClass.property] var property: R|@R|Anno|(str = (String(object ), R|/constant|)) @R|Anno|(str = (String(super ), R|/constant|)) kotlin/Int| -public abstract [ResolvedTo(STATUS)] [SubstitutedOverrideOriginalKey=/IntermediateClass.property] var property: R|@R|Anno|(str = (String(object ), R|/constant|)) @R|Anno|(str = (String(super ), R|/constant|)) kotlin/Int| +public abstract [ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=/IntermediateClass.property] var property: R|@R|Anno|(str = (String(object ), R|/constant|)) @R|Anno|(str = (String(super ), R|/constant|)) kotlin/Int| diff --git a/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithImplicitTypeInsideAnonymousObjectWithSubstitutionScript.after.txt b/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithImplicitTypeInsideAnonymousObjectWithSubstitutionScript.after.txt index 4bd4e143b80..b3025533dfe 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithImplicitTypeInsideAnonymousObjectWithSubstitutionScript.after.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithImplicitTypeInsideAnonymousObjectWithSubstitutionScript.after.txt @@ -2,7 +2,7 @@ public open override [ResolvedTo(BODY_RESOLVE)] fun isSchemeFile([ResolvedTo(BOD ^isSchemeFile !=(R|/name|, String(str)) } -public open [ResolvedTo(STATUS)] [CallableCopySubstitutionKey=CallableCopySubstitution(substitutor={SCHEME -> @R|Anno|(str = (String(object ), R|/constant|)) kotlin/Int}, baseSymbol=FirNamedFunctionSymbol /IntermediateClass.isSchemeFile), SubstitutedOverrideOriginalKey=/IntermediateClass.isSchemeFile] fun isSchemeFile([ResolvedTo(STATUS)] [SubstitutedOverrideOriginalKey=/name] name: R|kotlin/CharSequence| = STUB): +public open [ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=/IntermediateClass.isSchemeFile] fun isSchemeFile([ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=/name] name: R|kotlin/CharSequence| = STUB): R|kotlin/Boolean| public open [ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=/BaseClass.isSchemeFile] fun isSchemeFile([ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=/name] name: R|kotlin/CharSequence| = STUB): R|kotlin/Boolean| @@ -10,9 +10,9 @@ public open [ResolvedTo(BODY_RESOLVE)] fun isSchemeFile([ResolvedTo(BODY_RESOLVE ^isSchemeFile Boolean(true) } -public open [ResolvedTo(STATUS)] [CallableCopySubstitutionKey=CallableCopySubstitution(substitutor=Empty, baseSymbol=FirNamedFunctionSymbol /IntermediateClass.anotherFunction), DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /IntermediateClass.anotherFunction, containingClass=, delegateField=FirFieldSymbol /.$$delegate_0, SubstitutedOverrideOriginalKey=/IntermediateClass.anotherFunction] fun anotherFunction([ResolvedTo(STATUS)] [SubstitutedOverrideOriginalKey=/name] name: R|kotlin/CharSequence| = STUB): +public open [ResolvedTo(BODY_RESOLVE)] [DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /IntermediateClass.anotherFunction, containingClass=, delegateField=FirFieldSymbol /.$$delegate_0, SubstitutedOverrideOriginalKey=/IntermediateClass.anotherFunction] fun anotherFunction([ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=/name] name: R|kotlin/CharSequence| = STUB): R|kotlin/Boolean| -public open [ResolvedTo(STATUS)] [CallableCopySubstitutionKey=CallableCopySubstitution(substitutor={SCHEME -> @R|Anno|(str = (String(object ), R|/constant|)) kotlin/Int}, baseSymbol=FirNamedFunctionSymbol /IntermediateClass.anotherFunction), SubstitutedOverrideOriginalKey=/IntermediateClass.anotherFunction] fun anotherFunction([ResolvedTo(STATUS)] [SubstitutedOverrideOriginalKey=/name] name: R|kotlin/CharSequence| = STUB): +public open [ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=/IntermediateClass.anotherFunction] fun anotherFunction([ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=/name] name: R|kotlin/CharSequence| = STUB): R|kotlin/Boolean| public open [ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=/BaseClass.anotherFunction] fun anotherFunction([ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=/name] name: R|kotlin/CharSequence| = STUB): R|kotlin/Boolean| @@ -20,13 +20,13 @@ public open [ResolvedTo(BODY_RESOLVE)] fun anotherFunction([ResolvedTo(BODY_RESO ^anotherFunction Boolean(true) } -@R|Anno|[Types](str = (String(property ), R|/constant|)) public open [ResolvedTo(STATUS)] [CallableCopySubstitutionKey=CallableCopySubstitution(substitutor=Empty, baseSymbol=FirPropertySymbol /IntermediateClass.propertyWithAnnotations), DelegatedWrapperDataKey=[wrapped=FirPropertySymbol /IntermediateClass.propertyWithAnnotations, containingClass=, delegateField=FirFieldSymbol /.$$delegate_0, SubstitutedOverrideOriginalKey=/IntermediateClass.propertyWithAnnotations] var propertyWithAnnotations: - @PROPERTY_GETTER:R|Anno|[Types](str = (String(property ), R|/constant|)) public [ResolvedTo(STATUS)] [ContainingClassKey=] get(): - @PROPERTY_SETTER:R|Anno|[Types](str = (String(property ), R|/constant|)) public [ResolvedTo(STATUS)] [ContainingClassKey=] set([ResolvedTo(STATUS)] value: ): R|kotlin/Unit| +@R|Anno|[Types](str = (String(property ), R|/constant|)) public open [ResolvedTo(BODY_RESOLVE)] [DelegatedWrapperDataKey=[wrapped=FirPropertySymbol /IntermediateClass.propertyWithAnnotations, containingClass=, delegateField=FirFieldSymbol /.$$delegate_0, SubstitutedOverrideOriginalKey=/IntermediateClass.propertyWithAnnotations] var propertyWithAnnotations: R|@R|Anno|(str = (String(object ), R|/constant|)) @R|Anno|(str = (String(super ), R|/constant|)) kotlin/Int| + @PROPERTY_GETTER:R|Anno|[Types](str = (String(property ), R|/constant|)) public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=] get(): R|@R|Anno|(str = (String(object ), R|/constant|)) @R|Anno|(str = (String(super ), R|/constant|)) kotlin/Int| + @PROPERTY_SETTER:R|Anno|[Types](str = (String(property ), R|/constant|)) public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=] set([ResolvedTo(BODY_RESOLVE)] value: R|@R|Anno|(str = (String(object ), R|/constant|)) @R|Anno|(str = (String(super ), R|/constant|)) kotlin/Int|): R|kotlin/Unit| -@R|Anno|[Types](str = (String(property ), R|/constant|)) public open [ResolvedTo(STATUS)] [CallableCopySubstitutionKey=CallableCopySubstitution(substitutor={SCHEME -> @R|Anno|(str = (String(object ), R|/constant|)) kotlin/Int}, baseSymbol=FirPropertySymbol /IntermediateClass.propertyWithAnnotations), SubstitutedOverrideOriginalKey=/IntermediateClass.propertyWithAnnotations] var propertyWithAnnotations: - @PROPERTY_GETTER:R|Anno|[Types](str = (String(property ), R|/constant|)) public [ResolvedTo(STATUS)] [ContainingClassKey=, SubstitutedOverrideOriginalKey=special/accessor] get(): - @PROPERTY_SETTER:R|Anno|[Types](str = (String(property ), R|/constant|)) public [ResolvedTo(STATUS)] [ContainingClassKey=, SubstitutedOverrideOriginalKey=special/accessor] set([ResolvedTo(STATUS)] value: ): R|kotlin/Unit| +@R|Anno|[Types](str = (String(property ), R|/constant|)) public open [ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=/IntermediateClass.propertyWithAnnotations] var propertyWithAnnotations: R|@R|Anno|(str = (String(object ), R|/constant|)) @R|Anno|(str = (String(super ), R|/constant|)) kotlin/Int| + @PROPERTY_GETTER:R|Anno|[Types](str = (String(property ), R|/constant|)) public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=, SubstitutedOverrideOriginalKey=special/accessor] get(): R|@R|Anno|(str = (String(object ), R|/constant|)) @R|Anno|(str = (String(super ), R|/constant|)) kotlin/Int| + @PROPERTY_SETTER:R|Anno|[Types](str = (String(property ), R|/constant|)) public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=, SubstitutedOverrideOriginalKey=special/accessor] set([ResolvedTo(BODY_RESOLVE)] value: R|@R|Anno|(str = (String(object ), R|/constant|)) @R|Anno|(str = (String(super ), R|/constant|)) kotlin/Int|): R|kotlin/Unit| @R|Anno|[Types](str = (String(property ), R|/constant|)) public open [ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=/BaseClass.propertyWithAnnotations] var propertyWithAnnotations: R|@R|Anno|(str = (String(super ), R|/constant|)) SCHEME| @PROPERTY_GETTER:R|Anno|[Types](str = (String(property ), R|/constant|)) public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=IntermediateClass, SubstitutedOverrideOriginalKey=special/accessor] get(): R|@R|Anno|(str = (String(super ), R|/constant|)) SCHEME| @@ -36,11 +36,11 @@ public open [ResolvedTo(BODY_RESOLVE)] fun anotherFunction([ResolvedTo(BODY_RESO @PROPERTY_GETTER:R|Anno|[Types](str = (String(property ), R|/constant|)) public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=BaseClass] get(): R|SCHEME| @PROPERTY_SETTER:R|Anno|[Types](str = (String(property ), R|/constant|)) public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=BaseClass] set([ResolvedTo(BODY_RESOLVE)] @SETTER_PARAMETER:R|Anno|[Types](str = (String(property ), R|/constant|)) value: R|SCHEME|): R|kotlin/Unit| -public open [ResolvedTo(STATUS)] [DelegatedWrapperDataKey=[wrapped=FirPropertySymbol /IntermediateClass.property, containingClass=, delegateField=FirFieldSymbol /.$$delegate_0, SubstitutedOverrideOriginalKey=/IntermediateClass.property] var property: R|@R|Anno|(str = (String(object ), R|/constant|)) @R|Anno|(str = (String(super ), R|/constant|)) kotlin/Int| +public open [ResolvedTo(BODY_RESOLVE)] [DelegatedWrapperDataKey=[wrapped=FirPropertySymbol /IntermediateClass.property, containingClass=, delegateField=FirFieldSymbol /.$$delegate_0, SubstitutedOverrideOriginalKey=/IntermediateClass.property] var property: R|@R|Anno|(str = (String(object ), R|/constant|)) @R|Anno|(str = (String(super ), R|/constant|)) kotlin/Int| -public abstract [ResolvedTo(STATUS)] [SubstitutedOverrideOriginalKey=/IntermediateClass.property] var property: R|@R|Anno|(str = (String(object ), R|/constant|)) @R|Anno|(str = (String(super ), R|/constant|)) kotlin/Int| +public abstract [ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=/IntermediateClass.property] var property: R|@R|Anno|(str = (String(object ), R|/constant|)) @R|Anno|(str = (String(super ), R|/constant|)) kotlin/Int| diff --git a/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithoutImplicitTypeInsideAnonymousObject.after.txt b/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithoutImplicitTypeInsideAnonymousObject.after.txt index d1c417685ef..e7d578c9aa6 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithoutImplicitTypeInsideAnonymousObject.after.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithoutImplicitTypeInsideAnonymousObject.after.txt @@ -6,21 +6,21 @@ public open [ResolvedTo(BODY_RESOLVE)] fun isSchemeFile([ResolvedTo(BODY_RESOLVE ^isSchemeFile Boolean(true) } -public open [ResolvedTo(STATUS)] [DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /BaseInterface.anotherFunction, containingClass=, delegateField=FirFieldSymbol /.$$delegate_0] fun anotherFunction([ResolvedTo(STATUS)] name: R|kotlin/CharSequence|): R|kotlin/Boolean| +public open [ResolvedTo(BODY_RESOLVE)] [DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /BaseInterface.anotherFunction, containingClass=, delegateField=FirFieldSymbol /.$$delegate_0] fun anotherFunction([ResolvedTo(BODY_RESOLVE)] name: R|kotlin/CharSequence|): R|kotlin/Boolean| public open [ResolvedTo(BODY_RESOLVE)] fun anotherFunction([ResolvedTo(BODY_RESOLVE)] name: R|kotlin/CharSequence|): R|kotlin/Boolean| { ^anotherFunction Boolean(true) } -@R|Anno|[Types](str = (String(property ), R|/constant|)) public open [ResolvedTo(STATUS)] [DelegatedWrapperDataKey=[wrapped=FirPropertySymbol /BaseInterface.propertyWithAnnotations, containingClass=, delegateField=FirFieldSymbol /.$$delegate_0] var propertyWithAnnotations: R|kotlin/Int| - @PROPERTY_GETTER:R|Anno|[Types](str = (String(property ), R|/constant|)) public [ResolvedTo(STATUS)] [ContainingClassKey=] get(): R|kotlin/Int| - @PROPERTY_SETTER:R|Anno|[Types](str = (String(property ), R|/constant|)) public [ResolvedTo(STATUS)] [ContainingClassKey=] set([ResolvedTo(STATUS)] value: R|kotlin/Int|): R|kotlin/Unit| +@R|Anno|[Types](str = (String(property ), R|/constant|)) public open [ResolvedTo(BODY_RESOLVE)] [DelegatedWrapperDataKey=[wrapped=FirPropertySymbol /BaseInterface.propertyWithAnnotations, containingClass=, delegateField=FirFieldSymbol /.$$delegate_0] var propertyWithAnnotations: R|kotlin/Int| + @PROPERTY_GETTER:R|Anno|[Types](str = (String(property ), R|/constant|)) public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=] get(): R|kotlin/Int| + @PROPERTY_SETTER:R|Anno|[Types](str = (String(property ), R|/constant|)) public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=] set([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/Int|): R|kotlin/Unit| @R|Anno|[Types](str = (String(property ), R|/constant|)) public abstract [ResolvedTo(BODY_RESOLVE)] var propertyWithAnnotations: R|kotlin/Int| @PROPERTY_GETTER:R|Anno|[Types](str = (String(property ), R|/constant|)) public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=BaseInterface] get(): R|kotlin/Int| @PROPERTY_SETTER:R|Anno|[Types](str = (String(property ), R|/constant|)) public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=BaseInterface] set([ResolvedTo(BODY_RESOLVE)] @SETTER_PARAMETER:R|Anno|[Types](str = (String(property ), R|/constant|)) value: R|kotlin/Int|): R|kotlin/Unit| -public open [ResolvedTo(STATUS)] [DelegatedWrapperDataKey=[wrapped=FirPropertySymbol /BaseInterface.property, containingClass=, delegateField=FirFieldSymbol /.$$delegate_0] var property: R|kotlin/Int| +public open [ResolvedTo(BODY_RESOLVE)] [DelegatedWrapperDataKey=[wrapped=FirPropertySymbol /BaseInterface.property, containingClass=, delegateField=FirFieldSymbol /.$$delegate_0] var property: R|kotlin/Int| diff --git a/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithoutImplicitTypeInsideAnonymousObjectScript.after.txt b/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithoutImplicitTypeInsideAnonymousObjectScript.after.txt index d1c417685ef..e7d578c9aa6 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithoutImplicitTypeInsideAnonymousObjectScript.after.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithoutImplicitTypeInsideAnonymousObjectScript.after.txt @@ -6,21 +6,21 @@ public open [ResolvedTo(BODY_RESOLVE)] fun isSchemeFile([ResolvedTo(BODY_RESOLVE ^isSchemeFile Boolean(true) } -public open [ResolvedTo(STATUS)] [DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /BaseInterface.anotherFunction, containingClass=, delegateField=FirFieldSymbol /.$$delegate_0] fun anotherFunction([ResolvedTo(STATUS)] name: R|kotlin/CharSequence|): R|kotlin/Boolean| +public open [ResolvedTo(BODY_RESOLVE)] [DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /BaseInterface.anotherFunction, containingClass=, delegateField=FirFieldSymbol /.$$delegate_0] fun anotherFunction([ResolvedTo(BODY_RESOLVE)] name: R|kotlin/CharSequence|): R|kotlin/Boolean| public open [ResolvedTo(BODY_RESOLVE)] fun anotherFunction([ResolvedTo(BODY_RESOLVE)] name: R|kotlin/CharSequence|): R|kotlin/Boolean| { ^anotherFunction Boolean(true) } -@R|Anno|[Types](str = (String(property ), R|/constant|)) public open [ResolvedTo(STATUS)] [DelegatedWrapperDataKey=[wrapped=FirPropertySymbol /BaseInterface.propertyWithAnnotations, containingClass=, delegateField=FirFieldSymbol /.$$delegate_0] var propertyWithAnnotations: R|kotlin/Int| - @PROPERTY_GETTER:R|Anno|[Types](str = (String(property ), R|/constant|)) public [ResolvedTo(STATUS)] [ContainingClassKey=] get(): R|kotlin/Int| - @PROPERTY_SETTER:R|Anno|[Types](str = (String(property ), R|/constant|)) public [ResolvedTo(STATUS)] [ContainingClassKey=] set([ResolvedTo(STATUS)] value: R|kotlin/Int|): R|kotlin/Unit| +@R|Anno|[Types](str = (String(property ), R|/constant|)) public open [ResolvedTo(BODY_RESOLVE)] [DelegatedWrapperDataKey=[wrapped=FirPropertySymbol /BaseInterface.propertyWithAnnotations, containingClass=, delegateField=FirFieldSymbol /.$$delegate_0] var propertyWithAnnotations: R|kotlin/Int| + @PROPERTY_GETTER:R|Anno|[Types](str = (String(property ), R|/constant|)) public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=] get(): R|kotlin/Int| + @PROPERTY_SETTER:R|Anno|[Types](str = (String(property ), R|/constant|)) public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=] set([ResolvedTo(BODY_RESOLVE)] value: R|kotlin/Int|): R|kotlin/Unit| @R|Anno|[Types](str = (String(property ), R|/constant|)) public abstract [ResolvedTo(BODY_RESOLVE)] var propertyWithAnnotations: R|kotlin/Int| @PROPERTY_GETTER:R|Anno|[Types](str = (String(property ), R|/constant|)) public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=BaseInterface] get(): R|kotlin/Int| @PROPERTY_SETTER:R|Anno|[Types](str = (String(property ), R|/constant|)) public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=BaseInterface] set([ResolvedTo(BODY_RESOLVE)] @SETTER_PARAMETER:R|Anno|[Types](str = (String(property ), R|/constant|)) value: R|kotlin/Int|): R|kotlin/Unit| -public open [ResolvedTo(STATUS)] [DelegatedWrapperDataKey=[wrapped=FirPropertySymbol /BaseInterface.property, containingClass=, delegateField=FirFieldSymbol /.$$delegate_0] var property: R|kotlin/Int| +public open [ResolvedTo(BODY_RESOLVE)] [DelegatedWrapperDataKey=[wrapped=FirPropertySymbol /BaseInterface.property, containingClass=, delegateField=FirFieldSymbol /.$$delegate_0] var property: R|kotlin/Int| diff --git a/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithoutImplicitTypeInsideAnonymousObjectWithSubstitution.after.txt b/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithoutImplicitTypeInsideAnonymousObjectWithSubstitution.after.txt index 22a1bced638..55c59b05d72 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithoutImplicitTypeInsideAnonymousObjectWithSubstitution.after.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithoutImplicitTypeInsideAnonymousObjectWithSubstitution.after.txt @@ -2,7 +2,7 @@ public open override [ResolvedTo(BODY_RESOLVE)] fun isSchemeFile([ResolvedTo(BOD ^isSchemeFile !=(R|/name|, String(str)) } -public open [ResolvedTo(STATUS)] [SubstitutedOverrideOriginalKey=/IntermediateClass.isSchemeFile] fun isSchemeFile([ResolvedTo(STATUS)] [SubstitutedOverrideOriginalKey=/name] name: R|kotlin/CharSequence|): R|kotlin/Boolean| +public open [ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=/IntermediateClass.isSchemeFile] fun isSchemeFile([ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=/name] name: R|kotlin/CharSequence|): R|kotlin/Boolean| public open [ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=/BaseClass.isSchemeFile] fun isSchemeFile([ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=/name] name: R|kotlin/CharSequence|): R|kotlin/Boolean| @@ -10,9 +10,9 @@ public open [ResolvedTo(BODY_RESOLVE)] fun isSchemeFile([ResolvedTo(BODY_RESOLVE ^isSchemeFile Boolean(true) } -public open [ResolvedTo(STATUS)] [DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /IntermediateClass.anotherFunction, containingClass=, delegateField=FirFieldSymbol /.$$delegate_0, SubstitutedOverrideOriginalKey=/IntermediateClass.anotherFunction] fun anotherFunction([ResolvedTo(STATUS)] [SubstitutedOverrideOriginalKey=/name] name: R|@R|Anno|(str = (String(object ), R|/constant|)) @R|Anno|(str = (String(super ), R|/constant|)) kotlin/Int| = STUB): R|kotlin/Boolean| +public open [ResolvedTo(BODY_RESOLVE)] [DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /IntermediateClass.anotherFunction, containingClass=, delegateField=FirFieldSymbol /.$$delegate_0, SubstitutedOverrideOriginalKey=/IntermediateClass.anotherFunction] fun anotherFunction([ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=/name] name: R|@R|Anno|(str = (String(object ), R|/constant|)) @R|Anno|(str = (String(super ), R|/constant|)) kotlin/Int| = STUB): R|kotlin/Boolean| -public open [ResolvedTo(STATUS)] [SubstitutedOverrideOriginalKey=/IntermediateClass.anotherFunction] fun anotherFunction([ResolvedTo(STATUS)] [SubstitutedOverrideOriginalKey=/name] name: R|@R|Anno|(str = (String(object ), R|/constant|)) @R|Anno|(str = (String(super ), R|/constant|)) kotlin/Int| = STUB): R|kotlin/Boolean| +public open [ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=/IntermediateClass.anotherFunction] fun anotherFunction([ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=/name] name: R|@R|Anno|(str = (String(object ), R|/constant|)) @R|Anno|(str = (String(super ), R|/constant|)) kotlin/Int| = STUB): R|kotlin/Boolean| public open [ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=/BaseClass.anotherFunction] fun anotherFunction([ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=/name] name: R|@R|Anno|(str = (String(super ), R|/constant|)) SCHEME| = STUB): R|kotlin/Boolean| @@ -20,13 +20,13 @@ public open [ResolvedTo(BODY_RESOLVE)] fun anotherFunction([ResolvedTo(BODY_RESO ^anotherFunction Boolean(true) } -@R|Anno|[Types](str = (String(property ), R|/constant|)) public open [ResolvedTo(STATUS)] [DelegatedWrapperDataKey=[wrapped=FirPropertySymbol /IntermediateClass.propertyWithAnnotations, containingClass=, delegateField=FirFieldSymbol /.$$delegate_0, SubstitutedOverrideOriginalKey=/IntermediateClass.propertyWithAnnotations] var propertyWithAnnotations: R|@R|Anno|(str = (String(object ), R|/constant|)) @R|Anno|(str = (String(super ), R|/constant|)) kotlin/Int| - @PROPERTY_GETTER:R|Anno|[Types](str = (String(property ), R|/constant|)) public [ResolvedTo(STATUS)] [ContainingClassKey=] get(): R|@R|Anno|(str = (String(object ), R|/constant|)) @R|Anno|(str = (String(super ), R|/constant|)) kotlin/Int| - @PROPERTY_SETTER:R|Anno|[Types](str = (String(property ), R|/constant|)) public [ResolvedTo(STATUS)] [ContainingClassKey=] set([ResolvedTo(STATUS)] value: R|@R|Anno|(str = (String(object ), R|/constant|)) @R|Anno|(str = (String(super ), R|/constant|)) kotlin/Int|): R|kotlin/Unit| +@R|Anno|[Types](str = (String(property ), R|/constant|)) public open [ResolvedTo(BODY_RESOLVE)] [DelegatedWrapperDataKey=[wrapped=FirPropertySymbol /IntermediateClass.propertyWithAnnotations, containingClass=, delegateField=FirFieldSymbol /.$$delegate_0, SubstitutedOverrideOriginalKey=/IntermediateClass.propertyWithAnnotations] var propertyWithAnnotations: R|@R|Anno|(str = (String(object ), R|/constant|)) @R|Anno|(str = (String(super ), R|/constant|)) kotlin/Int| + @PROPERTY_GETTER:R|Anno|[Types](str = (String(property ), R|/constant|)) public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=] get(): R|@R|Anno|(str = (String(object ), R|/constant|)) @R|Anno|(str = (String(super ), R|/constant|)) kotlin/Int| + @PROPERTY_SETTER:R|Anno|[Types](str = (String(property ), R|/constant|)) public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=] set([ResolvedTo(BODY_RESOLVE)] value: R|@R|Anno|(str = (String(object ), R|/constant|)) @R|Anno|(str = (String(super ), R|/constant|)) kotlin/Int|): R|kotlin/Unit| -@R|Anno|[Types](str = (String(property ), R|/constant|)) public abstract [ResolvedTo(STATUS)] [SubstitutedOverrideOriginalKey=/IntermediateClass.propertyWithAnnotations] var propertyWithAnnotations: R|@R|Anno|(str = (String(object ), R|/constant|)) @R|Anno|(str = (String(super ), R|/constant|)) kotlin/Int| - @PROPERTY_GETTER:R|Anno|[Types](str = (String(property ), R|/constant|)) public [ResolvedTo(STATUS)] [ContainingClassKey=, SubstitutedOverrideOriginalKey=special/accessor] get(): R|@R|Anno|(str = (String(object ), R|/constant|)) @R|Anno|(str = (String(super ), R|/constant|)) kotlin/Int| - @PROPERTY_SETTER:R|Anno|[Types](str = (String(property ), R|/constant|)) public [ResolvedTo(STATUS)] [ContainingClassKey=, SubstitutedOverrideOriginalKey=special/accessor] set([ResolvedTo(STATUS)] value: R|@R|Anno|(str = (String(object ), R|/constant|)) @R|Anno|(str = (String(super ), R|/constant|)) kotlin/Int|): R|kotlin/Unit| +@R|Anno|[Types](str = (String(property ), R|/constant|)) public abstract [ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=/IntermediateClass.propertyWithAnnotations] var propertyWithAnnotations: R|@R|Anno|(str = (String(object ), R|/constant|)) @R|Anno|(str = (String(super ), R|/constant|)) kotlin/Int| + @PROPERTY_GETTER:R|Anno|[Types](str = (String(property ), R|/constant|)) public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=, SubstitutedOverrideOriginalKey=special/accessor] get(): R|@R|Anno|(str = (String(object ), R|/constant|)) @R|Anno|(str = (String(super ), R|/constant|)) kotlin/Int| + @PROPERTY_SETTER:R|Anno|[Types](str = (String(property ), R|/constant|)) public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=, SubstitutedOverrideOriginalKey=special/accessor] set([ResolvedTo(BODY_RESOLVE)] value: R|@R|Anno|(str = (String(object ), R|/constant|)) @R|Anno|(str = (String(super ), R|/constant|)) kotlin/Int|): R|kotlin/Unit| @R|Anno|[Types](str = (String(property ), R|/constant|)) public abstract [ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=/BaseClass.propertyWithAnnotations] var propertyWithAnnotations: R|@R|Anno|(str = (String(super ), R|/constant|)) SCHEME| @PROPERTY_GETTER:R|Anno|[Types](str = (String(property ), R|/constant|)) public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=IntermediateClass, SubstitutedOverrideOriginalKey=special/accessor] get(): R|@R|Anno|(str = (String(super ), R|/constant|)) SCHEME| @@ -36,11 +36,11 @@ public open [ResolvedTo(BODY_RESOLVE)] fun anotherFunction([ResolvedTo(BODY_RESO @PROPERTY_GETTER:R|Anno|[Types](str = (String(property ), R|/constant|)) public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=BaseClass] get(): R|SCHEME| @PROPERTY_SETTER:R|Anno|[Types](str = (String(property ), R|/constant|)) public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=BaseClass] set([ResolvedTo(BODY_RESOLVE)] @SETTER_PARAMETER:R|Anno|[Types](str = (String(property ), R|/constant|)) value: R|SCHEME|): R|kotlin/Unit| -public open [ResolvedTo(STATUS)] [DelegatedWrapperDataKey=[wrapped=FirPropertySymbol /IntermediateClass.property, containingClass=, delegateField=FirFieldSymbol /.$$delegate_0, SubstitutedOverrideOriginalKey=/IntermediateClass.property] var property: R|@R|Anno|(str = (String(object ), R|/constant|)) @R|Anno|(str = (String(super ), R|/constant|)) kotlin/Int| +public open [ResolvedTo(BODY_RESOLVE)] [DelegatedWrapperDataKey=[wrapped=FirPropertySymbol /IntermediateClass.property, containingClass=, delegateField=FirFieldSymbol /.$$delegate_0, SubstitutedOverrideOriginalKey=/IntermediateClass.property] var property: R|@R|Anno|(str = (String(object ), R|/constant|)) @R|Anno|(str = (String(super ), R|/constant|)) kotlin/Int| -public abstract [ResolvedTo(STATUS)] [SubstitutedOverrideOriginalKey=/IntermediateClass.property] var property: R|@R|Anno|(str = (String(object ), R|/constant|)) @R|Anno|(str = (String(super ), R|/constant|)) kotlin/Int| +public abstract [ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=/IntermediateClass.property] var property: R|@R|Anno|(str = (String(object ), R|/constant|)) @R|Anno|(str = (String(super ), R|/constant|)) kotlin/Int| diff --git a/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithoutImplicitTypeInsideAnonymousObjectWithSubstitutionScript.after.txt b/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithoutImplicitTypeInsideAnonymousObjectWithSubstitutionScript.after.txt index 22a1bced638..55c59b05d72 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithoutImplicitTypeInsideAnonymousObjectWithSubstitutionScript.after.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveScopes/delegateOverrideWithoutImplicitTypeInsideAnonymousObjectWithSubstitutionScript.after.txt @@ -2,7 +2,7 @@ public open override [ResolvedTo(BODY_RESOLVE)] fun isSchemeFile([ResolvedTo(BOD ^isSchemeFile !=(R|/name|, String(str)) } -public open [ResolvedTo(STATUS)] [SubstitutedOverrideOriginalKey=/IntermediateClass.isSchemeFile] fun isSchemeFile([ResolvedTo(STATUS)] [SubstitutedOverrideOriginalKey=/name] name: R|kotlin/CharSequence|): R|kotlin/Boolean| +public open [ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=/IntermediateClass.isSchemeFile] fun isSchemeFile([ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=/name] name: R|kotlin/CharSequence|): R|kotlin/Boolean| public open [ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=/BaseClass.isSchemeFile] fun isSchemeFile([ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=/name] name: R|kotlin/CharSequence|): R|kotlin/Boolean| @@ -10,9 +10,9 @@ public open [ResolvedTo(BODY_RESOLVE)] fun isSchemeFile([ResolvedTo(BODY_RESOLVE ^isSchemeFile Boolean(true) } -public open [ResolvedTo(STATUS)] [DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /IntermediateClass.anotherFunction, containingClass=, delegateField=FirFieldSymbol /.$$delegate_0, SubstitutedOverrideOriginalKey=/IntermediateClass.anotherFunction] fun anotherFunction([ResolvedTo(STATUS)] [SubstitutedOverrideOriginalKey=/name] name: R|@R|Anno|(str = (String(object ), R|/constant|)) @R|Anno|(str = (String(super ), R|/constant|)) kotlin/Int| = STUB): R|kotlin/Boolean| +public open [ResolvedTo(BODY_RESOLVE)] [DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /IntermediateClass.anotherFunction, containingClass=, delegateField=FirFieldSymbol /.$$delegate_0, SubstitutedOverrideOriginalKey=/IntermediateClass.anotherFunction] fun anotherFunction([ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=/name] name: R|@R|Anno|(str = (String(object ), R|/constant|)) @R|Anno|(str = (String(super ), R|/constant|)) kotlin/Int| = STUB): R|kotlin/Boolean| -public open [ResolvedTo(STATUS)] [SubstitutedOverrideOriginalKey=/IntermediateClass.anotherFunction] fun anotherFunction([ResolvedTo(STATUS)] [SubstitutedOverrideOriginalKey=/name] name: R|@R|Anno|(str = (String(object ), R|/constant|)) @R|Anno|(str = (String(super ), R|/constant|)) kotlin/Int| = STUB): R|kotlin/Boolean| +public open [ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=/IntermediateClass.anotherFunction] fun anotherFunction([ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=/name] name: R|@R|Anno|(str = (String(object ), R|/constant|)) @R|Anno|(str = (String(super ), R|/constant|)) kotlin/Int| = STUB): R|kotlin/Boolean| public open [ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=/BaseClass.anotherFunction] fun anotherFunction([ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=/name] name: R|@R|Anno|(str = (String(super ), R|/constant|)) SCHEME| = STUB): R|kotlin/Boolean| @@ -20,13 +20,13 @@ public open [ResolvedTo(BODY_RESOLVE)] fun anotherFunction([ResolvedTo(BODY_RESO ^anotherFunction Boolean(true) } -@R|Anno|[Types](str = (String(property ), R|/constant|)) public open [ResolvedTo(STATUS)] [DelegatedWrapperDataKey=[wrapped=FirPropertySymbol /IntermediateClass.propertyWithAnnotations, containingClass=, delegateField=FirFieldSymbol /.$$delegate_0, SubstitutedOverrideOriginalKey=/IntermediateClass.propertyWithAnnotations] var propertyWithAnnotations: R|@R|Anno|(str = (String(object ), R|/constant|)) @R|Anno|(str = (String(super ), R|/constant|)) kotlin/Int| - @PROPERTY_GETTER:R|Anno|[Types](str = (String(property ), R|/constant|)) public [ResolvedTo(STATUS)] [ContainingClassKey=] get(): R|@R|Anno|(str = (String(object ), R|/constant|)) @R|Anno|(str = (String(super ), R|/constant|)) kotlin/Int| - @PROPERTY_SETTER:R|Anno|[Types](str = (String(property ), R|/constant|)) public [ResolvedTo(STATUS)] [ContainingClassKey=] set([ResolvedTo(STATUS)] value: R|@R|Anno|(str = (String(object ), R|/constant|)) @R|Anno|(str = (String(super ), R|/constant|)) kotlin/Int|): R|kotlin/Unit| +@R|Anno|[Types](str = (String(property ), R|/constant|)) public open [ResolvedTo(BODY_RESOLVE)] [DelegatedWrapperDataKey=[wrapped=FirPropertySymbol /IntermediateClass.propertyWithAnnotations, containingClass=, delegateField=FirFieldSymbol /.$$delegate_0, SubstitutedOverrideOriginalKey=/IntermediateClass.propertyWithAnnotations] var propertyWithAnnotations: R|@R|Anno|(str = (String(object ), R|/constant|)) @R|Anno|(str = (String(super ), R|/constant|)) kotlin/Int| + @PROPERTY_GETTER:R|Anno|[Types](str = (String(property ), R|/constant|)) public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=] get(): R|@R|Anno|(str = (String(object ), R|/constant|)) @R|Anno|(str = (String(super ), R|/constant|)) kotlin/Int| + @PROPERTY_SETTER:R|Anno|[Types](str = (String(property ), R|/constant|)) public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=] set([ResolvedTo(BODY_RESOLVE)] value: R|@R|Anno|(str = (String(object ), R|/constant|)) @R|Anno|(str = (String(super ), R|/constant|)) kotlin/Int|): R|kotlin/Unit| -@R|Anno|[Types](str = (String(property ), R|/constant|)) public abstract [ResolvedTo(STATUS)] [SubstitutedOverrideOriginalKey=/IntermediateClass.propertyWithAnnotations] var propertyWithAnnotations: R|@R|Anno|(str = (String(object ), R|/constant|)) @R|Anno|(str = (String(super ), R|/constant|)) kotlin/Int| - @PROPERTY_GETTER:R|Anno|[Types](str = (String(property ), R|/constant|)) public [ResolvedTo(STATUS)] [ContainingClassKey=, SubstitutedOverrideOriginalKey=special/accessor] get(): R|@R|Anno|(str = (String(object ), R|/constant|)) @R|Anno|(str = (String(super ), R|/constant|)) kotlin/Int| - @PROPERTY_SETTER:R|Anno|[Types](str = (String(property ), R|/constant|)) public [ResolvedTo(STATUS)] [ContainingClassKey=, SubstitutedOverrideOriginalKey=special/accessor] set([ResolvedTo(STATUS)] value: R|@R|Anno|(str = (String(object ), R|/constant|)) @R|Anno|(str = (String(super ), R|/constant|)) kotlin/Int|): R|kotlin/Unit| +@R|Anno|[Types](str = (String(property ), R|/constant|)) public abstract [ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=/IntermediateClass.propertyWithAnnotations] var propertyWithAnnotations: R|@R|Anno|(str = (String(object ), R|/constant|)) @R|Anno|(str = (String(super ), R|/constant|)) kotlin/Int| + @PROPERTY_GETTER:R|Anno|[Types](str = (String(property ), R|/constant|)) public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=, SubstitutedOverrideOriginalKey=special/accessor] get(): R|@R|Anno|(str = (String(object ), R|/constant|)) @R|Anno|(str = (String(super ), R|/constant|)) kotlin/Int| + @PROPERTY_SETTER:R|Anno|[Types](str = (String(property ), R|/constant|)) public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=, SubstitutedOverrideOriginalKey=special/accessor] set([ResolvedTo(BODY_RESOLVE)] value: R|@R|Anno|(str = (String(object ), R|/constant|)) @R|Anno|(str = (String(super ), R|/constant|)) kotlin/Int|): R|kotlin/Unit| @R|Anno|[Types](str = (String(property ), R|/constant|)) public abstract [ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=/BaseClass.propertyWithAnnotations] var propertyWithAnnotations: R|@R|Anno|(str = (String(super ), R|/constant|)) SCHEME| @PROPERTY_GETTER:R|Anno|[Types](str = (String(property ), R|/constant|)) public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=IntermediateClass, SubstitutedOverrideOriginalKey=special/accessor] get(): R|@R|Anno|(str = (String(super ), R|/constant|)) SCHEME| @@ -36,11 +36,11 @@ public open [ResolvedTo(BODY_RESOLVE)] fun anotherFunction([ResolvedTo(BODY_RESO @PROPERTY_GETTER:R|Anno|[Types](str = (String(property ), R|/constant|)) public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=BaseClass] get(): R|SCHEME| @PROPERTY_SETTER:R|Anno|[Types](str = (String(property ), R|/constant|)) public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=BaseClass] set([ResolvedTo(BODY_RESOLVE)] @SETTER_PARAMETER:R|Anno|[Types](str = (String(property ), R|/constant|)) value: R|SCHEME|): R|kotlin/Unit| -public open [ResolvedTo(STATUS)] [DelegatedWrapperDataKey=[wrapped=FirPropertySymbol /IntermediateClass.property, containingClass=, delegateField=FirFieldSymbol /.$$delegate_0, SubstitutedOverrideOriginalKey=/IntermediateClass.property] var property: R|@R|Anno|(str = (String(object ), R|/constant|)) @R|Anno|(str = (String(super ), R|/constant|)) kotlin/Int| +public open [ResolvedTo(BODY_RESOLVE)] [DelegatedWrapperDataKey=[wrapped=FirPropertySymbol /IntermediateClass.property, containingClass=, delegateField=FirFieldSymbol /.$$delegate_0, SubstitutedOverrideOriginalKey=/IntermediateClass.property] var property: R|@R|Anno|(str = (String(object ), R|/constant|)) @R|Anno|(str = (String(super ), R|/constant|)) kotlin/Int| -public abstract [ResolvedTo(STATUS)] [SubstitutedOverrideOriginalKey=/IntermediateClass.property] var property: R|@R|Anno|(str = (String(object ), R|/constant|)) @R|Anno|(str = (String(super ), R|/constant|)) kotlin/Int| +public abstract [ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=/IntermediateClass.property] var property: R|@R|Anno|(str = (String(object ), R|/constant|)) @R|Anno|(str = (String(super ), R|/constant|)) kotlin/Int| diff --git a/analysis/low-level-api-fir/testData/lazyResolveScopes/intersectionOverrideWithImplicitTypeInsideAnonymousObject.after.txt b/analysis/low-level-api-fir/testData/lazyResolveScopes/intersectionOverrideWithImplicitTypeInsideAnonymousObject.after.txt index 1f59597b50d..cbae5a78884 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveScopes/intersectionOverrideWithImplicitTypeInsideAnonymousObject.after.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveScopes/intersectionOverrideWithImplicitTypeInsideAnonymousObject.after.txt @@ -2,7 +2,7 @@ public open override [ResolvedTo(BODY_RESOLVE)] fun foo([ResolvedTo(BODY_RESOLVE ^foo Q|kotlin/Unit| } -public open [ResolvedTo(STATUS)] [CallableCopySubstitutionKey=CallableCopySubstitution(substitutor={T -> @R|second/Anno|(str = (String(object ), R|second/constant|)) kotlin/String}, baseSymbol=FirIntersectionOverrideFunctionSymbol second/B.foo), IntersectionOverrideOriginalKey=second/B.foo, SubstitutedOverrideOriginalKey=second/B.foo] fun foo([ResolvedTo(STATUS)] [IntersectionOverrideOriginalKey=/x, SubstitutedOverrideOriginalKey=/x] x: R|@R|second/Anno|(str = (String(object ), R|second/constant|)) kotlin/String| = STUB): +public open [ResolvedTo(BODY_RESOLVE)] [IntersectionOverrideOriginalKey=second/B.foo, SubstitutedOverrideOriginalKey=second/B.foo] fun foo([ResolvedTo(BODY_RESOLVE)] [IntersectionOverrideOriginalKey=/x, SubstitutedOverrideOriginalKey=/x] x: R|@R|second/Anno|(str = (String(object ), R|second/constant|)) kotlin/String| = STUB): R|kotlin/Unit| public open [ResolvedTo(BODY_RESOLVE)] [IntersectionOverrideOriginalKey=second/B.foo, SubstitutedOverrideOriginalKey=second/C.foo] fun foo([ResolvedTo(BODY_RESOLVE)] [IntersectionOverrideOriginalKey=/x, SubstitutedOverrideOriginalKey=/x] x: R|T| = STUB): R|kotlin/Unit| @@ -18,7 +18,7 @@ public open [ResolvedTo(BODY_RESOLVE)] fun foo([ResolvedTo(BODY_RESOLVE)] x: R|F ^foo Q|kotlin/Unit| } -public open [ResolvedTo(STATUS)] [CallableCopySubstitutionKey=CallableCopySubstitution(substitutor={T -> @R|second/Anno|(str = (String(object ), R|second/constant|)) kotlin/String}, baseSymbol=FirIntersectionOverridePropertySymbol second/B.bar), IntersectionOverrideOriginalKey=second/B.bar, SubstitutedOverrideOriginalKey=second/B.bar] var bar: +public open [ResolvedTo(BODY_RESOLVE)] [IntersectionOverrideOriginalKey=second/B.bar, SubstitutedOverrideOriginalKey=second/B.bar] var bar: R|@R|second/Anno|(str = (String(object ), R|second/constant|)) kotlin/String| diff --git a/analysis/low-level-api-fir/testData/lazyResolveScopes/intersectionOverrideWithImplicitTypeInsideAnonymousObjectScript.after.txt b/analysis/low-level-api-fir/testData/lazyResolveScopes/intersectionOverrideWithImplicitTypeInsideAnonymousObjectScript.after.txt index 1f59597b50d..cbae5a78884 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveScopes/intersectionOverrideWithImplicitTypeInsideAnonymousObjectScript.after.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveScopes/intersectionOverrideWithImplicitTypeInsideAnonymousObjectScript.after.txt @@ -2,7 +2,7 @@ public open override [ResolvedTo(BODY_RESOLVE)] fun foo([ResolvedTo(BODY_RESOLVE ^foo Q|kotlin/Unit| } -public open [ResolvedTo(STATUS)] [CallableCopySubstitutionKey=CallableCopySubstitution(substitutor={T -> @R|second/Anno|(str = (String(object ), R|second/constant|)) kotlin/String}, baseSymbol=FirIntersectionOverrideFunctionSymbol second/B.foo), IntersectionOverrideOriginalKey=second/B.foo, SubstitutedOverrideOriginalKey=second/B.foo] fun foo([ResolvedTo(STATUS)] [IntersectionOverrideOriginalKey=/x, SubstitutedOverrideOriginalKey=/x] x: R|@R|second/Anno|(str = (String(object ), R|second/constant|)) kotlin/String| = STUB): +public open [ResolvedTo(BODY_RESOLVE)] [IntersectionOverrideOriginalKey=second/B.foo, SubstitutedOverrideOriginalKey=second/B.foo] fun foo([ResolvedTo(BODY_RESOLVE)] [IntersectionOverrideOriginalKey=/x, SubstitutedOverrideOriginalKey=/x] x: R|@R|second/Anno|(str = (String(object ), R|second/constant|)) kotlin/String| = STUB): R|kotlin/Unit| public open [ResolvedTo(BODY_RESOLVE)] [IntersectionOverrideOriginalKey=second/B.foo, SubstitutedOverrideOriginalKey=second/C.foo] fun foo([ResolvedTo(BODY_RESOLVE)] [IntersectionOverrideOriginalKey=/x, SubstitutedOverrideOriginalKey=/x] x: R|T| = STUB): R|kotlin/Unit| @@ -18,7 +18,7 @@ public open [ResolvedTo(BODY_RESOLVE)] fun foo([ResolvedTo(BODY_RESOLVE)] x: R|F ^foo Q|kotlin/Unit| } -public open [ResolvedTo(STATUS)] [CallableCopySubstitutionKey=CallableCopySubstitution(substitutor={T -> @R|second/Anno|(str = (String(object ), R|second/constant|)) kotlin/String}, baseSymbol=FirIntersectionOverridePropertySymbol second/B.bar), IntersectionOverrideOriginalKey=second/B.bar, SubstitutedOverrideOriginalKey=second/B.bar] var bar: +public open [ResolvedTo(BODY_RESOLVE)] [IntersectionOverrideOriginalKey=second/B.bar, SubstitutedOverrideOriginalKey=second/B.bar] var bar: R|@R|second/Anno|(str = (String(object ), R|second/constant|)) kotlin/String| diff --git a/analysis/low-level-api-fir/testData/lazyResolveScopes/intersectionOverrideWithoutImplicitTypeInsideAnonymousObject.after.txt b/analysis/low-level-api-fir/testData/lazyResolveScopes/intersectionOverrideWithoutImplicitTypeInsideAnonymousObject.after.txt index 1eb14cce3a1..c585a263ec1 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveScopes/intersectionOverrideWithoutImplicitTypeInsideAnonymousObject.after.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveScopes/intersectionOverrideWithoutImplicitTypeInsideAnonymousObject.after.txt @@ -2,7 +2,7 @@ public open override [ResolvedTo(BODY_RESOLVE)] fun foo([ResolvedTo(BODY_RESOLVE ^foo Q|kotlin/Unit| } -public open [ResolvedTo(STATUS)] [IntersectionOverrideOriginalKey=second/B.foo, SubstitutedOverrideOriginalKey=second/B.foo] fun foo([ResolvedTo(STATUS)] [IntersectionOverrideOriginalKey=/x, SubstitutedOverrideOriginalKey=/x] x: R|@R|second/Anno|(str = (String(super ), R|second/constant|)) kotlin/String|): R|kotlin/Unit| +public open [ResolvedTo(BODY_RESOLVE)] [IntersectionOverrideOriginalKey=second/B.foo, SubstitutedOverrideOriginalKey=second/B.foo] fun foo([ResolvedTo(BODY_RESOLVE)] [IntersectionOverrideOriginalKey=/x, SubstitutedOverrideOriginalKey=/x] x: R|@R|second/Anno|(str = (String(super ), R|second/constant|)) kotlin/String|): R|kotlin/Unit| public open [ResolvedTo(BODY_RESOLVE)] [IntersectionOverrideOriginalKey=second/B.foo, SubstitutedOverrideOriginalKey=second/C.foo] fun foo([ResolvedTo(BODY_RESOLVE)] [IntersectionOverrideOriginalKey=/x, SubstitutedOverrideOriginalKey=/x] x: R|T|): R|kotlin/Unit| @@ -16,7 +16,7 @@ public open [ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=second/D. public open [ResolvedTo(BODY_RESOLVE)] fun foo([ResolvedTo(BODY_RESOLVE)] x: R|F|): R|kotlin/Unit| { } -public abstract [ResolvedTo(STATUS)] [IntersectionOverrideOriginalKey=second/B.bar, SubstitutedOverrideOriginalKey=second/B.bar] var bar: R|@R|second/Anno|(str = (String(super ), R|second/constant|)) kotlin/String| +public abstract [ResolvedTo(BODY_RESOLVE)] [IntersectionOverrideOriginalKey=second/B.bar, SubstitutedOverrideOriginalKey=second/B.bar] var bar: R|@R|second/Anno|(str = (String(super ), R|second/constant|)) kotlin/String| diff --git a/analysis/low-level-api-fir/testData/lazyResolveScopes/intersectionOverrideWithoutImplicitTypeInsideAnonymousObjectScript.after.txt b/analysis/low-level-api-fir/testData/lazyResolveScopes/intersectionOverrideWithoutImplicitTypeInsideAnonymousObjectScript.after.txt index 1eb14cce3a1..c585a263ec1 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveScopes/intersectionOverrideWithoutImplicitTypeInsideAnonymousObjectScript.after.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveScopes/intersectionOverrideWithoutImplicitTypeInsideAnonymousObjectScript.after.txt @@ -2,7 +2,7 @@ public open override [ResolvedTo(BODY_RESOLVE)] fun foo([ResolvedTo(BODY_RESOLVE ^foo Q|kotlin/Unit| } -public open [ResolvedTo(STATUS)] [IntersectionOverrideOriginalKey=second/B.foo, SubstitutedOverrideOriginalKey=second/B.foo] fun foo([ResolvedTo(STATUS)] [IntersectionOverrideOriginalKey=/x, SubstitutedOverrideOriginalKey=/x] x: R|@R|second/Anno|(str = (String(super ), R|second/constant|)) kotlin/String|): R|kotlin/Unit| +public open [ResolvedTo(BODY_RESOLVE)] [IntersectionOverrideOriginalKey=second/B.foo, SubstitutedOverrideOriginalKey=second/B.foo] fun foo([ResolvedTo(BODY_RESOLVE)] [IntersectionOverrideOriginalKey=/x, SubstitutedOverrideOriginalKey=/x] x: R|@R|second/Anno|(str = (String(super ), R|second/constant|)) kotlin/String|): R|kotlin/Unit| public open [ResolvedTo(BODY_RESOLVE)] [IntersectionOverrideOriginalKey=second/B.foo, SubstitutedOverrideOriginalKey=second/C.foo] fun foo([ResolvedTo(BODY_RESOLVE)] [IntersectionOverrideOriginalKey=/x, SubstitutedOverrideOriginalKey=/x] x: R|T|): R|kotlin/Unit| @@ -16,7 +16,7 @@ public open [ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=second/D. public open [ResolvedTo(BODY_RESOLVE)] fun foo([ResolvedTo(BODY_RESOLVE)] x: R|F|): R|kotlin/Unit| { } -public abstract [ResolvedTo(STATUS)] [IntersectionOverrideOriginalKey=second/B.bar, SubstitutedOverrideOriginalKey=second/B.bar] var bar: R|@R|second/Anno|(str = (String(super ), R|second/constant|)) kotlin/String| +public abstract [ResolvedTo(BODY_RESOLVE)] [IntersectionOverrideOriginalKey=second/B.bar, SubstitutedOverrideOriginalKey=second/B.bar] var bar: R|@R|second/Anno|(str = (String(super ), R|second/constant|)) kotlin/String| diff --git a/analysis/low-level-api-fir/testData/lazyResolveScopes/substitutionOverrideWithImplicitTypeInsideAnonymousObject.after.txt b/analysis/low-level-api-fir/testData/lazyResolveScopes/substitutionOverrideWithImplicitTypeInsideAnonymousObject.after.txt index d67abeed1be..4ce72975fa3 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveScopes/substitutionOverrideWithImplicitTypeInsideAnonymousObject.after.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveScopes/substitutionOverrideWithImplicitTypeInsideAnonymousObject.after.txt @@ -2,21 +2,21 @@ public open override [ResolvedTo(BODY_RESOLVE)] fun isSchemeFile([ResolvedTo(BOD ^isSchemeFile !=(R|/name|, String(str)) } -public open [ResolvedTo(STATUS)] [CallableCopySubstitutionKey=CallableCopySubstitution(substitutor={SCHEME -> @R|second/Anno|(str = (String(super1 ), R|second/constant|)) kotlin/Int | MUTABLE_SCHEME -> @R|second/Anno|(str = (String(super2 ), R|second/constant|)) kotlin/Int}, baseSymbol=FirNamedFunctionSymbol second/LazySchemeProcessor.isSchemeFile), SubstitutedOverrideOriginalKey=second/LazySchemeProcessor.isSchemeFile] fun isSchemeFile([ResolvedTo(STATUS)] [SubstitutedOverrideOriginalKey=/name] name: R|kotlin/CharSequence|): +public open [ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=second/LazySchemeProcessor.isSchemeFile] fun isSchemeFile([ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=/name] name: R|kotlin/CharSequence|): R|kotlin/Boolean| public open [ResolvedTo(BODY_RESOLVE)] fun isSchemeFile([ResolvedTo(BODY_RESOLVE)] name: R|kotlin/CharSequence|): R|kotlin/Boolean| { ^isSchemeFile Boolean(true) } -@R|second/Anno|[Types](str = (String(property ), R|second/constant|)) public final [ResolvedTo(STATUS)] [SubstitutedOverrideOriginalKey=second/LazySchemeProcessor.propertyWithAnnotations] var propertyWithAnnotations: R|@R|second/Anno|(str = (String(super1 ), R|second/constant|)) kotlin/Int| - @PROPERTY_GETTER:R|second/Anno|[Types](str = (String(property ), R|second/constant|)) public [ResolvedTo(STATUS)] [ContainingClassKey=, SubstitutedOverrideOriginalKey=special/accessor] get(): R|@R|second/Anno|(str = (String(super1 ), R|second/constant|)) kotlin/Int| - @PROPERTY_SETTER:R|second/Anno|[Types](str = (String(property ), R|second/constant|)) public [ResolvedTo(STATUS)] [ContainingClassKey=, SubstitutedOverrideOriginalKey=special/accessor] set([ResolvedTo(STATUS)] value: R|@R|second/Anno|(str = (String(super1 ), R|second/constant|)) kotlin/Int|): R|kotlin/Unit| +@R|second/Anno|[Types](str = (String(property ), R|second/constant|)) public final [ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=second/LazySchemeProcessor.propertyWithAnnotations] var propertyWithAnnotations: R|@R|second/Anno|(str = (String(super1 ), R|second/constant|)) kotlin/Int| + @PROPERTY_GETTER:R|second/Anno|[Types](str = (String(property ), R|second/constant|)) public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=, SubstitutedOverrideOriginalKey=special/accessor] get(): R|@R|second/Anno|(str = (String(super1 ), R|second/constant|)) kotlin/Int| + @PROPERTY_SETTER:R|second/Anno|[Types](str = (String(property ), R|second/constant|)) public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=, SubstitutedOverrideOriginalKey=special/accessor] set([ResolvedTo(BODY_RESOLVE)] value: R|@R|second/Anno|(str = (String(super1 ), R|second/constant|)) kotlin/Int|): R|kotlin/Unit| @R|second/Anno|[Types](str = (String(property ), R|second/constant|)) public final [ResolvedTo(BODY_RESOLVE)] var propertyWithAnnotations: R|SCHEME| @PROPERTY_GETTER:R|second/Anno|[Types](str = (String(property ), R|second/constant|)) public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=LazySchemeProcessor] get(): R|SCHEME| @PROPERTY_SETTER:R|second/Anno|[Types](str = (String(property ), R|second/constant|)) public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=LazySchemeProcessor] set([ResolvedTo(BODY_RESOLVE)] @SETTER_PARAMETER:R|second/Anno|[Types](str = (String(property ), R|second/constant|)) value: R|SCHEME|): R|kotlin/Unit| -public final [ResolvedTo(STATUS)] [SubstitutedOverrideOriginalKey=second/LazySchemeProcessor.property] var property: R|@R|second/Anno|(str = (String(super1 ), R|second/constant|)) kotlin/Int| +public final [ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=second/LazySchemeProcessor.property] var property: R|@R|second/Anno|(str = (String(super1 ), R|second/constant|)) kotlin/Int| diff --git a/analysis/low-level-api-fir/testData/lazyResolveScopes/substitutionOverrideWithImplicitTypeInsideAnonymousObjectScript.after.txt b/analysis/low-level-api-fir/testData/lazyResolveScopes/substitutionOverrideWithImplicitTypeInsideAnonymousObjectScript.after.txt index d67abeed1be..4ce72975fa3 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveScopes/substitutionOverrideWithImplicitTypeInsideAnonymousObjectScript.after.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveScopes/substitutionOverrideWithImplicitTypeInsideAnonymousObjectScript.after.txt @@ -2,21 +2,21 @@ public open override [ResolvedTo(BODY_RESOLVE)] fun isSchemeFile([ResolvedTo(BOD ^isSchemeFile !=(R|/name|, String(str)) } -public open [ResolvedTo(STATUS)] [CallableCopySubstitutionKey=CallableCopySubstitution(substitutor={SCHEME -> @R|second/Anno|(str = (String(super1 ), R|second/constant|)) kotlin/Int | MUTABLE_SCHEME -> @R|second/Anno|(str = (String(super2 ), R|second/constant|)) kotlin/Int}, baseSymbol=FirNamedFunctionSymbol second/LazySchemeProcessor.isSchemeFile), SubstitutedOverrideOriginalKey=second/LazySchemeProcessor.isSchemeFile] fun isSchemeFile([ResolvedTo(STATUS)] [SubstitutedOverrideOriginalKey=/name] name: R|kotlin/CharSequence|): +public open [ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=second/LazySchemeProcessor.isSchemeFile] fun isSchemeFile([ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=/name] name: R|kotlin/CharSequence|): R|kotlin/Boolean| public open [ResolvedTo(BODY_RESOLVE)] fun isSchemeFile([ResolvedTo(BODY_RESOLVE)] name: R|kotlin/CharSequence|): R|kotlin/Boolean| { ^isSchemeFile Boolean(true) } -@R|second/Anno|[Types](str = (String(property ), R|second/constant|)) public final [ResolvedTo(STATUS)] [SubstitutedOverrideOriginalKey=second/LazySchemeProcessor.propertyWithAnnotations] var propertyWithAnnotations: R|@R|second/Anno|(str = (String(super1 ), R|second/constant|)) kotlin/Int| - @PROPERTY_GETTER:R|second/Anno|[Types](str = (String(property ), R|second/constant|)) public [ResolvedTo(STATUS)] [ContainingClassKey=, SubstitutedOverrideOriginalKey=special/accessor] get(): R|@R|second/Anno|(str = (String(super1 ), R|second/constant|)) kotlin/Int| - @PROPERTY_SETTER:R|second/Anno|[Types](str = (String(property ), R|second/constant|)) public [ResolvedTo(STATUS)] [ContainingClassKey=, SubstitutedOverrideOriginalKey=special/accessor] set([ResolvedTo(STATUS)] value: R|@R|second/Anno|(str = (String(super1 ), R|second/constant|)) kotlin/Int|): R|kotlin/Unit| +@R|second/Anno|[Types](str = (String(property ), R|second/constant|)) public final [ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=second/LazySchemeProcessor.propertyWithAnnotations] var propertyWithAnnotations: R|@R|second/Anno|(str = (String(super1 ), R|second/constant|)) kotlin/Int| + @PROPERTY_GETTER:R|second/Anno|[Types](str = (String(property ), R|second/constant|)) public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=, SubstitutedOverrideOriginalKey=special/accessor] get(): R|@R|second/Anno|(str = (String(super1 ), R|second/constant|)) kotlin/Int| + @PROPERTY_SETTER:R|second/Anno|[Types](str = (String(property ), R|second/constant|)) public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=, SubstitutedOverrideOriginalKey=special/accessor] set([ResolvedTo(BODY_RESOLVE)] value: R|@R|second/Anno|(str = (String(super1 ), R|second/constant|)) kotlin/Int|): R|kotlin/Unit| @R|second/Anno|[Types](str = (String(property ), R|second/constant|)) public final [ResolvedTo(BODY_RESOLVE)] var propertyWithAnnotations: R|SCHEME| @PROPERTY_GETTER:R|second/Anno|[Types](str = (String(property ), R|second/constant|)) public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=LazySchemeProcessor] get(): R|SCHEME| @PROPERTY_SETTER:R|second/Anno|[Types](str = (String(property ), R|second/constant|)) public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=LazySchemeProcessor] set([ResolvedTo(BODY_RESOLVE)] @SETTER_PARAMETER:R|second/Anno|[Types](str = (String(property ), R|second/constant|)) value: R|SCHEME|): R|kotlin/Unit| -public final [ResolvedTo(STATUS)] [SubstitutedOverrideOriginalKey=second/LazySchemeProcessor.property] var property: R|@R|second/Anno|(str = (String(super1 ), R|second/constant|)) kotlin/Int| +public final [ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=second/LazySchemeProcessor.property] var property: R|@R|second/Anno|(str = (String(super1 ), R|second/constant|)) kotlin/Int| diff --git a/analysis/low-level-api-fir/testData/lazyResolveScopes/substitutionOverrideWithoutImplicitTypeInsideAnonymousObject.after.txt b/analysis/low-level-api-fir/testData/lazyResolveScopes/substitutionOverrideWithoutImplicitTypeInsideAnonymousObject.after.txt index 3d13d5bf12f..4ce72975fa3 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveScopes/substitutionOverrideWithoutImplicitTypeInsideAnonymousObject.after.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveScopes/substitutionOverrideWithoutImplicitTypeInsideAnonymousObject.after.txt @@ -2,21 +2,21 @@ public open override [ResolvedTo(BODY_RESOLVE)] fun isSchemeFile([ResolvedTo(BOD ^isSchemeFile !=(R|/name|, String(str)) } -public open [ResolvedTo(STATUS)] [SubstitutedOverrideOriginalKey=second/LazySchemeProcessor.isSchemeFile] fun isSchemeFile([ResolvedTo(STATUS)] [SubstitutedOverrideOriginalKey=/name] name: R|kotlin/CharSequence|): R|kotlin/Boolean| +public open [ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=second/LazySchemeProcessor.isSchemeFile] fun isSchemeFile([ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=/name] name: R|kotlin/CharSequence|): R|kotlin/Boolean| public open [ResolvedTo(BODY_RESOLVE)] fun isSchemeFile([ResolvedTo(BODY_RESOLVE)] name: R|kotlin/CharSequence|): R|kotlin/Boolean| { ^isSchemeFile Boolean(true) } -@R|second/Anno|[Types](str = (String(property ), R|second/constant|)) public final [ResolvedTo(STATUS)] [SubstitutedOverrideOriginalKey=second/LazySchemeProcessor.propertyWithAnnotations] var propertyWithAnnotations: R|@R|second/Anno|(str = (String(super1 ), R|second/constant|)) kotlin/Int| - @PROPERTY_GETTER:R|second/Anno|[Types](str = (String(property ), R|second/constant|)) public [ResolvedTo(STATUS)] [ContainingClassKey=, SubstitutedOverrideOriginalKey=special/accessor] get(): R|@R|second/Anno|(str = (String(super1 ), R|second/constant|)) kotlin/Int| - @PROPERTY_SETTER:R|second/Anno|[Types](str = (String(property ), R|second/constant|)) public [ResolvedTo(STATUS)] [ContainingClassKey=, SubstitutedOverrideOriginalKey=special/accessor] set([ResolvedTo(STATUS)] value: R|@R|second/Anno|(str = (String(super1 ), R|second/constant|)) kotlin/Int|): R|kotlin/Unit| +@R|second/Anno|[Types](str = (String(property ), R|second/constant|)) public final [ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=second/LazySchemeProcessor.propertyWithAnnotations] var propertyWithAnnotations: R|@R|second/Anno|(str = (String(super1 ), R|second/constant|)) kotlin/Int| + @PROPERTY_GETTER:R|second/Anno|[Types](str = (String(property ), R|second/constant|)) public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=, SubstitutedOverrideOriginalKey=special/accessor] get(): R|@R|second/Anno|(str = (String(super1 ), R|second/constant|)) kotlin/Int| + @PROPERTY_SETTER:R|second/Anno|[Types](str = (String(property ), R|second/constant|)) public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=, SubstitutedOverrideOriginalKey=special/accessor] set([ResolvedTo(BODY_RESOLVE)] value: R|@R|second/Anno|(str = (String(super1 ), R|second/constant|)) kotlin/Int|): R|kotlin/Unit| @R|second/Anno|[Types](str = (String(property ), R|second/constant|)) public final [ResolvedTo(BODY_RESOLVE)] var propertyWithAnnotations: R|SCHEME| @PROPERTY_GETTER:R|second/Anno|[Types](str = (String(property ), R|second/constant|)) public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=LazySchemeProcessor] get(): R|SCHEME| @PROPERTY_SETTER:R|second/Anno|[Types](str = (String(property ), R|second/constant|)) public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=LazySchemeProcessor] set([ResolvedTo(BODY_RESOLVE)] @SETTER_PARAMETER:R|second/Anno|[Types](str = (String(property ), R|second/constant|)) value: R|SCHEME|): R|kotlin/Unit| -public final [ResolvedTo(STATUS)] [SubstitutedOverrideOriginalKey=second/LazySchemeProcessor.property] var property: R|@R|second/Anno|(str = (String(super1 ), R|second/constant|)) kotlin/Int| +public final [ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=second/LazySchemeProcessor.property] var property: R|@R|second/Anno|(str = (String(super1 ), R|second/constant|)) kotlin/Int| diff --git a/analysis/low-level-api-fir/testData/lazyResolveScopes/substitutionOverrideWithoutImplicitTypeInsideAnonymousObjectScript.after.txt b/analysis/low-level-api-fir/testData/lazyResolveScopes/substitutionOverrideWithoutImplicitTypeInsideAnonymousObjectScript.after.txt index 3d13d5bf12f..4ce72975fa3 100644 --- a/analysis/low-level-api-fir/testData/lazyResolveScopes/substitutionOverrideWithoutImplicitTypeInsideAnonymousObjectScript.after.txt +++ b/analysis/low-level-api-fir/testData/lazyResolveScopes/substitutionOverrideWithoutImplicitTypeInsideAnonymousObjectScript.after.txt @@ -2,21 +2,21 @@ public open override [ResolvedTo(BODY_RESOLVE)] fun isSchemeFile([ResolvedTo(BOD ^isSchemeFile !=(R|/name|, String(str)) } -public open [ResolvedTo(STATUS)] [SubstitutedOverrideOriginalKey=second/LazySchemeProcessor.isSchemeFile] fun isSchemeFile([ResolvedTo(STATUS)] [SubstitutedOverrideOriginalKey=/name] name: R|kotlin/CharSequence|): R|kotlin/Boolean| +public open [ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=second/LazySchemeProcessor.isSchemeFile] fun isSchemeFile([ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=/name] name: R|kotlin/CharSequence|): R|kotlin/Boolean| public open [ResolvedTo(BODY_RESOLVE)] fun isSchemeFile([ResolvedTo(BODY_RESOLVE)] name: R|kotlin/CharSequence|): R|kotlin/Boolean| { ^isSchemeFile Boolean(true) } -@R|second/Anno|[Types](str = (String(property ), R|second/constant|)) public final [ResolvedTo(STATUS)] [SubstitutedOverrideOriginalKey=second/LazySchemeProcessor.propertyWithAnnotations] var propertyWithAnnotations: R|@R|second/Anno|(str = (String(super1 ), R|second/constant|)) kotlin/Int| - @PROPERTY_GETTER:R|second/Anno|[Types](str = (String(property ), R|second/constant|)) public [ResolvedTo(STATUS)] [ContainingClassKey=, SubstitutedOverrideOriginalKey=special/accessor] get(): R|@R|second/Anno|(str = (String(super1 ), R|second/constant|)) kotlin/Int| - @PROPERTY_SETTER:R|second/Anno|[Types](str = (String(property ), R|second/constant|)) public [ResolvedTo(STATUS)] [ContainingClassKey=, SubstitutedOverrideOriginalKey=special/accessor] set([ResolvedTo(STATUS)] value: R|@R|second/Anno|(str = (String(super1 ), R|second/constant|)) kotlin/Int|): R|kotlin/Unit| +@R|second/Anno|[Types](str = (String(property ), R|second/constant|)) public final [ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=second/LazySchemeProcessor.propertyWithAnnotations] var propertyWithAnnotations: R|@R|second/Anno|(str = (String(super1 ), R|second/constant|)) kotlin/Int| + @PROPERTY_GETTER:R|second/Anno|[Types](str = (String(property ), R|second/constant|)) public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=, SubstitutedOverrideOriginalKey=special/accessor] get(): R|@R|second/Anno|(str = (String(super1 ), R|second/constant|)) kotlin/Int| + @PROPERTY_SETTER:R|second/Anno|[Types](str = (String(property ), R|second/constant|)) public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=, SubstitutedOverrideOriginalKey=special/accessor] set([ResolvedTo(BODY_RESOLVE)] value: R|@R|second/Anno|(str = (String(super1 ), R|second/constant|)) kotlin/Int|): R|kotlin/Unit| @R|second/Anno|[Types](str = (String(property ), R|second/constant|)) public final [ResolvedTo(BODY_RESOLVE)] var propertyWithAnnotations: R|SCHEME| @PROPERTY_GETTER:R|second/Anno|[Types](str = (String(property ), R|second/constant|)) public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=LazySchemeProcessor] get(): R|SCHEME| @PROPERTY_SETTER:R|second/Anno|[Types](str = (String(property ), R|second/constant|)) public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=LazySchemeProcessor] set([ResolvedTo(BODY_RESOLVE)] @SETTER_PARAMETER:R|second/Anno|[Types](str = (String(property ), R|second/constant|)) value: R|SCHEME|): R|kotlin/Unit| -public final [ResolvedTo(STATUS)] [SubstitutedOverrideOriginalKey=second/LazySchemeProcessor.property] var property: R|@R|second/Anno|(str = (String(super1 ), R|second/constant|)) kotlin/Int| +public final [ResolvedTo(BODY_RESOLVE)] [SubstitutedOverrideOriginalKey=second/LazySchemeProcessor.property] var property: R|@R|second/Anno|(str = (String(super1 ), R|second/constant|)) kotlin/Int|