[Analysis API] Move testdata for scope provider

analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase1.descriptors.pretty.txt

@@ -0,0 +1,13 @@
+fun noGeneric()
+
+fun withOuterGeneric(t: test.Foo)
+
+fun <TT> withOwnGeneric(tt: TT)
+
+fun <TT> withOuterAndOwnGeneric(t: test.Foo, tt: TT)
+
+open operator fun equals(other: kotlin.Any?): kotlin.Boolean
+
+open fun hashCode(): kotlin.Int
+
+open fun toString(): kotlin.String

analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase1.descriptors.txt

@@ -0,0 +1,34 @@
+KtFunctionSymbol:
+  callableIdIfNonLocal: test/Base.noGeneric
+  name: noGeneric
+  origin: SOURCE
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: test/ClassWithGenericBase.withOuterGeneric
+  name: withOuterGeneric
+  origin: SOURCE
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: test/Base.withOwnGeneric
+  name: withOwnGeneric
+  origin: SOURCE
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: test/ClassWithGenericBase.withOuterAndOwnGeneric
+  name: withOuterAndOwnGeneric
+  origin: SOURCE
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.equals
+  name: equals
+  origin: LIBRARY
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.hashCode
+  name: hashCode
+  origin: LIBRARY
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.toString
+  name: toString
+  origin: LIBRARY

analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase1.kt

@@ -0,0 +1,16 @@
+// DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE_K1
+package test
+
+class Foo
+
+abstract class Base<T> {
+    fun noGeneric() {}
+    
+    fun withOuterGeneric(t: T) {}
+    
+    fun <TT> withOwnGeneric(tt: TT) {}
+    
+    fun <TT> withOuterAndOwnGeneric(t: T, tt: TT) {}
+}
+
+class <caret>ClassWithGenericBase : Base<Foo>()

analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase1.pretty.txt

@@ -0,0 +1,15 @@
+fun noGeneric()
+
+fun withOuterGeneric(t: test.Foo)
+
+fun <TT> withOwnGeneric(tt: TT)
+
+fun <TT> withOuterAndOwnGeneric(t: test.Foo, tt: TT)
+
+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/substitutionOverridesUnwrapping/ClassWithGenericBase1.txt

@@ -0,0 +1,38 @@
+KtFunctionSymbol:
+  callableIdIfNonLocal: test/Base.noGeneric
+  name: noGeneric
+  origin: SOURCE
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: test/ClassWithGenericBase.withOuterGeneric
+  name: withOuterGeneric
+  origin: SUBSTITUTION_OVERRIDE
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: test/Base.withOwnGeneric
+  name: withOwnGeneric
+  origin: SOURCE
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: test/ClassWithGenericBase.withOuterAndOwnGeneric
+  name: withOuterAndOwnGeneric
+  origin: SUBSTITUTION_OVERRIDE
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.equals
+  name: equals
+  origin: LIBRARY
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.hashCode
+  name: hashCode
+  origin: LIBRARY
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.toString
+  name: toString
+  origin: LIBRARY
+
+KtConstructorSymbol:
+  callableIdIfNonLocal: null
+  origin: SOURCE_MEMBER_GENERATED

analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase2.descriptors.pretty.txt

@@ -0,0 +1,13 @@
+val noGeneric: test.Foo?
+
+val withOuterGeneric: test.Foo?
+
+val <TT> TT.withOwnGeneric: TT?
+
+val <TT> TT.withOuterAndOwnGeneric: test.Foo?
+
+open operator fun equals(other: kotlin.Any?): kotlin.Boolean
+
+open fun hashCode(): kotlin.Int
+
+open fun toString(): kotlin.String

analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase2.descriptors.txt

@@ -0,0 +1,34 @@
+KtKotlinPropertySymbol:
+  callableIdIfNonLocal: test/Base.noGeneric
+  name: noGeneric
+  origin: SOURCE
+
+KtKotlinPropertySymbol:
+  callableIdIfNonLocal: test/ClassWithGenericBase.withOuterGeneric
+  name: withOuterGeneric
+  origin: SOURCE
+
+KtKotlinPropertySymbol:
+  callableIdIfNonLocal: test/Base.withOwnGeneric
+  name: withOwnGeneric
+  origin: SOURCE
+
+KtKotlinPropertySymbol:
+  callableIdIfNonLocal: test/ClassWithGenericBase.withOuterAndOwnGeneric
+  name: withOuterAndOwnGeneric
+  origin: SOURCE
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.equals
+  name: equals
+  origin: LIBRARY
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.hashCode
+  name: hashCode
+  origin: LIBRARY
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.toString
+  name: toString
+  origin: LIBRARY

analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase2.kt

@@ -0,0 +1,16 @@
+// DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE_K1
+package test
+
+class Foo
+
+abstract class Base<T> {
+    val noGeneric: Foo? = null
+
+    val withOuterGeneric: T? = null
+
+    val <TT> TT.withOwnGeneric: TT? get() = null
+
+    val <TT> TT.withOuterAndOwnGeneric: T? get() = null
+}
+
+class <caret>ClassWithGenericBase : Base<Foo>()

analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase2.pretty.txt

@@ -0,0 +1,16 @@
+val noGeneric: test.Foo?
+
+val withOuterGeneric: test.Foo?
+
+val <TT> TT.withOwnGeneric: TT?
+  get()
+
+val <TT> TT.withOuterAndOwnGeneric: test.Foo?
+
+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/substitutionOverridesUnwrapping/ClassWithGenericBase2.txt

@@ -0,0 +1,38 @@
+KtKotlinPropertySymbol:
+  callableIdIfNonLocal: test/Base.noGeneric
+  name: noGeneric
+  origin: SOURCE
+
+KtKotlinPropertySymbol:
+  callableIdIfNonLocal: test/ClassWithGenericBase.withOuterGeneric
+  name: withOuterGeneric
+  origin: SUBSTITUTION_OVERRIDE
+
+KtKotlinPropertySymbol:
+  callableIdIfNonLocal: test/Base.withOwnGeneric
+  name: withOwnGeneric
+  origin: SOURCE
+
+KtKotlinPropertySymbol:
+  callableIdIfNonLocal: test/ClassWithGenericBase.withOuterAndOwnGeneric
+  name: withOuterAndOwnGeneric
+  origin: SUBSTITUTION_OVERRIDE
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.equals
+  name: equals
+  origin: LIBRARY
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.hashCode
+  name: hashCode
+  origin: LIBRARY
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.toString
+  name: toString
+  origin: LIBRARY
+
+KtConstructorSymbol:
+  callableIdIfNonLocal: null
+  origin: SOURCE_MEMBER_GENERATED

analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase3.descriptors.pretty.txt

@@ -0,0 +1,15 @@
+fun noGenerics_InterfaceWithFun()
+
+open fun withOuterGeneric_InterfaceWithFun(): test.SomeClass2
+
+fun noGenerics_InterfaceWithFunBase()
+
+fun withOuterGenericT1_InterfaceWithFunBase(): test.SomeClass1
+
+open fun withOuterGenericT2_InterfaceWithFunBase(): test.SomeClass2
+
+open operator fun equals(other: kotlin.Any?): kotlin.Boolean
+
+open fun hashCode(): kotlin.Int
+
+open fun toString(): kotlin.String

analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase3.descriptors.txt

@@ -0,0 +1,39 @@
+KtFunctionSymbol:
+  callableIdIfNonLocal: test/InterfaceWithFun.noGenerics_InterfaceWithFun
+  name: noGenerics_InterfaceWithFun
+  origin: SOURCE
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: test/ClassWithInterfaceWithFun.withOuterGeneric_InterfaceWithFun
+  name: withOuterGeneric_InterfaceWithFun
+  origin: SOURCE
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: test/InterfaceWithFunBase.noGenerics_InterfaceWithFunBase
+  name: noGenerics_InterfaceWithFunBase
+  origin: SOURCE
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: test/InterfaceWithFun.withOuterGenericT1_InterfaceWithFunBase
+  name: withOuterGenericT1_InterfaceWithFunBase
+  origin: SOURCE
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: test/ClassWithInterfaceWithFun.withOuterGenericT2_InterfaceWithFunBase
+  name: withOuterGenericT2_InterfaceWithFunBase
+  origin: SOURCE
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.equals
+  name: equals
+  origin: LIBRARY
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.hashCode
+  name: hashCode
+  origin: LIBRARY
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.toString
+  name: toString
+  origin: LIBRARY

analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase3.kt

@@ -0,0 +1,20 @@
+package test
+
+class SomeClass1
+class SomeClass2
+
+interface InterfaceWithFunBase<T1, T2> {
+    fun noGenerics_InterfaceWithFunBase() {}
+
+    fun withOuterGenericT1_InterfaceWithFunBase(): T1 {}
+
+    fun withOuterGenericT2_InterfaceWithFunBase(): T2 {}
+}
+
+interface InterfaceWithFun<T> : InterfaceWithFunBase<SomeClass1, T> {
+    fun noGenerics_InterfaceWithFun() {}
+
+    fun withOuterGeneric_InterfaceWithFun(): T {}
+}
+
+abstract class <caret>ClassWithInterfaceWithFun : InterfaceWithFun<SomeClass2>

analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase3.pretty.txt

@@ -0,0 +1,17 @@
+fun noGenerics_InterfaceWithFun()
+
+open fun withOuterGeneric_InterfaceWithFun(): test.SomeClass2
+
+fun noGenerics_InterfaceWithFunBase()
+
+fun withOuterGenericT1_InterfaceWithFunBase(): test.SomeClass1
+
+open fun withOuterGenericT2_InterfaceWithFunBase(): test.SomeClass2
+
+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/substitutionOverridesUnwrapping/ClassWithGenericBase3.txt

@@ -0,0 +1,43 @@
+KtFunctionSymbol:
+  callableIdIfNonLocal: test/InterfaceWithFun.noGenerics_InterfaceWithFun
+  name: noGenerics_InterfaceWithFun
+  origin: SOURCE
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: test/ClassWithInterfaceWithFun.withOuterGeneric_InterfaceWithFun
+  name: withOuterGeneric_InterfaceWithFun
+  origin: SUBSTITUTION_OVERRIDE
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: test/InterfaceWithFunBase.noGenerics_InterfaceWithFunBase
+  name: noGenerics_InterfaceWithFunBase
+  origin: SOURCE
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: test/InterfaceWithFun.withOuterGenericT1_InterfaceWithFunBase
+  name: withOuterGenericT1_InterfaceWithFunBase
+  origin: SUBSTITUTION_OVERRIDE
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: test/ClassWithInterfaceWithFun.withOuterGenericT2_InterfaceWithFunBase
+  name: withOuterGenericT2_InterfaceWithFunBase
+  origin: SUBSTITUTION_OVERRIDE
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.equals
+  name: equals
+  origin: LIBRARY
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.hashCode
+  name: hashCode
+  origin: LIBRARY
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.toString
+  name: toString
+  origin: LIBRARY
+
+KtConstructorSymbol:
+  callableIdIfNonLocal: null
+  origin: SOURCE_MEMBER_GENERATED

analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase4.descriptors.pretty.txt

@@ -0,0 +1,25 @@
+val noGenerics_InterfaceWithVal: test.SomeClass1
+
+abstract val withOuterGeneric_InterfaceWithVal: test.SomeClass2
+
+val <Own> Own.withOwnGeneric_InterfaceWithVal: test.SomeClass1
+
+abstract val <Own> Own.withOwnAndOuterGeneric_InterfaceWithVal: test.SomeClass2
+
+val noGenerics_InterfaceWithValBase: test.SomeClass1
+
+val withOuterGenericT1_InterfaceWithValBase: test.SomeClass1
+
+abstract val withOuterGenericT2_InterfaceWithValBase: test.SomeClass2
+
+val <Own> Own.withOwnGeneric_InterfaceWithValBase: test.SomeClass1
+
+val <Own> Own.withOwnAndOuterGenericT1_InterfaceWithValBase: test.SomeClass1
+
+abstract val <Own> Own.withOwnAndOuterGenericT2_InterfaceWithValBase: test.SomeClass2
+
+open operator fun equals(other: kotlin.Any?): kotlin.Boolean
+
+open fun hashCode(): kotlin.Int
+
+open fun toString(): kotlin.String

analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase4.descriptors.txt

@@ -0,0 +1,64 @@
+KtKotlinPropertySymbol:
+  callableIdIfNonLocal: test/InterfaceWithVal.noGenerics_InterfaceWithVal
+  name: noGenerics_InterfaceWithVal
+  origin: SOURCE
+
+KtKotlinPropertySymbol:
+  callableIdIfNonLocal: test/ClassWithInterfaceWithVal.withOuterGeneric_InterfaceWithVal
+  name: withOuterGeneric_InterfaceWithVal
+  origin: SOURCE
+
+KtKotlinPropertySymbol:
+  callableIdIfNonLocal: test/InterfaceWithVal.withOwnGeneric_InterfaceWithVal
+  name: withOwnGeneric_InterfaceWithVal
+  origin: SOURCE
+
+KtKotlinPropertySymbol:
+  callableIdIfNonLocal: test/ClassWithInterfaceWithVal.withOwnAndOuterGeneric_InterfaceWithVal
+  name: withOwnAndOuterGeneric_InterfaceWithVal
+  origin: SOURCE
+
+KtKotlinPropertySymbol:
+  callableIdIfNonLocal: test/InterfaceWithValBase.noGenerics_InterfaceWithValBase
+  name: noGenerics_InterfaceWithValBase
+  origin: SOURCE
+
+KtKotlinPropertySymbol:
+  callableIdIfNonLocal: test/InterfaceWithVal.withOuterGenericT1_InterfaceWithValBase
+  name: withOuterGenericT1_InterfaceWithValBase
+  origin: SOURCE
+
+KtKotlinPropertySymbol:
+  callableIdIfNonLocal: test/ClassWithInterfaceWithVal.withOuterGenericT2_InterfaceWithValBase
+  name: withOuterGenericT2_InterfaceWithValBase
+  origin: SOURCE
+
+KtKotlinPropertySymbol:
+  callableIdIfNonLocal: test/InterfaceWithValBase.withOwnGeneric_InterfaceWithValBase
+  name: withOwnGeneric_InterfaceWithValBase
+  origin: SOURCE
+
+KtKotlinPropertySymbol:
+  callableIdIfNonLocal: test/InterfaceWithVal.withOwnAndOuterGenericT1_InterfaceWithValBase
+  name: withOwnAndOuterGenericT1_InterfaceWithValBase
+  origin: SOURCE
+
+KtKotlinPropertySymbol:
+  callableIdIfNonLocal: test/ClassWithInterfaceWithVal.withOwnAndOuterGenericT2_InterfaceWithValBase
+  name: withOwnAndOuterGenericT2_InterfaceWithValBase
+  origin: SOURCE
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.equals
+  name: equals
+  origin: LIBRARY
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.hashCode
+  name: hashCode
+  origin: LIBRARY
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.toString
+  name: toString
+  origin: LIBRARY

analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase4.kt

@@ -0,0 +1,32 @@
+// DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE_K1
+package test
+
+class SomeClass1
+class SomeClass2
+
+interface InterfaceWithValBase<T1, T2> {
+    val noGenerics_InterfaceWithValBase: SomeClass1
+
+    val withOuterGenericT1_InterfaceWithValBase: T1
+
+    val withOuterGenericT2_InterfaceWithValBase: T2
+
+    val <Own> Own.withOwnGeneric_InterfaceWithValBase: SomeClass1
+
+    val <Own> Own.withOwnAndOuterGenericT1_InterfaceWithValBase: T1
+
+    val <Own> Own.withOwnAndOuterGenericT2_InterfaceWithValBase: T2
+}
+
+interface InterfaceWithVal<T> : InterfaceWithValBase<SomeClass1, T> {
+    val noGenerics_InterfaceWithVal: SomeClass1
+
+    val withOuterGeneric_InterfaceWithVal: T
+
+    val <Own> Own.withOwnGeneric_InterfaceWithVal: SomeClass1
+
+    val <Own> Own.withOwnAndOuterGeneric_InterfaceWithVal: T
+}
+
+
+abstract class <caret>ClassWithInterfaceWithVal : InterfaceWithVal<SomeClass2>

analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase4.pretty.txt

@@ -0,0 +1,27 @@
+val noGenerics_InterfaceWithVal: test.SomeClass1
+
+abstract val withOuterGeneric_InterfaceWithVal: test.SomeClass2
+
+val <Own> Own.withOwnGeneric_InterfaceWithVal: test.SomeClass1
+
+abstract val <Own> Own.withOwnAndOuterGeneric_InterfaceWithVal: test.SomeClass2
+
+val noGenerics_InterfaceWithValBase: test.SomeClass1
+
+val withOuterGenericT1_InterfaceWithValBase: test.SomeClass1
+
+abstract val withOuterGenericT2_InterfaceWithValBase: test.SomeClass2
+
+val <Own> Own.withOwnGeneric_InterfaceWithValBase: test.SomeClass1
+
+val <Own> Own.withOwnAndOuterGenericT1_InterfaceWithValBase: test.SomeClass1
+
+abstract val <Own> Own.withOwnAndOuterGenericT2_InterfaceWithValBase: test.SomeClass2
+
+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/substitutionOverridesUnwrapping/ClassWithGenericBase4.txt

