Adjust testData: get rid of obsolete annotations

2015-06-09 20:30:52 +03:00
parent 053dcf3abf
commit c9f79c2d05
193 changed files with 322 additions and 322 deletions
@@ -3,6 +3,6 @@ package ppp
 import kotlin.platform.platformStatic

 public object Dependency {
-    [platformStatic]
+    @platformStatic
    public val FIELD: Int = 1
 }
@@ -1,5 +1,5 @@
 fun foo() {
-    [Ann() Ann] val a = bar()<caret>
+    @Ann() @Ann val a = bar()<caret>
 }

 annotation class Ann
@@ -4,8 +4,8 @@ import dependency.*

 data A("a") B(1) C class Annotations {

-    inline A("f") B(2) C fun f(A("i") B(3) C deprecated("1") i: [A("int")] Int) {
+    inline A("f") B(2) C fun f(A("i") B(3) C deprecated("1") i: @A("int") Int) {
    }

-    inline A("p") B(3) C val p: [B(4)] Int = 2
+    inline A("p") B(3) C val p: @B(4) Int = 2
 }
@@ -2,4 +2,4 @@ package test

 import dependency.*

-class AnnotationsOnPrimaryCtr [A("a")] private [B(1) C] ()
+class AnnotationsOnPrimaryCtr @A("a") private @B(1) @C constructor()
@@ -1,4 +1,4 @@
-a public class Annotations private [a] (private [a] val c1: Int, [a] val c2: Int) {
+a public class Annotations private @a constructor(private @a val c1: Int, @a val c2: Int) {

    protected a fun f() {
    }
@@ -7,22 +7,22 @@ a public class Annotations private [a] (private [a] val c1: Int, [a] val c2: Int

    b(E.E1) private val c: Int = 1

-    a b(E.E2) public fun g([a] p1: E) {
+    a b(E.E2) public fun g(@a p1: E) {
    }

    var withCustomAccessors: Int = 0
    //TODO: accessor modifiers are lost
-        [a] get
-        [a] private set
+        @a get
+        @a private set


    private b(E.E2) companion object {

    }

-    class Nested [a] private [b(E.E1) b(E.E2)] ()
+    class Nested @a private @b(E.E1) @b(E.E2) constructor()

-    fun types(param: [a] [b(E.E1)] DoubleRange): [a] [b(E.E2)] Unit {}
+    fun types(param: @a @b(E.E1) DoubleRange): @a @b(E.E2) Unit {}
 }

 annotation class a
@@ -4,7 +4,7 @@ import d.e.f.*

 a b val i: Int = 0

-a b fun f([a b] p1: C): Int = 0
+a b fun f(@a @b p1: C): Int = 0


 class C
@@ -1,12 +1,12 @@
 class A1()

 class A2 private ()
-class A3 private [ann] protected ()
-class A4 private [ann1] protected [ann2] () {
+class A3 private @[ann] protected constructor()
+class A4 private @ann1 protected @[ann2] constructor() {

 }

-class A5 private [ann]
+class A5 private @ann constructor

 ()

@@ -14,17 +14,17 @@ class A6     /* faddf */ private ()

 class A7
 private
-[ann]
+@ann constructor
 ()

 class A8     // eol comment
 private
-[ann]
+@ann constructor
 ()

 class A9 // eol comment
 private // eol comment
-[ann] // eol comment
+@ann constructor// eol comment
 ()

 class A10
@@ -1,11 +1,11 @@
 class A1  ()

 class A2 private    ()
-class A3  private [ann] protected()
-class A4  private [ann1] protected    [ann2]  () {
+class A3 private @[ann] protected constructor()
+class A4 private @ann1         protected        @[ann2] constructor() {

 }
-class A5 private [ann]
+class A5 private @ann constructor

 ()

@@ -13,17 +13,17 @@ class A6     /* faddf */    private ()

 class A7
 private
-[ann]
+@ann constructor
 ()

 class A8     // eol comment
 private
-[ann]
+@ann constructor
 ()

 class A9 // eol comment
 private // eol comment
-[ann] // eol comment
+@ann constructor// eol comment
 ()

 class A10
@@ -64,21 +64,21 @@ annotation class A1

 annotation class A2

-private [A1 A2 A1] A1 A2 [A1 A2 A2] [A1] val fooProp1 = 1
+private @[A1 A2 A1] A1 A2 @[A1 A2 A2] @[A1] val fooProp1 = 1

-private [
+private @[


 A1


-A2 A1] A1 A2 [A1
+A2 A1] A1 A2 @[A1
 A2


 A2

-] [A1] val fooProp1 = 1
+] @[A1] val fooProp1 = 1

 private A1

@@ -61,15 +61,15 @@ public       var         varWithAccessors2:    Int
 annotation class A1
 annotation class A2

-private  [   A1   A2   A1 ]   A1    A2  [   A1  A2   A2     ]   [A1] val     fooProp1   = 1
+private  @[   A1   A2   A1 ]   A1    A2  @[   A1  A2   A2     ]   @[A1] val     fooProp1   = 1

-private  [
+private  @[


 A1


-A2   A1 ]   A1    A2  [A1
+A2   A1 ]   A1    A2  @[A1
 A2


@@ -77,7 +77,7 @@ A2

 A2

-]   [A1] val     fooProp1   = 1
+]   @[A1] val     fooProp1   = 1

 private  A1

@@ -1,4 +1,4 @@
-[annot]
-[foo] fun foo() {
+@annot
+@foo fun foo() {
 }

@@ -1,4 +1,4 @@
-[annot]
-[foo] fun foo() {
+@annot
+@foo fun foo() {
 }

@@ -1,4 +1,4 @@
-[annot]
+@annot
 foo() fun foo() {
 }

@@ -1,4 +1,4 @@
-[annot]
+@annot
 foo() fun foo() {
 }

@@ -1,4 +1,4 @@
-[annot]
+@annot
 final fun foo() {
 }

@@ -1,4 +1,4 @@
-[annot]
+@annot
 final fun foo() {
 }

@@ -1,4 +1,4 @@
 annot()
-[foo] fun foo() {
+@foo fun foo() {
 }

@@ -1,4 +1,4 @@
 annot()
-[foo] fun foo() {
+@foo fun foo() {
 }

@@ -1,4 +1,4 @@
 public
-[foo] fun foo() {
+@foo fun foo() {
 }

@@ -1,4 +1,4 @@
 public
-[foo] fun foo() {
+@foo fun foo() {
 }

@@ -1,4 +1,4 @@
 fun foo() {
-    <caret>[volatile] var v: Int
+    <caret>@volatile var v: Int
    v = 1
 }
@@ -1,3 +1,3 @@
 fun foo() {
-    <caret>[volatile] var v: Int = 1
+    <caret>@volatile var v: Int = 1
 }
@@ -10,7 +10,7 @@ package h

 interface H

-[suppress("UNUSED_CHANGED_VALUE")]
+@suppress("UNUSED_CHANGED_VALUE")
 fun f(h: H?) {
    var h1 = h
    h1<caret>++
@@ -1,5 +1,5 @@
 // "Create annotation 'foo'" "true"

-[<caret>foo] fun test() {
+@[<caret>foo] fun test() {

 }
@@ -1,6 +1,6 @@
 // "Create annotation 'foo'" "true"

-[foo] fun test() {
+@[foo] fun test() {

 }

@@ -1,5 +1,5 @@
 // "Create annotation 'foo'" "true"

-[<caret>foo()] fun test() {
+@[<caret>foo()] fun test() {

 }
@@ -1,6 +1,6 @@
 // "Create annotation 'foo'" "true"

-[foo()] fun test() {
+@[foo()] fun test() {

 }

@@ -1,5 +1,5 @@
 // "Create annotation 'foo'" "true"

-[<caret>foo(1, "2")] fun test() {
+@[<caret>foo(1, "2")] fun test() {

 }
@@ -1,6 +1,6 @@
 // "Create annotation 'foo'" "true"

-[foo(1, "2")] fun test() {
+@[foo(1, "2")] fun test() {

 }

@@ -1,5 +1,5 @@
 // "Create annotation 'foo'" "true"

-[<caret>foo<String>(1, "2")] fun test() {
+@[<caret>foo<String>(1, "2")] fun test() {

 }
@@ -1,6 +1,6 @@
 // "Create annotation 'foo'" "true"

-[foo(1, "2")] fun test() {
+@[foo(1, "2")] fun test() {

 }

@@ -1,5 +1,5 @@
 // "Create annotation 'foo'" "true"

-[<caret>foo(1)] fun test() {
+@[<caret>foo(1)] fun test() {

 }
@@ -1,6 +1,6 @@
 // "Create annotation 'foo'" "true"

-[foo(1)] fun test() {
+@[foo(1)] fun test() {

 }

@@ -1,5 +1,5 @@
 // "Create annotation 'foo'" "true"

-[<caret>foo(fooBar = 1)] fun test() {
+@[<caret>foo(fooBar = 1)] fun test() {

 }
@@ -1,6 +1,6 @@
 // "Create annotation 'foo'" "true"

-[foo(fooBar = 1)] fun test() {
+@[foo(fooBar = 1)] fun test() {

 }

@@ -1,6 +1,6 @@
 // "Create annotation 'bar'" "true"
 // ERROR: Unresolved reference: foo

-[foo(1, "2", <caret>bar("3", 4))] fun test() {
+@[foo(1, "2", <caret>bar("3", 4))] fun test() {

 }
@@ -1,7 +1,7 @@
 // "Create annotation 'bar'" "true"
 // ERROR: Unresolved reference: foo

-[foo(1, "2", bar("3", 4))] fun test() {
+@[foo(1, "2", bar("3", 4))] fun test() {

 }

@@ -2,6 +2,6 @@
 // ERROR: Unresolved reference: foo
 // ERROR: Unresolved reference: bar

-[foo(1, "2", J.bar("3", 4))] fun test() {
+@foo(1, "2", J.bar("3", 4)) fun test() {

 }
@@ -2,6 +2,6 @@
 // ERROR: Unresolved reference: foo
 // ERROR: Unresolved reference: bar

-[foo(1, "2", J.<caret>bar("3", 4))] fun test() {
+@foo(1, "2", J.<caret>bar("3", 4)) fun test() {

 }
@@ -1,6 +1,6 @@
 // "Create annotation 'bar'" "true"
 // ERROR: Unresolved reference: foo

-[foo(1, "2", <caret>bar<String, Int>("3", 4))] fun test() {
+@[foo(1, "2", <caret>bar<String, Int>("3", 4))] fun test() {

 }
@@ -1,7 +1,7 @@
 // "Create annotation 'bar'" "true"
 // ERROR: Unresolved reference: foo

-[foo(1, "2", bar("3", 4))] fun test() {
+@[foo(1, "2", bar("3", 4))] fun test() {

 }

@@ -1,6 +1,6 @@
 // "Create annotation 'bar'" "true"
 // ERROR: Unresolved reference: foo

-[foo(1, "2", <caret>bar("3"))] fun test() {
+@[foo(1, "2", <caret>bar("3"))] fun test() {

 }
@@ -1,7 +1,7 @@
 // "Create annotation 'bar'" "true"
 // ERROR: Unresolved reference: foo

-[foo(1, "2", bar("3"))] fun test() {
+@[foo(1, "2", bar("3"))] fun test() {

 }

@@ -1,6 +1,6 @@
 // "Create annotation 'bar'" "true"
 // ERROR: Unresolved reference: foo

-[foo(1, "2", <caret>bar(fooBar = "3"))] fun test() {
+@[foo(1, "2", <caret>bar(fooBar = "3"))] fun test() {

 }
@@ -1,7 +1,7 @@
 // "Create annotation 'bar'" "true"
 // ERROR: Unresolved reference: foo

-[foo(1, "2", bar(fooBar = "3"))] fun test() {
+@[foo(1, "2", bar(fooBar = "3"))] fun test() {

 }

@@ -10,13 +10,13 @@ Ann1(MyClass1::class) class MyClass2

 annotation class Ann2(val arg: Array<KClass<*>>)

-Ann2(arg = array(Double::class)) class MyClass3 [Ann1(Char::class)] () {
+Ann2(arg = array(Double::class)) class MyClass3 @Ann1(Char::class) constructor() {
    annotation class Ann3(val arg: KClass<*> = Any::class)

    Ann3(String::class) class Nested {
        Ann1(arg = String::class) fun foo1() {
            annotation class LocalAnn(val arg: KClass<*>)
-            [LocalAnn(Class::class)] val x = 1
+            @LocalAnn(Class::class) val x = 1
        }
    }

@@ -8,13 +8,13 @@ Ann1(javaClass<MyClass1>()) class MyClass2

 annotation class Ann2(val arg: Array<Class<*>>)

-Ann2(arg = array(javaClass<Double>())) class MyClass3 [Ann1(javaClass<Char>())] () {
+Ann2(arg = array(javaClass<Double>())) class MyClass3 @Ann1(javaClass<Char>()) constructor() {
    annotation class Ann3(val arg: Class<*> = javaClass<Any>())

    Ann3(javaClass<String>()) class Nested {
        Ann1(arg = javaClass<String>()) fun foo1() {
            annotation class LocalAnn(val arg: Class<*>)
-            [LocalAnn(javaClass<Class<*>>())] val x = 1
+            @LocalAnn(javaClass<Class<*>>()) val x = 1
        }
    }

@@ -7,12 +7,12 @@ Ann(String::class, arg = Int::class, x = 1, args = array(Double::class)) class M
    Ann(String::class, arg = Int::class, args = array(Double::class)) class Nested {
        Ann(String::class, arg = Int::class, args = array(Double::class)) fun foo1() {

-            [Ann(String::class, arg = Int::class, args = array(Double::class))] class Local
+            @Ann(String::class, arg = Int::class, args = array(Double::class)) class Local
        }

-        [Ann(String::class, arg = Int::class, args = array(Double::class), x = 1)] fun foo2() {
+        @Ann(String::class, arg = Int::class, args = array(Double::class), x = 1) fun foo2() {

-            [Ann(String::class, arg = Int::class, args = array(Double::class))] val local = 0
+            @Ann(String::class, arg = Int::class, args = array(Double::class)) val local = 0
        }
    }

@@ -7,12 +7,12 @@ Ann(javaClass<String>(), arg = javaClass<Int>(), x = 1, args = array(javaClass<D
    Ann(javaClass<String>(), arg = javaClass<Int>(), args = array(javaClass<Double>())) class Nested {
        Ann(javaClass<String>(), arg = javaClass<Int>(), args = array(javaClass<Double>())) fun foo1() {

-            [Ann(javaClass<String>(), arg = javaClass<Int>(), args = array(javaClass<Double>()))] class Local
+            @Ann(javaClass<String>(), arg = javaClass<Int>(), args = array(javaClass<Double>())) class Local
        }

-        [Ann(javaClass<String>(), arg = javaClass<Int>(), args = array(javaClass<Double>()), x = 1)] fun foo2() {
+        @Ann(javaClass<String>(), arg = javaClass<Int>(), args = array(javaClass<Double>()), x = 1) fun foo2() {

-            [Ann(javaClass<String>(), arg = javaClass<Int>(), args = array(javaClass<Double>()))] val local = 0
+            @Ann(javaClass<String>(), arg = javaClass<Int>(), args = array(javaClass<Double>())) val local = 0
        }
    }

@@ -1,3 +1,3 @@
 // "class org.jetbrains.kotlin.idea.quickfix.MakeClassAnAnnotationClassFix" "false"
 // ERROR: 'String' is not an annotation class
-[String<caret>] class foo {}
+@String<caret> class foo {}
@@ -1,4 +1,4 @@
 // "Make 'fancy' an annotation class" "true"
 class fancy

-[fancy<caret>] class foo {}
+@fancy<caret> class foo {}
@@ -1,4 +1,4 @@
 // "Make 'fancy' an annotation class" "true"
 annotation class fancy

-[fancy] class foo {}
+@fancy class foo {}
@@ -1,5 +1,5 @@
 // "Suppress 'REDUNDANT_NULLABLE' for fun foo" "true"

-[ann] fun foo(): String?<caret>? = null
+@ann fun foo(): String?<caret>? = null

 annotation class ann
@@ -1,6 +1,6 @@
 // "Suppress 'REDUNDANT_NULLABLE' for fun foo" "true"

@suppress("REDUNDANT_NULLABLE")
-[ann] fun foo(): String?<caret>? = null
+@ann fun foo(): String?<caret>? = null

 annotation class ann
@@ -1,4 +1,4 @@
 // "Suppress 'REDUNDANT_NULLABLE' for fun foo" "true"
 // ERROR: Unresolved reference: ann

-[ann] fun foo(): String?<caret>? = null
+@ann fun foo(): String?<caret>? = null
@@ -2,4 +2,4 @@
 // ERROR: Unresolved reference: ann

@suppress("REDUNDANT_NULLABLE")
-[ann] fun foo(): String?<caret>? = null
+@ann fun foo(): String?<caret>? = null
@@ -1,7 +1,7 @@
 // "Suppress 'UNNECESSARY_NOT_NULL_ASSERTION' for statement " "true"

 fun foo() {
-    [ann] ""<caret>!!
+    @ann ""<caret>!!
 }

 annotation class ann
@@ -2,7 +2,7 @@

 fun foo() {
    @suppress("UNNECESSARY_NOT_NULL_ASSERTION")
-    [ann] ""<caret>!!
+    @ann ""<caret>!!
 }

 annotation class ann
@@ -1,3 +1,3 @@
 annotation class foo(val n: Int)

-class Test([foo(1) foo(2)] [foo(3)] private val s: String, n: Int)
+class Test(@foo(1) @foo(2) @foo(3) private val s: String, n: Int)
@@ -1,3 +1,3 @@
 annotation class foo(val n: Int)

-class <caret>Test([foo(1) foo(2)] [foo(3)] private val s: String)
+class <caret>Test(@foo(1) @foo(2) @foo(3) private val s: String)
@@ -1,7 +1,7 @@
 // SIBLING:
 class MyClass {
    fun test() {
-        <selection>[P] val t: Int = 1
+        <selection>@[P] val t: Int = 1
        t</selection>
    }

@@ -8,6 +8,6 @@ class MyClass {
 }

 private fun __dummyTestFun__() {
-    [MyClass.P] val t: Int = 1
+    @[MyClass.P] val t: Int = 1
    t
 }
@@ -1,4 +1,4 @@
-[file: kotlin.<caret>deprecated("message")]
+@file:[kotlin.<caret>deprecated("message")]

 package foo

@@ -1,4 +1,4 @@
-[file: <caret>D("message")]
+@file:[<caret>D("message")]

 package foo

@@ -3,7 +3,7 @@ package testing
 annotation class Annotation<T>(val clazz: Class<T>)
 class ATest

-[Annotation<ATest>(javaClass<<caret>ATest>())]
+@[Annotation<ATest>(javaClass<<caret>ATest>())]
 class BTest

 // REF: (testing).ATest
@@ -3,7 +3,7 @@ package testing
 annotation class Annotation<T>(val clazz: Class<T>)
 class ATest

-[Annotation<<caret>ATest>(javaClass<ATest>())]
+@[Annotation<<caret>ATest>(javaClass<ATest>())]
 class BTest

 // REF: (testing).ATest
@@ -1,6 +1,6 @@
-[Deprecated] class TestClass1 {}
+@Deprecated class TestClass1 {}

-[java.lang.Deprecated] class TestClass2 {}
+@java.lang.Deprecated class TestClass2 {}

 Deprecated class TestClass3 {}

@@ -1,17 +1,17 @@
 import org.junit.Test

 class MyTestClass {
-    [org.junit.Test] fun test1() {}
+    @org.junit.Test fun test1() {}

    org.junit.Test fun test2() {}

-    [Test] fun test3() {}
+    @Test fun test3() {}

    Test fun test4() {}

-    [Deprecated org.junit.Test] fun test5() {}
+    @Deprecated @org.junit.Test fun test5() {}

-    [Deprecated Test] fun test6() {}
+    @Deprecated @Test fun test6() {}

    fun test7() {}
 }
@@ -4,7 +4,7 @@ import org.junit.Test
 class MyTestClass {
    test fun test1() {}

-    [Deprecated test] fun test2() {}
+    @Deprecated @test fun test2() {}

    Test fun test3() {}
 }
@@ -1,4 +1,4 @@
 fun foo() {
-    [Deprecated] fun innerFoo() {
+    @[Deprecated] fun innerFoo() {
    }
 }
@@ -1 +1 @@
-class A [Deprecated] private [Override Deprecated] ()
+class A @[Deprecated] private @[Override Deprecated] ()
@@ -1,5 +1,5 @@
 class C {
-    [Ann]
+    @[Ann]
 }

-[Ann]
+@[Ann]
@@ -1,2 +1,2 @@
-[Deprecated Override] fun foo() {
+@[Deprecated Override] fun foo() {
 }
@@ -1 +1 @@
-val c = [x] val a
+val c = @[x] val a
@@ -4,4 +4,4 @@ annotation class b(val e: E)

 enum class E { E1 E2 }

-fun types(param: [a] [b(E.E1)] DoubleRange): [a] [b(E.E2)] Unit {}
+fun types(param: @[a] @[b(E.E1)] DoubleRange): @[a] @[b(E.E2)] Unit {}