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

Fix tests

Browse Source
This commit is contained in:
Yan Zhulanow
2015-08-06 18:59:37 +03:00
parent 552211b2f4
commit 2ce9903356
84 changed files with 221 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/FieldAnnotations.kt
Vendored
+6 -6
View File
@@ -4,10 +4,10 @@ class CustomDelegate {
public fun get(thisRef: Any?, prop: PropertyMetadata): String = prop.name
}
<!INAPPLICABLE_FIELD_TARGET, WRONG_ANNOTATION_TARGET!>@field:Ann<!>
<!INAPPLICABLE_TARGET_ON_PROPERTY, WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>@field:Ann<!>
class SomeClass {
<!INAPPLICABLE_FIELD_TARGET, WRONG_ANNOTATION_TARGET!>@field:Ann<!>
<!INAPPLICABLE_TARGET_ON_PROPERTY, WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>@field:Ann<!>
constructor()
@field:Ann
@@ -23,12 +23,12 @@ class SomeClass {
val propertyWithCustomGetter: Int
get() = 5
<!INAPPLICABLE_FIELD_TARGET, WRONG_ANNOTATION_TARGET!>@field:Ann<!>
fun anotherFun(<!INAPPLICABLE_FIELD_TARGET!>@field:Ann<!> <!UNUSED_PARAMETER!>s<!>: String) {
<!INAPPLICABLE_FIELD_TARGET!>@field:Ann<!>
<!INAPPLICABLE_TARGET_ON_PROPERTY, WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>@field:Ann<!>
fun anotherFun(<!INAPPLICABLE_TARGET_ON_PROPERTY!>@field:Ann<!> <!UNUSED_PARAMETER!>s<!>: String) {
<!INAPPLICABLE_TARGET_ON_PROPERTY!>@field:Ann<!>
val <!UNUSED_VARIABLE!>localVariable<!> = 5
}
}
class WithPrimaryConstructor(<!INAPPLICABLE_FIELD_TARGET!>@field:Ann<!> val a: String)
class WithPrimaryConstructor(@field:Ann val a: String)
compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/FieldAnnotations.txt
Vendored
+1 -1
View File
@@ -28,7 +28,7 @@ internal final class CustomDelegate {
}
internal final class WithPrimaryConstructor {
public constructor WithPrimaryConstructor(/*0*/ @field:Ann() a: kotlin.String)
public constructor WithPrimaryConstructor(/*0*/ a: kotlin.String)
@field:Ann() internal final val a: 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/tests/annotations/withUseSiteTarget/GetterAnnotations.kt
Vendored
+4 -4
View File
@@ -4,10 +4,10 @@ class CustomDelegate {
public fun get(thisRef: Any?, prop: PropertyMetadata): String = prop.name
}
<!INAPPLICABLE_GET_TARGET, WRONG_ANNOTATION_TARGET!>@get:Ann<!>
<!INAPPLICABLE_TARGET_ON_PROPERTY, WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>@get:Ann<!>
class SomeClass {
<!INAPPLICABLE_GET_TARGET, WRONG_ANNOTATION_TARGET!>@get:Ann<!>
<!INAPPLICABLE_TARGET_ON_PROPERTY, WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>@get:Ann<!>
constructor()
@get:Ann
@@ -26,11 +26,11 @@ class SomeClass {
val propertyWithCustomGetter: Int
get() = 5
<!INAPPLICABLE_GET_TARGET, WRONG_ANNOTATION_TARGET!>@get:Ann<!>
<!INAPPLICABLE_TARGET_ON_PROPERTY, WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>@get:Ann<!>
fun annotationOnFunction(a: Int) = a + 5
fun anotherFun() {
<!INAPPLICABLE_GET_TARGET!>@get:Ann<!>
<!INAPPLICABLE_TARGET_ON_PROPERTY!>@get:Ann<!>
val <!UNUSED_VARIABLE!>localVariable<!> = 5
}
compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/GetterAnnotations.txt
Vendored
+5 -5
View File
@@ -17,11 +17,11 @@ internal final class CustomDelegate {
@get:Ann() internal final class SomeClass {
@get:Ann() public constructor SomeClass()
@get:Ann() protected final val delegatedProperty: kotlin.String
@get:Ann() protected final var mutableProperty: kotlin.String
@get:Ann() internal final val propertyWithCustomGetter: kotlin.Int
@get:Ann() protected final val simpleProperty: kotlin.String = "text"
@get:Ann() protected final val simplePropertyWithAnnotationList: kotlin.String = "text"
protected final val delegatedProperty: kotlin.String
protected final var mutableProperty: kotlin.String
internal final val propertyWithCustomGetter: kotlin.Int
protected final val simpleProperty: kotlin.String = "text"
protected final val simplePropertyWithAnnotationList: kotlin.String = "text"
@get:Ann() internal final fun annotationOnFunction(/*0*/ a: kotlin.Int): kotlin.Int
internal final fun anotherFun(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/ParamAnnotations.kt
Vendored
+9 -9
View File
@@ -1,24 +1,24 @@
annotation class Ann
annotation class Second
<!INAPPLICABLE_SPARAM_TARGET, WRONG_ANNOTATION_TARGET!>@param:Ann<!>
<!INAPPLICABLE_PARAM_TARGET, WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>@param:Ann<!>
class SomeClass {
<!INAPPLICABLE_SPARAM_TARGET, WRONG_ANNOTATION_TARGET!>@param:Ann<!>
constructor(<!INAPPLICABLE_SPARAM_TARGET!>@param:Ann<!> <!UNUSED_PARAMETER!>a<!>: String)
<!INAPPLICABLE_PARAM_TARGET, WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>@param:Ann<!>
constructor(<!INAPPLICABLE_PARAM_TARGET!>@param:Ann<!> <!UNUSED_PARAMETER!>a<!>: String)
<!INAPPLICABLE_SPARAM_TARGET!>@param:Ann<!>
<!INAPPLICABLE_PARAM_TARGET!>@param:Ann<!>
protected val simpleProperty: String = "text"
<!INAPPLICABLE_SPARAM_TARGET!>@param:Ann<!>
<!INAPPLICABLE_PARAM_TARGET!>@param:Ann<!>
fun anotherFun() {
<!INAPPLICABLE_SPARAM_TARGET!>@param:Ann<!>
<!INAPPLICABLE_PARAM_TARGET!>@param:Ann<!>
val <!UNUSED_VARIABLE!>localVariable<!> = 5
}
}
class PrimaryConstructorClass(
@param:Ann <!UNUSED_PARAMETER!>a<!>: String,
@param:[Ann Second] <!UNUSED_PARAMETER!>b<!>: String,
@param:Ann val <!UNUSED_PARAMETER!>c<!>: String)
<!REDUNDANT_ANNOTATION_TARGET!>@param:Ann<!> <!UNUSED_PARAMETER!>a<!>: String,
@param:[<!REDUNDANT_ANNOTATION_TARGET!>Ann<!> <!REDUNDANT_ANNOTATION_TARGET!>Second<!>] <!UNUSED_PARAMETER!>b<!>: String,
@param:Ann val c: String)
compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/ParamAnnotations.txt
Vendored
+2 -1
View File
@@ -8,7 +8,8 @@ kotlin.annotation.annotation() internal final class Ann : kotlin.Annotation {
}
internal final class PrimaryConstructorClass {
public constructor PrimaryConstructorClass(/*0*/ @param:Ann() a: kotlin.String, /*1*/ @param:Ann() @param:Second() b: kotlin.String)
public constructor PrimaryConstructorClass(/*0*/ @param:Ann() a: kotlin.String, /*1*/ @param:Ann() @param:Second() b: kotlin.String, /*2*/ @param:Ann() c: kotlin.String)
internal final val c: 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/tests/annotations/withUseSiteTarget/PropertyAnnotations.kt
Vendored
+4 -4
View File
@@ -5,10 +5,10 @@ class CustomDelegate {
public fun get(thisRef: Any?, prop: PropertyMetadata): String = prop.name
}
<!INAPPLICABLE_PROPERTY_TARGET, WRONG_ANNOTATION_TARGET!>@property:Ann<!>
<!INAPPLICABLE_TARGET_ON_PROPERTY, WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>@property:Ann<!>
class SomeClass {
<!INAPPLICABLE_PROPERTY_TARGET, WRONG_ANNOTATION_TARGET!>@property:Ann<!>
<!INAPPLICABLE_TARGET_ON_PROPERTY, WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>@property:Ann<!>
constructor(<!UNUSED_PARAMETER!>s<!>: String)
@property:Ann
@@ -28,9 +28,9 @@ class SomeClass {
get() = 5
set(v) {}
<!INAPPLICABLE_PROPERTY_TARGET, WRONG_ANNOTATION_TARGET!>@property:Ann<!>
<!INAPPLICABLE_TARGET_ON_PROPERTY, WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>@property:Ann<!>
fun anotherFun() {
<!INAPPLICABLE_PROPERTY_TARGET, WRONG_ANNOTATION_TARGET!>@property:Ann<!>
<!INAPPLICABLE_TARGET_ON_PROPERTY!>@property:Ann<!>
val <!UNUSED_VARIABLE!>localVariable<!> = 5
}
compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/ReceiverAnnotations.kt
Vendored
+5 -8
View File
@@ -1,9 +1,9 @@
annotation class Ann
<!INAPPLICABLE_RECEIVER_TARGET, WRONG_ANNOTATION_TARGET!>@receiver:Ann<!>
<!INAPPLICABLE_RECEIVER_TARGET, WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>@receiver:Ann<!>
class SomeClass {
<!INAPPLICABLE_RECEIVER_TARGET, WRONG_ANNOTATION_TARGET!>@receiver:Ann<!>
<!INAPPLICABLE_RECEIVER_TARGET, WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>@receiver:Ann<!>
constructor(<!INAPPLICABLE_RECEIVER_TARGET!>@receiver:Ann<!> <!UNUSED_PARAMETER!>a<!>: String)
<!INAPPLICABLE_RECEIVER_TARGET!>@receiver:Ann<!>
@@ -15,14 +15,11 @@ class SomeClass {
val <!UNUSED_VARIABLE!>localVariable<!> = 5
}
@receiver:Ann
val String.extensionProperty2: String
val @receiver:Ann String.extensionProperty2: String
get() = "A"
}
@receiver:Ann
fun String.length2() = length()
fun @receiver:Ann String.length2() = length()
@receiver:Ann
val String.extensionProperty: String
val @receiver:Ann String.extensionProperty: String
get() = "A"
compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/ReceiverAnnotations.txt
Vendored
+3 -2
View File
@@ -1,7 +1,7 @@
package
@receiver:Ann() internal val kotlin.String.extensionProperty: kotlin.String
@receiver:Ann() internal fun kotlin.String.length2(): kotlin.Int
internal val @receiver:Ann() kotlin.String.extensionProperty: kotlin.String
internal fun @receiver:Ann() kotlin.String.length2(): kotlin.Int
kotlin.annotation.annotation() internal final class Ann : kotlin.Annotation {
public constructor Ann()
@@ -13,6 +13,7 @@ kotlin.annotation.annotation() internal final class Ann : kotlin.Annotation {
@receiver:Ann() internal final class SomeClass {
@receiver:Ann() public constructor SomeClass(/*0*/ @receiver:Ann() a: kotlin.String)
@receiver:Ann() protected final val simpleProperty: kotlin.String = "text"
internal final val @receiver:Ann() kotlin.String.extensionProperty2: kotlin.String
@receiver:Ann() internal final fun anotherFun(): kotlin.Unit
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/tests/annotations/withUseSiteTarget/SetterAnnotations.kt
Vendored
+3 -3
View File
@@ -5,7 +5,7 @@ class CustomDelegate {
fun set(thisRef: Any?, prop: PropertyMetadata, value: String) {}
}
<!INAPPLICABLE_SET_TARGET, WRONG_ANNOTATION_TARGET!>@set:Ann<!>
<!INAPPLICABLE_TARGET_ON_PROPERTY, WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>@set:Ann<!>
class SomeClass {
<!INAPPLICABLE_TARGET_PROPERTY_IMMUTABLE!>@set:Ann<!>
@@ -25,11 +25,11 @@ class SomeClass {
get() = 5
set(v) {}
<!INAPPLICABLE_SET_TARGET, WRONG_ANNOTATION_TARGET!>@set:Ann<!>
<!INAPPLICABLE_TARGET_ON_PROPERTY, WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>@set:Ann<!>
fun annotationOnFunction(a: Int) = a + 5
fun anotherFun() {
<!INAPPLICABLE_SET_TARGET!>@set:Ann<!>
<!INAPPLICABLE_TARGET_ON_PROPERTY!>@set:Ann<!>
val <!UNUSED_VARIABLE!>localVariable<!> = 5
}
compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/SetterAnnotations.txt
Vendored
+4 -4
View File
@@ -18,10 +18,10 @@ internal final class CustomDelegate {
@set:Ann() internal final class SomeClass {
public constructor SomeClass()
@set:Ann() protected final var delegatedProperty: kotlin.String
@set:Ann() protected final var mutableProperty: kotlin.String
@set:Ann() protected final var mutablePropertyWithAnnotationList: kotlin.String
@set:Ann() internal final var propertyWithCustomSetter: kotlin.Int
protected final var delegatedProperty: kotlin.String
protected final var mutableProperty: kotlin.String
protected final var mutablePropertyWithAnnotationList: kotlin.String
internal final var propertyWithCustomSetter: kotlin.Int
@set:Ann() protected final val simpleProperty: kotlin.String = "text"
@set:Ann() internal final fun annotationOnFunction(/*0*/ a: kotlin.Int): kotlin.Int
internal final fun anotherFun(): kotlin.Unit
compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/SparamAnnotations.kt
Vendored
+4 -4
View File
@@ -5,10 +5,10 @@ class CustomDelegate {
fun set(thisRef: Any?, prop: PropertyMetadata, value: String) {}
}
<!INAPPLICABLE_SPARAM_TARGET, WRONG_ANNOTATION_TARGET!>@sparam:Ann<!>
<!INAPPLICABLE_TARGET_ON_PROPERTY, WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>@sparam:Ann<!>
class SomeClass {
<!INAPPLICABLE_SPARAM_TARGET, WRONG_ANNOTATION_TARGET!>@sparam:Ann<!>
<!INAPPLICABLE_TARGET_ON_PROPERTY, WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>@sparam:Ann<!>
constructor()
<!INAPPLICABLE_TARGET_PROPERTY_IMMUTABLE!>@sparam:Ann<!>
@@ -28,9 +28,9 @@ class SomeClass {
get() = 5
set(v) {}
<!INAPPLICABLE_SPARAM_TARGET!>@sparam:Ann<!>
<!INAPPLICABLE_TARGET_ON_PROPERTY!>@sparam:Ann<!>
fun anotherFun() {
<!INAPPLICABLE_SPARAM_TARGET!>@sparam:Ann<!>
<!INAPPLICABLE_TARGET_ON_PROPERTY!>@sparam:Ann<!>
val <!UNUSED_VARIABLE!>localVariable<!> = 5
}
compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/repeatable.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
annotation(repeatable = true) class RepeatableAnn
annotation(repeatable = true, retention = AnnotationRetention.SOURCE) class RepeatableAnn
annotation class Ann
public class A(@param:Ann <!REPEATED_ANNOTATION!>@Ann<!> val x: Int, @param: RepeatableAnn @Ann val y: Int) {
compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/repeatable.txt
Vendored
+6 -6
View File
@@ -1,11 +1,11 @@
package
public final class A {
public constructor A(/*0*/ Ann() Ann() x: kotlin.Int, /*1*/ RepeatableAnn() Ann() y: kotlin.Int)
Ann() RepeatableAnn() Ann() RepeatableAnn() internal final val a: kotlin.Int = 0
Ann() Ann() Ann() internal final val b: kotlin.Int = 0
RepeatableAnn() RepeatableAnn() internal final val c: kotlin.Int = 0
RepeatableAnn() RepeatableAnn() internal final val d: kotlin.Int = 0
public constructor A(/*0*/ @param:Ann() Ann() x: kotlin.Int, /*1*/ @param:RepeatableAnn() Ann() y: kotlin.Int)
@property:Ann() @property:RepeatableAnn() @field:Ann() RepeatableAnn() internal final val a: kotlin.Int = 0
@property:Ann() Ann() @field:Ann() internal final val b: kotlin.Int = 0
@field:RepeatableAnn() @field:RepeatableAnn() internal final val c: kotlin.Int = 0
@property:RepeatableAnn() RepeatableAnn() internal final val d: kotlin.Int = 0
internal final val x: kotlin.Int
internal final val y: kotlin.Int
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -20,7 +20,7 @@ kotlin.annotation.annotation() internal final class Ann : kotlin.Annotation {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
kotlin.annotation.annotation(repeatable = true) internal final class RepeatableAnn : kotlin.Annotation {
kotlin.annotation.annotation(repeatable = true, retention = AnnotationRetention.SOURCE) internal final class RepeatableAnn : kotlin.Annotation {
public constructor RepeatableAnn()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int