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

Fix the links to the language docs from JvmStatic and JvmName annotations. Add a link from JvmField annotation.

Browse Source 
#KT-14953 Fixed
This commit is contained in:
Ilya Gorbunov
2016-11-23 23:32:10 +03:00
parent 663d999ac4
commit 03bbe875d4
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/runtime.jvm/src/kotlin/jvm/annotations/JvmPlatformAnnotations.kt
+7 -2
View File
@@ -32,7 +32,8 @@ public annotation class JvmOverloads
/** /**
* Specifies that a static method or field needs to be generated from this element. * Specifies that a static method or field needs to be generated from this element.
* See the [Kotlin language documentation](http://kotlinlang.org/docs/reference/java-interop.html#static-methods-and-fields) *
* See the [Kotlin language documentation](https://kotlinlang.org/docs/reference/java-to-kotlin-interop.html#static-methods)
* for more information. * for more information.
*/ */
@Target(AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY, AnnotationTarget.PROPERTY_GETTER, AnnotationTarget.PROPERTY_SETTER) @Target(AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY, AnnotationTarget.PROPERTY_GETTER, AnnotationTarget.PROPERTY_SETTER)
@@ -42,7 +43,8 @@ public annotation class JvmStatic
/** /**
* Specifies the name for the Java class or method which is generated from this element. * Specifies the name for the Java class or method which is generated from this element.
* See the [Kotlin language documentation](http://kotlinlang.org/docs/reference/java-interop.html#handling-signature-clashes-with-jvmname) *
* See the [Kotlin language documentation](https://kotlinlang.org/docs/reference/java-to-kotlin-interop.html#handling-signature-clashes-with-jvmname)
* for more information. * for more information.
* @property name the name of the element. * @property name the name of the element.
*/ */
@@ -89,6 +91,9 @@ public annotation class Throws(vararg val exceptionClasses: KClass<out Throwable
/** /**
* Instructs the Kotlin compiler not to generate getters/setters for this property and expose it as a field. * Instructs the Kotlin compiler not to generate getters/setters for this property and expose it as a field.
*
* See the [Kotlin language documentation](https://kotlinlang.org/docs/reference/java-to-kotlin-interop.html#instance-fields)
* for more information.
*/ */
@Target(AnnotationTarget.FIELD) @Target(AnnotationTarget.FIELD)
@Retention(AnnotationRetention.BINARY) @Retention(AnnotationRetention.BINARY)