Adjust testData: get rid of obsolete annotations

This commit is contained in:
Denis Zharkov
2015-06-09 20:30:52 +03:00
parent 053dcf3abf
commit c9f79c2d05
193 changed files with 322 additions and 322 deletions
@@ -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 -1
View File
@@ -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