azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIR IDE] Add unwrapping substitution overrides which doesn't affect function's signature

Browse Source 
Also, do not use PSI to restore SUBSTITUTION_OVERRIDE function/property
symbols
This commit is contained in:
Roman Golyshev
2021-10-28 13:16:33 +03:00
committed by teamcityserver
parent 2766dc938b
commit fa8bb47bdf
51 changed files with 1291 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-api/testData/scopes/memberScopeByFqName/MutableList.txt
Vendored
+6 -6
View File
@@ -442,7 +442,7 @@ KtFunctionSymbol:
KtFunctionSymbol:
annotationsList: []
callableIdIfNonLocal: kotlin/collections/MutableList.isEmpty
callableIdIfNonLocal: kotlin/collections/List.isEmpty
hasStableParameterNames: true
isExtension: false
isExternal: false
@@ -461,7 +461,7 @@ KtFunctionSymbol:
typeParameters: []
valueParameters: []
visibility: Public
getDispatchReceiver(): kotlin/collections/MutableList<E>
getDispatchReceiver(): kotlin/collections/List<E>
deprecationStatus: null
KtFunctionSymbol:
@@ -516,10 +516,10 @@ KtFunctionSymbol:
KtKotlinPropertySymbol:
annotationsList: []
callableIdIfNonLocal: kotlin/collections/MutableList.size
getter: null
callableIdIfNonLocal: kotlin/collections/List.size
getter: KtPropertyGetterSymbol(<getter>)
hasBackingField: false
hasGetter: false
hasGetter: true
hasSetter: false
initializer: null
isConst: false
@@ -539,7 +539,7 @@ KtKotlinPropertySymbol:
symbolKind: CLASS_MEMBER
typeParameters: []
visibility: Public
getDispatchReceiver(): kotlin/collections/MutableList<E>
getDispatchReceiver(): kotlin/collections/List<E>
deprecationStatus: null
getterDeprecationStatus: null
javaGetterName: getSize
analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase1.kt
Vendored
+15
View File
@@ -0,0 +1,15 @@
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/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase1.txt
Vendored
+45
View File
@@ -0,0 +1,45 @@
KtFunctionSymbol:
callableIdIfNonLocal: test/Base.noGeneric
name: noGeneric
origin: SOURCE
getDispatchReceiver(): test/Base<T>
KtFunctionSymbol:
callableIdIfNonLocal: test/ClassWithGenericBase.withOuterGeneric
name: withOuterGeneric
origin: SOURCE
getDispatchReceiver(): test/ClassWithGenericBase
KtFunctionSymbol:
callableIdIfNonLocal: test/Base.withOwnGeneric
name: withOwnGeneric
origin: SOURCE
getDispatchReceiver(): test/Base<T>
KtFunctionSymbol:
callableIdIfNonLocal: test/ClassWithGenericBase.withOuterAndOwnGeneric
name: withOuterAndOwnGeneric
origin: SOURCE
getDispatchReceiver(): test/ClassWithGenericBase
KtFunctionSymbol:
callableIdIfNonLocal: kotlin/Any.equals
name: equals
origin: LIBRARY
getDispatchReceiver(): kotlin/Any
KtFunctionSymbol:
callableIdIfNonLocal: kotlin/Any.hashCode
name: hashCode
origin: LIBRARY
getDispatchReceiver(): kotlin/Any
KtFunctionSymbol:
callableIdIfNonLocal: kotlin/Any.toString
name: toString
origin: LIBRARY
getDispatchReceiver(): kotlin/Any
KtConstructorSymbol:
callableIdIfNonLocal: null
origin: SOURCE_MEMBER_GENERATED
analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase2.kt
Vendored
+15
View File
@@ -0,0 +1,15 @@
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/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase2.txt
Vendored
+45
View File
@@ -0,0 +1,45 @@
KtKotlinPropertySymbol:
callableIdIfNonLocal: test/Base.noGeneric
name: noGeneric
origin: SOURCE
getDispatchReceiver(): test/Base<T>
KtKotlinPropertySymbol:
callableIdIfNonLocal: test/ClassWithGenericBase.withOuterGeneric
name: withOuterGeneric
origin: SOURCE
getDispatchReceiver(): test/ClassWithGenericBase
KtKotlinPropertySymbol:
callableIdIfNonLocal: test/Base.withOwnGeneric
name: withOwnGeneric
origin: SOURCE
getDispatchReceiver(): test/Base<T>
KtKotlinPropertySymbol:
callableIdIfNonLocal: test/ClassWithGenericBase.withOuterAndOwnGeneric
name: withOuterAndOwnGeneric
origin: SOURCE
getDispatchReceiver(): test/ClassWithGenericBase
KtFunctionSymbol:
callableIdIfNonLocal: kotlin/Any.equals
name: equals
origin: LIBRARY
getDispatchReceiver(): kotlin/Any
KtFunctionSymbol:
callableIdIfNonLocal: kotlin/Any.hashCode
name: hashCode
origin: LIBRARY
getDispatchReceiver(): kotlin/Any
KtFunctionSymbol:
callableIdIfNonLocal: kotlin/Any.toString
name: toString
origin: LIBRARY
getDispatchReceiver(): kotlin/Any
KtConstructorSymbol:
callableIdIfNonLocal: null
origin: SOURCE_MEMBER_GENERATED
analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase3.kt
Vendored
+20
View File
@@ -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/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase3.txt
Vendored
+51
View File
@@ -0,0 +1,51 @@
KtFunctionSymbol:
callableIdIfNonLocal: test/InterfaceWithFun.noGenerics_InterfaceWithFun
name: noGenerics_InterfaceWithFun
origin: SOURCE
getDispatchReceiver(): test/InterfaceWithFun<T>
KtFunctionSymbol:
callableIdIfNonLocal: test/ClassWithInterfaceWithFun.withOuterGeneric_InterfaceWithFun
name: withOuterGeneric_InterfaceWithFun
origin: SOURCE
getDispatchReceiver(): test/ClassWithInterfaceWithFun
KtFunctionSymbol:
callableIdIfNonLocal: test/InterfaceWithFunBase.noGenerics_InterfaceWithFunBase
name: noGenerics_InterfaceWithFunBase
origin: SOURCE
getDispatchReceiver(): test/InterfaceWithFunBase<T1, T2>
KtFunctionSymbol:
callableIdIfNonLocal: test/InterfaceWithFun.withOuterGenericT1_InterfaceWithFunBase
name: withOuterGenericT1_InterfaceWithFunBase
origin: SOURCE
getDispatchReceiver(): test/InterfaceWithFun<T>
KtFunctionSymbol:
callableIdIfNonLocal: test/ClassWithInterfaceWithFun.withOuterGenericT2_InterfaceWithFunBase
name: withOuterGenericT2_InterfaceWithFunBase
origin: SOURCE
getDispatchReceiver(): test/ClassWithInterfaceWithFun
KtFunctionSymbol:
callableIdIfNonLocal: kotlin/Any.equals
name: equals
origin: LIBRARY
getDispatchReceiver(): kotlin/Any
KtFunctionSymbol:
callableIdIfNonLocal: kotlin/Any.hashCode
name: hashCode
origin: LIBRARY
getDispatchReceiver(): kotlin/Any
KtFunctionSymbol:
callableIdIfNonLocal: kotlin/Any.toString
name: toString
origin: LIBRARY
getDispatchReceiver(): kotlin/Any
KtConstructorSymbol:
callableIdIfNonLocal: null
origin: SOURCE_MEMBER_GENERATED
analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase4.kt
Vendored
+31
View File
@@ -0,0 +1,31 @@
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/scopes/substitutionOverridesUnwrapping/ClassWithGenericBase4.txt
Vendored
+81
View File
@@ -0,0 +1,81 @@
KtKotlinPropertySymbol:
callableIdIfNonLocal: test/InterfaceWithVal.noGenerics_InterfaceWithVal
name: noGenerics_InterfaceWithVal
origin: SOURCE
getDispatchReceiver(): test/InterfaceWithVal<T>
KtKotlinPropertySymbol:
callableIdIfNonLocal: test/ClassWithInterfaceWithVal.withOuterGeneric_InterfaceWithVal
name: withOuterGeneric_InterfaceWithVal
origin: SOURCE
getDispatchReceiver(): test/ClassWithInterfaceWithVal
KtKotlinPropertySymbol:
callableIdIfNonLocal: test/InterfaceWithVal.withOwnGeneric_InterfaceWithVal
name: withOwnGeneric_InterfaceWithVal
origin: SOURCE
getDispatchReceiver(): test/InterfaceWithVal<T>
KtKotlinPropertySymbol:
callableIdIfNonLocal: test/ClassWithInterfaceWithVal.withOwnAndOuterGeneric_InterfaceWithVal
name: withOwnAndOuterGeneric_InterfaceWithVal
origin: SOURCE
getDispatchReceiver(): test/ClassWithInterfaceWithVal
KtKotlinPropertySymbol:
callableIdIfNonLocal: test/InterfaceWithValBase.noGenerics_InterfaceWithValBase
name: noGenerics_InterfaceWithValBase
origin: SOURCE
getDispatchReceiver(): test/InterfaceWithValBase<T1, T2>
KtKotlinPropertySymbol:
callableIdIfNonLocal: test/InterfaceWithVal.withOuterGenericT1_InterfaceWithValBase
name: withOuterGenericT1_InterfaceWithValBase
origin: SOURCE
getDispatchReceiver(): test/InterfaceWithVal<T>
KtKotlinPropertySymbol:
callableIdIfNonLocal: test/ClassWithInterfaceWithVal.withOuterGenericT2_InterfaceWithValBase
name: withOuterGenericT2_InterfaceWithValBase
origin: SOURCE
getDispatchReceiver(): test/ClassWithInterfaceWithVal
KtKotlinPropertySymbol:
callableIdIfNonLocal: test/InterfaceWithValBase.withOwnGeneric_InterfaceWithValBase
name: withOwnGeneric_InterfaceWithValBase
origin: SOURCE
getDispatchReceiver(): test/InterfaceWithValBase<T1, T2>
KtKotlinPropertySymbol:
callableIdIfNonLocal: test/InterfaceWithVal.withOwnAndOuterGenericT1_InterfaceWithValBase
name: withOwnAndOuterGenericT1_InterfaceWithValBase
origin: SOURCE
getDispatchReceiver(): test/InterfaceWithVal<T>
KtKotlinPropertySymbol:
callableIdIfNonLocal: test/ClassWithInterfaceWithVal.withOwnAndOuterGenericT2_InterfaceWithValBase
name: withOwnAndOuterGenericT2_InterfaceWithValBase
origin: SOURCE
getDispatchReceiver(): test/ClassWithInterfaceWithVal
KtFunctionSymbol:
callableIdIfNonLocal: kotlin/Any.equals
name: equals
origin: LIBRARY
getDispatchReceiver(): kotlin/Any
KtFunctionSymbol:
callableIdIfNonLocal: kotlin/Any.hashCode
name: hashCode
origin: LIBRARY
getDispatchReceiver(): kotlin/Any
KtFunctionSymbol:
callableIdIfNonLocal: kotlin/Any.toString
name: toString
origin: LIBRARY
getDispatchReceiver(): kotlin/Any
KtConstructorSymbol:
callableIdIfNonLocal: null
origin: SOURCE_MEMBER_GENERATED
analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass1.kt
Vendored
+14
View File
@@ -0,0 +1,14 @@
// DO_NOT_CHECK_SYMBOL_RESTORE
package test
class SomeClass
fun <Outer> topLevel() {
open class Base {
fun withOuter(): Outer? = null
}
class <caret>Child : Base() {
fun noGenerics() {}
}
}
analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass1.txt
Vendored
+33
View File
@@ -0,0 +1,33 @@
KtFunctionSymbol:
callableIdIfNonLocal: null
name: noGenerics
origin: SOURCE
getDispatchReceiver(): test/Child<Outer>
KtFunctionSymbol:
callableIdIfNonLocal: null
name: withOuter
origin: SOURCE
getDispatchReceiver(): test/Base<Outer>
KtFunctionSymbol:
callableIdIfNonLocal: kotlin/Any.equals
name: equals
origin: LIBRARY
getDispatchReceiver(): kotlin/Any
KtFunctionSymbol:
callableIdIfNonLocal: kotlin/Any.hashCode
name: hashCode
origin: LIBRARY
getDispatchReceiver(): kotlin/Any
KtFunctionSymbol:
callableIdIfNonLocal: kotlin/Any.toString
name: toString
origin: LIBRARY
getDispatchReceiver(): kotlin/Any
KtConstructorSymbol:
callableIdIfNonLocal: null
origin: SOURCE_MEMBER_GENERATED
analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass2.kt
Vendored
+15
View File
@@ -0,0 +1,15 @@
// DO_NOT_CHECK_SYMBOL_RESTORE
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/scopes/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass2.txt
Vendored
+39
View File
@@ -0,0 +1,39 @@
KtFunctionSymbol:
callableIdIfNonLocal: null
name: noGenerics
origin: SOURCE
getDispatchReceiver(): test/Child<Outer>
KtFunctionSymbol:
callableIdIfNonLocal: null
name: withOuter
origin: SOURCE
getDispatchReceiver(): test/Base<T, Outer>
KtFunctionSymbol:
callableIdIfNonLocal: null
name: withOuterAndOwn
origin: SOURCE
getDispatchReceiver(): test/Child<Outer>
KtFunctionSymbol:
callableIdIfNonLocal: kotlin/Any.equals
name: equals
origin: LIBRARY
getDispatchReceiver(): kotlin/Any
KtFunctionSymbol:
callableIdIfNonLocal: kotlin/Any.hashCode
name: hashCode
origin: LIBRARY
getDispatchReceiver(): kotlin/Any
KtFunctionSymbol:
callableIdIfNonLocal: kotlin/Any.toString
name: toString
origin: LIBRARY
getDispatchReceiver(): kotlin/Any
KtConstructorSymbol:
callableIdIfNonLocal: null
origin: SOURCE_MEMBER_GENERATED
analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass1.kt
Vendored
+12
View File
@@ -0,0 +1,12 @@
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/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass1.txt
Vendored
+34
View File
@@ -0,0 +1,34 @@
KtFunctionSymbol:
callableIdIfNonLocal: test/TopLevel.Base.noGeneric
name: noGeneric
origin: SOURCE
getDispatchReceiver(): test/TopLevel.Base<Outer>
KtFunctionSymbol:
callableIdIfNonLocal: test/TopLevel.Base.withOuter
name: withOuter
origin: SOURCE
getDispatchReceiver(): test/TopLevel.Base<Outer>
KtFunctionSymbol:
callableIdIfNonLocal: kotlin/Any.equals
name: equals
origin: LIBRARY
getDispatchReceiver(): kotlin/Any
KtFunctionSymbol:
callableIdIfNonLocal: kotlin/Any.hashCode
name: hashCode
origin: LIBRARY
getDispatchReceiver(): kotlin/Any
KtFunctionSymbol:
callableIdIfNonLocal: kotlin/Any.toString
name: toString
origin: LIBRARY
getDispatchReceiver(): kotlin/Any
KtConstructorSymbol:
callableIdIfNonLocal: null
origin: SOURCE_MEMBER_GENERATED
getDispatchReceiver(): test/TopLevel<Outer>
analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass2.kt
Vendored
+13
View File
@@ -0,0 +1,13 @@
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/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass2.txt
Vendored
+40
View File
@@ -0,0 +1,40 @@
KtFunctionSymbol:
callableIdIfNonLocal: test/TopLevel.Base.noGeneric
name: noGeneric
origin: SOURCE
getDispatchReceiver(): test/TopLevel.Base<T, Outer>
KtFunctionSymbol:
callableIdIfNonLocal: test/TopLevel.Base.withOuter
name: withOuter
origin: SOURCE
getDispatchReceiver(): test/TopLevel.Base<T, Outer>
KtFunctionSymbol:
callableIdIfNonLocal: test/TopLevel.Child.withOwnAndOuter
name: withOwnAndOuter
origin: SOURCE
getDispatchReceiver(): test/TopLevel.Child<Outer>
KtFunctionSymbol:
callableIdIfNonLocal: kotlin/Any.equals
name: equals
origin: LIBRARY
getDispatchReceiver(): kotlin/Any
KtFunctionSymbol:
callableIdIfNonLocal: kotlin/Any.hashCode
name: hashCode
origin: LIBRARY
getDispatchReceiver(): kotlin/Any
KtFunctionSymbol:
callableIdIfNonLocal: kotlin/Any.toString
name: toString
origin: LIBRARY
getDispatchReceiver(): kotlin/Any
KtConstructorSymbol:
callableIdIfNonLocal: null
origin: SOURCE_MEMBER_GENERATED
getDispatchReceiver(): test/TopLevel<Outer>
analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor1.kt
Vendored
+14
View File
@@ -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/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor1.txt
Vendored
+34
View File
@@ -0,0 +1,34 @@
KtFunctionSymbol:
callableIdIfNonLocal: test/TopLevel.Base.noGeneric
name: noGeneric
origin: SOURCE
getDispatchReceiver(): test/TopLevel.Base<Outer>
KtFunctionSymbol:
callableIdIfNonLocal: test/OtherTopLevel.Child.withOuter
name: withOuter
origin: SOURCE
getDispatchReceiver(): test/OtherTopLevel.Child
KtFunctionSymbol:
callableIdIfNonLocal: kotlin/Any.equals
name: equals
origin: LIBRARY
getDispatchReceiver(): kotlin/Any
KtFunctionSymbol:
callableIdIfNonLocal: kotlin/Any.hashCode
name: hashCode
origin: LIBRARY
getDispatchReceiver(): kotlin/Any
KtFunctionSymbol:
callableIdIfNonLocal: kotlin/Any.toString
name: toString
origin: LIBRARY
getDispatchReceiver(): kotlin/Any
KtConstructorSymbol:
callableIdIfNonLocal: null
origin: SOURCE_MEMBER_GENERATED
getDispatchReceiver(): test/OtherTopLevel
analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor2.kt
Vendored
+14
View File
@@ -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/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor2.txt
Vendored
+34
View File
@@ -0,0 +1,34 @@
KtFunctionSymbol:
callableIdIfNonLocal: test/TopLevel.Base.noGeneric
name: noGeneric
origin: SOURCE
getDispatchReceiver(): test/TopLevel.Base<Outer>
KtFunctionSymbol:
callableIdIfNonLocal: test/OtherTopLevel.Child.withOuter
name: withOuter
origin: SOURCE
getDispatchReceiver(): test/OtherTopLevel.Child<T>
KtFunctionSymbol:
callableIdIfNonLocal: kotlin/Any.equals
name: equals
origin: LIBRARY
getDispatchReceiver(): kotlin/Any
KtFunctionSymbol:
callableIdIfNonLocal: kotlin/Any.hashCode
name: hashCode
origin: LIBRARY
getDispatchReceiver(): kotlin/Any
KtFunctionSymbol:
callableIdIfNonLocal: kotlin/Any.toString
name: toString
origin: LIBRARY
getDispatchReceiver(): kotlin/Any
KtConstructorSymbol:
callableIdIfNonLocal: null
origin: SOURCE_MEMBER_GENERATED
getDispatchReceiver(): test/OtherTopLevel<T>
analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor3.kt
Vendored
+15
View File
@@ -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/scopes/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor3.txt
Vendored
+40
View File
@@ -0,0 +1,40 @@
KtFunctionSymbol:
callableIdIfNonLocal: test/TopLevel.Base.noGeneric
name: noGeneric
origin: SOURCE
getDispatchReceiver(): test/TopLevel.Base<T, Outer>
KtFunctionSymbol:
callableIdIfNonLocal: test/OtherTopLevel.Child.withOuter
name: withOuter
origin: SOURCE
getDispatchReceiver(): test/OtherTopLevel.Child
KtFunctionSymbol:
callableIdIfNonLocal: test/OtherTopLevel.Child.withOwnAndOuter
name: withOwnAndOuter
origin: SOURCE
getDispatchReceiver(): test/OtherTopLevel.Child
KtFunctionSymbol:
callableIdIfNonLocal: kotlin/Any.equals
name: equals
origin: LIBRARY
getDispatchReceiver(): kotlin/Any
KtFunctionSymbol:
callableIdIfNonLocal: kotlin/Any.hashCode
name: hashCode
origin: LIBRARY
getDispatchReceiver(): kotlin/Any
KtFunctionSymbol:
callableIdIfNonLocal: kotlin/Any.toString
name: toString
origin: LIBRARY
getDispatchReceiver(): kotlin/Any
KtConstructorSymbol:
callableIdIfNonLocal: null
origin: SOURCE_MEMBER_GENERATED
getDispatchReceiver(): test/OtherTopLevel
analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/Implement_java_util_Collection.kt
Vendored
+5
View File
@@ -0,0 +1,5 @@
package test
class SomeClass
abstract class <caret>MyList : java.util.Collection<SomeClass>
analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/Implement_java_util_Collection.txt
Vendored
+99
View File
@@ -0,0 +1,99 @@
KtFunctionSymbol:
callableIdIfNonLocal: java/util/Collection.size
name: size
origin: JAVA
getDispatchReceiver(): java/util/Collection<E>
KtFunctionSymbol:
callableIdIfNonLocal: java/util/Collection.isEmpty
name: isEmpty
origin: JAVA
getDispatchReceiver(): java/util/Collection<E>
KtFunctionSymbol:
callableIdIfNonLocal: java/util/Collection.contains
name: contains
origin: JAVA
getDispatchReceiver(): java/util/Collection<E>
KtFunctionSymbol:
callableIdIfNonLocal: test/MyList.iterator
name: iterator
origin: JAVA
getDispatchReceiver(): test/MyList
KtFunctionSymbol:
callableIdIfNonLocal: java/util/Collection.toArray
name: toArray
origin: JAVA
getDispatchReceiver(): java/util/Collection<E>
KtFunctionSymbol:
callableIdIfNonLocal: java/util/Collection.toArray
name: toArray
origin: JAVA
getDispatchReceiver(): java/util/Collection<E>
KtFunctionSymbol:
callableIdIfNonLocal: test/MyList.add
name: add
origin: JAVA
getDispatchReceiver(): test/MyList
KtFunctionSymbol:
callableIdIfNonLocal: java/util/Collection.remove
name: remove
origin: JAVA
getDispatchReceiver(): java/util/Collection<E>
KtFunctionSymbol:
callableIdIfNonLocal: java/util/Collection.containsAll
name: containsAll
origin: JAVA
getDispatchReceiver(): java/util/Collection<E>
KtFunctionSymbol:
callableIdIfNonLocal: test/MyList.addAll
name: addAll
origin: JAVA
getDispatchReceiver(): test/MyList
KtFunctionSymbol:
callableIdIfNonLocal: java/util/Collection.removeAll
name: removeAll
origin: JAVA
getDispatchReceiver(): java/util/Collection<E>
KtFunctionSymbol:
callableIdIfNonLocal: java/util/Collection.retainAll
name: retainAll
origin: JAVA
getDispatchReceiver(): java/util/Collection<E>
KtFunctionSymbol:
callableIdIfNonLocal: java/util/Collection.clear
name: clear
origin: JAVA
getDispatchReceiver(): java/util/Collection<E>
KtFunctionSymbol:
callableIdIfNonLocal: kotlin/Any.equals
name: equals
origin: LIBRARY
getDispatchReceiver(): kotlin/Any
KtFunctionSymbol:
callableIdIfNonLocal: kotlin/Any.hashCode
name: hashCode
origin: LIBRARY
getDispatchReceiver(): kotlin/Any
KtFunctionSymbol:
callableIdIfNonLocal: kotlin/Any.toString
name: toString
origin: LIBRARY
getDispatchReceiver(): kotlin/Any
KtConstructorSymbol:
callableIdIfNonLocal: null
origin: SOURCE_MEMBER_GENERATED
analysis/analysis-api/testData/scopes/memberScopeByFqName/overridenFunctionWithGenericBound.kt → analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/MemberFunctionWithOuterTypeParameterBound.kt
Vendored
+1 -5
View File
@@ -1,7 +1,5 @@
// DO_NOT_CHECK_SYMBOL_RESTORE
package test
interface OtherInterface
interface TwoParams<T, TT>
@@ -14,6 +12,4 @@ interface MyInterface<T> {
class Foo
abstract class MyClass : MyInterface<Foo>
// class: test/MyClass
abstract class <caret>MyClass : MyInterface<Foo>
analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/MemberFunctionWithOuterTypeParameterBound.txt
Vendored
+33
View File
@@ -0,0 +1,33 @@
KtFunctionSymbol:
callableIdIfNonLocal: test/MyClass.funWithOuterAndOwnGenericsAndBounds
name: funWithOuterAndOwnGenericsAndBounds
origin: SOURCE
getDispatchReceiver(): test/MyClass
KtKotlinPropertySymbol:
callableIdIfNonLocal: test/MyClass.propWithOuterAndOwnGenericsAndBounds
name: propWithOuterAndOwnGenericsAndBounds
origin: SOURCE
getDispatchReceiver(): test/MyClass
KtFunctionSymbol:
callableIdIfNonLocal: kotlin/Any.equals
name: equals
origin: LIBRARY
getDispatchReceiver(): kotlin/Any
KtFunctionSymbol:
callableIdIfNonLocal: kotlin/Any.hashCode
name: hashCode
origin: LIBRARY
getDispatchReceiver(): kotlin/Any
KtFunctionSymbol:
callableIdIfNonLocal: kotlin/Any.toString
name: toString
origin: LIBRARY
getDispatchReceiver(): kotlin/Any
KtConstructorSymbol:
callableIdIfNonLocal: null
origin: SOURCE_MEMBER_GENERATED
analysis/analysis-api/testData/scopes/substitutionOverridesUnwrapping/MemberPropertyWithOuterTypeParameterBound.kt
Vendored
+11
View File
@@ -0,0 +1,11 @@
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/scopes/substitutionOverridesUnwrapping/MemberPropertyWithOuterTypeParameterBound.txt
Vendored
+33
View File
@@ -0,0 +1,33 @@
KtKotlinPropertySymbol:
callableIdIfNonLocal: test/MyInterface.withOwnGeneric_InterfaceWithValBase
name: withOwnGeneric_InterfaceWithValBase
origin: SOURCE
getDispatchReceiver(): test/MyInterface<T>
KtKotlinPropertySymbol:
callableIdIfNonLocal: test/Inheritor.withOwnAndOuterGenericAsTypeBound_InterfaceWithValBase
name: withOwnAndOuterGenericAsTypeBound_InterfaceWithValBase
origin: SOURCE
getDispatchReceiver(): test/Inheritor
KtFunctionSymbol:
callableIdIfNonLocal: kotlin/Any.equals
name: equals
origin: LIBRARY
getDispatchReceiver(): kotlin/Any
KtFunctionSymbol:
callableIdIfNonLocal: kotlin/Any.hashCode
name: hashCode
origin: LIBRARY
getDispatchReceiver(): kotlin/Any
KtFunctionSymbol:
callableIdIfNonLocal: kotlin/Any.toString
name: toString
origin: LIBRARY
getDispatchReceiver(): kotlin/Any
KtConstructorSymbol:
callableIdIfNonLocal: null
origin: SOURCE_MEMBER_GENERATED