[AA FIR] add tests on implicit type in delegated scope

^KT-58727

analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/components/scopeProvider/Fe10IdeNormalAnalysisSourceModuleDelegateMemberScopeTestGenerated.java

@@ -58,6 +58,12 @@ public class Fe10IdeNormalAnalysisSourceModuleDelegateMemberScopeTestGenerated e
         runTest("analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/simple.kt");
     }
 
+    @Test
+    @TestMetadata("withImplicitType.kt")
+    public void testWithImplicitType() throws Exception {
+        runTest("analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/withImplicitType.kt");
+    }
+
     @Test
     @TestMetadata("withOverridden.kt")
     public void testWithOverridden() throws Exception {

analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/scopeProvider/FirIdeNormalAnalysisSourceModuleDelegateMemberScopeTestGenerated.java

@@ -58,6 +58,12 @@ public class FirIdeNormalAnalysisSourceModuleDelegateMemberScopeTestGenerated ex
         runTest("analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/simple.kt");
     }
 
+    @Test
+    @TestMetadata("withImplicitType.kt")
+    public void testWithImplicitType() throws Exception {
+        runTest("analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/withImplicitType.kt");
+    }
+
     @Test
     @TestMetadata("withOverridden.kt")
     public void testWithOverridden() throws Exception {

analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/scopeProvider/FirIdeNormalAnalysisSourceModuleMemberScopeByFqNameTestGenerated.java

@@ -106,6 +106,12 @@ public class FirIdeNormalAnalysisSourceModuleMemberScopeByFqNameTestGenerated ex
         runTest("analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/MutableList.kt");
     }
 
+    @Test
+    @TestMetadata("substitutionOverride.kt")
+    public void testSubstitutionOverride() throws Exception {
+        runTest("analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/substitutionOverride.kt");
+    }
+
     @Nested
     @TestMetadata("analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/withTestCompilerPluginEnabled")
     @TestDataPath("$PROJECT_ROOT")

analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/scopeProvider/FirStandaloneNormalAnalysisSourceModuleDelegateMemberScopeTestGenerated.java

@@ -58,6 +58,12 @@ public class FirStandaloneNormalAnalysisSourceModuleDelegateMemberScopeTestGener
         runTest("analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/simple.kt");
     }
 
+    @Test
+    @TestMetadata("withImplicitType.kt")
+    public void testWithImplicitType() throws Exception {
+        runTest("analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/withImplicitType.kt");
+    }
+
     @Test
     @TestMetadata("withOverridden.kt")
     public void testWithOverridden() throws Exception {

analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/scopeProvider/FirStandaloneNormalAnalysisSourceModuleMemberScopeByFqNameTestGenerated.java

@@ -105,4 +105,10 @@ public class FirStandaloneNormalAnalysisSourceModuleMemberScopeByFqNameTestGener
     public void testMutableList() throws Exception {
         runTest("analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/MutableList.kt");
     }
+
+    @Test
+    @TestMetadata("substitutionOverride.kt")
+    public void testSubstitutionOverride() throws Exception {
+        runTest("analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/substitutionOverride.kt");
+    }
 }

analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/withImplicitType.descriptors.pretty.txt

@@ -0,0 +1,3 @@
+fun foo(): kotlin.Int
+
+fun bar(): kotlin.Int

analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/withImplicitType.descriptors.txt

@@ -0,0 +1,67 @@
+KtFunctionSymbol:
+  annotationsList: []
+  callableIdIfNonLocal: /I.foo
+  contextReceivers: []
+  contractEffects: []
+  hasStableParameterNames: true
+  isBuiltinFunctionInvoke: false
+  isExtension: false
+  isExternal: false
+  isInfix: false
+  isInline: false
+  isOperator: false
+  isOverride: false
+  isStatic: false
+  isSuspend: false
+  modality: OPEN
+  name: foo
+  origin: DELEGATED
+  receiverParameter: null
+  returnType: KtUsualClassType:
+    annotationsList: []
+    ownTypeArguments: []
+    type: kotlin/Int
+  symbolKind: CLASS_MEMBER
+  typeParameters: []
+  valueParameters: []
+  visibility: Public
+  getDispatchReceiver(): KtUsualClassType:
+    annotationsList: []
+    ownTypeArguments: []
+    type: A
+  getContainingModule: KtSourceModule "Sources of main"
+  deprecationStatus: null
+
+KtFunctionSymbol:
+  annotationsList: []
+  callableIdIfNonLocal: /I.bar
+  contextReceivers: []
+  contractEffects: []
+  hasStableParameterNames: true
+  isBuiltinFunctionInvoke: false
+  isExtension: false
+  isExternal: false
+  isInfix: false
+  isInline: false
+  isOperator: false
+  isOverride: false
+  isStatic: false
+  isSuspend: false
+  modality: OPEN
+  name: bar
+  origin: DELEGATED
+  receiverParameter: null
+  returnType: KtUsualClassType:
+    annotationsList: []
+    ownTypeArguments: []
+    type: kotlin/Int
+  symbolKind: CLASS_MEMBER
+  typeParameters: []
+  valueParameters: []
+  visibility: Public
+  getDispatchReceiver(): KtUsualClassType:
+    annotationsList: []
+    ownTypeArguments: []
+    type: A
+  getContainingModule: KtSourceModule "Sources of main"
+  deprecationStatus: null

analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/withImplicitType.kt

@@ -0,0 +1,13 @@
+// DO_NOT_CHECK_SYMBOL_RESTORE_K1
+
+interface I {
+    fun foo() = 4
+    fun bar(): Int = 42
+}
+
+class A(
+    private val p: I
+) : I by p
+
+// class: A
+

analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/withImplicitType.pretty.txt

@@ -0,0 +1,3 @@
+open fun foo(): ERROR(empty body)
+
+open fun bar(): kotlin.Int

analysis/analysis-api/testData/components/scopeProvider/delegatedMemberScope/withImplicitType.txt

@@ -0,0 +1,66 @@
+KtFunctionSymbol:
+  annotationsList: []
+  callableIdIfNonLocal: /A.foo
+  contextReceivers: []
+  contractEffects: []
+  hasStableParameterNames: true
+  isBuiltinFunctionInvoke: false
+  isExtension: false
+  isExternal: false
+  isInfix: false
+  isInline: false
+  isOperator: false
+  isOverride: false
+  isStatic: false
+  isSuspend: false
+  modality: OPEN
+  name: foo
+  origin: DELEGATED
+  receiverParameter: null
+  returnType: KtTypeErrorType:
+    annotationsList: []
+    type: ERROR CLASS: empty body
+  symbolKind: CLASS_MEMBER
+  typeParameters: []
+  valueParameters: []
+  visibility: Public
+  getDispatchReceiver(): KtUsualClassType:
+    annotationsList: []
+    ownTypeArguments: []
+    type: A
+  getContainingModule: KtSourceModule "Sources of main"
+  deprecationStatus: null
+
+KtFunctionSymbol:
+  annotationsList: []
+  callableIdIfNonLocal: /A.bar
+  contextReceivers: []
+  contractEffects: []
+  hasStableParameterNames: true
+  isBuiltinFunctionInvoke: false
+  isExtension: false
+  isExternal: false
+  isInfix: false
+  isInline: false
+  isOperator: false
+  isOverride: false
+  isStatic: false
+  isSuspend: false
+  modality: OPEN
+  name: bar
+  origin: DELEGATED
+  receiverParameter: null
+  returnType: KtUsualClassType:
+    annotationsList: []
+    ownTypeArguments: []
+    type: kotlin/Int
+  symbolKind: CLASS_MEMBER
+  typeParameters: []
+  valueParameters: []
+  visibility: Public
+  getDispatchReceiver(): KtUsualClassType:
+    annotationsList: []
+    ownTypeArguments: []
+    type: A
+  getContainingModule: KtSourceModule "Sources of main"
+  deprecationStatus: null

analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/substitutionOverride.kt

@@ -0,0 +1,18 @@
+// DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE_K1
+// class: test/ClassWithGenericBase
+package test
+
+class Foo
+
+abstract class Base<T> {
+    fun noGeneric() = 42
+    fun noGenericWithExplicitType(): Int = 24
+    fun withOuterGeneric(t: T) = "str"
+    fun withOuterGenericWithExplicitType(t: T): String = "rts"
+    fun <TT> withOwnGeneric(tt: TT) = true
+    fun <TT> withOwnGenericWithExplicitType(tt: TT): Boolean = false
+    fun <TT> withOuterAndOwnGeneric(t: T, tt: TT) = 4L
+    fun <TT> withOuterAndOwnGenericWithExplicitType(t: T, tt: TT): Long = 1L
+}
+
+class ClassWithGenericBase : Base<Foo>()

analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/substitutionOverride.pretty.txt

@@ -0,0 +1,23 @@
+fun noGeneric(): kotlin.Int
+
+fun noGenericWithExplicitType(): kotlin.Int
+
+fun withOuterGeneric(t: test.Foo): ERROR(empty body)
+
+fun withOuterGenericWithExplicitType(t: test.Foo): kotlin.String
+
+fun <TT> withOwnGeneric(tt: TT): kotlin.Boolean
+
+fun <TT> withOwnGenericWithExplicitType(tt: TT): kotlin.Boolean
+
+fun <TT> withOuterAndOwnGeneric(t: test.Foo, tt: TT): ERROR(empty body)
+
+fun <TT> withOuterAndOwnGenericWithExplicitType(t: test.Foo, tt: TT): kotlin.Long
+
+open operator fun equals(other: kotlin.Any?): kotlin.Boolean
+
+open fun hashCode(): kotlin.Int
+
+open fun toString(): kotlin.String
+
+constructor()

