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

Replace annotations with brackets in testData

Browse Source 
Just in tests that changed after deprecation
This commit is contained in:
Denis Zharkov
2015-05-06 14:58:59 +03:00
parent 5bc7c9600f
commit 849b8acbf8
87 changed files with 224 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/finalAndAbstract.kt
+8 -8
View File
@@ -12,24 +12,24 @@ abstract class A {
object B: A() {
<!OVERRIDE_CANNOT_BE_STATIC!>[platformStatic] override fun a()<!> {}
<!OVERRIDE_CANNOT_BE_STATIC!>@platformStatic override fun a()<!> {}
<!OVERRIDE_CANNOT_BE_STATIC!>[platformStatic] override fun b()<!> {}
<!OVERRIDE_CANNOT_BE_STATIC!>@platformStatic override fun b()<!> {}
<!OVERRIDE_CANNOT_BE_STATIC!>[platformStatic] final override fun c()<!> {}
<!OVERRIDE_CANNOT_BE_STATIC!>@platformStatic final override fun c()<!> {}
[platformStatic] open fun d() {}
@platformStatic open fun d() {}
}
class C {
companion object: A() {
[platformStatic] override fun a() {}
@platformStatic override fun a() {}
[platformStatic] override fun b() {}
@platformStatic override fun b() {}
[platformStatic] final override fun c() {}
@platformStatic final override fun c() {}
[platformStatic] open fun d() {}
@platformStatic open fun d() {}
}
}
compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/localFun.kt
+1 -1
View File
@@ -2,7 +2,7 @@
import kotlin.platform.platformStatic
fun main(args: Array<String>) {
<!PLATFORM_STATIC_NOT_IN_OBJECT!>[platformStatic] fun a()<!>{
<!PLATFORM_STATIC_NOT_IN_OBJECT!>@platformStatic fun a()<!>{
}
}
compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/property.kt
+10 -10
View File
@@ -9,38 +9,38 @@ open class B {
class A {
companion object : B() {
var p1:Int = 1
[platformStatic] set(p: Int) {
@platformStatic set(p: Int) {
p1 = 1
}
[platformStatic] val z = 1;
@platformStatic val z = 1;
[platformStatic] override val base1: Int = 0
@platformStatic override val base1: Int = 0
override val base2: Int = 0
[platformStatic] get
@platformStatic get
}
object A : B() {
var p:Int = 1
[platformStatic] set(p1: Int) {
@platformStatic set(p1: Int) {
p = 1
}
[platformStatic] val z = 1;
@platformStatic val z = 1;
<!OVERRIDE_CANNOT_BE_STATIC!>[platformStatic] override val base1: Int<!> = 0
<!OVERRIDE_CANNOT_BE_STATIC!>@platformStatic override val base1: Int<!> = 0
platformStatic open fun f() {}
override val base2: Int = 0
<!OVERRIDE_CANNOT_BE_STATIC!>[platformStatic] get<!>
<!OVERRIDE_CANNOT_BE_STATIC!>@platformStatic get<!>
}
var p:Int = 1
<!PLATFORM_STATIC_NOT_IN_OBJECT!>[platformStatic] set(p1: Int)<!> {
<!PLATFORM_STATIC_NOT_IN_OBJECT!>@platformStatic set(p1: Int)<!> {
p = 1
}
<!PLATFORM_STATIC_NOT_IN_OBJECT!>[platformStatic] val z2<!> = 1;
<!PLATFORM_STATIC_NOT_IN_OBJECT!>@platformStatic val z2<!> = 1;
}