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

[FIR] Set status.isOverride for fake overrides

Browse Source 
Even though SO may not be correct
overrides sometimes, it feels more
natural to treat fake overrides as...
well, "overrides". And without it
we'd need to make the code in
`FirOverrideChecker` less intuitive.
This commit is contained in:
Nikolay Lunyak
2023-11-29 16:08:26 +02:00
committed by Space Team
parent afd8895e51
commit 7056ad5325
252 changed files with 1025 additions and 1015 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase1.pretty.txt
Vendored
+2 -2
View File
@@ -1,10 +1,10 @@
fun noGeneric()
fun withOuterGeneric(t: test.Foo)
override fun withOuterGeneric(t: test.Foo)
fun <TT> withOwnGeneric(tt: TT)
fun <TT> withOuterAndOwnGeneric(t: test.Foo, tt: TT)
override fun <TT> withOuterAndOwnGeneric(t: test.Foo, tt: TT)
open operator fun equals(other: kotlin.Any?): kotlin.Boolean
analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase2.pretty.txt
Vendored
+2 -2
View File
@@ -1,11 +1,11 @@
val noGeneric: test.Foo?
val withOuterGeneric: test.Foo?
override val withOuterGeneric: test.Foo?
val <TT> TT.withOwnGeneric: TT?
get()
val <TT> TT.withOuterAndOwnGeneric: test.Foo?
override val <TT> TT.withOuterAndOwnGeneric: test.Foo?
open operator fun equals(other: kotlin.Any?): kotlin.Boolean
analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase3.pretty.txt
Vendored
+3 -3
View File
@@ -1,12 +1,12 @@
fun noGenerics_InterfaceWithFun()
open fun withOuterGeneric_InterfaceWithFun(): test.SomeClass2
override fun withOuterGeneric_InterfaceWithFun(): test.SomeClass2
fun noGenerics_InterfaceWithFunBase()
fun withOuterGenericT1_InterfaceWithFunBase(): test.SomeClass1
override fun withOuterGenericT1_InterfaceWithFunBase(): test.SomeClass1
open fun withOuterGenericT2_InterfaceWithFunBase(): test.SomeClass2
override fun withOuterGenericT2_InterfaceWithFunBase(): test.SomeClass2
open operator fun equals(other: kotlin.Any?): kotlin.Boolean
analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/ClassWithGenericBase4.pretty.txt
Vendored
+6 -6
View File
@@ -1,22 +1,22 @@
val noGenerics_InterfaceWithVal: test.SomeClass1
abstract val withOuterGeneric_InterfaceWithVal: test.SomeClass2
override val withOuterGeneric_InterfaceWithVal: test.SomeClass2
val <Own> Own.withOwnGeneric_InterfaceWithVal: test.SomeClass1
abstract val <Own> Own.withOwnAndOuterGeneric_InterfaceWithVal: test.SomeClass2
override val <Own> Own.withOwnAndOuterGeneric_InterfaceWithVal: test.SomeClass2
val noGenerics_InterfaceWithValBase: test.SomeClass1
val withOuterGenericT1_InterfaceWithValBase: test.SomeClass1
override val withOuterGenericT1_InterfaceWithValBase: test.SomeClass1
abstract val withOuterGenericT2_InterfaceWithValBase: test.SomeClass2
override val withOuterGenericT2_InterfaceWithValBase: test.SomeClass2
val <Own> Own.withOwnGeneric_InterfaceWithValBase: test.SomeClass1
val <Own> Own.withOwnAndOuterGenericT1_InterfaceWithValBase: test.SomeClass1
override val <Own> Own.withOwnAndOuterGenericT1_InterfaceWithValBase: test.SomeClass1
abstract val <Own> Own.withOwnAndOuterGenericT2_InterfaceWithValBase: test.SomeClass2
override val <Own> Own.withOwnAndOuterGenericT2_InterfaceWithValBase: test.SomeClass2
open operator fun equals(other: kotlin.Any?): kotlin.Boolean
analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromFunctionInLocalClass2.pretty.txt
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@ fun noGenerics()
fun withOuter(): Outer?
fun withOuterAndOwn(t: test.SomeClass): Outer?
override fun withOuterAndOwn(t: test.SomeClass): Outer?
open operator fun equals(other: kotlin.Any?): kotlin.Boolean
analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClass2.pretty.txt
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@ fun noGeneric()
fun withOuter(): Outer?
fun withOwnAndOuter(t: test.SomeClass): Outer?
override fun withOwnAndOuter(t: test.SomeClass): Outer?
open operator fun equals(other: kotlin.Any?): kotlin.Boolean
analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor1.pretty.txt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
fun noGeneric()
fun withOuter(): test.SomeClass?
override fun withOuter(): test.SomeClass?
open operator fun equals(other: kotlin.Any?): kotlin.Boolean
analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor2.pretty.txt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
fun noGeneric()
fun withOuter(): T?
override fun withOuter(): T?
open operator fun equals(other: kotlin.Any?): kotlin.Boolean
analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/GenericFromOuterClassInInnerClassInInheritor3.pretty.txt
Vendored
+2 -2
View File
@@ -1,8 +1,8 @@
fun noGeneric()
fun withOuter(): test.SomeClass?
override fun withOuter(): test.SomeClass?
fun withOwnAndOuter(t: test.SomeClass): test.SomeClass?
override fun withOwnAndOuter(t: test.SomeClass): test.SomeClass?
open operator fun equals(other: kotlin.Any?): kotlin.Boolean
analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/Implement_java_util_Collection.pretty.txt
Vendored
+3 -3
View File
@@ -4,19 +4,19 @@ fun isEmpty(): kotlin.Boolean
operator fun contains(p0: kotlin.Any!): kotlin.Boolean
abstract operator fun iterator(): kotlin.collections.MutableIterator<test.SomeClass!>
override operator fun iterator(): kotlin.collections.MutableIterator<test.SomeClass!>
fun toArray(): kotlin.Array<kotlin.Any!>!
fun <T : kotlin.Any!> toArray(p0: kotlin.Array<(T & kotlin.Any..T?)>!): kotlin.Array<(T & kotlin.Any..T?)>!
abstract fun add(p0: test.SomeClass!): kotlin.Boolean
override fun add(p0: test.SomeClass!): kotlin.Boolean
fun remove(p0: kotlin.Any!): kotlin.Boolean
fun containsAll(p0: kotlin.collections.(Mutable)Collection<*>!): kotlin.Boolean
abstract fun addAll(p0: kotlin.collections.(Mutable)Collection<out test.SomeClass!>!): kotlin.Boolean
override fun addAll(p0: kotlin.collections.(Mutable)Collection<out test.SomeClass!>!): kotlin.Boolean
fun removeAll(p0: kotlin.collections.(Mutable)Collection<*>!): kotlin.Boolean
analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/MemberFunctionWithOuterTypeParameterBound.pretty.txt
Vendored
+2 -2
View File
@@ -1,6 +1,6 @@
abstract fun <TT1 : test.Foo, TT2 : test.OtherInterface> funWithOuterAndOwnGenericsAndBounds(tT1: TT1?, tT2: TT2?)
override 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?
override val <TT1 : test.Foo, TT2 : test.OtherInterface> test.TwoParams<TT1, TT2>.propWithOuterAndOwnGenericsAndBounds: test.Foo?
open operator fun equals(other: kotlin.Any?): kotlin.Boolean
analysis/analysis-api/testData/components/scopeProvider/substitutionOverridesUnwrapping/MemberPropertyWithOuterTypeParameterBound.pretty.txt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
val <Own : test.ClassA> Own.withOwnGeneric_InterfaceWithValBase: test.ClassA
abstract val <Own : test.ClassB> Own.withOwnAndOuterGenericAsTypeBound_InterfaceWithValBase: test.ClassA
override val <Own : test.ClassB> Own.withOwnAndOuterGenericAsTypeBound_InterfaceWithValBase: test.ClassA
open operator fun equals(other: kotlin.Any?): kotlin.Boolean