From 344bb03e8cf8d2502223b29f2cb16afdd47c3e42 Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Mon, 10 Oct 2016 14:54:29 +0300 Subject: [PATCH] Annotations on type aliases: add annotation target TYPEALIAS, use it for @Deprecated and @Suppress. --- core/builtins/src/kotlin/Annotations.kt | 4 ++-- core/builtins/src/kotlin/annotation/Annotations.kt | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/core/builtins/src/kotlin/Annotations.kt b/core/builtins/src/kotlin/Annotations.kt index 23e89d52a90..f074b834c3a 100644 --- a/core/builtins/src/kotlin/Annotations.kt +++ b/core/builtins/src/kotlin/Annotations.kt @@ -26,7 +26,7 @@ import kotlin.annotation.AnnotationTarget.* * @property replaceWith if present, specifies a code fragment which should be used as a replacement for * the deprecated API usage. */ -@Target(CLASS, FUNCTION, PROPERTY, ANNOTATION_CLASS, CONSTRUCTOR, PROPERTY_SETTER, PROPERTY_GETTER) +@Target(CLASS, FUNCTION, PROPERTY, ANNOTATION_CLASS, CONSTRUCTOR, PROPERTY_SETTER, PROPERTY_GETTER, TYPEALIAS) @MustBeDocumented public annotation class Deprecated( val message: String, @@ -84,7 +84,7 @@ public annotation class ParameterName(val name: String) * @property names names of the compiler diagnostics to suppress. */ @Target(CLASS, ANNOTATION_CLASS, PROPERTY, FIELD, LOCAL_VARIABLE, VALUE_PARAMETER, - CONSTRUCTOR, FUNCTION, PROPERTY_GETTER, PROPERTY_SETTER, TYPE, EXPRESSION, FILE) + CONSTRUCTOR, FUNCTION, PROPERTY_GETTER, PROPERTY_SETTER, TYPE, EXPRESSION, FILE, TYPEALIAS) @Retention(SOURCE) public annotation class Suppress(vararg val names: String) diff --git a/core/builtins/src/kotlin/annotation/Annotations.kt b/core/builtins/src/kotlin/annotation/Annotations.kt index 2500fb9622e..0759c8625be 100644 --- a/core/builtins/src/kotlin/annotation/Annotations.kt +++ b/core/builtins/src/kotlin/annotation/Annotations.kt @@ -47,7 +47,9 @@ public enum class AnnotationTarget { /** Any expression */ EXPRESSION, /** File */ - FILE + FILE, + /** Type alias */ + TYPEALIAS } /**