FE: add & fix test with intersection property shadowed by base field
This commit is contained in:
committed by
teamcity
parent
949a39b80f
commit
7904f23660
Vendored
+23
@@ -0,0 +1,23 @@
|
||||
// WITH_STDLIB
|
||||
// FIR_DUMP
|
||||
// FILE: Base.java
|
||||
|
||||
public class Base {
|
||||
public String x = "";
|
||||
}
|
||||
|
||||
// FILE: test.kt
|
||||
|
||||
interface Proxy {
|
||||
val x: String
|
||||
}
|
||||
|
||||
open class Intermediate : Base() {
|
||||
val x get() = " "
|
||||
}
|
||||
|
||||
class Derived : Proxy, Intermediate() {
|
||||
fun test() {
|
||||
x
|
||||
}
|
||||
}
|
||||
Vendored
+27
@@ -0,0 +1,27 @@
|
||||
FILE: test.kt
|
||||
public abstract interface Proxy : R|kotlin/Any| {
|
||||
public abstract val x: R|kotlin/String|
|
||||
public get(): R|kotlin/String|
|
||||
|
||||
}
|
||||
public open class Intermediate : R|Base| {
|
||||
public constructor(): R|Intermediate| {
|
||||
super<R|Base|>()
|
||||
}
|
||||
|
||||
public final val x: R|kotlin/String|
|
||||
public get(): R|kotlin/String| {
|
||||
^ String( )
|
||||
}
|
||||
|
||||
}
|
||||
public final class Derived : R|Proxy|, R|Intermediate| {
|
||||
public constructor(): R|Derived| {
|
||||
super<R|Intermediate|>()
|
||||
}
|
||||
|
||||
public final fun test(): R|kotlin/Unit| {
|
||||
this@R|/Derived|.R|/Proxy.x|
|
||||
}
|
||||
|
||||
}
|
||||
+23
@@ -0,0 +1,23 @@
|
||||
// WITH_STDLIB
|
||||
// FIR_DUMP
|
||||
// FILE: Base.java
|
||||
|
||||
public class Base {
|
||||
public String x = "";
|
||||
}
|
||||
|
||||
// FILE: test.kt
|
||||
|
||||
interface Proxy {
|
||||
val x: String
|
||||
}
|
||||
|
||||
open class Intermediate : Base() {
|
||||
val x get() = " "
|
||||
}
|
||||
|
||||
class Derived : Proxy, Intermediate() {
|
||||
fun test() {
|
||||
<!BASE_CLASS_FIELD_SHADOWS_DERIVED_CLASS_PROPERTY!>x<!>
|
||||
}
|
||||
}
|
||||
+36
@@ -0,0 +1,36 @@
|
||||
package
|
||||
|
||||
public open class Base {
|
||||
public constructor Base()
|
||||
public final var x: kotlin.String!
|
||||
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
|
||||
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
|
||||
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
|
||||
}
|
||||
|
||||
public final class Derived : Proxy, Intermediate {
|
||||
public constructor Derived()
|
||||
public final override /*2*/ /*fake_override*/ val x: kotlin.String
|
||||
public final override /*1*/ /*fake_override*/ var x: kotlin.String!
|
||||
public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
|
||||
public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
|
||||
public final fun test(): kotlin.Unit
|
||||
public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
|
||||
}
|
||||
|
||||
public open class Intermediate : Base {
|
||||
public constructor Intermediate()
|
||||
public final val x: kotlin.String
|
||||
public final override /*1*/ /*fake_override*/ var x: kotlin.String!
|
||||
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
|
||||
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
|
||||
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
|
||||
}
|
||||
|
||||
public interface Proxy {
|
||||
public abstract val x: kotlin.String
|
||||
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
|
||||
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
|
||||
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user