From 7056ad5325324bb8162db4cef2b5bcf02b3c5483 Mon Sep 17 00:00:00 2001 From: Nikolay Lunyak Date: Wed, 29 Nov 2023 16:08:26 +0200 Subject: [PATCH] [FIR] Set `status.isOverride` for fake overrides Even though SO may not be correct overrides sometimes, it feels more natural to treat fake overrides as... well, "overrides". And without it we'd need to make the code in `FirOverrideChecker` less intuitive. --- .../delegateInterfaceLibrary.pretty.txt | 12 ++--- .../delegateInterfaceLibrary.txt | 24 +++++----- .../propertyWithGetter.pretty.txt | 2 +- .../propertyWithGetter.txt | 2 +- .../delegatedMemberScope/simple.pretty.txt | 12 ++--- .../delegatedMemberScope/simple.txt | 12 ++--- .../withImplicitType.pretty.txt | 4 +- .../delegatedMemberScope/withImplicitType.txt | 4 +- .../withOverridden.pretty.txt | 2 +- .../delegatedMemberScope/withOverridden.txt | 2 +- .../memberScope/MutableList.pretty.txt | 20 ++++---- .../scopeProvider/memberScope/MutableList.txt | 20 ++++---- .../memberScope/enumClass.pretty.txt | 6 +-- .../scopeProvider/memberScope/enumClass.txt | 6 +-- .../enumClassWithAbstractMembers.pretty.txt | 6 +-- .../enumClassWithAbstractMembers.txt | 6 +-- .../enumClassWithFinalMembers.pretty.txt | 6 +-- .../memberScope/enumClassWithFinalMembers.txt | 6 +-- .../enumEntryInitializer.pretty.txt | 6 +-- .../memberScope/enumEntryInitializer.txt | 6 +-- ...yInitializerWithFinalEnumMember.pretty.txt | 6 +-- ...numEntryInitializerWithFinalEnumMember.txt | 6 +-- ...InitializerWithOverriddenMember.pretty.txt | 6 +-- ...umEntryInitializerWithOverriddenMember.txt | 6 +-- .../substitutionOverride.pretty.txt | 8 ++-- .../memberScope/substitutionOverride.txt | 8 ++-- .../enumEntry.standalone.fir.txt | 6 +-- .../scopeContextForPosition/enumEntry.txt | 6 +-- .../ClassWithGenericBase1.pretty.txt | 4 +- .../ClassWithGenericBase2.pretty.txt | 4 +- .../ClassWithGenericBase3.pretty.txt | 6 +-- .../ClassWithGenericBase4.pretty.txt | 12 ++--- ...enericFromFunctionInLocalClass2.pretty.txt | 2 +- ...ericFromOuterClassInInnerClass2.pretty.txt | 2 +- ...erClassInInnerClassInInheritor1.pretty.txt | 2 +- ...erClassInInnerClassInInheritor2.pretty.txt | 2 +- ...erClassInInnerClassInInheritor3.pretty.txt | 4 +- .../Implement_java_util_Collection.pretty.txt | 6 +-- ...tionWithOuterTypeParameterBound.pretty.txt | 4 +- ...ertyWithOuterTypeParameterBound.pretty.txt | 2 +- .../innerClassTypeParamsSubstitution.txt | 2 +- ...aMethodWithMultipleTypeParametersBound.txt | 2 +- .../javaMethodWithTypeParametersBound.txt | 2 +- .../referenceResolve/CollectionStream.txt | 2 +- .../SeveralOverrides.descriptors.txt | 2 + .../referenceResolve/SeveralOverrides.txt | 2 +- .../arrayAccess/get.descriptors.txt | 2 + .../referenceResolve/arrayAccess/get.txt | 2 +- .../lazyResolve/delegateWithImplicitType.txt | 12 ++--- ...gateWithImplicitTypeInDifferentModules.txt | 12 ++--- .../delegateWithImplicitTypeScript.txt | 12 ++--- .../explicitSubstitutionOverrideProperty.txt | 12 ++--- ...icitSubstitutionOverridePropertyScript.txt | 12 ++--- .../implicitSubstitutionOverrideProperty.txt | 12 ++--- ...icitSubstitutionOverridePropertyScript.txt | 12 ++--- .../propertyDelegateWithImplicitType.txt | 12 ++--- ...propertyDelegateWithImplicitTypeScript.txt | 12 ++--- .../lazyResolve/substitutionFakeOverride.txt | 12 ++--- .../substitutionFakeOverrideFunction.txt | 12 ++--- ...substitutionFakeOverrideFunctionScript.txt | 12 ++--- ...onFakeOverrideFunctionWithImplicitType.txt | 12 ++--- ...OverrideFunctionWithImplicitTypeScript.txt | 12 ++--- ...titutionFakeOverrideInDifferentModules.txt | 12 ++--- .../substitutionFakeOverrideScript.txt | 12 ++--- ...bstitutionFakeOverrideWithImplicitType.txt | 12 ++--- ...akeOverrideWithImplicitTypeAndReceiver.txt | 12 ++--- ...rrideWithImplicitTypeAndReceiverScript.txt | 12 ++--- ...tionFakeOverrideWithImplicitTypeScript.txt | 12 ++--- ...mplicitTypeInsideAnonymousObject.after.txt | 6 +-- ...plicitTypeInsideAnonymousObject.before.txt | 6 +-- ...tTypeInsideAnonymousObjectScript.after.txt | 6 +-- ...TypeInsideAnonymousObjectScript.before.txt | 6 +-- ...eAnonymousObjectWithSubstitution.after.txt | 22 ++++----- ...AnonymousObjectWithSubstitution.before.txt | 22 ++++----- ...mousObjectWithSubstitutionScript.after.txt | 22 ++++----- ...ousObjectWithSubstitutionScript.before.txt | 22 ++++----- ...rrideWithImplicitTypeInsideClass.after.txt | 6 +-- ...rideWithImplicitTypeInsideClass.before.txt | 6 +-- ...ithImplicitTypeInsideClassScript.after.txt | 6 +-- ...thImplicitTypeInsideClassScript.before.txt | 6 +-- ...tTypeInsideClassWithSubstitution.after.txt | 22 ++++----- ...TypeInsideClassWithSubstitution.before.txt | 22 ++++----- ...nsideClassWithSubstitutionScript.after.txt | 22 ++++----- ...sideClassWithSubstitutionScript.before.txt | 22 ++++----- ...mplicitTypeInsideAnonymousObject.after.txt | 6 +-- ...plicitTypeInsideAnonymousObject.before.txt | 6 +-- ...tTypeInsideAnonymousObjectScript.after.txt | 6 +-- ...TypeInsideAnonymousObjectScript.before.txt | 6 +-- ...eAnonymousObjectWithSubstitution.after.txt | 22 ++++----- ...AnonymousObjectWithSubstitution.before.txt | 22 ++++----- ...mousObjectWithSubstitutionScript.after.txt | 22 ++++----- ...ousObjectWithSubstitutionScript.before.txt | 22 ++++----- ...deWithoutImplicitTypeInsideClass.after.txt | 6 +-- ...eWithoutImplicitTypeInsideClass.before.txt | 6 +-- ...outImplicitTypeInsideClassScript.after.txt | 6 +-- ...utImplicitTypeInsideClassScript.before.txt | 6 +-- ...tTypeInsideClassWithSubstitution.after.txt | 22 ++++----- ...TypeInsideClassWithSubstitution.before.txt | 22 ++++----- ...nsideClassWithSubstitutionScript.after.txt | 22 ++++----- ...sideClassWithSubstitutionScript.before.txt | 22 ++++----- .../intersectionOverride.after.txt | 4 +- .../intersectionOverride.before.txt | 4 +- .../intersectionOverride2.after.txt | 4 +- .../intersectionOverride2.before.txt | 4 +- .../intersectionOverride2Script.after.txt | 4 +- .../intersectionOverride2Script.before.txt | 4 +- .../intersectionOverrideScript.after.txt | 4 +- .../intersectionOverrideScript.before.txt | 4 +- ...mplicitTypeInsideAnonymousObject.after.txt | 16 +++---- ...plicitTypeInsideAnonymousObject.before.txt | 16 +++---- ...tTypeInsideAnonymousObjectScript.after.txt | 16 +++---- ...TypeInsideAnonymousObjectScript.before.txt | 16 +++---- ...mplicitTypeInsideAnonymousObject.after.txt | 16 +++---- ...plicitTypeInsideAnonymousObject.before.txt | 16 +++---- ...tTypeInsideAnonymousObjectScript.after.txt | 16 +++---- ...TypeInsideAnonymousObjectScript.before.txt | 16 +++---- ...mplicitTypeInsideAnonymousObject.after.txt | 6 +-- ...plicitTypeInsideAnonymousObject.before.txt | 6 +-- ...tTypeInsideAnonymousObjectScript.after.txt | 6 +-- ...TypeInsideAnonymousObjectScript.before.txt | 6 +-- ...rrideWithImplicitTypeInsideClass.after.txt | 6 +-- ...rideWithImplicitTypeInsideClass.before.txt | 6 +-- ...ithImplicitTypeInsideClassScript.after.txt | 6 +-- ...thImplicitTypeInsideClassScript.before.txt | 6 +-- ...mplicitTypeInsideAnonymousObject.after.txt | 6 +-- ...plicitTypeInsideAnonymousObject.before.txt | 6 +-- ...tTypeInsideAnonymousObjectScript.after.txt | 6 +-- ...TypeInsideAnonymousObjectScript.before.txt | 6 +-- ...deWithoutImplicitTypeInsideClass.after.txt | 6 +-- ...eWithoutImplicitTypeInsideClass.before.txt | 6 +-- ...outImplicitTypeInsideClassScript.after.txt | 6 +-- ...utImplicitTypeInsideClassScript.before.txt | 6 +-- .../delegateWithExplicitType.after.txt | 2 +- .../delegateWithExplicitType.before.txt | 2 +- .../delegateWithExplicitType.lazyResolve.txt | 12 ++--- .../delegateWithExplicitTypeScript.after.txt | 2 +- .../delegateWithExplicitTypeScript.before.txt | 2 +- ...gateWithExplicitTypeScript.lazyResolve.txt | 12 ++--- ...egateWithExplicitTypeUnavailable.after.txt | 2 +- ...gateWithExplicitTypeUnavailable.before.txt | 2 +- ...ithExplicitTypeUnavailable.lazyResolve.txt | 12 ++--- ...ithExplicitTypeUnavailableScript.after.txt | 2 +- ...thExplicitTypeUnavailableScript.before.txt | 2 +- ...licitTypeUnavailableScript.lazyResolve.txt | 12 ++--- .../delegateWithImplicitType.after.txt | 2 +- .../delegateWithImplicitType.before.txt | 2 +- .../delegateWithImplicitType.lazyResolve.txt | 12 ++--- .../delegateWithImplicitTypeScript.after.txt | 2 +- .../delegateWithImplicitTypeScript.before.txt | 2 +- ...gateWithImplicitTypeScript.lazyResolve.txt | 12 ++--- ...egateWithImplicitTypeUnavailable.after.txt | 2 +- ...gateWithImplicitTypeUnavailable.before.txt | 2 +- ...ithImplicitTypeUnavailable.lazyResolve.txt | 12 ++--- ...ithImplicitTypeUnavailableScript.after.txt | 2 +- ...thImplicitTypeUnavailableScript.before.txt | 2 +- ...licitTypeUnavailableScript.lazyResolve.txt | 12 ++--- .../substitutionOverride/function.after.txt | 2 +- .../substitutionOverride/function.before.txt | 2 +- .../function.lazyResolve.txt | 12 ++--- .../functionScript.after.txt | 2 +- .../functionScript.before.txt | 2 +- .../functionScript.lazyResolve.txt | 12 ++--- .../functionUnavailable.after.txt | 2 +- .../functionUnavailable.before.txt | 2 +- .../functionUnavailable.lazyResolve.txt | 12 ++--- .../functionUnavailableScript.after.txt | 2 +- .../functionUnavailableScript.before.txt | 2 +- .../functionUnavailableScript.lazyResolve.txt | 12 ++--- .../implicitFunction.after.txt | 2 +- .../implicitFunction.before.txt | 2 +- .../implicitFunction.lazyResolve.txt | 12 ++--- .../implicitFunctionScript.after.txt | 2 +- .../implicitFunctionScript.before.txt | 2 +- .../implicitFunctionScript.lazyResolve.txt | 12 ++--- .../implicitFunctionUnavailable.after.txt | 2 +- .../implicitFunctionUnavailable.before.txt | 2 +- ...mplicitFunctionUnavailable.lazyResolve.txt | 12 ++--- ...mplicitFunctionUnavailableScript.after.txt | 2 +- ...plicitFunctionUnavailableScript.before.txt | 2 +- ...tFunctionUnavailableScript.lazyResolve.txt | 12 ++--- .../implicitProperty.after.txt | 2 +- .../implicitProperty.before.txt | 2 +- .../implicitProperty.lazyResolve.txt | 12 ++--- .../implicitPropertyAndReceiver.after.txt | 2 +- .../implicitPropertyAndReceiver.before.txt | 2 +- ...mplicitPropertyAndReceiver.lazyResolve.txt | 12 ++--- ...mplicitPropertyAndReceiverScript.after.txt | 2 +- ...plicitPropertyAndReceiverScript.before.txt | 2 +- ...tPropertyAndReceiverScript.lazyResolve.txt | 12 ++--- .../implicitPropertyScript.after.txt | 2 +- .../implicitPropertyScript.before.txt | 2 +- .../implicitPropertyScript.lazyResolve.txt | 12 ++--- .../implicitPropertyUnavailable.after.txt | 2 +- .../implicitPropertyUnavailable.before.txt | 2 +- ...mplicitPropertyUnavailable.lazyResolve.txt | 12 ++--- ...mplicitPropertyUnavailableScript.after.txt | 2 +- ...plicitPropertyUnavailableScript.before.txt | 2 +- ...tPropertyUnavailableScript.lazyResolve.txt | 12 ++--- .../substitutionOverride/property.after.txt | 2 +- .../substitutionOverride/property.before.txt | 2 +- .../property.lazyResolve.txt | 12 ++--- .../propertyScript.after.txt | 2 +- .../propertyScript.before.txt | 2 +- .../propertyScript.lazyResolve.txt | 12 ++--- .../propertyUnavailable.after.txt | 2 +- .../propertyUnavailable.before.txt | 2 +- .../propertyUnavailable.lazyResolve.txt | 12 ++--- .../propertyUnavailableScript.after.txt | 2 +- .../propertyUnavailableScript.before.txt | 2 +- .../propertyUnavailableScript.lazyResolve.txt | 12 ++--- .../diagnostics/conflictingOverloads.fir.txt | 2 +- .../testData/resolve/overrides/simple.fir.txt | 2 +- .../kotlinOverridesJavaComplex.fir.txt | 2 +- ...citOverrideOfTwoMembers_java.overrides.txt | 4 +- ...rsectionOverrideOfTwoMembers.overrides.txt | 8 ++-- ...ionOverrideOfTwoMembers_java.overrides.txt | 8 ++-- ...rsectionOverrideOfTwoMembers.overrides.txt | 16 +++---- ...ionOverrideOfTwoMembers_java.overrides.txt | 16 +++---- ...ublicJavaAndPrivateKotlinVar.overrides.txt | 4 +- .../singleIntersectionOverride.overrides.txt | 8 ++-- .../specialFunctionInJava_1.overrides.txt | 4 +- .../specialFunctionInJava_2.overrides.txt | 38 +++++++-------- .../j+k/OverrideWithJava.fir.txt | 2 +- .../declaration/FirOverrideChecker.kt | 43 ++++++++--------- .../scopes/impl/FirFakeOverrideGenerator.kt | 4 +- .../resolve/transformers/FirStatusResolver.kt | 2 + .../delegatingToInterfaces.fir.java | 5 +- .../containsAndOverload.fir.overrides.txt | 12 ++--- ...dWithoutExplicitOverride.fir.overrides.txt | 12 ++--- .../overridesBuiltinNoMagic.fir.overrides.txt | 2 +- .../weirdCharBuffers.overrides.txt | 4 +- .../primitiveOverrides/removeAt.overrides.txt | 8 ++-- ...hFlexibleTypeAndSubstitution.overrides.txt | 6 +-- ...FlexibleTypeAndSubstitution2.overrides.txt | 6 +-- ...FlexibleTypeAndSubstitution3.overrides.txt | 6 +-- ...ibleTypeAndSubstitution4.fir.overrides.txt | 10 ++-- ...FlexibleTypeAndSubstitution5.overrides.txt | 6 +-- .../java8Overrides/hidingMethodOfAny.fir.kt | 5 ++ .../tests/java8Overrides/hidingMethodOfAny.kt | 1 - .../firMembers/abstractAndSealed.fir.txt | 6 +-- .../classWithCompanionObject.fir.txt | 6 +-- .../classWithGenericParameters.fir.txt | 8 ++-- .../firMembers/defaultProperties.fir.txt | 6 +-- .../testData/firMembers/enums.fir.txt | 6 +-- .../firMembers/externalSerializers.fir.txt | 8 ++-- .../testData/firMembers/inlineClasses.fir.txt | 12 ++--- .../firMembers/metaSerializable.fir.txt | 48 +++++++++---------- .../firMembers/multipleProperties.fir.txt | 6 +-- .../privatePropertiesSerialization.fir.txt | 12 ++--- .../serializableWithCompanion.fir.txt | 12 ++--- .../firMembers/serializerInLocalClass.fir.txt | 6 +-- .../firMembers/serializerViaCompanion.fir.txt | 16 +++---- 252 files changed, 1025 insertions(+), 1015 deletions(-) create mode 100644 analysis/analysis-api/testData/referenceResolve/SeveralOverrides.descriptors.txt create mode 100644 analysis/analysis-api/testData/referenceResolve/arrayAccess/get.descriptors.txt create mode 100644 compiler/testData/diagnostics/tests/java8Overrides/hidingMethodOfAny.fir.kt diff --git a/analysis/analysis-api/testData/components/scopeProvider/declaredMemberScope/delegateInterfaceLibrary.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/declaredMemberScope/delegateInterfaceLibrary.pretty.txt index 1aaf3666f5e..6f18e61a3f0 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/declaredMemberScope/delegateInterfaceLibrary.pretty.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/declaredMemberScope/delegateInterfaceLibrary.pretty.txt @@ -1,15 +1,15 @@ private val p: A -open var bar: kotlin.Long +override var bar: kotlin.Long -open val kotlin.Int.doo: kotlin.String +override val kotlin.Int.doo: kotlin.String -open fun foo() +override fun foo() -open val foo: kotlin.Int +override val foo: kotlin.Int -open var kotlin.Int.zoo: kotlin.Unit +override var kotlin.Int.zoo: kotlin.Unit -open fun kotlin.Int.smth(): kotlin.Short +override fun kotlin.Int.smth(): kotlin.Short constructor(p: A) \ No newline at end of file diff --git a/analysis/analysis-api/testData/components/scopeProvider/declaredMemberScope/delegateInterfaceLibrary.txt b/analysis/analysis-api/testData/components/scopeProvider/declaredMemberScope/delegateInterfaceLibrary.txt index 44f0b528628..bb8c53e06b3 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/declaredMemberScope/delegateInterfaceLibrary.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/declaredMemberScope/delegateInterfaceLibrary.txt @@ -121,7 +121,7 @@ KtKotlinPropertySymbol: isDefault: true isExtension: false isInline: false - isOverride: false + isOverride: true modality: OPEN origin: SOURCE receiverParameter: null @@ -152,7 +152,7 @@ KtKotlinPropertySymbol: isExtension: false isFromPrimaryConstructor: false isLateInit: false - isOverride: false + isOverride: true isStatic: false isVal: false modality: OPEN @@ -172,7 +172,7 @@ KtKotlinPropertySymbol: isDefault: true isExtension: false isInline: false - isOverride: false + isOverride: true modality: OPEN origin: SOURCE parameter: KtValueParameterSymbol: @@ -289,7 +289,7 @@ KtKotlinPropertySymbol: isDefault: true isExtension: false isInline: false - isOverride: false + isOverride: true modality: OPEN origin: SOURCE receiverParameter: KtReceiverParameterSymbol: @@ -330,7 +330,7 @@ KtKotlinPropertySymbol: isExtension: true isFromPrimaryConstructor: false isLateInit: false - isOverride: false + isOverride: true isStatic: false isVal: true modality: OPEN @@ -382,7 +382,7 @@ KtFunctionSymbol: isInfix: false isInline: false isOperator: false - isOverride: false + isOverride: true isStatic: false isSuspend: false modality: OPEN @@ -438,7 +438,7 @@ KtKotlinPropertySymbol: isDefault: true isExtension: false isInline: false - isOverride: false + isOverride: true modality: OPEN origin: SOURCE receiverParameter: null @@ -469,7 +469,7 @@ KtKotlinPropertySymbol: isExtension: false isFromPrimaryConstructor: false isLateInit: false - isOverride: false + isOverride: true isStatic: false isVal: true modality: OPEN @@ -529,7 +529,7 @@ KtKotlinPropertySymbol: isDefault: true isExtension: false isInline: false - isOverride: false + isOverride: true modality: OPEN origin: SOURCE receiverParameter: KtReceiverParameterSymbol: @@ -570,7 +570,7 @@ KtKotlinPropertySymbol: isExtension: true isFromPrimaryConstructor: false isLateInit: false - isOverride: false + isOverride: true isStatic: false isVal: false modality: OPEN @@ -600,7 +600,7 @@ KtKotlinPropertySymbol: isDefault: true isExtension: false isInline: false - isOverride: false + isOverride: true modality: OPEN origin: SOURCE parameter: KtValueParameterSymbol: @@ -709,7 +709,7 @@ KtFunctionSymbol: isInfix: false isInline: false isOperator: false - isOverride: false + isOverride: true isStatic: false isSuspend: false modality: OPEN diff --git a/analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/propertyWithGetter.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/propertyWithGetter.pretty.txt index c27adf98f4d..46f67acd743 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/propertyWithGetter.pretty.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/propertyWithGetter.pretty.txt @@ -1 +1 @@ -open val foo: kotlin.Int +override val foo: kotlin.Int \ No newline at end of file diff --git a/analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/propertyWithGetter.txt b/analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/propertyWithGetter.txt index 43ebd369d91..51ab1349de8 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/propertyWithGetter.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/propertyWithGetter.txt @@ -15,7 +15,7 @@ KtKotlinPropertySymbol: isExtension: false isFromPrimaryConstructor: false isLateInit: false - isOverride: false + isOverride: true isStatic: false isVal: true modality: OPEN diff --git a/analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/simple.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/simple.pretty.txt index 1d9f3fecbc5..c6faf6cff4c 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/simple.pretty.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/simple.pretty.txt @@ -1,11 +1,11 @@ -open var kotlin.Int.zoo: kotlin.Unit +override var kotlin.Int.zoo: kotlin.Unit -open fun foo() +override fun foo() -open val foo: kotlin.Int +override val foo: kotlin.Int -open fun kotlin.Int.smth(): kotlin.Short +override fun kotlin.Int.smth(): kotlin.Short -open var bar: kotlin.Long +override var bar: kotlin.Long -open val kotlin.Int.doo: kotlin.String +override val kotlin.Int.doo: kotlin.String \ No newline at end of file diff --git a/analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/simple.txt b/analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/simple.txt index 616528d12ce..82d626c186d 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/simple.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/simple.txt @@ -15,7 +15,7 @@ KtKotlinPropertySymbol: isExtension: true isFromPrimaryConstructor: false isLateInit: false - isOverride: false + isOverride: true isStatic: false isVal: false modality: OPEN @@ -67,7 +67,7 @@ KtFunctionSymbol: isInfix: false isInline: false isOperator: false - isOverride: false + isOverride: true isStatic: false isSuspend: false modality: OPEN @@ -108,7 +108,7 @@ KtKotlinPropertySymbol: isExtension: false isFromPrimaryConstructor: false isLateInit: false - isOverride: false + isOverride: true isStatic: false isVal: true modality: OPEN @@ -150,7 +150,7 @@ KtFunctionSymbol: isInfix: false isInline: false isOperator: false - isOverride: false + isOverride: true isStatic: false isSuspend: false modality: OPEN @@ -201,7 +201,7 @@ KtKotlinPropertySymbol: isExtension: false isFromPrimaryConstructor: false isLateInit: false - isOverride: false + isOverride: true isStatic: false isVal: false modality: OPEN @@ -246,7 +246,7 @@ KtKotlinPropertySymbol: isExtension: true isFromPrimaryConstructor: false isLateInit: false - isOverride: false + isOverride: true isStatic: false isVal: true modality: OPEN diff --git a/analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/withImplicitType.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/withImplicitType.pretty.txt index 3094c92b6ad..bc57e21f82e 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/withImplicitType.pretty.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/withImplicitType.pretty.txt @@ -1,3 +1,3 @@ -open fun foo(): kotlin.Int +override fun foo(): kotlin.Int -open fun bar(): kotlin.Int +override fun bar(): kotlin.Int \ No newline at end of file diff --git a/analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/withImplicitType.txt b/analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/withImplicitType.txt index 9626b5b7763..2d6bff7a509 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/withImplicitType.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/withImplicitType.txt @@ -12,7 +12,7 @@ KtFunctionSymbol: isInfix: false isInline: false isOperator: false - isOverride: false + isOverride: true isStatic: false isSuspend: false modality: OPEN @@ -50,7 +50,7 @@ KtFunctionSymbol: isInfix: false isInline: false isOperator: false - isOverride: false + isOverride: true isStatic: false isSuspend: false modality: OPEN diff --git a/analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/withOverridden.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/withOverridden.pretty.txt index d53958b0b0b..10ca0d3fa68 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/withOverridden.pretty.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/withOverridden.pretty.txt @@ -1 +1 @@ -open fun bar() +override fun bar() \ No newline at end of file diff --git a/analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/withOverridden.txt b/analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/withOverridden.txt index abd11a6709e..8fcd4dba21d 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/withOverridden.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/withOverridden.txt @@ -12,7 +12,7 @@ KtFunctionSymbol: isInfix: false isInline: false isOperator: false - isOverride: false + isOverride: true isStatic: false isSuspend: false modality: OPEN diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScope/MutableList.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/MutableList.pretty.txt index 1003cf4f9f5..b38c78152e6 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/memberScope/MutableList.pretty.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/memberScope/MutableList.pretty.txt @@ -24,21 +24,21 @@ operator fun set(index: kotlin.Int, element: E): E fun subList(fromIndex: kotlin.Int, toIndex: kotlin.Int): kotlin.collections.MutableList -val size: kotlin.Int +override val size: kotlin.Int -fun isEmpty(): kotlin.Boolean +override fun isEmpty(): kotlin.Boolean -operator fun contains(element: E): kotlin.Boolean +override operator fun contains(element: E): kotlin.Boolean -operator fun iterator(): kotlin.collections.MutableIterator +override operator fun iterator(): kotlin.collections.MutableIterator -fun containsAll(elements: kotlin.collections.Collection): kotlin.Boolean +override fun containsAll(elements: kotlin.collections.Collection): kotlin.Boolean -operator fun get(index: kotlin.Int): E +override operator fun get(index: kotlin.Int): E -fun indexOf(element: E): kotlin.Int +override fun indexOf(element: E): kotlin.Int -fun lastIndexOf(element: E): kotlin.Int +override fun lastIndexOf(element: E): kotlin.Int open operator fun equals(other: kotlin.Any?): kotlin.Boolean @@ -46,6 +46,6 @@ open fun hashCode(): kotlin.Int open fun toString(): kotlin.String -fun getFirst(): E +override fun getFirst(): E -fun getLast(): E \ No newline at end of file +override fun getLast(): E \ No newline at end of file diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScope/MutableList.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/MutableList.txt index 1f5ed2647d7..a482ec947d4 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/memberScope/MutableList.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/memberScope/MutableList.txt @@ -954,7 +954,7 @@ KtKotlinPropertySymbol: isExtension: false isFromPrimaryConstructor: false isLateInit: false - isOverride: false + isOverride: true isStatic: false isVal: true modality: ABSTRACT @@ -1000,7 +1000,7 @@ KtFunctionSymbol: isInfix: false isInline: false isOperator: false - isOverride: false + isOverride: true isStatic: false isSuspend: false modality: ABSTRACT @@ -1042,7 +1042,7 @@ KtFunctionSymbol: isInfix: false isInline: false isOperator: true - isOverride: false + isOverride: true isStatic: false isSuspend: false modality: ABSTRACT @@ -1108,7 +1108,7 @@ KtFunctionSymbol: isInfix: false isInline: false isOperator: true - isOverride: false + isOverride: true isStatic: false isSuspend: false modality: ABSTRACT @@ -1154,7 +1154,7 @@ KtFunctionSymbol: isInfix: false isInline: false isOperator: false - isOverride: false + isOverride: true isStatic: false isSuspend: false modality: ABSTRACT @@ -1225,7 +1225,7 @@ KtFunctionSymbol: isInfix: false isInline: false isOperator: true - isOverride: false + isOverride: true isStatic: false isSuspend: false modality: ABSTRACT @@ -1291,7 +1291,7 @@ KtFunctionSymbol: isInfix: false isInline: false isOperator: false - isOverride: false + isOverride: true isStatic: false isSuspend: false modality: ABSTRACT @@ -1357,7 +1357,7 @@ KtFunctionSymbol: isInfix: false isInline: false isOperator: false - isOverride: false + isOverride: true isStatic: false isSuspend: false modality: ABSTRACT @@ -1562,7 +1562,7 @@ KtFunctionSymbol: isInfix: false isInline: false isOperator: false - isOverride: false + isOverride: true isStatic: false isSuspend: false modality: OPEN @@ -1603,7 +1603,7 @@ KtFunctionSymbol: isInfix: false isInline: false isOperator: false - isOverride: false + isOverride: true isStatic: false isSuspend: false modality: OPEN diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScope/enumClass.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/enumClass.pretty.txt index 6e8caadb59d..0b4f256f49a 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/memberScope/enumClass.pretty.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/memberScope/enumClass.pretty.txt @@ -1,6 +1,6 @@ protected fun clone(): kotlin.Any -operator fun compareTo(other: test.E): kotlin.Int +override operator fun compareTo(other: test.E): kotlin.Int operator fun equals(other: kotlin.Any?): kotlin.Boolean @@ -13,9 +13,9 @@ val name: kotlin.String val ordinal: kotlin.Int -fun getDeclaringClass(): java.lang.Class! +override fun getDeclaringClass(): java.lang.Class! -fun finalize() +override fun finalize() companion object diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScope/enumClass.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/enumClass.txt index ee5833c0050..2cdc4512113 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/memberScope/enumClass.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/memberScope/enumClass.txt @@ -54,7 +54,7 @@ KtFunctionSymbol: isInfix: false isInline: false isOperator: true - isOverride: false + isOverride: true isStatic: false isSuspend: false modality: FINAL @@ -469,7 +469,7 @@ KtFunctionSymbol: isInfix: false isInline: false isOperator: false - isOverride: false + isOverride: true isStatic: false isSuspend: false modality: FINAL @@ -506,7 +506,7 @@ KtFunctionSymbol: isInfix: false isInline: false isOperator: false - isOverride: false + isOverride: true isStatic: false isSuspend: false modality: FINAL diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScope/enumClassWithAbstractMembers.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/enumClassWithAbstractMembers.pretty.txt index 75b3125fef8..d3caf1ca179 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/memberScope/enumClassWithAbstractMembers.pretty.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/memberScope/enumClassWithAbstractMembers.pretty.txt @@ -4,7 +4,7 @@ abstract fun bar() protected fun clone(): kotlin.Any -operator fun compareTo(other: test.E): kotlin.Int +override operator fun compareTo(other: test.E): kotlin.Int operator fun equals(other: kotlin.Any?): kotlin.Boolean @@ -17,9 +17,9 @@ val name: kotlin.String val ordinal: kotlin.Int -fun getDeclaringClass(): java.lang.Class! +override fun getDeclaringClass(): java.lang.Class! -fun finalize() +override fun finalize() companion object diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScope/enumClassWithAbstractMembers.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/enumClassWithAbstractMembers.txt index 1ff816c6fa7..9e1a2ad75a3 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/memberScope/enumClassWithAbstractMembers.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/memberScope/enumClassWithAbstractMembers.txt @@ -183,7 +183,7 @@ KtFunctionSymbol: isInfix: false isInline: false isOperator: true - isOverride: false + isOverride: true isStatic: false isSuspend: false modality: FINAL @@ -598,7 +598,7 @@ KtFunctionSymbol: isInfix: false isInline: false isOperator: false - isOverride: false + isOverride: true isStatic: false isSuspend: false modality: FINAL @@ -635,7 +635,7 @@ KtFunctionSymbol: isInfix: false isInline: false isOperator: false - isOverride: false + isOverride: true isStatic: false isSuspend: false modality: FINAL diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScope/enumClassWithFinalMembers.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/enumClassWithFinalMembers.pretty.txt index 94767a3c14b..094a714f909 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/memberScope/enumClassWithFinalMembers.pretty.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/memberScope/enumClassWithFinalMembers.pretty.txt @@ -4,7 +4,7 @@ fun bar() protected fun clone(): kotlin.Any -operator fun compareTo(other: test.E): kotlin.Int +override operator fun compareTo(other: test.E): kotlin.Int operator fun equals(other: kotlin.Any?): kotlin.Boolean @@ -17,9 +17,9 @@ val name: kotlin.String val ordinal: kotlin.Int -fun getDeclaringClass(): java.lang.Class! +override fun getDeclaringClass(): java.lang.Class! -fun finalize() +override fun finalize() companion object diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScope/enumClassWithFinalMembers.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/enumClassWithFinalMembers.txt index 7d81f5965e2..3efb9694e3e 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/memberScope/enumClassWithFinalMembers.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/memberScope/enumClassWithFinalMembers.txt @@ -183,7 +183,7 @@ KtFunctionSymbol: isInfix: false isInline: false isOperator: true - isOverride: false + isOverride: true isStatic: false isSuspend: false modality: FINAL @@ -598,7 +598,7 @@ KtFunctionSymbol: isInfix: false isInline: false isOperator: false - isOverride: false + isOverride: true isStatic: false isSuspend: false modality: FINAL @@ -635,7 +635,7 @@ KtFunctionSymbol: isInfix: false isInline: false isOperator: false - isOverride: false + isOverride: true isStatic: false isSuspend: false modality: FINAL diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScope/enumEntryInitializer.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/enumEntryInitializer.pretty.txt index 54ecbe61f10..ce0fa1c01c8 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/memberScope/enumEntryInitializer.pretty.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/memberScope/enumEntryInitializer.pretty.txt @@ -2,7 +2,7 @@ val x: kotlin.String protected fun clone(): kotlin.Any -operator fun compareTo(other: test.E): kotlin.Int +override operator fun compareTo(other: test.E): kotlin.Int operator fun equals(other: kotlin.Any?): kotlin.Boolean @@ -15,9 +15,9 @@ val name: kotlin.String val ordinal: kotlin.Int -fun getDeclaringClass(): java.lang.Class! +override fun getDeclaringClass(): java.lang.Class! -fun finalize() +override fun finalize() companion object diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScope/enumEntryInitializer.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/enumEntryInitializer.txt index e71f349520c..39bcb567d59 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/memberScope/enumEntryInitializer.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/memberScope/enumEntryInitializer.txt @@ -145,7 +145,7 @@ KtFunctionSymbol: isInfix: false isInline: false isOperator: true - isOverride: false + isOverride: true isStatic: false isSuspend: false modality: FINAL @@ -560,7 +560,7 @@ KtFunctionSymbol: isInfix: false isInline: false isOperator: false - isOverride: false + isOverride: true isStatic: false isSuspend: false modality: FINAL @@ -597,7 +597,7 @@ KtFunctionSymbol: isInfix: false isInline: false isOperator: false - isOverride: false + isOverride: true isStatic: false isSuspend: false modality: FINAL diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScope/enumEntryInitializerWithFinalEnumMember.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/enumEntryInitializerWithFinalEnumMember.pretty.txt index de0b3b593a7..18212a441ee 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/memberScope/enumEntryInitializerWithFinalEnumMember.pretty.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/memberScope/enumEntryInitializerWithFinalEnumMember.pretty.txt @@ -4,7 +4,7 @@ val foo: kotlin.Int protected fun clone(): kotlin.Any -operator fun compareTo(other: test.E): kotlin.Int +override operator fun compareTo(other: test.E): kotlin.Int operator fun equals(other: kotlin.Any?): kotlin.Boolean @@ -17,9 +17,9 @@ val name: kotlin.String val ordinal: kotlin.Int -fun getDeclaringClass(): java.lang.Class! +override fun getDeclaringClass(): java.lang.Class! -fun finalize() +override fun finalize() companion object diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScope/enumEntryInitializerWithFinalEnumMember.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/enumEntryInitializerWithFinalEnumMember.txt index 054bd799772..a2b406f1061 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/memberScope/enumEntryInitializerWithFinalEnumMember.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/memberScope/enumEntryInitializerWithFinalEnumMember.txt @@ -236,7 +236,7 @@ KtFunctionSymbol: isInfix: false isInline: false isOperator: true - isOverride: false + isOverride: true isStatic: false isSuspend: false modality: FINAL @@ -651,7 +651,7 @@ KtFunctionSymbol: isInfix: false isInline: false isOperator: false - isOverride: false + isOverride: true isStatic: false isSuspend: false modality: FINAL @@ -688,7 +688,7 @@ KtFunctionSymbol: isInfix: false isInline: false isOperator: false - isOverride: false + isOverride: true isStatic: false isSuspend: false modality: FINAL diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScope/enumEntryInitializerWithOverriddenMember.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/enumEntryInitializerWithOverriddenMember.pretty.txt index 38b2c2f16bd..d406120d182 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/memberScope/enumEntryInitializerWithOverriddenMember.pretty.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/memberScope/enumEntryInitializerWithOverriddenMember.pretty.txt @@ -2,7 +2,7 @@ override val foo: kotlin.Int protected fun clone(): kotlin.Any -operator fun compareTo(other: test.E): kotlin.Int +override operator fun compareTo(other: test.E): kotlin.Int operator fun equals(other: kotlin.Any?): kotlin.Boolean @@ -15,9 +15,9 @@ val name: kotlin.String val ordinal: kotlin.Int -fun getDeclaringClass(): java.lang.Class! +override fun getDeclaringClass(): java.lang.Class! -fun finalize() +override fun finalize() companion object diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScope/enumEntryInitializerWithOverriddenMember.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/enumEntryInitializerWithOverriddenMember.txt index e1eb6ec3634..0a16eb9ad63 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/memberScope/enumEntryInitializerWithOverriddenMember.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/memberScope/enumEntryInitializerWithOverriddenMember.txt @@ -145,7 +145,7 @@ KtFunctionSymbol: isInfix: false isInline: false isOperator: true - isOverride: false + isOverride: true isStatic: false isSuspend: false modality: FINAL @@ -560,7 +560,7 @@ KtFunctionSymbol: isInfix: false isInline: false isOperator: false - isOverride: false + isOverride: true isStatic: false isSuspend: false modality: FINAL @@ -597,7 +597,7 @@ KtFunctionSymbol: isInfix: false isInline: false isOperator: false - isOverride: false + isOverride: true isStatic: false isSuspend: false modality: FINAL diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScope/substitutionOverride.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/substitutionOverride.pretty.txt index c4540aa33c8..a273f67a1f0 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/memberScope/substitutionOverride.pretty.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/memberScope/substitutionOverride.pretty.txt @@ -2,17 +2,17 @@ fun noGeneric(): kotlin.Int fun noGenericWithExplicitType(): kotlin.Int -fun withOuterGeneric(t: test.Foo): kotlin.String +override fun withOuterGeneric(t: test.Foo): kotlin.String -fun withOuterGenericWithExplicitType(t: test.Foo): kotlin.String +override fun withOuterGenericWithExplicitType(t: test.Foo): kotlin.String fun withOwnGeneric(tt: TT): kotlin.Boolean fun withOwnGenericWithExplicitType(tt: TT): kotlin.Boolean -fun withOuterAndOwnGeneric(t: test.Foo, tt: TT): kotlin.Long +override fun withOuterAndOwnGeneric(t: test.Foo, tt: TT): kotlin.Long -fun withOuterAndOwnGenericWithExplicitType(t: test.Foo, tt: TT): kotlin.Long +override fun withOuterAndOwnGenericWithExplicitType(t: test.Foo, tt: TT): kotlin.Long open operator fun equals(other: kotlin.Any?): kotlin.Boolean diff --git a/analysis/analysis-api/testData/components/scopeProvider/memberScope/substitutionOverride.txt b/analysis/analysis-api/testData/components/scopeProvider/memberScope/substitutionOverride.txt index 5065b027d60..365b19359cd 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/memberScope/substitutionOverride.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/memberScope/substitutionOverride.txt @@ -96,7 +96,7 @@ KtFunctionSymbol: isInfix: false isInline: false isOperator: false - isOverride: false + isOverride: true isStatic: false isSuspend: false modality: FINAL @@ -159,7 +159,7 @@ KtFunctionSymbol: isInfix: false isInline: false isOperator: false - isOverride: false + isOverride: true isStatic: false isSuspend: false modality: FINAL @@ -358,7 +358,7 @@ KtFunctionSymbol: isInfix: false isInline: false isOperator: false - isOverride: false + isOverride: true isStatic: false isSuspend: false modality: FINAL @@ -446,7 +446,7 @@ KtFunctionSymbol: isInfix: false isInline: false isOperator: false - isOverride: false + isOverride: true isStatic: false isSuspend: false modality: FINAL diff --git a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/enumEntry.standalone.fir.txt b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/enumEntry.standalone.fir.txt index 1e22f095031..8da8377fde2 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/enumEntry.standalone.fir.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/enumEntry.standalone.fir.txt @@ -192,7 +192,7 @@ scopes: isInfix: false isInline: false isOperator: true - isOverride: false + isOverride: true isStatic: false isSuspend: false modality: FINAL @@ -485,7 +485,7 @@ scopes: isInfix: false isInline: false isOperator: false - isOverride: false + isOverride: true isStatic: false isSuspend: false modality: FINAL @@ -513,7 +513,7 @@ scopes: isInfix: false isInline: false isOperator: false - isOverride: false + isOverride: true isStatic: false isSuspend: false modality: FINAL diff --git a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/enumEntry.txt b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/enumEntry.txt index c094967ffa1..a60a28efe7b 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/enumEntry.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/scopeContextForPosition/enumEntry.txt @@ -192,7 +192,7 @@ scopes: isInfix: false isInline: false isOperator: true - isOverride: false + isOverride: true isStatic: false isSuspend: false modality: FINAL @@ -485,7 +485,7 @@ scopes: isInfix: false isInline: false isOperator: false - isOverride: false + isOverride: true isStatic: false isSuspend: false modality: FINAL @@ -513,7 +513,7 @@ scopes: isInfix: false isInline: false isOperator: false - isOverride: false + isOverride: true isStatic: false isSuspend: false modality: FINAL diff --git a/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase1.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase1.pretty.txt index aa8b4116019..84c6729580a 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase1.pretty.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase1.pretty.txt @@ -1,10 +1,10 @@ fun noGeneric() -fun withOuterGeneric(t: test.Foo) +override fun withOuterGeneric(t: test.Foo) fun withOwnGeneric(tt: TT) -fun withOuterAndOwnGeneric(t: test.Foo, tt: TT) +override fun withOuterAndOwnGeneric(t: test.Foo, tt: TT) open operator fun equals(other: kotlin.Any?): kotlin.Boolean diff --git a/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase2.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase2.pretty.txt index 1669e13d698..3ed2ad57620 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase2.pretty.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase2.pretty.txt @@ -1,11 +1,11 @@ val noGeneric: test.Foo? -val withOuterGeneric: test.Foo? +override val withOuterGeneric: test.Foo? val TT.withOwnGeneric: TT? get() -val TT.withOuterAndOwnGeneric: test.Foo? +override val TT.withOuterAndOwnGeneric: test.Foo? open operator fun equals(other: kotlin.Any?): kotlin.Boolean diff --git a/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase3.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase3.pretty.txt index b9a2114b8ee..9daa242c5e0 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase3.pretty.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase3.pretty.txt @@ -1,12 +1,12 @@ fun noGenerics_InterfaceWithFun() -open fun withOuterGeneric_InterfaceWithFun(): test.SomeClass2 +override fun withOuterGeneric_InterfaceWithFun(): test.SomeClass2 fun noGenerics_InterfaceWithFunBase() -fun withOuterGenericT1_InterfaceWithFunBase(): test.SomeClass1 +override fun withOuterGenericT1_InterfaceWithFunBase(): test.SomeClass1 -open fun withOuterGenericT2_InterfaceWithFunBase(): test.SomeClass2 +override fun withOuterGenericT2_InterfaceWithFunBase(): test.SomeClass2 open operator fun equals(other: kotlin.Any?): kotlin.Boolean diff --git a/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase4.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase4.pretty.txt index 784d316804b..e7910a7d42e 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase4.pretty.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase4.pretty.txt @@ -1,22 +1,22 @@ val noGenerics_InterfaceWithVal: test.SomeClass1 -abstract val withOuterGeneric_InterfaceWithVal: test.SomeClass2 +override val withOuterGeneric_InterfaceWithVal: test.SomeClass2 val Own.withOwnGeneric_InterfaceWithVal: test.SomeClass1 -abstract val Own.withOwnAndOuterGeneric_InterfaceWithVal: test.SomeClass2 +override val Own.withOwnAndOuterGeneric_InterfaceWithVal: test.SomeClass2 val noGenerics_InterfaceWithValBase: test.SomeClass1 -val withOuterGenericT1_InterfaceWithValBase: test.SomeClass1 +override val withOuterGenericT1_InterfaceWithValBase: test.SomeClass1 -abstract val withOuterGenericT2_InterfaceWithValBase: test.SomeClass2 +override val withOuterGenericT2_InterfaceWithValBase: test.SomeClass2 val Own.withOwnGeneric_InterfaceWithValBase: test.SomeClass1 -val Own.withOwnAndOuterGenericT1_InterfaceWithValBase: test.SomeClass1 +override val Own.withOwnAndOuterGenericT1_InterfaceWithValBase: test.SomeClass1 -abstract val Own.withOwnAndOuterGenericT2_InterfaceWithValBase: test.SomeClass2 +override val Own.withOwnAndOuterGenericT2_InterfaceWithValBase: test.SomeClass2 open operator fun equals(other: kotlin.Any?): kotlin.Boolean diff --git a/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass2.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass2.pretty.txt index adb030204ca..18b27f26b3b 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass2.pretty.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass2.pretty.txt @@ -2,7 +2,7 @@ fun noGenerics() fun withOuter(): Outer? -fun withOuterAndOwn(t: test.SomeClass): Outer? +override fun withOuterAndOwn(t: test.SomeClass): Outer? open operator fun equals(other: kotlin.Any?): kotlin.Boolean diff --git a/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass2.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass2.pretty.txt index 44cb77098f7..0a3fc30c4b9 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass2.pretty.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass2.pretty.txt @@ -2,7 +2,7 @@ fun noGeneric() fun withOuter(): Outer? -fun withOwnAndOuter(t: test.SomeClass): Outer? +override fun withOwnAndOuter(t: test.SomeClass): Outer? open operator fun equals(other: kotlin.Any?): kotlin.Boolean diff --git a/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor1.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor1.pretty.txt index 965beaaed25..49a8627a269 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor1.pretty.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor1.pretty.txt @@ -1,6 +1,6 @@ fun noGeneric() -fun withOuter(): test.SomeClass? +override fun withOuter(): test.SomeClass? open operator fun equals(other: kotlin.Any?): kotlin.Boolean diff --git a/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor2.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor2.pretty.txt index 8598ad1b1de..863ea6c9d6a 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor2.pretty.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor2.pretty.txt @@ -1,6 +1,6 @@ fun noGeneric() -fun withOuter(): T? +override fun withOuter(): T? open operator fun equals(other: kotlin.Any?): kotlin.Boolean diff --git a/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor3.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor3.pretty.txt index 10a4410334f..dca0a70fb78 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor3.pretty.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor3.pretty.txt @@ -1,8 +1,8 @@ fun noGeneric() -fun withOuter(): test.SomeClass? +override fun withOuter(): test.SomeClass? -fun withOwnAndOuter(t: test.SomeClass): test.SomeClass? +override fun withOwnAndOuter(t: test.SomeClass): test.SomeClass? open operator fun equals(other: kotlin.Any?): kotlin.Boolean diff --git a/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/Implement_java_util_Collection.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/Implement_java_util_Collection.pretty.txt index 7157ff2033d..2f8d0cfb081 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/Implement_java_util_Collection.pretty.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/Implement_java_util_Collection.pretty.txt @@ -4,19 +4,19 @@ fun isEmpty(): kotlin.Boolean operator fun contains(p0: kotlin.Any!): kotlin.Boolean -abstract operator fun iterator(): kotlin.collections.MutableIterator +override operator fun iterator(): kotlin.collections.MutableIterator fun toArray(): kotlin.Array! fun toArray(p0: kotlin.Array<(T & kotlin.Any..T?)>!): kotlin.Array<(T & kotlin.Any..T?)>! -abstract fun add(p0: test.SomeClass!): kotlin.Boolean +override fun add(p0: test.SomeClass!): kotlin.Boolean fun remove(p0: kotlin.Any!): kotlin.Boolean fun containsAll(p0: kotlin.collections.(Mutable)Collection<*>!): kotlin.Boolean -abstract fun addAll(p0: kotlin.collections.(Mutable)Collection!): kotlin.Boolean +override fun addAll(p0: kotlin.collections.(Mutable)Collection!): kotlin.Boolean fun removeAll(p0: kotlin.collections.(Mutable)Collection<*>!): kotlin.Boolean diff --git a/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/MemberFunctionWithOuterTypeParameterBound.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/MemberFunctionWithOuterTypeParameterBound.pretty.txt index 614d8e08a78..419fcdbef87 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/MemberFunctionWithOuterTypeParameterBound.pretty.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/MemberFunctionWithOuterTypeParameterBound.pretty.txt @@ -1,6 +1,6 @@ -abstract fun funWithOuterAndOwnGenericsAndBounds(tT1: TT1?, tT2: TT2?) +override fun funWithOuterAndOwnGenericsAndBounds(tT1: TT1?, tT2: TT2?) -open val test.TwoParams.propWithOuterAndOwnGenericsAndBounds: test.Foo? +override val test.TwoParams.propWithOuterAndOwnGenericsAndBounds: test.Foo? open operator fun equals(other: kotlin.Any?): kotlin.Boolean diff --git a/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/MemberPropertyWithOuterTypeParameterBound.pretty.txt b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/MemberPropertyWithOuterTypeParameterBound.pretty.txt index 657ad8131f8..54cc5bc1867 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/MemberPropertyWithOuterTypeParameterBound.pretty.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/MemberPropertyWithOuterTypeParameterBound.pretty.txt @@ -1,6 +1,6 @@ val Own.withOwnGeneric_InterfaceWithValBase: test.ClassA -abstract val Own.withOwnAndOuterGenericAsTypeBound_InterfaceWithValBase: test.ClassA +override val Own.withOwnAndOuterGenericAsTypeBound_InterfaceWithValBase: test.ClassA open operator fun equals(other: kotlin.Any?): kotlin.Boolean diff --git a/analysis/analysis-api/testData/components/scopeProvider/typeScope/innerClassTypeParamsSubstitution.txt b/analysis/analysis-api/testData/components/scopeProvider/typeScope/innerClassTypeParamsSubstitution.txt index 5d6a8fe168d..f2a09911ee4 100644 --- a/analysis/analysis-api/testData/components/scopeProvider/typeScope/innerClassTypeParamsSubstitution.txt +++ b/analysis/analysis-api/testData/components/scopeProvider/typeScope/innerClassTypeParamsSubstitution.txt @@ -247,7 +247,7 @@ KtFunctionSymbol: isInfix: false isInline: false isOperator: false - isOverride: false + isOverride: true isStatic: false isSuspend: false modality: ABSTRACT diff --git a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/symbolRenderingByReference/javaMethodWithMultipleTypeParametersBound.txt b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/symbolRenderingByReference/javaMethodWithMultipleTypeParametersBound.txt index 99618396764..cd513f1394b 100644 --- a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/symbolRenderingByReference/javaMethodWithMultipleTypeParametersBound.txt +++ b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/symbolRenderingByReference/javaMethodWithMultipleTypeParametersBound.txt @@ -1 +1 @@ -open fun foo() where K : kotlin.String?, K : java.lang.Runnable? +override fun foo() where K : kotlin.String?, K : java.lang.Runnable? \ No newline at end of file diff --git a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/symbolRenderingByReference/javaMethodWithTypeParametersBound.txt b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/symbolRenderingByReference/javaMethodWithTypeParametersBound.txt index 9cfda35e495..19df1d412e6 100644 --- a/analysis/analysis-api/testData/components/symbolDeclarationRenderer/symbolRenderingByReference/javaMethodWithTypeParametersBound.txt +++ b/analysis/analysis-api/testData/components/symbolDeclarationRenderer/symbolRenderingByReference/javaMethodWithTypeParametersBound.txt @@ -1 +1 @@ -open fun foo() +override fun foo() \ No newline at end of file diff --git a/analysis/analysis-api/testData/referenceResolve/CollectionStream.txt b/analysis/analysis-api/testData/referenceResolve/CollectionStream.txt index 0213bf1d277..dcbcb9571e4 100644 --- a/analysis/analysis-api/testData/referenceResolve/CollectionStream.txt +++ b/analysis/analysis-api/testData/referenceResolve/CollectionStream.txt @@ -1,2 +1,2 @@ Resolved to: -0: (in kotlin.collections.Collection) fun stream(): java.util.stream.Stream (psi: ClsMethodImpl) +0: (in kotlin.collections.Collection) override fun stream(): java.util.stream.Stream (psi: ClsMethodImpl) diff --git a/analysis/analysis-api/testData/referenceResolve/SeveralOverrides.descriptors.txt b/analysis/analysis-api/testData/referenceResolve/SeveralOverrides.descriptors.txt new file mode 100644 index 00000000000..42d0f54fd08 --- /dev/null +++ b/analysis/analysis-api/testData/referenceResolve/SeveralOverrides.descriptors.txt @@ -0,0 +1,2 @@ +Resolved to: +0: (in C) fun foo() \ No newline at end of file diff --git a/analysis/analysis-api/testData/referenceResolve/SeveralOverrides.txt b/analysis/analysis-api/testData/referenceResolve/SeveralOverrides.txt index c2ef4379d2f..964fc1856c4 100644 --- a/analysis/analysis-api/testData/referenceResolve/SeveralOverrides.txt +++ b/analysis/analysis-api/testData/referenceResolve/SeveralOverrides.txt @@ -1,2 +1,2 @@ Resolved to: -0: (in C) fun foo() +0: (in C) override fun foo() \ No newline at end of file diff --git a/analysis/analysis-api/testData/referenceResolve/arrayAccess/get.descriptors.txt b/analysis/analysis-api/testData/referenceResolve/arrayAccess/get.descriptors.txt new file mode 100644 index 00000000000..f14bf51e2a5 --- /dev/null +++ b/analysis/analysis-api/testData/referenceResolve/arrayAccess/get.descriptors.txt @@ -0,0 +1,2 @@ +Resolved to: +0: (in kotlin.collections.MutableList) operator fun get(index: kotlin.Int): E \ No newline at end of file diff --git a/analysis/analysis-api/testData/referenceResolve/arrayAccess/get.txt b/analysis/analysis-api/testData/referenceResolve/arrayAccess/get.txt index 408f24cc882..964d060ae00 100644 --- a/analysis/analysis-api/testData/referenceResolve/arrayAccess/get.txt +++ b/analysis/analysis-api/testData/referenceResolve/arrayAccess/get.txt @@ -1,2 +1,2 @@ Resolved to: -0: (in kotlin.collections.MutableList) operator fun get(index: kotlin.Int): E +0: (in kotlin.collections.MutableList) override operator fun get(index: kotlin.Int): E \ No newline at end of file diff --git a/analysis/low-level-api-fir/testData/lazyResolve/delegateWithImplicitType.txt b/analysis/low-level-api-fir/testData/lazyResolve/delegateWithImplicitType.txt index 4a9b1472451..c1a0e5a8223 100644 --- a/analysis/low-level-api-fir/testData/lazyResolve/delegateWithImplicitType.txt +++ b/analysis/low-level-api-fir/testData/lazyResolve/delegateWithImplicitType.txt @@ -1,5 +1,5 @@ STATUS: -TARGET: public open [ResolvedTo(STATUS)] [CallableCopyDeferredReturnTypeCalculationKey=CallableCopySubstitution(substitutor=Empty, baseSymbol=FirNamedFunctionSymbol /Interface.implicitType), DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /Interface.implicitType, containingClass=Aaa, delegateField=FirFieldSymbol /Aaa.$$delegate_0] fun implicitType(): +TARGET: public open override [ResolvedTo(STATUS)] [CallableCopyDeferredReturnTypeCalculationKey=CallableCopySubstitution(substitutor=Empty, baseSymbol=FirNamedFunctionSymbol /Interface.implicitType), DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /Interface.implicitType, containingClass=Aaa, delegateField=FirFieldSymbol /Aaa.$$delegate_0] fun implicitType(): FILE: [ResolvedTo(IMPORTS)] delegateWithImplicitType.kt public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol /Aaa.$$delegate_0}] class Aaa : R|Interface| { @@ -16,7 +16,7 @@ FILE: [ResolvedTo(IMPORTS)] delegateWithImplicitType.kt } EXPECT_ACTUAL_MATCHING: -TARGET: public open [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [CallableCopyDeferredReturnTypeCalculationKey=CallableCopySubstitution(substitutor=Empty, baseSymbol=FirNamedFunctionSymbol /Interface.implicitType), DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /Interface.implicitType, containingClass=Aaa, delegateField=FirFieldSymbol /Aaa.$$delegate_0] fun implicitType(): +TARGET: public open override [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [CallableCopyDeferredReturnTypeCalculationKey=CallableCopySubstitution(substitutor=Empty, baseSymbol=FirNamedFunctionSymbol /Interface.implicitType), DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /Interface.implicitType, containingClass=Aaa, delegateField=FirFieldSymbol /Aaa.$$delegate_0] fun implicitType(): FILE: [ResolvedTo(IMPORTS)] delegateWithImplicitType.kt public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol /Aaa.$$delegate_0}] class Aaa : R|Interface| { @@ -33,7 +33,7 @@ FILE: [ResolvedTo(IMPORTS)] delegateWithImplicitType.kt } CONTRACTS: -TARGET: public open [ResolvedTo(CONTRACTS)] [CallableCopyDeferredReturnTypeCalculationKey=CallableCopySubstitution(substitutor=Empty, baseSymbol=FirNamedFunctionSymbol /Interface.implicitType), DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /Interface.implicitType, containingClass=Aaa, delegateField=FirFieldSymbol /Aaa.$$delegate_0] fun implicitType(): +TARGET: public open override [ResolvedTo(CONTRACTS)] [CallableCopyDeferredReturnTypeCalculationKey=CallableCopySubstitution(substitutor=Empty, baseSymbol=FirNamedFunctionSymbol /Interface.implicitType), DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /Interface.implicitType, containingClass=Aaa, delegateField=FirFieldSymbol /Aaa.$$delegate_0] fun implicitType(): FILE: [ResolvedTo(IMPORTS)] delegateWithImplicitType.kt public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol /Aaa.$$delegate_0}] class Aaa : R|Interface| { @@ -50,7 +50,7 @@ FILE: [ResolvedTo(IMPORTS)] delegateWithImplicitType.kt } IMPLICIT_TYPES_BODY_RESOLVE: -TARGET: public open [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /Interface.implicitType, containingClass=Aaa, delegateField=FirFieldSymbol /Aaa.$$delegate_0] fun implicitType(): R|kotlin/Int| +TARGET: public open override [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /Interface.implicitType, containingClass=Aaa, delegateField=FirFieldSymbol /Aaa.$$delegate_0] fun implicitType(): R|kotlin/Int| FILE: [ResolvedTo(IMPORTS)] delegateWithImplicitType.kt public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol /Aaa.$$delegate_0}] class Aaa : R|Interface| { @@ -69,7 +69,7 @@ FILE: [ResolvedTo(IMPORTS)] delegateWithImplicitType.kt } ANNOTATION_ARGUMENTS: -TARGET: public open [ResolvedTo(ANNOTATION_ARGUMENTS)] [DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /Interface.implicitType, containingClass=Aaa, delegateField=FirFieldSymbol /Aaa.$$delegate_0] fun implicitType(): R|kotlin/Int| +TARGET: public open override [ResolvedTo(ANNOTATION_ARGUMENTS)] [DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /Interface.implicitType, containingClass=Aaa, delegateField=FirFieldSymbol /Aaa.$$delegate_0] fun implicitType(): R|kotlin/Int| FILE: [ResolvedTo(IMPORTS)] delegateWithImplicitType.kt public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol /Aaa.$$delegate_0}] class Aaa : R|Interface| { @@ -88,7 +88,7 @@ FILE: [ResolvedTo(IMPORTS)] delegateWithImplicitType.kt } BODY_RESOLVE: -TARGET: public open [ResolvedTo(BODY_RESOLVE)] [DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /Interface.implicitType, containingClass=Aaa, delegateField=FirFieldSymbol /Aaa.$$delegate_0] fun implicitType(): R|kotlin/Int| +TARGET: public open override [ResolvedTo(BODY_RESOLVE)] [DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /Interface.implicitType, containingClass=Aaa, delegateField=FirFieldSymbol /Aaa.$$delegate_0] fun implicitType(): R|kotlin/Int| FILE: [ResolvedTo(IMPORTS)] delegateWithImplicitType.kt public final [ResolvedTo(STATUS)] [DelegateFieldsMapKey={0=FirFieldSymbol /Aaa.$$delegate_0}] class Aaa : R|Interface| { diff --git a/analysis/low-level-api-fir/testData/lazyResolve/delegateWithImplicitTypeInDifferentModules.txt b/analysis/low-level-api-fir/testData/lazyResolve/delegateWithImplicitTypeInDifferentModules.txt index 0f5d8cfb70e..62dc50aded8 100644 --- a/analysis/low-level-api-fir/testData/lazyResolve/delegateWithImplicitTypeInDifferentModules.txt +++ b/analysis/low-level-api-fir/testData/lazyResolve/delegateWithImplicitTypeInDifferentModules.txt @@ -1,5 +1,5 @@ STATUS: -TARGET: public open [ResolvedTo(STATUS)] [CallableCopyDeferredReturnTypeCalculationKey=CallableCopySubstitution(substitutor=Empty, baseSymbol=FirNamedFunctionSymbol /Interface.implicitType), DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /Interface.implicitType, containingClass=Aaa, delegateField=FirFieldSymbol /Aaa.$$delegate_0] fun implicitType(): +TARGET: public open override [ResolvedTo(STATUS)] [CallableCopyDeferredReturnTypeCalculationKey=CallableCopySubstitution(substitutor=Empty, baseSymbol=FirNamedFunctionSymbol /Interface.implicitType), DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /Interface.implicitType, containingClass=Aaa, delegateField=FirFieldSymbol /Aaa.$$delegate_0] fun implicitType(): FILE: [ResolvedTo(IMPORTS)] Interface.kt public abstract [ResolvedTo(STATUS)] interface Interface : R|kotlin/Any| { @@ -18,7 +18,7 @@ FILE: [ResolvedTo(IMPORTS)] usage.kt } EXPECT_ACTUAL_MATCHING: -TARGET: public open [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [CallableCopyDeferredReturnTypeCalculationKey=CallableCopySubstitution(substitutor=Empty, baseSymbol=FirNamedFunctionSymbol /Interface.implicitType), DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /Interface.implicitType, containingClass=Aaa, delegateField=FirFieldSymbol /Aaa.$$delegate_0] fun implicitType(): +TARGET: public open override [ResolvedTo(EXPECT_ACTUAL_MATCHING)] [CallableCopyDeferredReturnTypeCalculationKey=CallableCopySubstitution(substitutor=Empty, baseSymbol=FirNamedFunctionSymbol /Interface.implicitType), DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /Interface.implicitType, containingClass=Aaa, delegateField=FirFieldSymbol /Aaa.$$delegate_0] fun implicitType(): FILE: [ResolvedTo(IMPORTS)] Interface.kt public abstract [ResolvedTo(STATUS)] interface Interface : R|kotlin/Any| { @@ -37,7 +37,7 @@ FILE: [ResolvedTo(IMPORTS)] usage.kt } CONTRACTS: -TARGET: public open [ResolvedTo(CONTRACTS)] [CallableCopyDeferredReturnTypeCalculationKey=CallableCopySubstitution(substitutor=Empty, baseSymbol=FirNamedFunctionSymbol /Interface.implicitType), DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /Interface.implicitType, containingClass=Aaa, delegateField=FirFieldSymbol /Aaa.$$delegate_0] fun implicitType(): +TARGET: public open override [ResolvedTo(CONTRACTS)] [CallableCopyDeferredReturnTypeCalculationKey=CallableCopySubstitution(substitutor=Empty, baseSymbol=FirNamedFunctionSymbol /Interface.implicitType), DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /Interface.implicitType, containingClass=Aaa, delegateField=FirFieldSymbol /Aaa.$$delegate_0] fun implicitType(): FILE: [ResolvedTo(IMPORTS)] Interface.kt public abstract [ResolvedTo(STATUS)] interface Interface : R|kotlin/Any| { @@ -56,7 +56,7 @@ FILE: [ResolvedTo(IMPORTS)] usage.kt } IMPLICIT_TYPES_BODY_RESOLVE: -TARGET: public open [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /Interface.implicitType, containingClass=Aaa, delegateField=FirFieldSymbol /Aaa.$$delegate_0] fun implicitType(): R|kotlin/Int| +TARGET: public open override [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /Interface.implicitType, containingClass=Aaa, delegateField=FirFieldSymbol /Aaa.$$delegate_0] fun implicitType(): R|kotlin/Int| FILE: [ResolvedTo(IMPORTS)] Interface.kt public abstract [ResolvedTo(STATUS)] interface Interface : R|kotlin/Any| { @@ -77,7 +77,7 @@ FILE: [ResolvedTo(IMPORTS)] usage.kt } ANNOTATION_ARGUMENTS: -TARGET: public open [ResolvedTo(ANNOTATION_ARGUMENTS)] [DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /Interface.implicitType, containingClass=Aaa, delegateField=FirFieldSymbol /Aaa.$$delegate_0] fun implicitType(): R|kotlin/Int| +TARGET: public open override [ResolvedTo(ANNOTATION_ARGUMENTS)] [DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /Interface.implicitType, containingClass=Aaa, delegateField=FirFieldSymbol /Aaa.$$delegate_0] fun implicitType(): R|kotlin/Int| FILE: [ResolvedTo(IMPORTS)] Interface.kt public abstract [ResolvedTo(STATUS)] interface Interface : R|kotlin/Any| { @@ -98,7 +98,7 @@ FILE: [ResolvedTo(IMPORTS)] usage.kt } BODY_RESOLVE: -TARGET: public open [ResolvedTo(BODY_RESOLVE)] [DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /Interface.implicitType, containingClass=Aaa, delegateField=FirFieldSymbol /Aaa.$$delegate_0] fun implicitType(): R|kotlin/Int| +TARGET: public open override [ResolvedTo(BODY_RESOLVE)] [DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /Interface.implicitType, containingClass=Aaa, delegateField=FirFieldSymbol /Aaa.$$delegate_0] fun implicitType(): R|kotlin/Int| FILE: [ResolvedTo(IMPORTS)] Interface.kt public abstract [ResolvedTo(STATUS)] interface Interface : R|kotlin/Any| { diff --git a/analysis/low-level-api-fir/testData/lazyResolve/delegateWithImplicitTypeScript.txt b/analysis/low-level-api-fir/testData/lazyResolve/delegateWithImplicitTypeScript.txt index b638f2f842c..b160c4b2e8a 100644 --- a/analysis/low-level-api-fir/testData/lazyResolve/delegateWithImplicitTypeScript.txt +++ b/analysis/low-level-api-fir/testData/lazyResolve/delegateWithImplicitTypeScript.txt @@ -1,5 +1,5 @@ STATUS: -TARGET: public open [ResolvedTo(STATUS)] [CallableCopyDeferredReturnTypeCalculationKey=CallableCopySubstitution(substitutor=Empty, baseSymbol=FirNamedFunctionSymbol /Interface.implicitType), DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /Interface.implicitType, containingClass=Aaa, delegateField=FirFieldSymbol /Aaa.$$delegate_0] fun implicitType(): +TARGET: public open override [ResolvedTo(STATUS)] [CallableCopyDeferredReturnTypeCalculationKey=CallableCopySubstitution(substitutor=Empty, baseSymbol=FirNamedFunctionSymbol /Interface.implicitType), DelegatedWrapperDataKey=[wrapped=FirNamedFunctionSymbol /Interface.implicitType, containingClass=Aaa, delegateField=FirFieldSymbol /Aaa.$$delegate_0] fun implicitType(): FILE: [ResolvedTo(IMPORTS)] delegateWithImplicitTypeScript.kts context(