From fc13de8cedb956107b624ebb0a7e4c3544a504ca Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Mon, 4 Jan 2016 19:46:09 +0100
Subject: kotlin-for-upsource 1.0-beta-5179; update the FQ name of annotation
 used to mark extension function types

---
 core/src/main/kotlin/Kotlin/DocumentationBuilder.kt  | 2 +-
 core/src/main/kotlin/Kotlin/KotlinLanguageService.kt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'core')

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(".")
-- 
cgit