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/diagnostics/testsWithStdLib/annotations/jvmDefault/generic.kt
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@
// !API_VERSION: 1.3
// !JVM_TARGET: 1.8
interface A<T> {
@kotlin.annotations.JvmDefault
@JvmDefault
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 open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
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
}
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/notInterface.kt
Vendored
+5 -5
View File
@@ -3,21 +3,21 @@
// !JVM_TARGET: 1.8
abstract class A {
<!JVM_DEFAULT_NOT_IN_INTERFACE!>@kotlin.annotations.JvmDefault<!>
<!JVM_DEFAULT_NOT_IN_INTERFACE!>@JvmDefault<!>
fun test() {}
<!JVM_DEFAULT_NOT_IN_INTERFACE!>@kotlin.annotations.JvmDefault<!>
<!JVM_DEFAULT_NOT_IN_INTERFACE!>@JvmDefault<!>
abstract fun test2(s: String = "")
<!JVM_DEFAULT_NOT_IN_INTERFACE!>@kotlin.annotations.JvmDefault<!>
<!JVM_DEFAULT_NOT_IN_INTERFACE!>@JvmDefault<!>
abstract fun test3()
}
object B {
<!JVM_DEFAULT_NOT_IN_INTERFACE!>@kotlin.annotations.JvmDefault<!>
<!JVM_DEFAULT_NOT_IN_INTERFACE!>@JvmDefault<!>
fun test() {}
<!JVM_DEFAULT_NOT_IN_INTERFACE!>@kotlin.annotations.JvmDefault<!>
<!JVM_DEFAULT_NOT_IN_INTERFACE!>@JvmDefault<!>
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 open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@kotlin.annotations.JvmDefault public final fun test(): kotlin.Unit
@kotlin.annotations.JvmDefault public abstract fun test2(/*0*/ s: kotlin.String = ...): kotlin.Unit
@kotlin.annotations.JvmDefault public abstract fun test3(): kotlin.Unit
@kotlin.jvm.JvmDefault public final fun test(): kotlin.Unit
@kotlin.jvm.JvmDefault public abstract fun test2(/*0*/ s: kotlin.String = ...): kotlin.Unit
@kotlin.jvm.JvmDefault public abstract fun test3(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
@@ -14,7 +14,7 @@ public object 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 hashCode(): kotlin.Int
@kotlin.annotations.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 test(): 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
}
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/propertyAccessor.kt
Vendored
+4 -4
View File
@@ -3,12 +3,12 @@
// !JVM_TARGET: 1.8
interface B {
@kotlin.annotations.JvmDefault
@JvmDefault
val prop1: String
<!WRONG_ANNOTATION_TARGET!>@kotlin.annotations.JvmDefault<!> get() = ""
<!WRONG_ANNOTATION_TARGET!>@JvmDefault<!> get() = ""
var prop2: String
<!WRONG_ANNOTATION_TARGET!>@kotlin.annotations.JvmDefault<!> get() = ""
<!WRONG_ANNOTATION_TARGET!>@kotlin.annotations.JvmDefault<!> set(value) {}
<!WRONG_ANNOTATION_TARGET!>@JvmDefault<!> get() = ""
<!WRONG_ANNOTATION_TARGET!>@JvmDefault<!> set(value) {}
}
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/propertyAccessor.txt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
package
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 override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
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
// !JVM_TARGET: 1.8
interface A {
@kotlin.annotations.JvmDefault
@JvmDefault
fun test() {}
}
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/simpleOverride.txt
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@ package
public interface A {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
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
}
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/simpleOverrideWithFeature.kt
Vendored
+2 -2
View File
@@ -1,8 +1,8 @@
// !API_VERSION: 1.3
// !JVM_TARGET: 1.8
@kotlin.annotations.JvmDefaultFeature
@JvmDefaultFeature
interface A {
@kotlin.annotations.JvmDefault
@JvmDefault
fun test() {
}
}
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/simpleOverrideWithFeature.txt
Vendored
+2 -2
View File
@@ -1,9 +1,9 @@
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 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
}
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/simplePropertyOverride.kt
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@
// !API_VERSION: 1.3
// !JVM_TARGET: 1.8
interface A {
@kotlin.annotations.JvmDefault
@JvmDefault
val test: String
get() = "OK"
}
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/simplePropertyOverride.txt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
package
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 hashCode(): kotlin.Int
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
interface B {
<!JVM_DEFAULT_IN_JVM6_TARGET!>@kotlin.annotations.JvmDefault<!>
<!JVM_DEFAULT_IN_JVM6_TARGET!>@JvmDefault<!>
fun test() {}
<!JVM_DEFAULT_IN_JVM6_TARGET!>@kotlin.annotations.JvmDefault<!>
<!JVM_DEFAULT_IN_JVM6_TARGET!>@JvmDefault<!>
abstract fun test2(s: String = "")
<!JVM_DEFAULT_IN_JVM6_TARGET!>@kotlin.annotations.JvmDefault<!>
<!JVM_DEFAULT_IN_JVM6_TARGET!>@JvmDefault<!>
abstract fun test3()
<!JVM_DEFAULT_IN_JVM6_TARGET!>@kotlin.annotations.JvmDefault<!>
<!JVM_DEFAULT_IN_JVM6_TARGET!>@JvmDefault<!>
abstract val prop: String
<!JVM_DEFAULT_IN_JVM6_TARGET!>@kotlin.annotations.JvmDefault<!>
<!JVM_DEFAULT_IN_JVM6_TARGET!>@JvmDefault<!>
abstract val prop2: String
<!JVM_DEFAULT_IN_JVM6_TARGET!>@kotlin.annotations.JvmDefault<!>
<!JVM_DEFAULT_IN_JVM6_TARGET!>@JvmDefault<!>
val prop3: String
get() = ""
<!JVM_DEFAULT_IN_JVM6_TARGET!>@kotlin.annotations.JvmDefault<!>
<!JVM_DEFAULT_IN_JVM6_TARGET!>@JvmDefault<!>
var prop4: String
get() = ""
set(value) {}
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/target6.txt
Vendored
+7 -7
View File
@@ -1,14 +1,14 @@
package
public interface B {
@kotlin.annotations.JvmDefault public abstract val prop: kotlin.String
@kotlin.annotations.JvmDefault public abstract val prop2: kotlin.String
@kotlin.annotations.JvmDefault public open val prop3: kotlin.String
@kotlin.annotations.JvmDefault public open var prop4: kotlin.String
@kotlin.jvm.JvmDefault public abstract val prop: kotlin.String
@kotlin.jvm.JvmDefault public abstract val prop2: kotlin.String
@kotlin.jvm.JvmDefault public open val prop3: 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 hashCode(): kotlin.Int
@kotlin.annotations.JvmDefault public open fun test(): kotlin.Unit
@kotlin.annotations.JvmDefault public abstract fun test2(/*0*/ s: kotlin.String = ...): kotlin.Unit
@kotlin.annotations.JvmDefault public abstract fun test3(): kotlin.Unit
@kotlin.jvm.JvmDefault public open fun test(): kotlin.Unit
@kotlin.jvm.JvmDefault public abstract fun test2(/*0*/ s: kotlin.String = ...): kotlin.Unit
@kotlin.jvm.JvmDefault public abstract fun test3(): kotlin.Unit
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
interface B {
@kotlin.annotations.JvmDefault
@JvmDefault
fun test() {}
@kotlin.annotations.JvmDefault
@JvmDefault
abstract fun test2(s: String = "")
@kotlin.annotations.JvmDefault
@JvmDefault
abstract fun test3()
@kotlin.annotations.JvmDefault
@JvmDefault
abstract val prop: String
@kotlin.annotations.JvmDefault
@JvmDefault
abstract val prop2: String
@kotlin.annotations.JvmDefault
@JvmDefault
val prop3: String
get() = ""
@kotlin.annotations.JvmDefault
@JvmDefault
var prop4: String
get() = ""
set(value) {}
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/target8.txt
Vendored
+7 -7
View File
@@ -1,14 +1,14 @@
package
public interface B {
@kotlin.annotations.JvmDefault public abstract val prop: kotlin.String
@kotlin.annotations.JvmDefault public abstract val prop2: kotlin.String
@kotlin.annotations.JvmDefault public open val prop3: kotlin.String
@kotlin.annotations.JvmDefault public open var prop4: kotlin.String
@kotlin.jvm.JvmDefault public abstract val prop: kotlin.String
@kotlin.jvm.JvmDefault public abstract val prop2: kotlin.String
@kotlin.jvm.JvmDefault public open val prop3: 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 hashCode(): kotlin.Int
@kotlin.annotations.JvmDefault public open fun test(): kotlin.Unit
@kotlin.annotations.JvmDefault public abstract fun test2(/*0*/ s: kotlin.String = ...): kotlin.Unit
@kotlin.annotations.JvmDefault public abstract fun test3(): kotlin.Unit
@kotlin.jvm.JvmDefault public open fun test(): kotlin.Unit
@kotlin.jvm.JvmDefault public abstract fun test2(/*0*/ s: kotlin.String = ...): kotlin.Unit
@kotlin.jvm.JvmDefault public abstract fun test3(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}