analysis/analysis-api/testData/components/scopeProvider/memberScopeByFqName/substitutionOverride.txt

@@ -0,0 +1,617 @@
+KtFunctionSymbol:
+  annotationsList: []
+  callableIdIfNonLocal: test/Base.noGeneric
+  contextReceivers: []
+  contractEffects: []
+  hasStableParameterNames: true
+  isBuiltinFunctionInvoke: false
+  isExtension: false
+  isExternal: false
+  isInfix: false
+  isInline: false
+  isOperator: false
+  isOverride: false
+  isStatic: false
+  isSuspend: false
+  modality: FINAL
+  name: noGeneric
+  origin: SOURCE
+  receiverParameter: null
+  returnType: KtUsualClassType:
+    annotationsList: []
+    ownTypeArguments: []
+    type: kotlin/Int
+  symbolKind: CLASS_MEMBER
+  typeParameters: []
+  valueParameters: []
+  visibility: Public
+  getDispatchReceiver(): KtUsualClassType:
+    annotationsList: []
+    ownTypeArguments: [
+      KtTypeParameterType:
+        annotationsList: []
+        type: T
+    ]
+    type: test/Base<T>
+  getContainingModule: KtSourceModule "Sources of main"
+  deprecationStatus: null
+
+KtFunctionSymbol:
+  annotationsList: []
+  callableIdIfNonLocal: test/Base.noGenericWithExplicitType
+  contextReceivers: []
+  contractEffects: []
+  hasStableParameterNames: true
+  isBuiltinFunctionInvoke: false
+  isExtension: false
+  isExternal: false
+  isInfix: false
+  isInline: false
+  isOperator: false
+  isOverride: false
+  isStatic: false
+  isSuspend: false
+  modality: FINAL
+  name: noGenericWithExplicitType
+  origin: SOURCE
+  receiverParameter: null
+  returnType: KtUsualClassType:
+    annotationsList: []
+    ownTypeArguments: []
+    type: kotlin/Int
+  symbolKind: CLASS_MEMBER
+  typeParameters: []
+  valueParameters: []
+  visibility: Public
+  getDispatchReceiver(): KtUsualClassType:
+    annotationsList: []
+    ownTypeArguments: [
+      KtTypeParameterType:
+        annotationsList: []
+        type: T
+    ]
+    type: test/Base<T>
+  getContainingModule: KtSourceModule "Sources of main"
+  deprecationStatus: null
+
+KtFunctionSymbol:
+  annotationsList: []
+  callableIdIfNonLocal: test/ClassWithGenericBase.withOuterGeneric
+  contextReceivers: []
+  contractEffects: []
+  hasStableParameterNames: true
+  isBuiltinFunctionInvoke: false
+  isExtension: false
+  isExternal: false
+  isInfix: false
+  isInline: false
+  isOperator: false
+  isOverride: false
+  isStatic: false
+  isSuspend: false
+  modality: FINAL
+  name: withOuterGeneric
+  origin: SUBSTITUTION_OVERRIDE
+  receiverParameter: null
+  returnType: KtTypeErrorType:
+    annotationsList: []
+    type: ERROR CLASS: empty body
+  symbolKind: CLASS_MEMBER
+  typeParameters: []
+  valueParameters: [
+    KtValueParameterSymbol:
+      annotationsList: []
+      callableIdIfNonLocal: null
+      contextReceivers: []
+      generatedPrimaryConstructorProperty: null
+      hasDefaultValue: false
+      isCrossinline: false
+      isExtension: false
+      isImplicitLambdaParameter: false
+      isNoinline: false
+      isVararg: false
+      name: t
+      origin: SUBSTITUTION_OVERRIDE
+      receiverParameter: null
+      returnType: KtUsualClassType:
+        annotationsList: []
+        ownTypeArguments: []
+        type: test/Foo
+      symbolKind: LOCAL
+      typeParameters: []
+      getContainingModule: KtSourceModule "Sources of main"
+      deprecationStatus: null
+  ]
+  visibility: Public
+  getDispatchReceiver(): KtUsualClassType:
+    annotationsList: []
+    ownTypeArguments: []
+    type: test/ClassWithGenericBase
+  getContainingModule: KtSourceModule "Sources of main"
+  deprecationStatus: null
+
+KtFunctionSymbol:
+  annotationsList: []
+  callableIdIfNonLocal: test/ClassWithGenericBase.withOuterGenericWithExplicitType
+  contextReceivers: []
+  contractEffects: []
+  hasStableParameterNames: true
+  isBuiltinFunctionInvoke: false
+  isExtension: false
+  isExternal: false
+  isInfix: false
+  isInline: false
+  isOperator: false
+  isOverride: false
+  isStatic: false
+  isSuspend: false
+  modality: FINAL
+  name: withOuterGenericWithExplicitType
+  origin: SUBSTITUTION_OVERRIDE
+  receiverParameter: null
+  returnType: KtUsualClassType:
+    annotationsList: []
+    ownTypeArguments: []
+    type: kotlin/String
+  symbolKind: CLASS_MEMBER
+  typeParameters: []
+  valueParameters: [
+    KtValueParameterSymbol:
+      annotationsList: []
+      callableIdIfNonLocal: null
+      contextReceivers: []
+      generatedPrimaryConstructorProperty: null
+      hasDefaultValue: false
+      isCrossinline: false
+      isExtension: false
+      isImplicitLambdaParameter: false
+      isNoinline: false
+      isVararg: false
+      name: t
+      origin: SUBSTITUTION_OVERRIDE
+      receiverParameter: null
+      returnType: KtUsualClassType:
+        annotationsList: []
+        ownTypeArguments: []
+        type: test/Foo
+      symbolKind: LOCAL
+      typeParameters: []
+      getContainingModule: KtSourceModule "Sources of main"
+      deprecationStatus: null
+  ]
+  visibility: Public
+  getDispatchReceiver(): KtUsualClassType:
+    annotationsList: []
+    ownTypeArguments: []
+    type: test/ClassWithGenericBase
+  getContainingModule: KtSourceModule "Sources of main"
+  deprecationStatus: null
+
+KtFunctionSymbol:
+  annotationsList: []
+  callableIdIfNonLocal: test/Base.withOwnGeneric
+  contextReceivers: []
+  contractEffects: []
+  hasStableParameterNames: true
+  isBuiltinFunctionInvoke: false
+  isExtension: false
+  isExternal: false
+  isInfix: false
+  isInline: false
+  isOperator: false
+  isOverride: false
+  isStatic: false
+  isSuspend: false
+  modality: FINAL
+  name: withOwnGeneric
+  origin: SOURCE
+  receiverParameter: null
+  returnType: KtUsualClassType:
+    annotationsList: []
+    ownTypeArguments: []
+    type: kotlin/Boolean
+  symbolKind: CLASS_MEMBER
+  typeParameters: [
+    KtTypeParameterSymbol(TT)
+  ]
+  valueParameters: [
+    KtValueParameterSymbol:
+      annotationsList: []
+      callableIdIfNonLocal: null
+      contextReceivers: []
+      generatedPrimaryConstructorProperty: null
+      hasDefaultValue: false
+      isCrossinline: false
+      isExtension: false
+      isImplicitLambdaParameter: false
+      isNoinline: false
+      isVararg: false
+      name: tt
+      origin: SOURCE
+      receiverParameter: null
+      returnType: KtTypeParameterType:
+        annotationsList: []
+        type: TT
+      symbolKind: LOCAL
+      typeParameters: []
+      getContainingModule: KtSourceModule "Sources of main"
+      deprecationStatus: null
+  ]
+  visibility: Public
+  getDispatchReceiver(): KtUsualClassType:
+    annotationsList: []
+    ownTypeArguments: [
+      KtTypeParameterType:
+        annotationsList: []
+        type: T
+    ]
+    type: test/Base<T>
+  getContainingModule: KtSourceModule "Sources of main"
+  deprecationStatus: null
+
+KtFunctionSymbol:
+  annotationsList: []
+  callableIdIfNonLocal: test/Base.withOwnGenericWithExplicitType
+  contextReceivers: []
+  contractEffects: []
+  hasStableParameterNames: true
+  isBuiltinFunctionInvoke: false
+  isExtension: false
+  isExternal: false
+  isInfix: false
+  isInline: false
+  isOperator: false
+  isOverride: false
+  isStatic: false
+  isSuspend: false
+  modality: FINAL
+  name: withOwnGenericWithExplicitType
+  origin: SOURCE
+  receiverParameter: null
+  returnType: KtUsualClassType:
+    annotationsList: []
+    ownTypeArguments: []
+    type: kotlin/Boolean
+  symbolKind: CLASS_MEMBER
+  typeParameters: [
+    KtTypeParameterSymbol(TT)
+  ]
+  valueParameters: [
+    KtValueParameterSymbol:
+      annotationsList: []
+      callableIdIfNonLocal: null
+      contextReceivers: []
+      generatedPrimaryConstructorProperty: null
+      hasDefaultValue: false
+      isCrossinline: false
+      isExtension: false
+      isImplicitLambdaParameter: false
+      isNoinline: false
+      isVararg: false
+      name: tt
+      origin: SOURCE
+      receiverParameter: null
+      returnType: KtTypeParameterType:
+        annotationsList: []
+        type: TT
+      symbolKind: LOCAL
+      typeParameters: []
+      getContainingModule: KtSourceModule "Sources of main"
+      deprecationStatus: null
+  ]
+  visibility: Public
+  getDispatchReceiver(): KtUsualClassType:
+    annotationsList: []
+    ownTypeArguments: [
+      KtTypeParameterType:
+        annotationsList: []
+        type: T
+    ]
+    type: test/Base<T>
+  getContainingModule: KtSourceModule "Sources of main"
+  deprecationStatus: null
+
+KtFunctionSymbol:
+  annotationsList: []
+  callableIdIfNonLocal: test/ClassWithGenericBase.withOuterAndOwnGeneric
+  contextReceivers: []
+  contractEffects: []
+  hasStableParameterNames: true
+  isBuiltinFunctionInvoke: false
+  isExtension: false
+  isExternal: false
+  isInfix: false
+  isInline: false
+  isOperator: false
+  isOverride: false
+  isStatic: false
+  isSuspend: false
+  modality: FINAL
+  name: withOuterAndOwnGeneric
+  origin: SUBSTITUTION_OVERRIDE
+  receiverParameter: null
+  returnType: KtTypeErrorType:
+    annotationsList: []
+    type: ERROR CLASS: empty body
+  symbolKind: CLASS_MEMBER
+  typeParameters: [
+    KtTypeParameterSymbol(TT)
+  ]
+  valueParameters: [
+    KtValueParameterSymbol:
+      annotationsList: []
+      callableIdIfNonLocal: null
+      contextReceivers: []
+      generatedPrimaryConstructorProperty: null
+      hasDefaultValue: false
+      isCrossinline: false
+      isExtension: false
+      isImplicitLambdaParameter: false
+      isNoinline: false
+      isVararg: false
+      name: t
+      origin: SUBSTITUTION_OVERRIDE
+      receiverParameter: null
+      returnType: KtUsualClassType:
+        annotationsList: []
+        ownTypeArguments: []
+        type: test/Foo
+      symbolKind: LOCAL
+      typeParameters: []
+      getContainingModule: KtSourceModule "Sources of main"
+      deprecationStatus: null
+    KtValueParameterSymbol:
+      annotationsList: []
+      callableIdIfNonLocal: null
+      contextReceivers: []
+      generatedPrimaryConstructorProperty: null
+      hasDefaultValue: false
+      isCrossinline: false
+      isExtension: false
+      isImplicitLambdaParameter: false
+      isNoinline: false
+      isVararg: false
+      name: tt
+      origin: SUBSTITUTION_OVERRIDE
+      receiverParameter: null
+      returnType: KtTypeParameterType:
+        annotationsList: []
+        type: TT
+      symbolKind: LOCAL
+      typeParameters: []
+      getContainingModule: KtSourceModule "Sources of main"
+      deprecationStatus: null
+  ]
+  visibility: Public
+  getDispatchReceiver(): KtUsualClassType:
+    annotationsList: []
+    ownTypeArguments: []
+    type: test/ClassWithGenericBase
+  getContainingModule: KtSourceModule "Sources of main"
+  deprecationStatus: null
+
+KtFunctionSymbol:
+  annotationsList: []
+  callableIdIfNonLocal: test/ClassWithGenericBase.withOuterAndOwnGenericWithExplicitType
+  contextReceivers: []
+  contractEffects: []
+  hasStableParameterNames: true
+  isBuiltinFunctionInvoke: false
+  isExtension: false
+  isExternal: false
+  isInfix: false
+  isInline: false
+  isOperator: false
+  isOverride: false
+  isStatic: false
+  isSuspend: false
+  modality: FINAL
+  name: withOuterAndOwnGenericWithExplicitType
+  origin: SUBSTITUTION_OVERRIDE
+  receiverParameter: null
+  returnType: KtUsualClassType:
+    annotationsList: []
+    ownTypeArguments: []
+    type: kotlin/Long
+  symbolKind: CLASS_MEMBER
+  typeParameters: [
+    KtTypeParameterSymbol(TT)
+  ]
+  valueParameters: [
+    KtValueParameterSymbol:
+      annotationsList: []
+      callableIdIfNonLocal: null
+      contextReceivers: []
+      generatedPrimaryConstructorProperty: null
+      hasDefaultValue: false
+      isCrossinline: false
+      isExtension: false
+      isImplicitLambdaParameter: false
+      isNoinline: false
+      isVararg: false
+      name: t
+      origin: SUBSTITUTION_OVERRIDE
+      receiverParameter: null
+      returnType: KtUsualClassType:
+        annotationsList: []
+        ownTypeArguments: []
+        type: test/Foo
+      symbolKind: LOCAL
+      typeParameters: []
+      getContainingModule: KtSourceModule "Sources of main"
+      deprecationStatus: null
+    KtValueParameterSymbol:
+      annotationsList: []
+      callableIdIfNonLocal: null
+      contextReceivers: []
+      generatedPrimaryConstructorProperty: null
+      hasDefaultValue: false
+      isCrossinline: false
+      isExtension: false
+      isImplicitLambdaParameter: false
+      isNoinline: false
+      isVararg: false
+      name: tt
+      origin: SUBSTITUTION_OVERRIDE
+      receiverParameter: null
+      returnType: KtTypeParameterType:
+        annotationsList: []
+        type: TT
+      symbolKind: LOCAL
+      typeParameters: []
+      getContainingModule: KtSourceModule "Sources of main"
+      deprecationStatus: null
+  ]
+  visibility: Public
+  getDispatchReceiver(): KtUsualClassType:
+    annotationsList: []
+    ownTypeArguments: []
+    type: test/ClassWithGenericBase
+  getContainingModule: KtSourceModule "Sources of main"
+  deprecationStatus: null
+
+KtFunctionSymbol:
+  annotationsList: []
+  callableIdIfNonLocal: kotlin/Any.equals
+  contextReceivers: []
+  contractEffects: []
+  hasStableParameterNames: true
+  isBuiltinFunctionInvoke: false
+  isExtension: false
+  isExternal: false
+  isInfix: false
+  isInline: false
+  isOperator: true
+  isOverride: false
+  isStatic: false
+  isSuspend: false
+  modality: OPEN
+  name: equals
+  origin: LIBRARY
+  receiverParameter: null
+  returnType: KtUsualClassType:
+    annotationsList: []
+    ownTypeArguments: []
+    type: kotlin/Boolean
+  symbolKind: CLASS_MEMBER
+  typeParameters: []
+  valueParameters: [
+    KtValueParameterSymbol:
+      annotationsList: []
+      callableIdIfNonLocal: null
+      contextReceivers: []
+      generatedPrimaryConstructorProperty: null
+      hasDefaultValue: false
+      isCrossinline: false
+      isExtension: false
+      isImplicitLambdaParameter: false
+      isNoinline: false
+      isVararg: false
+      name: other
+      origin: LIBRARY
+      receiverParameter: null
+      returnType: KtUsualClassType:
+        annotationsList: []
+        ownTypeArguments: []
+        type: kotlin/Any?
+      symbolKind: LOCAL
+      typeParameters: []
+      getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
+      deprecationStatus: null
+  ]
+  visibility: Public
+  getDispatchReceiver(): KtUsualClassType:
+    annotationsList: []
+    ownTypeArguments: []
+    type: kotlin/Any
+  getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
+  deprecationStatus: null
+
+KtFunctionSymbol:
+  annotationsList: []
+  callableIdIfNonLocal: kotlin/Any.hashCode
+  contextReceivers: []
+  contractEffects: []
+  hasStableParameterNames: true
+  isBuiltinFunctionInvoke: false
+  isExtension: false
+  isExternal: false
+  isInfix: false
+  isInline: false
+  isOperator: false
+  isOverride: false
+  isStatic: false
+  isSuspend: false
+  modality: OPEN
+  name: hashCode
+  origin: LIBRARY
+  receiverParameter: null
+  returnType: KtUsualClassType:
+    annotationsList: []
+    ownTypeArguments: []
+    type: kotlin/Int
+  symbolKind: CLASS_MEMBER
+  typeParameters: []
+  valueParameters: []
+  visibility: Public
+  getDispatchReceiver(): KtUsualClassType:
+    annotationsList: []
+    ownTypeArguments: []
+    type: kotlin/Any
+  getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
+  deprecationStatus: null
+
+KtFunctionSymbol:
+  annotationsList: []
+  callableIdIfNonLocal: kotlin/Any.toString
+  contextReceivers: []
+  contractEffects: []
+  hasStableParameterNames: true
+  isBuiltinFunctionInvoke: false
+  isExtension: false
+  isExternal: false
+  isInfix: false
+  isInline: false
+  isOperator: false
+  isOverride: false
+  isStatic: false
+  isSuspend: false
+  modality: OPEN
+  name: toString
+  origin: LIBRARY
+  receiverParameter: null
+  returnType: KtUsualClassType:
+    annotationsList: []
+    ownTypeArguments: []
+    type: kotlin/String
+  symbolKind: CLASS_MEMBER
+  typeParameters: []
+  valueParameters: []
+  visibility: Public
+  getDispatchReceiver(): KtUsualClassType:
+    annotationsList: []
+    ownTypeArguments: []
+    type: kotlin/Any
+  getContainingModule: KtBinaryModule "Builtins for JVM (1.8)"
+  deprecationStatus: null
+
+KtConstructorSymbol:
+  annotationsList: []
+  callableIdIfNonLocal: null
+  containingClassIdIfNonLocal: test/ClassWithGenericBase
+  contextReceivers: []
+  hasStableParameterNames: true
+  isExtension: false
+  isPrimary: true
+  origin: SOURCE_MEMBER_GENERATED
+  receiverParameter: null
+  returnType: KtUsualClassType:
+    annotationsList: []
+    ownTypeArguments: []
+    type: test/ClassWithGenericBase
+  symbolKind: CLASS_MEMBER
+  typeParameters: []
+  valueParameters: []
+  visibility: Public
+  getContainingModule: KtSourceModule "Sources of main"
+  deprecationStatus: null

analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesByFqNameForLibraryTestGenerated.java

@@ -282,6 +282,12 @@ public class SymbolLightClassesByFqNameForLibraryTestGenerated extends AbstractS
         runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/StubOrderForOverloads.kt");
     }
 
+    @Test
+    @TestMetadata("SubstitutionOverride.kt")
+    public void testSubstitutionOverride() throws Exception {
+        runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/SubstitutionOverride.kt");
+    }
+
     @Test
     @TestMetadata("Throws.kt")
     public void testThrows() throws Exception {
@@ -320,6 +326,12 @@ public class SymbolLightClassesByFqNameForLibraryTestGenerated extends AbstractS
         public void testProperty() throws Exception {
             runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/delegation/Property.kt");
         }
+
+        @Test
+        @TestMetadata("WithImplicitType.kt")
+        public void testWithImplicitType() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/delegation/WithImplicitType.kt");
+        }
     }
 
     @Nested

analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesEqualityByFqNameForLibraryTestGenerated.java

@@ -282,6 +282,12 @@ public class SymbolLightClassesEqualityByFqNameForLibraryTestGenerated extends A
         runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/StubOrderForOverloads.kt");
     }
 
+    @Test
+    @TestMetadata("SubstitutionOverride.kt")
+    public void testSubstitutionOverride() throws Exception {
+        runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/SubstitutionOverride.kt");
+    }
+
     @Test
     @TestMetadata("Throws.kt")
     public void testThrows() throws Exception {
@@ -320,6 +326,12 @@ public class SymbolLightClassesEqualityByFqNameForLibraryTestGenerated extends A
         public void testProperty() throws Exception {
             runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/delegation/Property.kt");
         }
+
+        @Test
+        @TestMetadata("WithImplicitType.kt")
+        public void testWithImplicitType() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/delegation/WithImplicitType.kt");
+        }
     }
 
     @Nested

analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesParentingByFqNameForLibraryTestGenerated.java

@@ -282,6 +282,12 @@ public class SymbolLightClassesParentingByFqNameForLibraryTestGenerated extends
         runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/StubOrderForOverloads.kt");
     }
 
+    @Test
+    @TestMetadata("SubstitutionOverride.kt")
+    public void testSubstitutionOverride() throws Exception {
+        runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/SubstitutionOverride.kt");
+    }
+
     @Test
     @TestMetadata("Throws.kt")
     public void testThrows() throws Exception {
@@ -320,6 +326,12 @@ public class SymbolLightClassesParentingByFqNameForLibraryTestGenerated extends
         public void testProperty() throws Exception {
             runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/delegation/Property.kt");
         }
+
+        @Test
+        @TestMetadata("WithImplicitType.kt")
+        public void testWithImplicitType() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/delegation/WithImplicitType.kt");
+        }
     }
 
     @Nested

analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesByFqNameForSourceTestGenerated.java

@@ -282,6 +282,12 @@ public class SymbolLightClassesByFqNameForSourceTestGenerated extends AbstractSy
         runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/StubOrderForOverloads.kt");
     }
 
+    @Test
+    @TestMetadata("SubstitutionOverride.kt")
+    public void testSubstitutionOverride() throws Exception {
+        runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/SubstitutionOverride.kt");
+    }
+
     @Test
     @TestMetadata("Throws.kt")
     public void testThrows() throws Exception {
@@ -462,6 +468,12 @@ public class SymbolLightClassesByFqNameForSourceTestGenerated extends AbstractSy
         public void testProperty() throws Exception {
             runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/delegation/Property.kt");
         }
+
+        @Test
+        @TestMetadata("WithImplicitType.kt")
+        public void testWithImplicitType() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/delegation/WithImplicitType.kt");
+        }
     }
 
     @Nested

analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesEqualityByFqNameForSourceTestGenerated.java

@@ -282,6 +282,12 @@ public class SymbolLightClassesEqualityByFqNameForSourceTestGenerated extends Ab
         runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/StubOrderForOverloads.kt");
     }
 
+    @Test
+    @TestMetadata("SubstitutionOverride.kt")
+    public void testSubstitutionOverride() throws Exception {
+        runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/SubstitutionOverride.kt");
+    }
+
     @Test
     @TestMetadata("Throws.kt")
     public void testThrows() throws Exception {
@@ -462,6 +468,12 @@ public class SymbolLightClassesEqualityByFqNameForSourceTestGenerated extends Ab
         public void testProperty() throws Exception {
             runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/delegation/Property.kt");
         }
+
+        @Test
+        @TestMetadata("WithImplicitType.kt")
+        public void testWithImplicitType() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/delegation/WithImplicitType.kt");
+        }
     }
 
     @Nested

analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesParentingByFqNameForSourceTestGenerated.java

@@ -282,6 +282,12 @@ public class SymbolLightClassesParentingByFqNameForSourceTestGenerated extends A
         runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/StubOrderForOverloads.kt");
     }
 
+    @Test
+    @TestMetadata("SubstitutionOverride.kt")
+    public void testSubstitutionOverride() throws Exception {
+        runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/SubstitutionOverride.kt");
+    }
+
     @Test
     @TestMetadata("Throws.kt")
     public void testThrows() throws Exception {
@@ -462,6 +468,12 @@ public class SymbolLightClassesParentingByFqNameForSourceTestGenerated extends A
         public void testProperty() throws Exception {
             runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/delegation/Property.kt");
         }
+
+        @Test
+        @TestMetadata("WithImplicitType.kt")
+        public void testWithImplicitType() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/delegation/WithImplicitType.kt");
+        }
     }
 
     @Nested

