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/tests/annotations/AnnotationsForClasses.kt
+1 -1
View File
@@ -1,2 +1,2 @@
annotation [<!PLATFORM_CLASS_MAPPED_TO_KOTLIN!>java.lang.Deprecated<!>] class my
annotation @<!PLATFORM_CLASS_MAPPED_TO_KOTLIN!>java.lang.Deprecated<!> class my
annotation <!PLATFORM_CLASS_MAPPED_TO_KOTLIN!>Deprecated<!> class my1
compiler/testData/diagnostics/tests/annotations/DanglingInScript.kt
+1 -1
View File
@@ -2,4 +2,4 @@
annotation class Ann
[Ann]<!SYNTAX!><!>
@Ann<!SYNTAX!><!>
compiler/testData/diagnostics/tests/annotations/DanglingMixed.kt
+7 -7
View File
@@ -5,18 +5,18 @@ class C {
fun foo() {
class Local {
<!UNRESOLVED_REFERENCE!>Ann0<!>
[Ann <!UNRESOLVED_REFERENCE!>Ann3<!>]
@Ann <!UNRESOLVED_REFERENCE!>@Ann3<!>
Ann2(<!TOO_MANY_ARGUMENTS!>1<!>)
[<!UNRESOLVED_REFERENCE!>Ann4<!>]<!SYNTAX!><!>
<!UNRESOLVED_REFERENCE!>@Ann4<!><!SYNTAX!><!>
}
}
<!UNRESOLVED_REFERENCE!>Ann0<!>
[Ann <!UNRESOLVED_REFERENCE!>Ann3<!>]
@Ann <!UNRESOLVED_REFERENCE!>@Ann3<!>
Ann2(<!TOO_MANY_ARGUMENTS!>1<!>)
[<!UNRESOLVED_REFERENCE!>Ann4<!>]<!SYNTAX!><!>
<!UNRESOLVED_REFERENCE!>@Ann4<!><!SYNTAX!><!>
}
<!UNRESOLVED_REFERENCE!>Ann0<!>
[Ann <!UNRESOLVED_REFERENCE!>Ann3<!>]
Ann2(<!TOO_MANY_ARGUMENTS!>1<!>)
[<!UNRESOLVED_REFERENCE!>Ann4<!>]<!SYNTAX!><!>
@Ann <!UNRESOLVED_REFERENCE!>@Ann3<!>
@Ann2(<!TOO_MANY_ARGUMENTS!>1<!>)
<!UNRESOLVED_REFERENCE!>@Ann4<!SYNTAX!><!><!>
compiler/testData/diagnostics/tests/annotations/DanglingWithBrackets.kt
+4 -4
View File
@@ -2,15 +2,15 @@ annotation class Ann
class C {
fun test() {
[Ann]<!SYNTAX!><!>
@Ann<!SYNTAX!><!>
}
fun foo() {
class Local {
[Ann]<!SYNTAX!><!>
@Ann<!SYNTAX!><!>
}
}
[Ann]<!SYNTAX!><!>
@Ann<!SYNTAX!><!>
}
[Ann]<!SYNTAX!><!>
@Ann<!SYNTAX!><!>
compiler/testData/diagnostics/tests/annotations/JavaAnnotationConstructors.kt
+1 -1
View File
@@ -1,4 +1,4 @@
import java.lang.annotation.*
annotation [java.lang.annotation.Retention(RetentionPolicy.CLASS)] class my
annotation @java.lang.annotation.Retention(RetentionPolicy.CLASS) class my
annotation Retention(RetentionPolicy.RUNTIME) Target(ElementType.ANNOTATION_TYPE, ElementType.CONSTRUCTOR) class my1
compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/booleanLocalVal.kt
+1 -1
View File
@@ -2,5 +2,5 @@ annotation class Ann(vararg val i: Boolean)
fun foo() {
val bool1 = true
[Ann(<!ANNOTATION_PARAMETER_MUST_BE_CONST!>bool1<!>)] val <!UNUSED_VARIABLE!>a<!> = bool1
@Ann(<!ANNOTATION_PARAMETER_MUST_BE_CONST!>bool1<!>) val <!UNUSED_VARIABLE!>a<!> = bool1
}
compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/compareAndEquals.kt
+2 -2
View File
@@ -6,11 +6,11 @@ fun foo() {
val a3 = a1 == a2
val a4 = a1 > a2
[Ann(
@Ann(
<!ANNOTATION_PARAMETER_MUST_BE_CONST!>a1<!>,
<!ANNOTATION_PARAMETER_MUST_BE_CONST!>a2<!>,
<!ANNOTATION_PARAMETER_MUST_BE_CONST!>a3<!>,
<!ANNOTATION_PARAMETER_MUST_BE_CONST!>a1 > a2<!>,
<!ANNOTATION_PARAMETER_MUST_BE_CONST!>a1 == a2<!>
)] val b = 1
) val b = 1
}
compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/strings.kt
+2 -2
View File
@@ -11,7 +11,7 @@ fun foo() {
val a4 = 1
val a5 = 1.0
[Ann(
@Ann(
<!ANNOTATION_PARAMETER_MUST_BE_CONST!>a1<!>,
<!ANNOTATION_PARAMETER_MUST_BE_CONST!>a2<!>,
<!ANNOTATION_PARAMETER_MUST_BE_CONST!>a3<!>,
@@ -24,5 +24,5 @@ fun foo() {
<!ANNOTATION_PARAMETER_MUST_BE_CONST!>"a" + a2<!>,
"a" + topLevel,
<!ANNOTATION_PARAMETER_MUST_BE_CONST!>"a" + a4<!>
)] val b = 1
) val b = 1
}
compiler/testData/diagnostics/tests/annotations/annotationsOnLambdaAsCallArgument.kt
+1 -1
View File
@@ -3,7 +3,7 @@ annotation class Ann(val x: Int = 1)
inline fun bar(block: () -> Int): Int = block()
fun foo() {
bar() [Ann(1)] @Ann(2) { 101 }
bar() @Ann(1) @Ann(2) { 101 }
bar() @Ann(3) { 102 }
bar @Ann l1@ {
compiler/testData/diagnostics/tests/annotations/atAnnotationResolve.kt
+2 -2
View File
@@ -1,7 +1,7 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER
annotation class Ann(val x: Int = 6)
@Ann(1) [Ann(2)] @Ann(3) @private class A [Ann] () {
@Ann(1) @Ann(2) @Ann(3) @private class A [Ann] () {
@Ann(x = 5) fun foo() {
1 + @Ann(1) 1 * @Ann(<!TYPE_MISMATCH!>""<!>) 6
@@ -10,5 +10,5 @@ annotation class Ann(val x: Int = 6)
@Ann val x = 1
fun bar(x: @Ann(1) [Ann(2)] @Ann(3) Int) {}
fun bar(x: @Ann(1) @Ann(2) @Ann(3) Int) {}
}
compiler/testData/diagnostics/tests/annotations/kt1860-negative.kt
+1 -1
View File
@@ -3,7 +3,7 @@ fun foo(<!UNRESOLVED_REFERENCE!>varargs<!> <!UNUSED_PARAMETER!>f<!> : Int) {}
var bar : Int = 1
set(<!UNRESOLVED_REFERENCE!>varargs<!> v) {}
val x : (Int) -> Int = {[<!UNRESOLVED_REFERENCE!>varargs<!>] <!TYPE_MISMATCH!>x<!> <!DEPRECATED_STATIC_ASSERT!>: Int<!> <!SYNTAX!>-> x<!>}
val x : (Int) -> Int = {<!UNRESOLVED_REFERENCE!>@varargs<!> <!TYPE_MISMATCH!>x<!> <!DEPRECATED_STATIC_ASSERT!>: Int<!> <!SYNTAX!>-> x<!>}
class Hello(<!UNRESOLVED_REFERENCE!>varargs<!> <!UNUSED_PARAMETER!>args<!>: Any) {
}
compiler/testData/diagnostics/tests/annotations/kt1860-positive.kt
+1 -1
View File
@@ -5,7 +5,7 @@ fun foo(test <!UNUSED_PARAMETER!>f<!> : Int) {}
var bar : Int = 1
set(test v) {}
val x : (Int) -> Int = {[test] <!TYPE_MISMATCH!>x<!> <!DEPRECATED_STATIC_ASSERT!>: Int<!> <!SYNTAX!>-> x<!>} // todo fix parser annotation on lambda parameter
val x : (Int) -> Int = {@test <!TYPE_MISMATCH!>x<!> <!DEPRECATED_STATIC_ASSERT!>: Int<!> <!SYNTAX!>-> x<!>} // todo fix parser annotation on lambda parameter
class Hello(test <!UNUSED_PARAMETER!>args<!>: Any) {
}
compiler/testData/diagnostics/tests/annotations/onExpression.kt
+1 -1
View File
@@ -1,3 +1,3 @@
fun foo() = [ann] 1
fun foo() = @ann 1
annotation class ann
compiler/testData/diagnostics/tests/annotations/onFunctionParameter.kt
+3 -3
View File
@@ -1,9 +1,9 @@
annotation class ann
fun test([ann] <!UNUSED_PARAMETER!>p<!>: Int) {
fun test(@ann <!UNUSED_PARAMETER!>p<!>: Int) {
}
val bar = fun test([ann] <!UNUSED_PARAMETER!>g<!>: Int) {}
val bar = fun test(@ann <!UNUSED_PARAMETER!>g<!>: Int) {}
val bas = { <!DEPRECATED_LAMBDA_SYNTAX!>([ann] t: Int)<!> -> }
val bas = { <!DEPRECATED_LAMBDA_SYNTAX!>(@ann t: Int)<!> -> }
compiler/testData/diagnostics/tests/annotations/onInitializer.kt
+4 -4
View File
@@ -1,15 +1,15 @@
class A {
ann init {}
[ann] init {}
@ann init {}
<!UNRESOLVED_REFERENCE!>aaa<!> init {}
[<!UNRESOLVED_REFERENCE!>aaa<!>] init {}
<!UNRESOLVED_REFERENCE!>@aaa<!> init {}
}
trait T {
<!ANONYMOUS_INITIALIZER_IN_TRAIT!>ann init {}<!>
<!ANONYMOUS_INITIALIZER_IN_TRAIT!>[ann] init {}<!>
<!ANONYMOUS_INITIALIZER_IN_TRAIT!>@ann init {}<!>
<!ANONYMOUS_INITIALIZER_IN_TRAIT!><!UNRESOLVED_REFERENCE!>aaa<!> init {}<!>
<!ANONYMOUS_INITIALIZER_IN_TRAIT!>[<!UNRESOLVED_REFERENCE!>aaa<!>] init {}<!>
<!ANONYMOUS_INITIALIZER_IN_TRAIT!><!UNRESOLVED_REFERENCE!>@aaa<!> init {}<!>
}
annotation class ann
compiler/testData/diagnostics/tests/annotations/onLoops.kt
+3 -3
View File
@@ -1,11 +1,11 @@
fun test() {
[ann]
@ann
while (2 < 1) {}
[ann]
@ann
do {} while (2 < 1)
[ann]
@ann
for (i in 1..2) {}
}
compiler/testData/diagnostics/tests/annotations/onLoopsUnreachable.kt
+3 -3
View File
@@ -1,11 +1,11 @@
fun test() {
[ann]
@ann
while (2 > 1) {}
[ann]
@ann
<!UNREACHABLE_CODE!>do {} while (2 > 1)<!>
[ann]
@ann
<!UNREACHABLE_CODE!>for (i in 1..2) {}<!>
}
compiler/testData/diagnostics/tests/annotations/onMultiDeclaration.kt
+1 -1
View File
@@ -1,5 +1,5 @@
fun test(): Any? {
[ann] val (a, b) = P(1, 1)
@ann val (a, b) = P(1, 1)
return a + b
}
compiler/testData/diagnostics/tests/annotations/typeAnnotations.kt
+2 -2
View File
@@ -1,6 +1,6 @@
// !DIAGNOSTICS: -UNUSED_VARIABLE, -UNUSED_PARAMETER
class A
fun [<!UNRESOLVED_REFERENCE!>x<!>] A.foo(a: [<!UNRESOLVED_REFERENCE!>x<!>] Int) {
val v: [<!UNRESOLVED_REFERENCE!>x<!>] Int = 1
fun <!UNRESOLVED_REFERENCE!>@x<!> A.foo(a: <!UNRESOLVED_REFERENCE!>@x<!> Int) {
val v: <!UNRESOLVED_REFERENCE!>@x<!> Int = 1
}
compiler/testData/diagnostics/tests/annotations/typeParameterAsAnnotation.kt
+2 -2
View File
@@ -1,9 +1,9 @@
class Foo<T> {
[<!NOT_A_CLASS!>T<!>]
@<!NOT_A_CLASS!>T<!>
fun foo() = 0
}
class Bar<T : Annotation> {
[<!NOT_A_CLASS!>T<!>]
@<!NOT_A_CLASS!>T<!>
fun foo() = 0
}