@@ -0,0 +1,68 @@
+KtKotlinPropertySymbol:
+  callableIdIfNonLocal: test/InterfaceWithVal.noGenerics_InterfaceWithVal
+  name: noGenerics_InterfaceWithVal
+  origin: SOURCE
+
+KtKotlinPropertySymbol:
+  callableIdIfNonLocal: test/ClassWithInterfaceWithVal.withOuterGeneric_InterfaceWithVal
+  name: withOuterGeneric_InterfaceWithVal
+  origin: SUBSTITUTION_OVERRIDE
+
+KtKotlinPropertySymbol:
+  callableIdIfNonLocal: test/InterfaceWithVal.withOwnGeneric_InterfaceWithVal
+  name: withOwnGeneric_InterfaceWithVal
+  origin: SOURCE
+
+KtKotlinPropertySymbol:
+  callableIdIfNonLocal: test/ClassWithInterfaceWithVal.withOwnAndOuterGeneric_InterfaceWithVal
+  name: withOwnAndOuterGeneric_InterfaceWithVal
+  origin: SUBSTITUTION_OVERRIDE
+
+KtKotlinPropertySymbol:
+  callableIdIfNonLocal: test/InterfaceWithValBase.noGenerics_InterfaceWithValBase
+  name: noGenerics_InterfaceWithValBase
+  origin: SOURCE
+
+KtKotlinPropertySymbol:
+  callableIdIfNonLocal: test/InterfaceWithVal.withOuterGenericT1_InterfaceWithValBase
+  name: withOuterGenericT1_InterfaceWithValBase
+  origin: SUBSTITUTION_OVERRIDE
+
+KtKotlinPropertySymbol:
+  callableIdIfNonLocal: test/ClassWithInterfaceWithVal.withOuterGenericT2_InterfaceWithValBase
+  name: withOuterGenericT2_InterfaceWithValBase
+  origin: SUBSTITUTION_OVERRIDE
+
+KtKotlinPropertySymbol:
+  callableIdIfNonLocal: test/InterfaceWithValBase.withOwnGeneric_InterfaceWithValBase
+  name: withOwnGeneric_InterfaceWithValBase
+  origin: SOURCE
+
+KtKotlinPropertySymbol:
+  callableIdIfNonLocal: test/InterfaceWithVal.withOwnAndOuterGenericT1_InterfaceWithValBase
+  name: withOwnAndOuterGenericT1_InterfaceWithValBase
+  origin: SUBSTITUTION_OVERRIDE
+
+KtKotlinPropertySymbol:
+  callableIdIfNonLocal: test/ClassWithInterfaceWithVal.withOwnAndOuterGenericT2_InterfaceWithValBase
+  name: withOwnAndOuterGenericT2_InterfaceWithValBase
+  origin: SUBSTITUTION_OVERRIDE
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.equals
+  name: equals
+  origin: LIBRARY
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.hashCode
+  name: hashCode
+  origin: LIBRARY
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.toString
+  name: toString
+  origin: LIBRARY
+
+KtConstructorSymbol:
+  callableIdIfNonLocal: null
+  origin: SOURCE_MEMBER_GENERATED

analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass1.descriptors.pretty.txt

@@ -0,0 +1,9 @@
+fun noGenerics()
+
+fun withOuter(): Outer?
+
+open operator fun equals(other: kotlin.Any?): kotlin.Boolean
+
+open fun hashCode(): kotlin.Int
+
+open fun toString(): kotlin.String

analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass1.descriptors.txt

@@ -0,0 +1,24 @@
+KtFunctionSymbol:
+  callableIdIfNonLocal: null
+  name: noGenerics
+  origin: SOURCE
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: null
+  name: withOuter
+  origin: SOURCE
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.equals
+  name: equals
+  origin: LIBRARY
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.hashCode
+  name: hashCode
+  origin: LIBRARY
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.toString
+  name: toString
+  origin: LIBRARY

analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass1.kt

@@ -0,0 +1,15 @@
+// DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE
+// DO_NOT_CHECK_SYMBOL_RESTORE_K1
+package test
+
+class SomeClass
+
+fun <Outer> topLevel() {
+    open class Base {
+        fun withOuter(): Outer? = null
+    }
+
+    class <caret>Child : Base() {
+        fun noGenerics() {}
+    }
+}

analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass1.pretty.txt

@@ -0,0 +1,11 @@
+fun noGenerics()
+
+fun withOuter(): Outer?
+
+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/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass1.txt

@@ -0,0 +1,28 @@
+KtFunctionSymbol:
+  callableIdIfNonLocal: null
+  name: noGenerics
+  origin: SOURCE
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: null
+  name: withOuter
+  origin: SOURCE
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.equals
+  name: equals
+  origin: LIBRARY
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.hashCode
+  name: hashCode
+  origin: LIBRARY
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.toString
+  name: toString
+  origin: LIBRARY
+
+KtConstructorSymbol:
+  callableIdIfNonLocal: null
+  origin: SOURCE_MEMBER_GENERATED

analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass2.descriptors.pretty.txt

@@ -0,0 +1,11 @@
+fun noGenerics()
+
+fun withOuter(): Outer?
+
+fun withOuterAndOwn(t: test.SomeClass): Outer?
+
+open operator fun equals(other: kotlin.Any?): kotlin.Boolean
+
+open fun hashCode(): kotlin.Int
+
+open fun toString(): kotlin.String

analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass2.descriptors.txt

@@ -0,0 +1,29 @@
+KtFunctionSymbol:
+  callableIdIfNonLocal: null
+  name: noGenerics
+  origin: SOURCE
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: null
+  name: withOuter
+  origin: SOURCE
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: null
+  name: withOuterAndOwn
+  origin: SOURCE
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.equals
+  name: equals
+  origin: LIBRARY
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.hashCode
+  name: hashCode
+  origin: LIBRARY
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.toString
+  name: toString
+  origin: LIBRARY

analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass2.kt

@@ -0,0 +1,16 @@
+// DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE
+// DO_NOT_CHECK_SYMBOL_RESTORE_K1
+package test
+
+class SomeClass
+
+fun <Outer> topLevel() {
+    open class Base<T> {
+        fun withOuter(): Outer? = null
+        fun withOuterAndOwn(t: T): Outer? = null
+    }
+
+    class <caret>Child : Base<SomeClass>() {
+        fun noGenerics() {}
+    }
+}

analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass2.pretty.txt

@@ -0,0 +1,13 @@
+fun noGenerics()
+
+fun withOuter(): Outer?
+
+fun withOuterAndOwn(t: test.SomeClass): Outer?
+
+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/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass2.txt

