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

Fix misspelling in test data

Browse Source
This commit is contained in:
Mikhael Bogdanov
2018-04-09 10:06:06 +02:00
parent d788b3b6f9
commit 31e459d9c0
10 changed files with 97 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/j+k/defaultMethods.kt
Vendored
+12 -12
View File
@@ -46,14 +46,14 @@ interface KotlinInterface : JavaInterface {
} }
} }
interface KotlinInterfaceInderectInheritance : KotlinInterface { interface KotlinInterfaceIndirectInheritance : KotlinInterface {
fun foooo() { fun foooo() {
<!INTERFACE_STATIC_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>testStatic<!>() <!INTERFACE_STATIC_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>testStatic<!>()
super.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>test<!>() super.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>test<!>()
object { object {
fun run () { fun run () {
super@KotlinInterfaceInderectInheritance.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>test<!>() super@KotlinInterfaceIndirectInheritance.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>test<!>()
} }
} }
} }
@@ -64,7 +64,7 @@ interface KotlinInterfaceInderectInheritance : KotlinInterface {
object { object {
fun run () { fun run () {
super@KotlinInterfaceInderectInheritance.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>test<!>() super@KotlinInterfaceIndirectInheritance.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>test<!>()
} }
} }
return "" return ""
@@ -98,7 +98,7 @@ open class KotlinClass : JavaInterface {
} }
} }
class KotlinClassInderectInheritance : KotlinClass() { class KotlinClassIndirectInheritance : KotlinClass() {
fun foo2(){ fun foo2(){
<!INTERFACE_STATIC_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>testStatic<!>() <!INTERFACE_STATIC_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>testStatic<!>()
super.test() super.test()
@@ -106,7 +106,7 @@ class KotlinClassInderectInheritance : KotlinClass() {
object { object {
fun run () { fun run () {
super@KotlinClassInderectInheritance.test() super@KotlinClassIndirectInheritance.test()
} }
} }
} }
@@ -118,14 +118,14 @@ class KotlinClassInderectInheritance : KotlinClass() {
object { object {
fun run () { fun run () {
super@KotlinClassInderectInheritance.test() super@KotlinClassIndirectInheritance.test()
} }
} }
return "" return ""
} }
} }
class KotlinClassInderectInheritance2 : KotlinInterfaceInderectInheritance { class KotlinClassIndirectInheritance2 : KotlinInterfaceIndirectInheritance {
fun foo() { fun foo() {
<!INTERFACE_STATIC_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>testStatic<!>() <!INTERFACE_STATIC_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>testStatic<!>()
super.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>test<!>() super.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>test<!>()
@@ -133,7 +133,7 @@ class KotlinClassInderectInheritance2 : KotlinInterfaceInderectInheritance {
object { object {
fun run () { fun run () {
super@KotlinClassInderectInheritance2.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>test<!>() super@KotlinClassIndirectInheritance2.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>test<!>()
} }
} }
} }
@@ -145,7 +145,7 @@ class KotlinClassInderectInheritance2 : KotlinInterfaceInderectInheritance {
object { object {
fun run () { fun run () {
super@KotlinClassInderectInheritance2.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>test<!>() super@KotlinClassIndirectInheritance2.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>test<!>()
} }
} }
return "" return ""
@@ -156,11 +156,11 @@ fun test() {
JavaInterface.<!INTERFACE_STATIC_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>testStatic<!>() JavaInterface.<!INTERFACE_STATIC_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>testStatic<!>()
KotlinClass().foo() KotlinClass().foo()
KotlinClass().property KotlinClass().property
KotlinClassInderectInheritance2().foo() KotlinClassIndirectInheritance2().foo()
KotlinClassInderectInheritance2().property KotlinClassIndirectInheritance2().property
KotlinClass().test() KotlinClass().test()
KotlinClass().property KotlinClass().property
KotlinClass().testOverride() KotlinClass().testOverride()
KotlinClassInderectInheritance().testOverride() KotlinClassIndirectInheritance().testOverride()
} }
compiler/testData/diagnostics/tests/j+k/defaultMethods.txt
Vendored
+5 -5
View File
@@ -24,8 +24,8 @@ public open class KotlinClass : JavaInterface {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
} }
public final class KotlinClassInderectInheritance : KotlinClass { public final class KotlinClassIndirectInheritance : KotlinClass {
public constructor KotlinClassInderectInheritance() public constructor KotlinClassIndirectInheritance()
public final override /*1*/ /*fake_override*/ val property: kotlin.String public final override /*1*/ /*fake_override*/ val property: kotlin.String
public final val property2: kotlin.String public final val property2: kotlin.String
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -37,8 +37,8 @@ public final class KotlinClassInderectInheritance : KotlinClass {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
} }
public final class KotlinClassInderectInheritance2 : KotlinInterfaceInderectInheritance { public final class KotlinClassIndirectInheritance2 : KotlinInterfaceIndirectInheritance {
public constructor KotlinClassInderectInheritance2() public constructor KotlinClassIndirectInheritance2()
public final val property: kotlin.String public final val property: kotlin.String
public open override /*1*/ /*fake_override*/ val propertyy: kotlin.String public open override /*1*/ /*fake_override*/ val propertyy: kotlin.String
public open override /*1*/ /*fake_override*/ val propertyyy: kotlin.String public open override /*1*/ /*fake_override*/ val propertyyy: kotlin.String
@@ -62,7 +62,7 @@ public interface KotlinInterface : JavaInterface {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
} }
public interface KotlinInterfaceInderectInheritance : KotlinInterface { public interface KotlinInterfaceIndirectInheritance : KotlinInterface {
public open override /*1*/ /*fake_override*/ val propertyy: kotlin.String public open override /*1*/ /*fake_override*/ val propertyy: kotlin.String
public open val propertyyy: kotlin.String public open val propertyyy: kotlin.String
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
compiler/testData/diagnostics/tests/j+k/defaultMethods_warning.kt
Vendored
+12 -12
View File
@@ -48,14 +48,14 @@ interface KotlinInterface : JavaInterface {
} }
} }
interface KotlinInterfaceInderectInheritance : KotlinInterface { interface KotlinInterfaceIndirectInheritance : KotlinInterface {
fun foooo() { fun foooo() {
<!INTERFACE_STATIC_METHOD_CALL_FROM_JAVA6_TARGET!>testStatic<!>() <!INTERFACE_STATIC_METHOD_CALL_FROM_JAVA6_TARGET!>testStatic<!>()
super.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>test<!>() super.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>test<!>()
object { object {
fun run () { fun run () {
super@KotlinInterfaceInderectInheritance.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>test<!>() super@KotlinInterfaceIndirectInheritance.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>test<!>()
} }
} }
} }
@@ -66,7 +66,7 @@ interface KotlinInterfaceInderectInheritance : KotlinInterface {
object { object {
fun run () { fun run () {
super@KotlinInterfaceInderectInheritance.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>test<!>() super@KotlinInterfaceIndirectInheritance.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>test<!>()
} }
} }
return "" return ""
@@ -100,7 +100,7 @@ open class KotlinClass : JavaInterface {
} }
} }
class KotlinClassInderectInheritance : KotlinClass() { class KotlinClassIndirectInheritance : KotlinClass() {
fun foo2(){ fun foo2(){
<!INTERFACE_STATIC_METHOD_CALL_FROM_JAVA6_TARGET!>testStatic<!>() <!INTERFACE_STATIC_METHOD_CALL_FROM_JAVA6_TARGET!>testStatic<!>()
super.test() super.test()
@@ -108,7 +108,7 @@ class KotlinClassInderectInheritance : KotlinClass() {
object { object {
fun run () { fun run () {
super@KotlinClassInderectInheritance.test() super@KotlinClassIndirectInheritance.test()
} }
} }
} }
@@ -120,14 +120,14 @@ class KotlinClassInderectInheritance : KotlinClass() {
object { object {
fun run () { fun run () {
super@KotlinClassInderectInheritance.test() super@KotlinClassIndirectInheritance.test()
} }
} }
return "" return ""
} }
} }
class KotlinClassInderectInheritance2 : KotlinInterfaceInderectInheritance { class KotlinClassIndirectInheritance2 : KotlinInterfaceIndirectInheritance {
fun foo(){ fun foo(){
<!INTERFACE_STATIC_METHOD_CALL_FROM_JAVA6_TARGET!>testStatic<!>() <!INTERFACE_STATIC_METHOD_CALL_FROM_JAVA6_TARGET!>testStatic<!>()
super.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET!>test<!>() super.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET!>test<!>()
@@ -135,7 +135,7 @@ class KotlinClassInderectInheritance2 : KotlinInterfaceInderectInheritance {
object { object {
fun run () { fun run () {
super@KotlinClassInderectInheritance2.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET!>test<!>() super@KotlinClassIndirectInheritance2.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET!>test<!>()
} }
} }
} }
@@ -147,7 +147,7 @@ class KotlinClassInderectInheritance2 : KotlinInterfaceInderectInheritance {
object { object {
fun run () { fun run () {
super@KotlinClassInderectInheritance2.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET!>test<!>() super@KotlinClassIndirectInheritance2.<!DEFAULT_METHOD_CALL_FROM_JAVA6_TARGET!>test<!>()
} }
} }
return "" return ""
@@ -158,11 +158,11 @@ fun test() {
JavaInterface.<!INTERFACE_STATIC_METHOD_CALL_FROM_JAVA6_TARGET!>testStatic<!>() JavaInterface.<!INTERFACE_STATIC_METHOD_CALL_FROM_JAVA6_TARGET!>testStatic<!>()
KotlinClass().foo() KotlinClass().foo()
KotlinClass().property KotlinClass().property
KotlinClassInderectInheritance2().foo() KotlinClassIndirectInheritance2().foo()
KotlinClassInderectInheritance2().property KotlinClassIndirectInheritance2().property
KotlinClass().test() KotlinClass().test()
KotlinClass().property KotlinClass().property
KotlinClass().testOverride() KotlinClass().testOverride()
KotlinClassInderectInheritance().testOverride() KotlinClassIndirectInheritance().testOverride()
} }
compiler/testData/diagnostics/tests/j+k/defaultMethods_warning.txt
Vendored
+5 -5
View File
@@ -24,8 +24,8 @@ public open class KotlinClass : JavaInterface {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
} }
public final class KotlinClassInderectInheritance : KotlinClass { public final class KotlinClassIndirectInheritance : KotlinClass {
public constructor KotlinClassInderectInheritance() public constructor KotlinClassIndirectInheritance()
public final override /*1*/ /*fake_override*/ val property: kotlin.String public final override /*1*/ /*fake_override*/ val property: kotlin.String
public final val property2: kotlin.String public final val property2: kotlin.String
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -37,8 +37,8 @@ public final class KotlinClassInderectInheritance : KotlinClass {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
} }
public final class KotlinClassInderectInheritance2 : KotlinInterfaceInderectInheritance { public final class KotlinClassIndirectInheritance2 : KotlinInterfaceIndirectInheritance {
public constructor KotlinClassInderectInheritance2() public constructor KotlinClassIndirectInheritance2()
public final val property: kotlin.String public final val property: kotlin.String
public open override /*1*/ /*fake_override*/ val propertyy: kotlin.String public open override /*1*/ /*fake_override*/ val propertyy: kotlin.String
public open override /*1*/ /*fake_override*/ val propertyyy: kotlin.String public open override /*1*/ /*fake_override*/ val propertyyy: kotlin.String
@@ -62,7 +62,7 @@ public interface KotlinInterface : JavaInterface {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
} }
public interface KotlinInterfaceInderectInheritance : KotlinInterface { public interface KotlinInterfaceIndirectInheritance : KotlinInterface {
public open override /*1*/ /*fake_override*/ val propertyy: kotlin.String public open override /*1*/ /*fake_override*/ val propertyy: kotlin.String
public open val propertyyy: kotlin.String public open val propertyyy: kotlin.String
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/javaOverride.kt
Vendored
+1 -1
View File
@@ -36,7 +36,7 @@ interface KotlinInterfaceForIndirect : JavaInterface {
} }
interface KotlinInterfaceInderectInheritance : KotlinInterfaceForIndirect { interface KotlinInterfaceIndirectInheritance : KotlinInterfaceForIndirect {
@JvmDefault @JvmDefault
override fun test() {} override fun test() {}
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/javaOverride.txt
Vendored
+1 -1
View File
@@ -33,7 +33,7 @@ public interface KotlinInterfaceForIndirect : JavaInterface {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
} }
public interface KotlinInterfaceInderectInheritance : KotlinInterfaceForIndirect { public interface KotlinInterfaceIndirectInheritance : KotlinInterfaceForIndirect {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean 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 hashCode(): kotlin.Int
@kotlin.jvm.JvmDefault public open override /*1*/ fun test(): kotlin.Unit @kotlin.jvm.JvmDefault public open override /*1*/ fun test(): kotlin.Unit
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaults.kt
Vendored
+39 -39
View File
@@ -105,7 +105,7 @@ interface KotlinInterface : KInterface {
} }
interface KotlinInterfaceInderectInheritance : KotlinInterface { interface KotlinInterfaceIndirectInheritance : KotlinInterface {
@JvmDefault @JvmDefault
fun foooo() { fun foooo() {
super.test() super.test()
@@ -116,11 +116,11 @@ interface KotlinInterfaceInderectInheritance : KotlinInterface {
object { object {
fun run () { fun run () {
super@KotlinInterfaceInderectInheritance.test() super@KotlinInterfaceIndirectInheritance.test()
super@KotlinInterfaceInderectInheritance.property super@KotlinInterfaceIndirectInheritance.property
super@KotlinInterfaceInderectInheritance.testNonDefault() super@KotlinInterfaceIndirectInheritance.testNonDefault()
super@KotlinInterfaceInderectInheritance.propertyNonDefault super@KotlinInterfaceIndirectInheritance.propertyNonDefault
} }
} }
} }
@@ -136,11 +136,11 @@ interface KotlinInterfaceInderectInheritance : KotlinInterface {
object { object {
fun run () { fun run () {
super@KotlinInterfaceInderectInheritance.test() super@KotlinInterfaceIndirectInheritance.test()
super@KotlinInterfaceInderectInheritance.property super@KotlinInterfaceIndirectInheritance.property
super@KotlinInterfaceInderectInheritance.testNonDefault() super@KotlinInterfaceIndirectInheritance.testNonDefault()
super@KotlinInterfaceInderectInheritance.propertyNonDefault super@KotlinInterfaceIndirectInheritance.propertyNonDefault
} }
} }
return "" return ""
@@ -155,11 +155,11 @@ interface KotlinInterfaceInderectInheritance : KotlinInterface {
object { object {
fun run () { fun run () {
super@KotlinInterfaceInderectInheritance.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>test<!>() super@KotlinInterfaceIndirectInheritance.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>test<!>()
super@KotlinInterfaceInderectInheritance.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>property<!> super@KotlinInterfaceIndirectInheritance.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>property<!>
super@KotlinInterfaceInderectInheritance.testNonDefault() super@KotlinInterfaceIndirectInheritance.testNonDefault()
super@KotlinInterfaceInderectInheritance.propertyNonDefault super@KotlinInterfaceIndirectInheritance.propertyNonDefault
} }
} }
} }
@@ -174,11 +174,11 @@ interface KotlinInterfaceInderectInheritance : KotlinInterface {
object { object {
fun run () { fun run () {
super@KotlinInterfaceInderectInheritance.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>test<!>() super@KotlinInterfaceIndirectInheritance.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>test<!>()
super@KotlinInterfaceInderectInheritance.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>property<!> super@KotlinInterfaceIndirectInheritance.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>property<!>
super@KotlinInterfaceInderectInheritance.testNonDefault() super@KotlinInterfaceIndirectInheritance.testNonDefault()
super@KotlinInterfaceInderectInheritance.propertyNonDefault super@KotlinInterfaceIndirectInheritance.propertyNonDefault
} }
} }
return "" return ""
@@ -226,7 +226,7 @@ open class KotlinClass : KInterface {
} }
} }
class KotlinClassInderectInheritance : KotlinClass() { class KotlinClassIndirectInheritance : KotlinClass() {
fun foo2() { fun foo2() {
super.test() super.test()
super.property super.property
@@ -236,11 +236,11 @@ class KotlinClassInderectInheritance : KotlinClass() {
object { object {
fun run () { fun run () {
super@KotlinClassInderectInheritance.test() super@KotlinClassIndirectInheritance.test()
super@KotlinClassInderectInheritance.property super@KotlinClassIndirectInheritance.property
super@KotlinClassInderectInheritance.testNonDefault() super@KotlinClassIndirectInheritance.testNonDefault()
super@KotlinClassInderectInheritance.propertyNonDefault super@KotlinClassIndirectInheritance.propertyNonDefault
} }
} }
@@ -256,18 +256,18 @@ class KotlinClassInderectInheritance : KotlinClass() {
object { object {
fun run () { fun run () {
super@KotlinClassInderectInheritance.test() super@KotlinClassIndirectInheritance.test()
super@KotlinClassInderectInheritance.property super@KotlinClassIndirectInheritance.property
super@KotlinClassInderectInheritance.testNonDefault() super@KotlinClassIndirectInheritance.testNonDefault()
super@KotlinClassInderectInheritance.propertyNonDefault super@KotlinClassIndirectInheritance.propertyNonDefault
} }
} }
return "" return ""
} }
} }
class KotlinClassInderectInheritance2 : KotlinInterfaceInderectInheritance { class KotlinClassIndirectInheritance2 : KotlinInterfaceIndirectInheritance {
fun foo() { fun foo() {
super.test() super.test()
super.property super.property
@@ -277,11 +277,11 @@ class KotlinClassInderectInheritance2 : KotlinInterfaceInderectInheritance {
object { object {
fun run () { fun run () {
super@KotlinClassInderectInheritance2.test() super@KotlinClassIndirectInheritance2.test()
super@KotlinClassInderectInheritance2.property super@KotlinClassIndirectInheritance2.property
super@KotlinClassInderectInheritance2.testNonDefault() super@KotlinClassIndirectInheritance2.testNonDefault()
super@KotlinClassInderectInheritance2.propertyNonDefault super@KotlinClassIndirectInheritance2.propertyNonDefault
} }
} }
} }
@@ -296,11 +296,11 @@ class KotlinClassInderectInheritance2 : KotlinInterfaceInderectInheritance {
object { object {
fun run () { fun run () {
super@KotlinClassInderectInheritance2.test() super@KotlinClassIndirectInheritance2.test()
super@KotlinClassInderectInheritance2.property super@KotlinClassIndirectInheritance2.property
super@KotlinClassInderectInheritance2.testNonDefault() super@KotlinClassIndirectInheritance2.testNonDefault()
super@KotlinClassInderectInheritance2.propertyNonDefault super@KotlinClassIndirectInheritance2.propertyNonDefault
} }
} }
return "" return ""
@@ -311,10 +311,10 @@ fun test() {
KotlinClass().test() KotlinClass().test()
KotlinClass().property KotlinClass().property
KotlinClass().propertyNonDefault KotlinClass().propertyNonDefault
KotlinClassInderectInheritance2().test() KotlinClassIndirectInheritance2().test()
KotlinClassInderectInheritance2().testNonDefault() KotlinClassIndirectInheritance2().testNonDefault()
KotlinClassInderectInheritance2().propertyyy KotlinClassIndirectInheritance2().propertyyy
KotlinClassInderectInheritance2().propertyyyNonDefault KotlinClassIndirectInheritance2().propertyyyNonDefault
KotlinClass().test() KotlinClass().test()
KotlinClass().testNonDefault() KotlinClass().testNonDefault()
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaults.txt
Vendored
+5 -5
View File
@@ -25,8 +25,8 @@ public open class KotlinClass : KInterface {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
} }
public final class KotlinClassInderectInheritance : KotlinClass { public final class KotlinClassIndirectInheritance : KotlinClass {
public constructor KotlinClassInderectInheritance() public constructor KotlinClassIndirectInheritance()
@kotlin.jvm.JvmDefault public open override /*1*/ /*fake_override*/ val property: kotlin.String @kotlin.jvm.JvmDefault public open override /*1*/ /*fake_override*/ val property: kotlin.String
public final val property2: kotlin.String public final val property2: kotlin.String
public open override /*1*/ /*fake_override*/ val propertyNonDefault: kotlin.String public open override /*1*/ /*fake_override*/ val propertyNonDefault: kotlin.String
@@ -40,8 +40,8 @@ public final class KotlinClassInderectInheritance : KotlinClass {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
} }
public final class KotlinClassInderectInheritance2 : KotlinInterfaceInderectInheritance { public final class KotlinClassIndirectInheritance2 : KotlinInterfaceIndirectInheritance {
public constructor KotlinClassInderectInheritance2() public constructor KotlinClassIndirectInheritance2()
@kotlin.jvm.JvmDefault public open override /*1*/ /*fake_override*/ val property: kotlin.String @kotlin.jvm.JvmDefault public open override /*1*/ /*fake_override*/ val property: kotlin.String
public open override /*1*/ /*fake_override*/ val propertyNonDefault: kotlin.String public open override /*1*/ /*fake_override*/ val propertyNonDefault: kotlin.String
@kotlin.jvm.JvmDefault public open override /*1*/ /*fake_override*/ val propertyy: kotlin.String @kotlin.jvm.JvmDefault public open override /*1*/ /*fake_override*/ val propertyy: kotlin.String
@@ -75,7 +75,7 @@ public interface KotlinInterface : KInterface {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
} }
public interface KotlinInterfaceInderectInheritance : KotlinInterface { public interface KotlinInterfaceIndirectInheritance : KotlinInterface {
@kotlin.jvm.JvmDefault public open override /*1*/ /*fake_override*/ val property: kotlin.String @kotlin.jvm.JvmDefault public open override /*1*/ /*fake_override*/ val property: kotlin.String
public open override /*1*/ /*fake_override*/ val propertyNonDefault: kotlin.String public open override /*1*/ /*fake_override*/ val propertyNonDefault: kotlin.String
@kotlin.jvm.JvmDefault public open override /*1*/ /*fake_override*/ val propertyy: kotlin.String @kotlin.jvm.JvmDefault public open override /*1*/ /*fake_override*/ val propertyy: kotlin.String
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaultsWithJava.kt
Vendored
+12 -12
View File
@@ -46,14 +46,14 @@ interface KotlinInterface : JavaInterface {
} }
} }
interface KotlinInterfaceInderectInheritance : KotlinInterface { interface KotlinInterfaceIndirectInheritance : KotlinInterface {
@JvmDefault @JvmDefault
fun foooo() { fun foooo() {
super.test() super.test()
object { object {
fun run () { fun run () {
super@KotlinInterfaceInderectInheritance.test() super@KotlinInterfaceIndirectInheritance.test()
} }
} }
} }
@@ -65,7 +65,7 @@ interface KotlinInterfaceInderectInheritance : KotlinInterface {
object { object {
fun run () { fun run () {
super@KotlinInterfaceInderectInheritance.test() super@KotlinInterfaceIndirectInheritance.test()
} }
} }
return "" return ""
@@ -98,14 +98,14 @@ open class KotlinClass : JavaInterface {
} }
} }
class KotlinClassInderectInheritance : KotlinClass() { class KotlinClassIndirectInheritance : KotlinClass() {
fun foo2() { fun foo2() {
super.test() super.test()
super.testOverride() super.testOverride()
object { object {
fun run () { fun run () {
super@KotlinClassInderectInheritance.test() super@KotlinClassIndirectInheritance.test()
} }
} }
} }
@@ -117,21 +117,21 @@ class KotlinClassInderectInheritance : KotlinClass() {
object { object {
fun run () { fun run () {
super@KotlinClassInderectInheritance.test() super@KotlinClassIndirectInheritance.test()
} }
} }
return "" return ""
} }
} }
class KotlinClassInderectInheritance2 : KotlinInterfaceInderectInheritance { class KotlinClassIndirectInheritance2 : KotlinInterfaceIndirectInheritance {
fun foo() { fun foo() {
super.test() super.test()
super.testOverride() super.testOverride()
object { object {
fun run () { fun run () {
super@KotlinClassInderectInheritance2.test() super@KotlinClassIndirectInheritance2.test()
} }
} }
} }
@@ -143,7 +143,7 @@ class KotlinClassInderectInheritance2 : KotlinInterfaceInderectInheritance {
object { object {
fun run () { fun run () {
super@KotlinClassInderectInheritance2.test() super@KotlinClassIndirectInheritance2.test()
} }
} }
return "" return ""
@@ -153,11 +153,11 @@ class KotlinClassInderectInheritance2 : KotlinInterfaceInderectInheritance {
fun test() { fun test() {
KotlinClass().foo() KotlinClass().foo()
KotlinClass().property KotlinClass().property
KotlinClassInderectInheritance2().foo() KotlinClassIndirectInheritance2().foo()
KotlinClassInderectInheritance2().property KotlinClassIndirectInheritance2().property
KotlinClass().test() KotlinClass().test()
KotlinClass().property KotlinClass().property
KotlinClass().testOverride() KotlinClass().testOverride()
KotlinClassInderectInheritance().testOverride() KotlinClassIndirectInheritance().testOverride()
} }
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaultsWithJava.txt
Vendored
+5 -5
View File
@@ -21,8 +21,8 @@ public open class KotlinClass : JavaInterface {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
} }
public final class KotlinClassInderectInheritance : KotlinClass { public final class KotlinClassIndirectInheritance : KotlinClass {
public constructor KotlinClassInderectInheritance() public constructor KotlinClassIndirectInheritance()
public final override /*1*/ /*fake_override*/ val property: kotlin.String public final override /*1*/ /*fake_override*/ val property: kotlin.String
public final val property2: kotlin.String public final val property2: kotlin.String
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -34,8 +34,8 @@ public final class KotlinClassInderectInheritance : KotlinClass {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
} }
public final class KotlinClassInderectInheritance2 : KotlinInterfaceInderectInheritance { public final class KotlinClassIndirectInheritance2 : KotlinInterfaceIndirectInheritance {
public constructor KotlinClassInderectInheritance2() public constructor KotlinClassIndirectInheritance2()
public final val property: kotlin.String public final val property: kotlin.String
@kotlin.jvm.JvmDefault public open override /*1*/ /*fake_override*/ val propertyy: kotlin.String @kotlin.jvm.JvmDefault public open override /*1*/ /*fake_override*/ val propertyy: kotlin.String
@kotlin.jvm.JvmDefault public open override /*1*/ /*fake_override*/ val propertyyy: kotlin.String @kotlin.jvm.JvmDefault public open override /*1*/ /*fake_override*/ val propertyyy: kotlin.String
@@ -59,7 +59,7 @@ public interface KotlinInterface : JavaInterface {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
} }
public interface KotlinInterfaceInderectInheritance : KotlinInterface { public interface KotlinInterfaceIndirectInheritance : KotlinInterface {
@kotlin.jvm.JvmDefault public open override /*1*/ /*fake_override*/ val propertyy: kotlin.String @kotlin.jvm.JvmDefault public open override /*1*/ /*fake_override*/ val propertyy: kotlin.String
@kotlin.jvm.JvmDefault public open val propertyyy: kotlin.String @kotlin.jvm.JvmDefault public open val propertyyy: kotlin.String
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean