[JVM_IR] Remove line numbers from delegated member functions.

This fixes smart step into for delegated member functions.
Additionally, we align on the string "memberFunctionName(...)"
for expression non-null checks for both JVM_IR and JVM
backends.
This commit is contained in:
Mads Ager
2020-09-17 14:14:48 +02:00
committed by Alexander Udalov
parent eea4ff33a0
commit 05c662ec55
8 changed files with 20 additions and 13 deletions
@@ -7,4 +7,4 @@ interface D {
val x: Int
}
class C(d: D) : D by <!ACCIDENTAL_OVERRIDE!>d<!>, B
class <!ACCIDENTAL_OVERRIDE!>C(d: D)<!> : D by d, B
@@ -9,7 +9,7 @@ interface Bar<T> {
fun foo(l: List<T>)
}
class Baz(f: Foo<String>, b: Bar<Int>) :
Foo<String> by <!CONFLICTING_JVM_DECLARATIONS!>f<!>,
Bar<Int> by <!CONFLICTING_JVM_DECLARATIONS!>b<!> {
class <!CONFLICTING_JVM_DECLARATIONS!>Baz(f: Foo<String>, b: Bar<Int>)<!> :
Foo<String> by f,
Bar<Int> by b {
}
@@ -5,6 +5,6 @@ interface Foo<T> {
fun foo(l: List<T>)
}
class Bar(f: Foo<String>): Foo<String> by <!CONFLICTING_JVM_DECLARATIONS!>f<!> {
class <!CONFLICTING_JVM_DECLARATIONS!>Bar(f: Foo<String>)<!>: Foo<String> by f {
<!CONFLICTING_JVM_DECLARATIONS!>fun foo(l: List<Int>)<!> {}
}
@@ -7,7 +7,7 @@ interface Foo<T> {
}
}
class Bar(f: Foo<String>): Foo<String> by <!CONFLICTING_JVM_DECLARATIONS!>f<!> {
class <!CONFLICTING_JVM_DECLARATIONS!>Bar(f: Foo<String>)<!>: Foo<String> by f {
<!CONFLICTING_JVM_DECLARATIONS!>fun foo(l: List<Int>)<!> {}
}
@@ -9,6 +9,6 @@ interface B {
fun foo(l: List<Int>) {}
}
class C(f: A<String>): A<String> by <!ACCIDENTAL_OVERRIDE!>f<!>, B
class <!ACCIDENTAL_OVERRIDE!>C(f: A<String>)<!>: A<String> by f, B
<!DELEGATED_MEMBER_HIDES_SUPERTYPE_OVERRIDE!>class D<!>(f: A<Int>): A<Int> by f, B