@@ -0,0 +1,33 @@
+KtFunctionSymbol:
+  callableIdIfNonLocal: null
+  name: noGenerics
+  origin: SOURCE
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: null
+  name: withOuter
+  origin: SOURCE
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: null
+  name: withOuterAndOwn
+  origin: SUBSTITUTION_OVERRIDE
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.equals
+  name: equals
+  origin: LIBRARY
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.hashCode
+  name: hashCode
+  origin: LIBRARY
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.toString
+  name: toString
+  origin: LIBRARY
+
+KtConstructorSymbol:
+  callableIdIfNonLocal: null
+  origin: SOURCE_MEMBER_GENERATED

analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass1.descriptors.pretty.txt

@@ -0,0 +1,9 @@
+fun noGeneric()
+
+fun withOuter(): Outer?
+
+open operator fun equals(other: kotlin.Any?): kotlin.Boolean
+
+open fun hashCode(): kotlin.Int
+
+open fun toString(): kotlin.String

analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass1.descriptors.txt

@@ -0,0 +1,24 @@
+KtFunctionSymbol:
+  callableIdIfNonLocal: test/TopLevel.Base.noGeneric
+  name: noGeneric
+  origin: SOURCE
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: test/TopLevel.Base.withOuter
+  name: withOuter
+  origin: SOURCE
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.equals
+  name: equals
+  origin: LIBRARY
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.hashCode
+  name: hashCode
+  origin: LIBRARY
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.toString
+  name: toString
+  origin: LIBRARY

analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass1.kt

@@ -0,0 +1,13 @@
+// DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE_K1
+package test
+
+class SomeClass
+
+open class TopLevel<Outer> {
+    open inner class Base {
+        fun noGeneric() {}
+        fun withOuter(): Outer? = null
+    }
+    inner class <caret>Child : Base()
+}
+

analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass1.pretty.txt

@@ -0,0 +1,11 @@
+fun noGeneric()
+
+fun withOuter(): Outer?
+
+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/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass1.txt

@@ -0,0 +1,28 @@
+KtFunctionSymbol:
+  callableIdIfNonLocal: test/TopLevel.Base.noGeneric
+  name: noGeneric
+  origin: SOURCE
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: test/TopLevel.Base.withOuter
+  name: withOuter
+  origin: SOURCE
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.equals
+  name: equals
+  origin: LIBRARY
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.hashCode
+  name: hashCode
+  origin: LIBRARY
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.toString
+  name: toString
+  origin: LIBRARY
+
+KtConstructorSymbol:
+  callableIdIfNonLocal: null
+  origin: SOURCE_MEMBER_GENERATED

analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass2.descriptors.pretty.txt

@@ -0,0 +1,11 @@
+fun noGeneric()
+
+fun withOuter(): Outer?
+
+fun withOwnAndOuter(t: test.SomeClass): Outer?
+
+open operator fun equals(other: kotlin.Any?): kotlin.Boolean
+
+open fun hashCode(): kotlin.Int
+
+open fun toString(): kotlin.String

analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass2.descriptors.txt

@@ -0,0 +1,29 @@
+KtFunctionSymbol:
+  callableIdIfNonLocal: test/TopLevel.Base.noGeneric
+  name: noGeneric
+  origin: SOURCE
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: test/TopLevel.Base.withOuter
+  name: withOuter
+  origin: SOURCE
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: test/TopLevel.Child.withOwnAndOuter
+  name: withOwnAndOuter
+  origin: SOURCE
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.equals
+  name: equals
+  origin: LIBRARY
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.hashCode
+  name: hashCode
+  origin: LIBRARY
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.toString
+  name: toString
+  origin: LIBRARY

analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass2.kt

@@ -0,0 +1,14 @@
+// DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE_K1
+package test
+
+class SomeClass
+
+open class TopLevel<Outer> {
+    open inner class Base<T> {
+        fun noGeneric() {}
+        fun withOuter(): Outer? = null
+        fun withOwnAndOuter(t: T): Outer? = null
+    }
+
+    inner class <caret>Child : Base<SomeClass>()
+}

analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass2.pretty.txt

@@ -0,0 +1,13 @@
+fun noGeneric()
+
+fun withOuter(): Outer?
+
+fun withOwnAndOuter(t: test.SomeClass): Outer?
+
+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/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass2.txt

@@ -0,0 +1,33 @@
+KtFunctionSymbol:
+  callableIdIfNonLocal: test/TopLevel.Base.noGeneric
+  name: noGeneric
+  origin: SOURCE
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: test/TopLevel.Base.withOuter
+  name: withOuter
+  origin: SOURCE
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: test/TopLevel.Child.withOwnAndOuter
+  name: withOwnAndOuter
+  origin: SUBSTITUTION_OVERRIDE
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.equals
+  name: equals
+  origin: LIBRARY
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.hashCode
+  name: hashCode
+  origin: LIBRARY
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.toString
+  name: toString
+  origin: LIBRARY
+
+KtConstructorSymbol:
+  callableIdIfNonLocal: null
+  origin: SOURCE_MEMBER_GENERATED

analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor1.descriptors.pretty.txt

@@ -0,0 +1,9 @@
+fun noGeneric()
+
+fun withOuter(): test.SomeClass?
+
+open operator fun equals(other: kotlin.Any?): kotlin.Boolean
+
+open fun hashCode(): kotlin.Int
+
+open fun toString(): kotlin.String

analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor1.descriptors.txt

@@ -0,0 +1,24 @@
+KtFunctionSymbol:
+  callableIdIfNonLocal: test/TopLevel.Base.noGeneric
+  name: noGeneric
+  origin: SOURCE
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: test/OtherTopLevel.Child.withOuter
+  name: withOuter
+  origin: SOURCE
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.equals
+  name: equals
+  origin: LIBRARY
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.hashCode
+  name: hashCode
+  origin: LIBRARY
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.toString
+  name: toString
+  origin: LIBRARY

analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor1.kt

@@ -0,0 +1,14 @@
+package test
+
+class SomeClass
+
+open class TopLevel<Outer> {
+    open inner class Base {
+        fun noGeneric() {}
+        fun withOuter(): Outer? = null
+    }
+}
+
+class OtherTopLevel : TopLevel<SomeClass>() {
+    inner class <caret>Child : Base()
+}

analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor1.pretty.txt

@@ -0,0 +1,11 @@
+fun noGeneric()
+
+fun withOuter(): test.SomeClass?
+
+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/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor1.txt

@@ -0,0 +1,28 @@
+KtFunctionSymbol:
+  callableIdIfNonLocal: test/TopLevel.Base.noGeneric
+  name: noGeneric
+  origin: SOURCE
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: test/OtherTopLevel.Child.withOuter
+  name: withOuter
+  origin: SUBSTITUTION_OVERRIDE
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.equals
+  name: equals
+  origin: LIBRARY
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.hashCode
+  name: hashCode
+  origin: LIBRARY
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.toString
+  name: toString
+  origin: LIBRARY
+
+KtConstructorSymbol:
+  callableIdIfNonLocal: null
+  origin: SOURCE_MEMBER_GENERATED

analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor2.descriptors.pretty.txt

@@ -0,0 +1,9 @@
+fun noGeneric()
+
+fun withOuter(): T?
+
+open operator fun equals(other: kotlin.Any?): kotlin.Boolean
+
+open fun hashCode(): kotlin.Int
+
+open fun toString(): kotlin.String

analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor2.descriptors.txt

@@ -0,0 +1,24 @@
+KtFunctionSymbol:
+  callableIdIfNonLocal: test/TopLevel.Base.noGeneric
+  name: noGeneric
+  origin: SOURCE
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: test/OtherTopLevel.Child.withOuter
+  name: withOuter
+  origin: SOURCE
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.equals
+  name: equals
+  origin: LIBRARY
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.hashCode
+  name: hashCode
+  origin: LIBRARY
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.toString
+  name: toString
+  origin: LIBRARY

analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor2.kt

@@ -0,0 +1,14 @@
+package test
+
+class SomeClass
+
+open class TopLevel<Outer> {
+    open inner class Base {
+        fun noGeneric() {}
+        fun withOuter(): Outer? = null
+    }
+}
+
+class OtherTopLevel<T> : TopLevel<T>() {
+    inner class <caret>Child : Base()
+}

analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor2.pretty.txt

@@ -0,0 +1,11 @@
+fun noGeneric()
+
+fun withOuter(): T?
+
+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/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor2.txt

@@ -0,0 +1,28 @@
+KtFunctionSymbol:
+  callableIdIfNonLocal: test/TopLevel.Base.noGeneric
+  name: noGeneric
+  origin: SOURCE
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: test/OtherTopLevel.Child.withOuter
+  name: withOuter
+  origin: SUBSTITUTION_OVERRIDE
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.equals
+  name: equals
+  origin: LIBRARY
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.hashCode
+  name: hashCode
+  origin: LIBRARY
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.toString
+  name: toString
+  origin: LIBRARY
+
+KtConstructorSymbol:
+  callableIdIfNonLocal: null
+  origin: SOURCE_MEMBER_GENERATED

analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor3.descriptors.pretty.txt

@@ -0,0 +1,11 @@
+fun noGeneric()
+
+fun withOuter(): test.SomeClass?
+
+fun withOwnAndOuter(t: test.SomeClass): test.SomeClass?
+
+open operator fun equals(other: kotlin.Any?): kotlin.Boolean
+
+open fun hashCode(): kotlin.Int
+
+open fun toString(): kotlin.String

analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor3.descriptors.txt

@@ -0,0 +1,29 @@
+KtFunctionSymbol:
+  callableIdIfNonLocal: test/TopLevel.Base.noGeneric
+  name: noGeneric
+  origin: SOURCE
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: test/OtherTopLevel.Child.withOuter
+  name: withOuter
+  origin: SOURCE
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: test/OtherTopLevel.Child.withOwnAndOuter
+  name: withOwnAndOuter
+  origin: SOURCE
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.equals
+  name: equals
+  origin: LIBRARY
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.hashCode
+  name: hashCode
+  origin: LIBRARY
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.toString
+  name: toString
+  origin: LIBRARY

analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor3.kt

@@ -0,0 +1,15 @@
+package test
+
+class SomeClass
+
+open class TopLevel<Outer> {
+    open inner class Base<T> {
+        fun noGeneric() {}
+        fun withOuter(): Outer? = null
+        fun withOwnAndOuter(t: T): Outer? = null
+    }
+}
+
+class OtherTopLevel : TopLevel<SomeClass>() {
+    inner class <caret>Child : Base<SomeClass>()
+}

analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor3.pretty.txt

@@ -0,0 +1,13 @@
+fun noGeneric()
+
+fun withOuter(): test.SomeClass?
+
+fun withOwnAndOuter(t: test.SomeClass): test.SomeClass?
+
+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/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor3.txt

@@ -0,0 +1,33 @@
+KtFunctionSymbol:
+  callableIdIfNonLocal: test/TopLevel.Base.noGeneric
+  name: noGeneric
+  origin: SOURCE
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: test/OtherTopLevel.Child.withOuter
+  name: withOuter
+  origin: SUBSTITUTION_OVERRIDE
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: test/OtherTopLevel.Child.withOwnAndOuter
+  name: withOwnAndOuter
+  origin: SUBSTITUTION_OVERRIDE
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.equals
+  name: equals
+  origin: LIBRARY
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.hashCode
+  name: hashCode
+  origin: LIBRARY
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.toString
+  name: toString
+  origin: LIBRARY
+
+KtConstructorSymbol:
+  callableIdIfNonLocal: null
+  origin: SOURCE_MEMBER_GENERATED

analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/Implement_java_util_Collection.descriptors.pretty.txt

