aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Jemerov <yole@jetbrains.com>2016-01-04 19:46:09 +0100
committerDmitry Jemerov <yole@jetbrains.com>2016-01-04 19:46:09 +0100
commitfc13de8cedb956107b624ebb0a7e4c3544a504ca (patch)
treef851ea5335dd260fc7beeefb22ada1f1871b9e6c
parent42b6094b08c74bbb73911b5aa59a77f49365553d (diff)
downloaddokka-fc13de8cedb956107b624ebb0a7e4c3544a504ca.tar.gz
dokka-fc13de8cedb956107b624ebb0a7e4c3544a504ca.tar.bz2
dokka-fc13de8cedb956107b624ebb0a7e4c3544a504ca.zip
kotlin-for-upsource 1.0-beta-5179; update the FQ name of annotation used to mark extension function types
-rw-r--r--core/src/main/kotlin/Kotlin/DocumentationBuilder.kt2
-rw-r--r--core/src/main/kotlin/Kotlin/KotlinLanguageService.kt2
-rw-r--r--lib/kotlin-for-upsource.jarbin15659303 -> 15533326 bytes
3 files changed, 2 insertions, 2 deletions
diff --git a/core/src/main/kotlin/Kotlin/DocumentationBuilder.kt b/core/src/main/kotlin/Kotlin/DocumentationBuilder.kt
index 7ac5c020..d6db3d59 100644
--- a/core/src/main/kotlin/Kotlin/DocumentationBuilder.kt
+++ b/core/src/main/kotlin/Kotlin/DocumentationBuilder.kt
@@ -555,7 +555,7 @@ class KotlinJavaDocumentationBuilder
private fun AnnotationDescriptor.isDocumented(): Boolean {
if (source.getPsi() != null && mustBeDocumented()) return true
val annotationClassName = type.constructor.declarationDescriptor?.fqNameSafe?.asString()
- return annotationClassName == "kotlin.Extension"
+ return annotationClassName == "kotlin.ExtensionFunctionType"
}
fun AnnotationDescriptor.mustBeDocumented(): Boolean {
diff --git a/core/src/main/kotlin/Kotlin/KotlinLanguageService.kt b/core/src/main/kotlin/Kotlin/KotlinLanguageService.kt
index 4aa36b36..c0c101bf 100644
--- a/core/src/main/kotlin/Kotlin/KotlinLanguageService.kt
+++ b/core/src/main/kotlin/Kotlin/KotlinLanguageService.kt
@@ -145,7 +145,7 @@ class KotlinLanguageService : LanguageService {
var typeArguments = node.details(DocumentationNode.Kind.Type)
if (node.name == "Function${typeArguments.count() - 1}") {
// lambda
- val isExtension = node.annotations.any { it.name == "Extension" }
+ val isExtension = node.annotations.any { it.name == "ExtensionFunctionType" }
if (isExtension) {
renderType(typeArguments.first(), renderMode)
symbol(".")
diff --git a/lib/kotlin-for-upsource.jar b/lib/kotlin-for-upsource.jar
index 5538bd48..23159b16 100644
--- a/lib/kotlin-for-upsource.jar
+++ b/lib/kotlin-for-upsource.jar
Binary files differ