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

Update test data. Use simple ''@JvmDefault' instead full qualifier

Browse Source
This commit is contained in:
Mikhael Bogdanov
2018-03-09 11:46:00 +01:00
parent 2a8041e77e
commit 38f8924ae3
61 changed files with 121 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/java8/box/jvm8/defaults/accessor.kt
Vendored
+3 -3
View File
@@ -6,19 +6,19 @@ var storage = "fail"
interface Test { interface Test {
@kotlin.annotations.JvmDefault @JvmDefault
private var foo: String private var foo: String
get() = storage get() = storage
set(value) { set(value) {
storage = value storage = value
} }
@kotlin.annotations.JvmDefault @JvmDefault
private fun bar(): String { private fun bar(): String {
return "K" return "K"
} }
@kotlin.annotations.JvmDefault @JvmDefault
fun call(): String { fun call(): String {
return { return {
foo = "O" foo = "O"
compiler/testData/codegen/java8/box/jvm8/defaults/accessorFromCompanion.kt
Vendored
+2 -2
View File
@@ -3,11 +3,11 @@
// WITH_RUNTIME // WITH_RUNTIME
interface Test { interface Test {
@kotlin.annotations.JvmDefault @JvmDefault
private val foo: String private val foo: String
get() = "O" get() = "O"
@kotlin.annotations.JvmDefault @JvmDefault
private fun bar(): String { private fun bar(): String {
return "K" return "K"
} }
compiler/testData/codegen/java8/box/jvm8/defaults/accessorsFromDefaultImpls.kt
Vendored
+2 -2
View File
@@ -3,11 +3,11 @@
// WITH_RUNTIME // WITH_RUNTIME
interface Test { interface Test {
@kotlin.annotations.JvmDefault @JvmDefault
private val foo: String private val foo: String
get() = "O" get() = "O"
@kotlin.annotations.JvmDefault @JvmDefault
private fun bar(): String { private fun bar(): String {
return "K" return "K"
} }
compiler/testData/codegen/java8/box/jvm8/defaults/bridgeInClass.kt
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@
// WITH_RUNTIME // WITH_RUNTIME
interface Test<T> { interface Test<T> {
@kotlin.annotations.JvmDefault @JvmDefault
fun test(p: T): T { fun test(p: T): T {
return p return p
} }
compiler/testData/codegen/java8/box/jvm8/defaults/bridgeInInterface.kt
Vendored
+2 -2
View File
@@ -3,14 +3,14 @@
// WITH_RUNTIME // WITH_RUNTIME
interface Test<T> { interface Test<T> {
@kotlin.annotations.JvmDefault @JvmDefault
fun test(p: T): T { fun test(p: T): T {
return p return p
} }
} }
interface Test2: Test<String> { interface Test2: Test<String> {
@kotlin.annotations.JvmDefault @JvmDefault
override fun test(p: String): String { override fun test(p: String): String {
return p + "K" return p + "K"
} }
compiler/testData/codegen/java8/box/jvm8/defaults/bridgeInInterface2.kt
Vendored
+2 -2
View File
@@ -4,7 +4,7 @@
// FULL_JDK // FULL_JDK
interface Test<T> { interface Test<T> {
@kotlin.annotations.JvmDefault @JvmDefault
fun test(p: T): T { fun test(p: T): T {
return null!! return null!!
} }
@@ -15,7 +15,7 @@ interface Test<T> {
} }
interface Test2: Test<String> { interface Test2: Test<String> {
@kotlin.annotations.JvmDefault @JvmDefault
override fun test(p: String): String { override fun test(p: String): String {
return p return p
} }
compiler/testData/codegen/java8/box/jvm8/defaults/bridgeInInterfaceWithProperties.kt
Vendored
+2 -2
View File
@@ -3,7 +3,7 @@
// WITH_RUNTIME // WITH_RUNTIME
interface Test<T> { interface Test<T> {
@kotlin.annotations.JvmDefault @JvmDefault
var test: T var test: T
get() = null!! get() = null!!
set(value) { set(value) {
@@ -13,7 +13,7 @@ interface Test<T> {
var result = "fail" var result = "fail"
interface Test2 : Test<String> { interface Test2 : Test<String> {
@kotlin.annotations.JvmDefault @JvmDefault
override var test: String override var test: String
get() = result get() = result
set(value) { set(value) {
compiler/testData/codegen/java8/box/jvm8/defaults/bridgeInInterfaceWithProperties2.kt
Vendored
+2 -2
View File
@@ -4,7 +4,7 @@
// FULL_JDK // FULL_JDK
interface Test<T> { interface Test<T> {
@kotlin.annotations.JvmDefault @JvmDefault
var T.test: T var T.test: T
get() = null!! get() = null!!
set(value) { set(value) {
@@ -19,7 +19,7 @@ interface Test<T> {
} }
interface Test2 : Test<String> { interface Test2 : Test<String> {
@kotlin.annotations.JvmDefault @JvmDefault
override var String.test: String override var String.test: String
get() = "" get() = ""
set(value) {} set(value) {}
compiler/testData/codegen/java8/box/jvm8/defaults/bridgeWithJava.kt
Vendored
+1 -1
View File
@@ -12,7 +12,7 @@ public interface Test<T> {
// FILE: kotlin.kt // FILE: kotlin.kt
interface Test2: Test<String> { interface Test2: Test<String> {
@kotlin.annotations.JvmDefault @JvmDefault
override fun test(p: String): String { override fun test(p: String): String {
return p return p
} }
compiler/testData/codegen/java8/box/jvm8/defaults/callableReference.kt
Vendored
+2 -2
View File
@@ -3,10 +3,10 @@
// WITH_RUNTIME // WITH_RUNTIME
interface Test { interface Test {
@kotlin.annotations.JvmDefault @JvmDefault
fun foo(): String = "O" fun foo(): String = "O"
@kotlin.annotations.JvmDefault @JvmDefault
val bar: String val bar: String
get() = "K" get() = "K"
compiler/testData/codegen/java8/box/jvm8/defaults/capturedSuperCall.kt
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@
// WITH_RUNTIME // WITH_RUNTIME
interface IBase { interface IBase {
@kotlin.annotations.JvmDefault @JvmDefault
fun bar() = "OK" fun bar() = "OK"
} }
compiler/testData/codegen/java8/box/jvm8/defaults/defaultArgs.kt
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@
// JVM_TARGET: 1.8 // JVM_TARGET: 1.8
// WITH_RUNTIME // WITH_RUNTIME
interface Z { interface Z {
@kotlin.annotations.JvmDefault @JvmDefault
fun test(s: String = "OK"): String { fun test(s: String = "OK"): String {
return s return s
} }
compiler/testData/codegen/java8/box/jvm8/defaults/delegationBy/simple.kt
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@
// WITH_RUNTIME // WITH_RUNTIME
interface Test { interface Test {
@kotlin.annotations.JvmDefault @JvmDefault
fun test(): String { fun test(): String {
return "O" return "O"
} }
compiler/testData/codegen/java8/box/jvm8/defaults/delegationBy/simpleProperty.kt
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@
// WITH_RUNTIME // WITH_RUNTIME
interface Test { interface Test {
@kotlin.annotations.JvmDefault @JvmDefault
val test: String val test: String
get() = "O" get() = "O"
compiler/testData/codegen/java8/box/jvm8/defaults/diamond.kt
Vendored
+2 -2
View File
@@ -4,7 +4,7 @@
// FULL_JDK // FULL_JDK
interface Test { interface Test {
@kotlin.annotations.JvmDefault @JvmDefault
fun test(): String { fun test(): String {
return "Test" return "Test"
} }
@@ -16,7 +16,7 @@ open class TestClass : Test {
interface Test2 : Test { interface Test2 : Test {
@kotlin.annotations.JvmDefault @JvmDefault
override fun test(): String { override fun test(): String {
return "Test2" return "Test2"
} }
compiler/testData/codegen/java8/box/jvm8/defaults/inline.kt
Vendored
+2 -2
View File
@@ -3,7 +3,7 @@
// WITH_RUNTIME // WITH_RUNTIME
interface Test { interface Test {
@kotlin.annotations.JvmDefault @JvmDefault
fun test(): String { fun test(): String {
return inlineFun { "O" } return inlineFun { "O" }
} }
@@ -12,7 +12,7 @@ interface Test {
return inlineFun { "K" } return inlineFun { "K" }
} }
@kotlin.annotations.JvmDefault @JvmDefault
private inline fun inlineFun(s: () -> String) = s() private inline fun inlineFun(s: () -> String) = s()
} }
compiler/testData/codegen/java8/box/jvm8/defaults/inlineProperty.kt
Vendored
+2 -2
View File
@@ -3,7 +3,7 @@
// WITH_RUNTIME // WITH_RUNTIME
interface Test { interface Test {
@kotlin.annotations.JvmDefault @JvmDefault
fun test(): String { fun test(): String {
return inlineProp return inlineProp
} }
@@ -12,7 +12,7 @@ interface Test {
return inlineProp return inlineProp
} }
@kotlin.annotations.JvmDefault @JvmDefault
private inline val inlineProp: String private inline val inlineProp: String
get() = "OK" get() = "OK"
compiler/testData/codegen/java8/box/jvm8/defaults/kt11969.kt
Vendored
+5 -5
View File
@@ -5,19 +5,19 @@
interface Z { interface Z {
@kotlin.annotations.JvmDefault @JvmDefault
private fun privateFun() = { "OK" } private fun privateFun() = { "OK" }
@kotlin.annotations.JvmDefault @JvmDefault
fun callPrivateFun() = privateFun() fun callPrivateFun() = privateFun()
@kotlin.annotations.JvmDefault @JvmDefault
fun publicFun() = { "OK" } fun publicFun() = { "OK" }
@kotlin.annotations.JvmDefault @JvmDefault
fun funWithDefaultArgs(s: () -> Unit = {}): () -> Unit fun funWithDefaultArgs(s: () -> Unit = {}): () -> Unit
@kotlin.annotations.JvmDefault @JvmDefault
val property: () -> Unit val property: () -> Unit
get() = {} get() = {}
compiler/testData/codegen/java8/box/jvm8/defaults/kt14243.kt
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@
// WITH_RUNTIME // WITH_RUNTIME
interface Z<T> { interface Z<T> {
@kotlin.annotations.JvmDefault @JvmDefault
fun test(p: T): T { fun test(p: T): T {
return p return p
} }
compiler/testData/codegen/java8/box/jvm8/defaults/kt14243_2.kt
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@
// WITH_RUNTIME // WITH_RUNTIME
interface Z<T> { interface Z<T> {
@kotlin.annotations.JvmDefault @JvmDefault
fun test(p: T): T { fun test(p: T): T {
return p return p
} }
compiler/testData/codegen/java8/box/jvm8/defaults/kt14243_prop.kt
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@ interface Z<T> {
val value: T val value: T
@kotlin.annotations.JvmDefault @JvmDefault
val z: T val z: T
get() = value get() = value
} }
compiler/testData/codegen/java8/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInClass.kt
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@
// WITH_RUNTIME // WITH_RUNTIME
// FULL_JDK // FULL_JDK
interface Test { interface Test {
@kotlin.annotations.JvmDefault @JvmDefault
fun test() { fun test() {
} }
} }
compiler/testData/codegen/java8/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInInterface.kt
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@
// WITH_RUNTIME // WITH_RUNTIME
// FULL_JDK // FULL_JDK
interface Test { interface Test {
@kotlin.annotations.JvmDefault @JvmDefault
fun test() { fun test() {
} }
} }
compiler/testData/codegen/java8/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInInterface2.kt
Vendored
+1 -1
View File
@@ -4,7 +4,7 @@
// FULL_JDK // FULL_JDK
interface Test { interface Test {
@kotlin.annotations.JvmDefault @JvmDefault
fun test() { fun test() {
} }
} }
compiler/testData/codegen/java8/box/jvm8/defaults/oneImplementation.kt
Vendored
+2 -2
View File
@@ -3,12 +3,12 @@
// WITH_RUNTIME // WITH_RUNTIME
interface KCallable { interface KCallable {
@kotlin.annotations.JvmDefault @JvmDefault
val returnType: String val returnType: String
} }
interface KCallableImpl : KCallable { interface KCallableImpl : KCallable {
@kotlin.annotations.JvmDefault @JvmDefault
override val returnType: String override val returnType: String
get() = "OK" get() = "OK"
} }
compiler/testData/codegen/java8/box/jvm8/defaults/oneImplementation2.kt
Vendored
+2 -2
View File
@@ -3,12 +3,12 @@
// WITH_RUNTIME // WITH_RUNTIME
interface KCallable { interface KCallable {
@kotlin.annotations.JvmDefault @JvmDefault
val returnType: String val returnType: String
} }
interface KCallableImpl : KCallable { interface KCallableImpl : KCallable {
@kotlin.annotations.JvmDefault @JvmDefault
override val returnType: String override val returnType: String
get() = "OK" get() = "OK"
} }
compiler/testData/codegen/java8/box/jvm8/defaults/privateDefaultFromDefaultImpl.kt
Vendored
+2 -2
View File
@@ -7,12 +7,12 @@ interface Test {
return privateFun() + privateProp return privateFun() + privateProp
} }
@kotlin.annotations.JvmDefault @JvmDefault
private fun privateFun(): String { private fun privateFun(): String {
return "O" return "O"
} }
@kotlin.annotations.JvmDefault @JvmDefault
private val privateProp: String private val privateProp: String
get() = "K" get() = "K"
} }
compiler/testData/codegen/java8/box/jvm8/defaults/privateInDefaultImpls.kt
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@
// WITH_RUNTIME // WITH_RUNTIME
interface Test { interface Test {
@kotlin.annotations.JvmDefault @JvmDefault
fun test(): String { fun test(): String {
return privateFun() + privateProp return privateFun() + privateProp
} }
compiler/testData/codegen/java8/box/jvm8/defaults/reflection/propertyAnnotations.kt
Vendored
+1 -1
View File
@@ -7,7 +7,7 @@ annotation class Accessor(val value: String)
interface Z { interface Z {
@Property("OK") @Property("OK")
@kotlin.annotations.JvmDefault @JvmDefault
val z: String val z: String
@Accessor("OK") @Accessor("OK")
get() = "OK" get() = "OK"
compiler/testData/codegen/java8/box/jvm8/defaults/simpleCall.kt
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@
// WITH_RUNTIME // WITH_RUNTIME
interface Test { interface Test {
@kotlin.annotations.JvmDefault @JvmDefault
fun test(): String { fun test(): String {
return "OK" return "OK"
} }
compiler/testData/codegen/java8/box/jvm8/defaults/simpleProperty.kt
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@
// WITH_RUNTIME // WITH_RUNTIME
interface Z { interface Z {
@kotlin.annotations.JvmDefault @JvmDefault
val z: String val z: String
get() = "OK" get() = "OK"
} }
compiler/testData/codegen/java8/box/jvm8/defaults/superCall.kt
Vendored
+2 -2
View File
@@ -3,14 +3,14 @@
// WITH_RUNTIME // WITH_RUNTIME
interface Test { interface Test {
@kotlin.annotations.JvmDefault @JvmDefault
fun test(): String { fun test(): String {
return "OK" return "OK"
} }
} }
interface Test2 : Test { interface Test2 : Test {
@kotlin.annotations.JvmDefault @JvmDefault
override fun test(): String { override fun test(): String {
return super.test() return super.test()
} }
compiler/testData/codegen/java8/box/mapRemove/noDefaultImpls.kt
Vendored
+1 -1
View File
@@ -12,7 +12,7 @@ class B : A<String, String>, java.util.AbstractMap<String, String>() {
} }
interface C<K, V> : MutableMap<K, V> { interface C<K, V> : MutableMap<K, V> {
@kotlin.annotations.JvmDefault @JvmDefault
override fun remove(key: K, value: V) = true override fun remove(key: K, value: V) = true
} }
compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8/defaults/superCall.kt
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@
// WITH_RUNTIME // WITH_RUNTIME
// FILE: 1.kt // FILE: 1.kt
interface Test { interface Test {
@kotlin.annotations.JvmDefault @JvmDefault
fun test(): String { fun test(): String {
return "OK" return "OK"
} }
compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8/defaults/superCallFromInterface.kt
Vendored
+2 -2
View File
@@ -3,7 +3,7 @@
// WITH_RUNTIME // WITH_RUNTIME
// FILE: 1.kt // FILE: 1.kt
interface Test { interface Test {
@kotlin.annotations.JvmDefault @JvmDefault
fun test(): String { fun test(): String {
return "OK" return "OK"
} }
@@ -12,7 +12,7 @@ interface Test {
// FILE: 2.kt // FILE: 2.kt
interface Test2 : Test { interface Test2 : Test {
@kotlin.annotations.JvmDefault @JvmDefault
override fun test(): String { override fun test(): String {
return super.test() return super.test()
} }
compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8/defaults/superPropAccess.kt
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@
// WITH_RUNTIME // WITH_RUNTIME
// FILE: 1.kt // FILE: 1.kt
interface Test { interface Test {
@kotlin.annotations.JvmDefault @JvmDefault
val prop: String val prop: String
get() = "OK" get() = "OK"
} }
compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8/defaults/superPropAccessFromInterface.kt
Vendored
+2 -2
View File
@@ -3,14 +3,14 @@
// WITH_RUNTIME // WITH_RUNTIME
// FILE: 1.kt // FILE: 1.kt
interface Test { interface Test {
@kotlin.annotations.JvmDefault @JvmDefault
val prop: String val prop: String
get() = "OK" get() = "OK"
} }
// FILE: 2.kt // FILE: 2.kt
interface Test2 : Test { interface Test2 : Test {
@kotlin.annotations.JvmDefault @JvmDefault
override val prop: String override val prop: String
get() = super.prop get() = super.prop
} }
compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/delegation/diamond.kt
Vendored
+2 -2
View File
@@ -10,7 +10,7 @@ interface Test {
// JVM_TARGET: 1.8 // JVM_TARGET: 1.8
// WITH_RUNTIME // WITH_RUNTIME
interface Test2 : Test { interface Test2 : Test {
@kotlin.annotations.JvmDefault @JvmDefault
override fun test(): String { override fun test(): String {
return super.test() return super.test()
} }
@@ -22,7 +22,7 @@ interface Test3 : Test {
interface Test4 : Test2, Test3 { interface Test4 : Test2, Test3 {
@kotlin.annotations.JvmDefault @JvmDefault
override fun test(): String { override fun test(): String {
return super.test() return super.test()
} }
compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/delegation/diamond2.kt
Vendored
+1 -1
View File
@@ -16,7 +16,7 @@ open class TestClass : Test {
} }
interface Test2 : Test { interface Test2 : Test {
@kotlin.annotations.JvmDefault @JvmDefault
override fun test(): String override fun test(): String
} }
compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/delegation/diamond3.kt
Vendored
+1 -1
View File
@@ -14,7 +14,7 @@ abstract class TestClass : Test {
} }
interface Test2 : Test { interface Test2 : Test {
@kotlin.annotations.JvmDefault @JvmDefault
override fun test(): String { override fun test(): String {
return "OK" return "OK"
} }
compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/simpleCallWithBigHierarchy.kt
Vendored
+1 -1
View File
@@ -10,7 +10,7 @@ interface Test {
// JVM_TARGET: 1.8 // JVM_TARGET: 1.8
// WITH_RUNTIME // WITH_RUNTIME
interface Test2 : Test { interface Test2 : Test {
@kotlin.annotations.JvmDefault @JvmDefault
override fun test(): String { override fun test(): String {
return super.test() return super.test()
} }
compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/simpleCallWithHierarchy.kt
Vendored
+1 -1
View File
@@ -11,7 +11,7 @@ interface Test {
// JVM_TARGET: 1.8 // JVM_TARGET: 1.8
// WITH_RUNTIME // WITH_RUNTIME
interface Test2 : Test { interface Test2 : Test {
@kotlin.annotations.JvmDefault @JvmDefault
override fun test(): String { override fun test(): String {
return super.test() return super.test()
} }
compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/simplePropWithHierarchy.kt
Vendored
+1 -1
View File
@@ -10,7 +10,7 @@ interface Test {
// JVM_TARGET: 1.8 // JVM_TARGET: 1.8
// WITH_RUNTIME // WITH_RUNTIME
interface Test2 : Test { interface Test2 : Test {
@kotlin.annotations.JvmDefault @JvmDefault
override val test: String override val test: String
get() = super.test get() = super.test
} }
compiler/testData/codegen/java8/writeFlags/defaults/defaultMethod.kt
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@
// WITH_RUNTIME // WITH_RUNTIME
interface Test { interface Test {
@kotlin.annotations.JvmDefault @JvmDefault
fun test(): String { fun test(): String {
return "OK" return "OK"
} }
compiler/testData/codegen/java8/writeFlags/defaults/defaultProperty.kt
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@
// WITH_RUNTIME // WITH_RUNTIME
interface Test { interface Test {
@kotlin.annotations.JvmDefault @JvmDefault
var z: String var z: String
get() = "OK" get() = "OK"
set(value) {} set(value) {}
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/generic.kt
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@
// !API_VERSION: 1.3 // !API_VERSION: 1.3
// !JVM_TARGET: 1.8 // !JVM_TARGET: 1.8
interface A<T> { interface A<T> {
@kotlin.annotations.JvmDefault @JvmDefault
fun test(p: T) { fun test(p: T) {
} }
} }
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/generic.txt
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@ package
public interface A</*0*/ T> { public interface A</*0*/ T> {
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.annotations.JvmDefault public open fun test(/*0*/ p: T): kotlin.Unit @kotlin.jvm.JvmDefault public open fun test(/*0*/ p: T): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
} }
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/notInterface.kt
Vendored
+5 -5
View File
@@ -3,21 +3,21 @@
// !JVM_TARGET: 1.8 // !JVM_TARGET: 1.8
abstract class A { abstract class A {
<!JVM_DEFAULT_NOT_IN_INTERFACE!>@kotlin.annotations.JvmDefault<!> <!JVM_DEFAULT_NOT_IN_INTERFACE!>@JvmDefault<!>
fun test() {} fun test() {}
<!JVM_DEFAULT_NOT_IN_INTERFACE!>@kotlin.annotations.JvmDefault<!> <!JVM_DEFAULT_NOT_IN_INTERFACE!>@JvmDefault<!>
abstract fun test2(s: String = "") abstract fun test2(s: String = "")
<!JVM_DEFAULT_NOT_IN_INTERFACE!>@kotlin.annotations.JvmDefault<!> <!JVM_DEFAULT_NOT_IN_INTERFACE!>@JvmDefault<!>
abstract fun test3() abstract fun test3()
} }
object B { object B {
<!JVM_DEFAULT_NOT_IN_INTERFACE!>@kotlin.annotations.JvmDefault<!> <!JVM_DEFAULT_NOT_IN_INTERFACE!>@JvmDefault<!>
fun test() {} fun test() {}
<!JVM_DEFAULT_NOT_IN_INTERFACE!>@kotlin.annotations.JvmDefault<!> <!JVM_DEFAULT_NOT_IN_INTERFACE!>@JvmDefault<!>
fun test2(<!UNUSED_PARAMETER!>s<!>: String = "") {} fun test2(<!UNUSED_PARAMETER!>s<!>: String = "") {}
} }
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/notInterface.txt
Vendored
+5 -5
View File
@@ -4,9 +4,9 @@ public abstract class A {
public constructor A() public constructor A()
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.annotations.JvmDefault public final fun test(): kotlin.Unit @kotlin.jvm.JvmDefault public final fun test(): kotlin.Unit
@kotlin.annotations.JvmDefault public abstract fun test2(/*0*/ s: kotlin.String = ...): kotlin.Unit @kotlin.jvm.JvmDefault public abstract fun test2(/*0*/ s: kotlin.String = ...): kotlin.Unit
@kotlin.annotations.JvmDefault public abstract fun test3(): kotlin.Unit @kotlin.jvm.JvmDefault public abstract fun test3(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
} }
@@ -14,7 +14,7 @@ public object B {
private constructor B() private constructor B()
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.annotations.JvmDefault public final fun test(): kotlin.Unit @kotlin.jvm.JvmDefault public final fun test(): kotlin.Unit
@kotlin.annotations.JvmDefault public final fun test2(/*0*/ s: kotlin.String = ...): kotlin.Unit @kotlin.jvm.JvmDefault public final fun test2(/*0*/ s: kotlin.String = ...): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
} }
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/propertyAccessor.kt
Vendored
+4 -4
View File
@@ -3,12 +3,12 @@
// !JVM_TARGET: 1.8 // !JVM_TARGET: 1.8
interface B { interface B {
@kotlin.annotations.JvmDefault @JvmDefault
val prop1: String val prop1: String
<!WRONG_ANNOTATION_TARGET!>@kotlin.annotations.JvmDefault<!> get() = "" <!WRONG_ANNOTATION_TARGET!>@JvmDefault<!> get() = ""
var prop2: String var prop2: String
<!WRONG_ANNOTATION_TARGET!>@kotlin.annotations.JvmDefault<!> get() = "" <!WRONG_ANNOTATION_TARGET!>@JvmDefault<!> get() = ""
<!WRONG_ANNOTATION_TARGET!>@kotlin.annotations.JvmDefault<!> set(value) {} <!WRONG_ANNOTATION_TARGET!>@JvmDefault<!> set(value) {}
} }
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/propertyAccessor.txt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
package package
public interface B { public interface B {
@kotlin.annotations.JvmDefault public open val prop1: kotlin.String @kotlin.jvm.JvmDefault public open val prop1: kotlin.String
public open var prop2: kotlin.String public open var prop2: 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
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/simpleOverride.kt
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@
// !API_VERSION: 1.3 // !API_VERSION: 1.3
// !JVM_TARGET: 1.8 // !JVM_TARGET: 1.8
interface A { interface A {
@kotlin.annotations.JvmDefault @JvmDefault
fun test() {} fun test() {}
} }
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/simpleOverride.txt
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@ package
public interface A { public interface A {
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.annotations.JvmDefault public open fun test(): kotlin.Unit @kotlin.jvm.JvmDefault public open fun test(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
} }
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/simpleOverrideWithFeature.kt
Vendored
+2 -2
View File
@@ -1,8 +1,8 @@
// !API_VERSION: 1.3 // !API_VERSION: 1.3
// !JVM_TARGET: 1.8 // !JVM_TARGET: 1.8
@kotlin.annotations.JvmDefaultFeature @JvmDefaultFeature
interface A { interface A {
@kotlin.annotations.JvmDefault @JvmDefault
fun test() { fun test() {
} }
} }
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/simpleOverrideWithFeature.txt
Vendored
+2 -2
View File
@@ -1,9 +1,9 @@
package package
@kotlin.annotations.JvmDefaultFeature public interface A { @kotlin.jvm.JvmDefaultFeature public interface A {
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.annotations.JvmDefault public open fun test(): kotlin.Unit @kotlin.jvm.JvmDefault public open fun test(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
} }
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/simplePropertyOverride.kt
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@
// !API_VERSION: 1.3 // !API_VERSION: 1.3
// !JVM_TARGET: 1.8 // !JVM_TARGET: 1.8
interface A { interface A {
@kotlin.annotations.JvmDefault @JvmDefault
val test: String val test: String
get() = "OK" get() = "OK"
} }
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/simplePropertyOverride.txt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
package package
public interface A { public interface A {
@kotlin.annotations.JvmDefault public open val test: kotlin.String @kotlin.jvm.JvmDefault public open val test: 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
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/target6.kt
Vendored
+7 -7
View File
@@ -3,28 +3,28 @@
// !JVM_TARGET: 1.6 // !JVM_TARGET: 1.6
interface B { interface B {
<!JVM_DEFAULT_IN_JVM6_TARGET!>@kotlin.annotations.JvmDefault<!> <!JVM_DEFAULT_IN_JVM6_TARGET!>@JvmDefault<!>
fun test() {} fun test() {}
<!JVM_DEFAULT_IN_JVM6_TARGET!>@kotlin.annotations.JvmDefault<!> <!JVM_DEFAULT_IN_JVM6_TARGET!>@JvmDefault<!>
abstract fun test2(s: String = "") abstract fun test2(s: String = "")
<!JVM_DEFAULT_IN_JVM6_TARGET!>@kotlin.annotations.JvmDefault<!> <!JVM_DEFAULT_IN_JVM6_TARGET!>@JvmDefault<!>
abstract fun test3() abstract fun test3()
<!JVM_DEFAULT_IN_JVM6_TARGET!>@kotlin.annotations.JvmDefault<!> <!JVM_DEFAULT_IN_JVM6_TARGET!>@JvmDefault<!>
abstract val prop: String abstract val prop: String
<!JVM_DEFAULT_IN_JVM6_TARGET!>@kotlin.annotations.JvmDefault<!> <!JVM_DEFAULT_IN_JVM6_TARGET!>@JvmDefault<!>
abstract val prop2: String abstract val prop2: String
<!JVM_DEFAULT_IN_JVM6_TARGET!>@kotlin.annotations.JvmDefault<!> <!JVM_DEFAULT_IN_JVM6_TARGET!>@JvmDefault<!>
val prop3: String val prop3: String
get() = "" get() = ""
<!JVM_DEFAULT_IN_JVM6_TARGET!>@kotlin.annotations.JvmDefault<!> <!JVM_DEFAULT_IN_JVM6_TARGET!>@JvmDefault<!>
var prop4: String var prop4: String
get() = "" get() = ""
set(value) {} set(value) {}
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/target6.txt
Vendored
+7 -7
View File
@@ -1,14 +1,14 @@
package package
public interface B { public interface B {
@kotlin.annotations.JvmDefault public abstract val prop: kotlin.String @kotlin.jvm.JvmDefault public abstract val prop: kotlin.String
@kotlin.annotations.JvmDefault public abstract val prop2: kotlin.String @kotlin.jvm.JvmDefault public abstract val prop2: kotlin.String
@kotlin.annotations.JvmDefault public open val prop3: kotlin.String @kotlin.jvm.JvmDefault public open val prop3: kotlin.String
@kotlin.annotations.JvmDefault public open var prop4: kotlin.String @kotlin.jvm.JvmDefault public open var prop4: 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
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@kotlin.annotations.JvmDefault public open fun test(): kotlin.Unit @kotlin.jvm.JvmDefault public open fun test(): kotlin.Unit
@kotlin.annotations.JvmDefault public abstract fun test2(/*0*/ s: kotlin.String = ...): kotlin.Unit @kotlin.jvm.JvmDefault public abstract fun test2(/*0*/ s: kotlin.String = ...): kotlin.Unit
@kotlin.annotations.JvmDefault public abstract fun test3(): kotlin.Unit @kotlin.jvm.JvmDefault public abstract fun test3(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
} }
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/target8.kt
Vendored
+7 -7
View File
@@ -3,27 +3,27 @@
// !JVM_TARGET: 1.8 // !JVM_TARGET: 1.8
interface B { interface B {
@kotlin.annotations.JvmDefault @JvmDefault
fun test() {} fun test() {}
@kotlin.annotations.JvmDefault @JvmDefault
abstract fun test2(s: String = "") abstract fun test2(s: String = "")
@kotlin.annotations.JvmDefault @JvmDefault
abstract fun test3() abstract fun test3()
@kotlin.annotations.JvmDefault @JvmDefault
abstract val prop: String abstract val prop: String
@kotlin.annotations.JvmDefault @JvmDefault
abstract val prop2: String abstract val prop2: String
@kotlin.annotations.JvmDefault @JvmDefault
val prop3: String val prop3: String
get() = "" get() = ""
@kotlin.annotations.JvmDefault @JvmDefault
var prop4: String var prop4: String
get() = "" get() = ""
set(value) {} set(value) {}
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/target8.txt
Vendored
+7 -7
View File
@@ -1,14 +1,14 @@
package package
public interface B { public interface B {
@kotlin.annotations.JvmDefault public abstract val prop: kotlin.String @kotlin.jvm.JvmDefault public abstract val prop: kotlin.String
@kotlin.annotations.JvmDefault public abstract val prop2: kotlin.String @kotlin.jvm.JvmDefault public abstract val prop2: kotlin.String
@kotlin.annotations.JvmDefault public open val prop3: kotlin.String @kotlin.jvm.JvmDefault public open val prop3: kotlin.String
@kotlin.annotations.JvmDefault public open var prop4: kotlin.String @kotlin.jvm.JvmDefault public open var prop4: 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
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@kotlin.annotations.JvmDefault public open fun test(): kotlin.Unit @kotlin.jvm.JvmDefault public open fun test(): kotlin.Unit
@kotlin.annotations.JvmDefault public abstract fun test2(/*0*/ s: kotlin.String = ...): kotlin.Unit @kotlin.jvm.JvmDefault public abstract fun test2(/*0*/ s: kotlin.String = ...): kotlin.Unit
@kotlin.annotations.JvmDefault public abstract fun test3(): kotlin.Unit @kotlin.jvm.JvmDefault public abstract fun test3(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
} }