@@ -0,0 +1,31 @@
+override operator fun iterator(): kotlin.collections.MutableIterator<E!>
+
+open operator fun equals(other: kotlin.Any?): kotlin.Boolean
+
+open fun hashCode(): kotlin.Int
+
+open fun toString(): kotlin.String
+
+fun size(): kotlin.Int
+
+fun isEmpty(): kotlin.Boolean
+
+operator fun contains(p0: kotlin.Any!): kotlin.Boolean
+
+fun toArray(): kotlin.Array<(out) kotlin.Any!>!
+
+fun <T : kotlin.Any!> toArray(p0: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>!
+
+fun add(p0: E!): kotlin.Boolean
+
+fun remove(p0: kotlin.Any!): kotlin.Boolean
+
+fun containsAll(p0: kotlin.collections.(Mutable)Collection<*>!): kotlin.Boolean
+
+fun addAll(p0: (kotlin.collections.MutableCollection<out E!>..kotlin.collections.Collection<E!>?)): kotlin.Boolean
+
+fun removeAll(p0: kotlin.collections.(Mutable)Collection<*>!): kotlin.Boolean
+
+fun retainAll(p0: kotlin.collections.(Mutable)Collection<*>!): kotlin.Boolean
+
+fun clear()

analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/Implement_java_util_Collection.descriptors.txt

@@ -0,0 +1,79 @@
+KtFunctionSymbol:
+  callableIdIfNonLocal: java/util/Collection.iterator
+  name: iterator
+  origin: JAVA
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.equals
+  name: equals
+  origin: LIBRARY
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.hashCode
+  name: hashCode
+  origin: LIBRARY
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.toString
+  name: toString
+  origin: LIBRARY
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: java/util/Collection.size
+  name: size
+  origin: JAVA
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: java/util/Collection.isEmpty
+  name: isEmpty
+  origin: JAVA
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: java/util/Collection.contains
+  name: contains
+  origin: JAVA
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: java/util/Collection.toArray
+  name: toArray
+  origin: JAVA
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: java/util/Collection.toArray
+  name: toArray
+  origin: JAVA
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: java/util/Collection.add
+  name: add
+  origin: JAVA
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: java/util/Collection.remove
+  name: remove
+  origin: JAVA
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: java/util/Collection.containsAll
+  name: containsAll
+  origin: JAVA
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: java/util/Collection.addAll
+  name: addAll
+  origin: JAVA
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: java/util/Collection.removeAll
+  name: removeAll
+  origin: JAVA
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: java/util/Collection.retainAll
+  name: retainAll
+  origin: JAVA
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: java/util/Collection.clear
+  name: clear
+  origin: JAVA

analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/Implement_java_util_Collection.kt

@@ -0,0 +1,5 @@
+package test
+
+class SomeClass
+
+abstract class <caret>MyList : java.util.Collection<SomeClass>

analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/Implement_java_util_Collection.pretty.txt

@@ -0,0 +1,33 @@
+fun size(): kotlin.Int
+
+fun isEmpty(): kotlin.Boolean
+
+operator fun contains(p0: kotlin.Any!): kotlin.Boolean
+
+abstract operator fun iterator(): kotlin.collections.MutableIterator<test.SomeClass!>
+
+fun toArray(): (kotlin.Array<kotlin.Any!>..kotlin.Array<out kotlin.Any!>?)
+
+fun <T : kotlin.Any!> toArray(p0: (kotlin.Array<(T & kotlin.Any..T?)>..kotlin.Array<out (T & kotlin.Any..T?)>?)): (kotlin.Array<(T & kotlin.Any..T?)>..kotlin.Array<out (T & kotlin.Any..T?)>?)
+
+abstract 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<out test.SomeClass!>!): kotlin.Boolean
+
+fun removeAll(p0: kotlin.collections.(Mutable)Collection<*>!): kotlin.Boolean
+
+fun retainAll(p0: kotlin.collections.(Mutable)Collection<*>!): kotlin.Boolean
+
+fun clear()
+
+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/substitutionOverridesUnwrapping/Implement_java_util_Collection.txt

@@ -0,0 +1,83 @@
+KtFunctionSymbol:
+  callableIdIfNonLocal: java/util/Collection.size
+  name: size
+  origin: JAVA
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: java/util/Collection.isEmpty
+  name: isEmpty
+  origin: JAVA
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: java/util/Collection.contains
+  name: contains
+  origin: JAVA
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: test/MyList.iterator
+  name: iterator
+  origin: SUBSTITUTION_OVERRIDE
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: java/util/Collection.toArray
+  name: toArray
+  origin: JAVA
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: java/util/Collection.toArray
+  name: toArray
+  origin: JAVA
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: test/MyList.add
+  name: add
+  origin: SUBSTITUTION_OVERRIDE
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: java/util/Collection.remove
+  name: remove
+  origin: JAVA
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: java/util/Collection.containsAll
+  name: containsAll
+  origin: JAVA
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: test/MyList.addAll
+  name: addAll
+  origin: SUBSTITUTION_OVERRIDE
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: java/util/Collection.removeAll
+  name: removeAll
+  origin: JAVA
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: java/util/Collection.retainAll
+  name: retainAll
+  origin: JAVA
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: java/util/Collection.clear
+  name: clear
+  origin: JAVA
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.equals
+  name: equals
+  origin: LIBRARY
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.hashCode
+  name: hashCode
+  origin: LIBRARY
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.toString
+  name: toString
+  origin: LIBRARY
+
+KtConstructorSymbol:
+  callableIdIfNonLocal: null
+  origin: SOURCE_MEMBER_GENERATED

analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/MemberFunctionWithOuterTypeParameterBound.descriptors.pretty.txt

@@ -0,0 +1,9 @@
+abstract fun <TT1 : test.Foo, TT2 : test.OtherInterface> funWithOuterAndOwnGenericsAndBounds(tT1: TT1?, tT2: TT2?)
+
+open val <TT1 : test.Foo, TT2 : test.OtherInterface> test.TwoParams<TT1, TT2>.propWithOuterAndOwnGenericsAndBounds: test.Foo?
+
+open operator fun equals(other: kotlin.Any?): kotlin.Boolean
+
+open fun hashCode(): kotlin.Int
+
+open fun toString(): kotlin.String

analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/MemberFunctionWithOuterTypeParameterBound.descriptors.txt