compiler/testData/asJava/lightClasses/lightClassByFqName/SubstitutionOverride.java

@@ -0,0 +1,3 @@
+public final class ClassWithGenericBase /* test.ClassWithGenericBase*/ extends test.Base<test.Foo> {
+  public  ClassWithGenericBase();//  .ctor()
+}

compiler/testData/asJava/lightClasses/lightClassByFqName/SubstitutionOverride.kt

@@ -0,0 +1,18 @@
+// test.ClassWithGenericBase
+
+package test
+
+class Foo
+
+abstract class Base<T> {
+    fun noGeneric() = 42
+    fun noGenericWithExplicitType(): Int = 24
+    fun withOuterGeneric(t: T) = "str"
+    fun withOuterGenericWithExplicitType(t: T): String = "rts"
+    fun <TT> withOwnGeneric(tt: TT) = true
+    fun <TT> withOwnGenericWithExplicitType(tt: TT): Boolean = false
+    fun <TT> withOuterAndOwnGeneric(t: T, tt: TT) = 4L
+    fun <TT> withOuterAndOwnGenericWithExplicitType(t: T, tt: TT): Long = 1L
+}
+
+class ClassWithGenericBase : Base<Foo>()

compiler/testData/asJava/lightClasses/lightClassByFqName/delegation/WithImplicitType.descriptors.java

@@ -0,0 +1,10 @@
+public final class A /* one.A*/ implements one.I {
+  @org.jetbrains.annotations.NotNull()
+  private final one.I p;
+
+  public  A(@org.jetbrains.annotations.NotNull() one.I);//  .ctor(one.I)
+
+  public int bar();//  bar()
+
+  public int foo();//  foo()
+}

compiler/testData/asJava/lightClasses/lightClassByFqName/delegation/WithImplicitType.java

@@ -0,0 +1,12 @@
+public final class A /* one.A*/ implements one.I {
+  @org.jetbrains.annotations.NotNull()
+  private final one.I p;
+
+  @java.lang.Override()
+  public error.NonExistentClass foo();//  foo()
+
+  @java.lang.Override()
+  public int bar();//  bar()
+
+  public  A(@org.jetbrains.annotations.NotNull() one.I);//  .ctor(one.I)
+}

compiler/testData/asJava/lightClasses/lightClassByFqName/delegation/WithImplicitType.kt

@@ -0,0 +1,12 @@
+// one.A
+
+package one
+
+interface I {
+    fun foo() = 4
+    fun bar(): Int = 42
+}
+
+class A(
+    private val p: I
+) : I by p

compiler/testData/asJava/lightClasses/lightClassByFqName/delegation/WithImplicitType.lib.java

@@ -0,0 +1,10 @@
+public final class A /* one.A*/ implements one.I {
+  @org.jetbrains.annotations.NotNull()
+  private final one.I p;
+
+  public  A(@org.jetbrains.annotations.NotNull() one.I);//  .ctor(one.I)
+
+  public int bar();//  bar()
+
+  public int foo();//  foo()
+}

compiler/tests-gen/org/jetbrains/kotlin/asJava/CompilerLightClassTestGenerated.java

@@ -244,6 +244,11 @@ public class CompilerLightClassTestGenerated extends AbstractCompilerLightClassT
         runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/StubOrderForOverloads.kt");
     }
 
+    @TestMetadata("SubstitutionOverride.kt")
+    public void testSubstitutionOverride() throws Exception {
+        runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/SubstitutionOverride.kt");
+    }
+
     @TestMetadata("Throws.kt")
     public void testThrows() throws Exception {
         runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/Throws.kt");
@@ -403,6 +408,11 @@ public class CompilerLightClassTestGenerated extends AbstractCompilerLightClassT
         public void testProperty() throws Exception {
             runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/delegation/Property.kt");
         }
+
+        @TestMetadata("WithImplicitType.kt")
+        public void testWithImplicitType() throws Exception {
+            runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/delegation/WithImplicitType.kt");
+        }
     }
 
     @TestMetadata("compiler/testData/asJava/lightClasses/lightClassByFqName/facades")