diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java index 29de27575d6..df20ffd2213 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java @@ -114,7 +114,7 @@ public interface Errors { // Annotations DiagnosticFactory0 SUPERTYPES_FOR_ANNOTATION_CLASS = DiagnosticFactory0.create(ERROR); - DiagnosticFactory0 MISSING_VAL_ON_ANNOTATION_PARAMETER = DiagnosticFactory0.create(WARNING); + DiagnosticFactory0 MISSING_VAL_ON_ANNOTATION_PARAMETER = DiagnosticFactory0.create(ERROR); DiagnosticFactory0 ANNOTATION_CLASS_CONSTRUCTOR_CALL = DiagnosticFactory0.create(ERROR); DiagnosticFactory1 NOT_AN_ANNOTATION_CLASS = DiagnosticFactory1.create(ERROR); DiagnosticFactory0 ANNOTATION_CLASS_WITH_BODY = DiagnosticFactory0.create(ERROR); diff --git a/compiler/testData/lazyResolve/recursiveComparator/WrongAnnotationArgsOnObject.kt b/compiler/testData/lazyResolve/recursiveComparator/WrongAnnotationArgsOnObject.kt index acc11250ff7..99e48c45ca6 100644 --- a/compiler/testData/lazyResolve/recursiveComparator/WrongAnnotationArgsOnObject.kt +++ b/compiler/testData/lazyResolve/recursiveComparator/WrongAnnotationArgsOnObject.kt @@ -5,4 +5,4 @@ object SomeObject val some = SomeObject -annotation class BadAnnotation(s: String) +annotation class BadAnnotation(val s: String) diff --git a/compiler/testData/lazyResolve/recursiveComparator/WrongAnnotationArgsOnObject.txt b/compiler/testData/lazyResolve/recursiveComparator/WrongAnnotationArgsOnObject.txt index 3a7d25c453c..85c7cee2454 100644 --- a/compiler/testData/lazyResolve/recursiveComparator/WrongAnnotationArgsOnObject.txt +++ b/compiler/testData/lazyResolve/recursiveComparator/WrongAnnotationArgsOnObject.txt @@ -5,6 +5,8 @@ internal val some: test.SomeObject internal final annotation class BadAnnotation : kotlin.Annotation { /*primary*/ public constructor BadAnnotation(/*0*/ s: kotlin.String) + internal final val s: kotlin.String + internal final fun (): kotlin.String } test.BadAnnotation(s = IntegerValueType(1): IntegerValueType(1)) internal object SomeObject { diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/EnumArgument.kt b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/EnumArgument.kt index b0c9a8ad876..4726039d85a 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/EnumArgument.kt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/EnumArgument.kt @@ -3,7 +3,7 @@ package test import java.lang.annotation.ElementType -annotation class Anno(t: ElementType) +annotation class Anno(val t: ElementType) class Class { Anno(ElementType.METHOD) fun foo() {} diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/EnumArgument.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/EnumArgument.txt index 118eab1b02b..7d89c1eb860 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/EnumArgument.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/EnumArgument.txt @@ -2,6 +2,8 @@ package test internal final annotation class Anno : kotlin.Annotation { /*primary*/ public constructor Anno(/*0*/ t: java.lang.annotation.ElementType) + internal final val t: java.lang.annotation.ElementType + internal final fun (): java.lang.annotation.ElementType } internal final class Class { diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classes/EnumArgument.kt b/compiler/testData/loadJava/compiledKotlin/annotations/classes/EnumArgument.kt index 5f4ea09da5a..2ae6f00b765 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/classes/EnumArgument.kt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/classes/EnumArgument.kt @@ -3,7 +3,7 @@ package test import java.lang.annotation.ElementType -annotation class Anno(t: ElementType) +annotation class Anno(val t: ElementType) Anno(ElementType.METHOD) class Class { Anno(ElementType.PARAMETER) inner class Inner diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/classes/EnumArgument.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classes/EnumArgument.txt index 174821891f1..fa706a2fd5c 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/classes/EnumArgument.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/classes/EnumArgument.txt @@ -2,6 +2,8 @@ package test internal final annotation class Anno : kotlin.Annotation { /*primary*/ public constructor Anno(/*0*/ t: java.lang.annotation.ElementType) + internal final val t: java.lang.annotation.ElementType + internal final fun (): java.lang.annotation.ElementType } test.Anno(t = ElementType.METHOD: java.lang.annotation.ElementType) internal final class Class { diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArgument.kt b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArgument.kt index 68e09e1e265..c98e12002e9 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArgument.kt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArgument.kt @@ -3,7 +3,7 @@ package test import java.lang.annotation.ElementType -annotation class Anno(t: ElementType) +annotation class Anno(val t: ElementType) Anno(ElementType.METHOD) fun foo() {} diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArgument.txt b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArgument.txt index 78f430706b7..203fba4da78 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArgument.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArgument.txt @@ -6,4 +6,6 @@ test.Anno(t = ElementType.METHOD: java.lang.annotation.ElementType) internal fun internal final annotation class Anno : kotlin.Annotation { /*primary*/ public constructor Anno(/*0*/ t: java.lang.annotation.ElementType) + internal final val t: java.lang.annotation.ElementType + internal final fun (): java.lang.annotation.ElementType } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArrayArgument.kt b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArrayArgument.kt index 6f3e39ef8a2..5ecb954db5d 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArrayArgument.kt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArrayArgument.kt @@ -3,7 +3,7 @@ package test import java.lang.annotation.ElementType -annotation class Anno(vararg t: ElementType) +annotation class Anno(vararg val t: ElementType) Anno(ElementType.METHOD, ElementType.FIELD) fun foo() {} diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArrayArgument.txt b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArrayArgument.txt index e89b7ff2d00..cde02ce95e7 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArrayArgument.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArrayArgument.txt @@ -7,4 +7,6 @@ test.Anno(t = {ElementType.METHOD, ElementType.FIELD}: kotlin.Array*/) + internal final val t: kotlin.Array + internal final fun (): kotlin.Array } \ No newline at end of file diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/StringArrayArgument.kt b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/StringArrayArgument.kt index da6a4f0f714..4ab3b748c0a 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/StringArrayArgument.kt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/StringArrayArgument.kt @@ -1,7 +1,7 @@ //ALLOW_AST_ACCESS package test -annotation class Anno(vararg t: String) +annotation class Anno(vararg val t: String) Anno("live", "long") fun foo() {} diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/StringArrayArgument.txt b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/StringArrayArgument.txt index 3a8c6eeffca..b0b9e2fd754 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/StringArrayArgument.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/StringArrayArgument.txt @@ -7,4 +7,6 @@ test.Anno(t = {"live", "long"}: kotlin.Array) internal fun foo(): internal final annotation class Anno : kotlin.Annotation { /*primary*/ public constructor Anno(/*0*/ vararg t: kotlin.String /*kotlin.Array*/) + internal final val t: kotlin.Array + internal final fun (): kotlin.Array } \ No newline at end of file diff --git a/js/js.libraries/src/junit/core.kt b/js/js.libraries/src/junit/core.kt index bc11c43b19e..426a347dc6d 100644 --- a/js/js.libraries/src/junit/core.kt +++ b/js/js.libraries/src/junit/core.kt @@ -1,5 +1,4 @@ package org.junit; native -public annotation class Test(name : String = "") - +public annotation class Test(val name: String = "")