@@ -0,0 +1,24 @@
+KtFunctionSymbol:
+  callableIdIfNonLocal: test/MyClass.funWithOuterAndOwnGenericsAndBounds
+  name: funWithOuterAndOwnGenericsAndBounds
+  origin: SOURCE
+
+KtKotlinPropertySymbol:
+  callableIdIfNonLocal: test/MyClass.propWithOuterAndOwnGenericsAndBounds
+  name: propWithOuterAndOwnGenericsAndBounds
+  origin: SOURCE
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.equals
+  name: equals
+  origin: LIBRARY
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.hashCode
+  name: hashCode
+  origin: LIBRARY
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.toString
+  name: toString
+  origin: LIBRARY

analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/MemberFunctionWithOuterTypeParameterBound.kt

@@ -0,0 +1,15 @@
+package test
+
+interface OtherInterface
+
+interface TwoParams<T, TT>
+
+interface MyInterface<T> {
+    fun <TT1 : T, TT2 : OtherInterface> funWithOuterAndOwnGenericsAndBounds(tT1: TT1?, tT2: TT2?)
+
+    val <TT1 : T, TT2 : OtherInterface> TwoParams<TT1, TT2>.propWithOuterAndOwnGenericsAndBounds: T? get() = null
+}
+
+class Foo
+
+abstract class <caret>MyClass : MyInterface<Foo>

analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/MemberFunctionWithOuterTypeParameterBound.pretty.txt

@@ -0,0 +1,11 @@
+abstract fun <TT1 : test.Foo, TT2 : test.OtherInterface> funWithOuterAndOwnGenericsAndBounds(tT1: TT1?, tT2: TT2?)
+
+open val <TT1 : test.Foo, TT2 : test.OtherInterface> test.TwoParams<TT1, TT2>.propWithOuterAndOwnGenericsAndBounds: test.Foo?
+
+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/substitutionOverridesUnwrapping/MemberFunctionWithOuterTypeParameterBound.txt

@@ -0,0 +1,28 @@
+KtFunctionSymbol:
+  callableIdIfNonLocal: test/MyClass.funWithOuterAndOwnGenericsAndBounds
+  name: funWithOuterAndOwnGenericsAndBounds
+  origin: SUBSTITUTION_OVERRIDE
+
+KtKotlinPropertySymbol:
+  callableIdIfNonLocal: test/MyClass.propWithOuterAndOwnGenericsAndBounds
+  name: propWithOuterAndOwnGenericsAndBounds
+  origin: SUBSTITUTION_OVERRIDE
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.equals
+  name: equals
+  origin: LIBRARY
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.hashCode
+  name: hashCode
+  origin: LIBRARY
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.toString
+  name: toString
+  origin: LIBRARY
+
+KtConstructorSymbol:
+  callableIdIfNonLocal: null
+  origin: SOURCE_MEMBER_GENERATED

analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/MemberPropertyWithOuterTypeParameterBound.descriptors.pretty.txt

@@ -0,0 +1,9 @@
+val <Own : test.ClassA> Own.withOwnGeneric_InterfaceWithValBase: test.ClassA
+
+abstract val <Own : test.ClassB> Own.withOwnAndOuterGenericAsTypeBound_InterfaceWithValBase: test.ClassA
+
+open operator fun equals(other: kotlin.Any?): kotlin.Boolean
+
+open fun hashCode(): kotlin.Int
+
+open fun toString(): kotlin.String

analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/MemberPropertyWithOuterTypeParameterBound.descriptors.txt

@@ -0,0 +1,24 @@
+KtKotlinPropertySymbol:
+  callableIdIfNonLocal: test/MyInterface.withOwnGeneric_InterfaceWithValBase
+  name: withOwnGeneric_InterfaceWithValBase
+  origin: SOURCE
+
+KtKotlinPropertySymbol:
+  callableIdIfNonLocal: test/Inheritor.withOwnAndOuterGenericAsTypeBound_InterfaceWithValBase
+  name: withOwnAndOuterGenericAsTypeBound_InterfaceWithValBase
+  origin: SOURCE
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.equals
+  name: equals
+  origin: LIBRARY
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.hashCode
+  name: hashCode
+  origin: LIBRARY
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.toString
+  name: toString
+  origin: LIBRARY

analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/MemberPropertyWithOuterTypeParameterBound.kt

@@ -0,0 +1,12 @@
+// DO_NOT_CHECK_NON_PSI_SYMBOL_RESTORE_K1
+package test
+
+interface ClassA
+interface ClassB
+
+interface MyInterface<T> {
+    val <Own : ClassA> Own.withOwnGeneric_InterfaceWithValBase: ClassA
+    val <Own : T> Own.withOwnAndOuterGenericAsTypeBound_InterfaceWithValBase: ClassA
+}
+
+abstract class <caret>Inheritor : MyInterface<ClassB>

analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/MemberPropertyWithOuterTypeParameterBound.pretty.txt

@@ -0,0 +1,11 @@
+val <Own : test.ClassA> Own.withOwnGeneric_InterfaceWithValBase: test.ClassA
+
+abstract val <Own : test.ClassB> Own.withOwnAndOuterGenericAsTypeBound_InterfaceWithValBase: test.ClassA
+
+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/substitutionOverridesUnwrapping/MemberPropertyWithOuterTypeParameterBound.txt

@@ -0,0 +1,28 @@
+KtKotlinPropertySymbol:
+  callableIdIfNonLocal: test/MyInterface.withOwnGeneric_InterfaceWithValBase
+  name: withOwnGeneric_InterfaceWithValBase
+  origin: SOURCE
+
+KtKotlinPropertySymbol:
+  callableIdIfNonLocal: test/Inheritor.withOwnAndOuterGenericAsTypeBound_InterfaceWithValBase
+  name: withOwnAndOuterGenericAsTypeBound_InterfaceWithValBase
+  origin: SUBSTITUTION_OVERRIDE
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.equals
+  name: equals
+  origin: LIBRARY
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.hashCode
+  name: hashCode
+  origin: LIBRARY
+
+KtFunctionSymbol:
+  callableIdIfNonLocal: kotlin/Any.toString
+  name: toString
+  origin: LIBRARY
+
+KtConstructorSymbol:
+  callableIdIfNonLocal: null
+  origin: SOURCE_MEMBER_GENERATED