From 40c7daf254f40bcf830825da6e067908b01f1507 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Mon, 21 Sep 2015 20:42:24 +0200
Subject: fix rendering of extension function types

---
 src/Kotlin/KotlinLanguageService.kt | 23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

(limited to 'src/Kotlin/KotlinLanguageService.kt')

diff --git a/src/Kotlin/KotlinLanguageService.kt b/src/Kotlin/KotlinLanguageService.kt
index bd98579a..6541e46c 100644
--- a/src/Kotlin/KotlinLanguageService.kt
+++ b/src/Kotlin/KotlinLanguageService.kt
@@ -76,26 +76,17 @@ class KotlinLanguageService : LanguageService {
     }
 
     private fun ContentBlock.renderType(node: DocumentationNode) {
-        val typeArguments = node.details(DocumentationNode.Kind.Type)
+        var typeArguments = node.details(DocumentationNode.Kind.Type)
         if (node.name == "Function${typeArguments.count() - 1}") {
             // lambda
-            symbol("(")
-            renderList(typeArguments.take(typeArguments.size() - 1), noWrap = true) {
-                renderType(it)
+            val isExtension = node.annotations.any { it.name == "Extension" }
+            if (isExtension) {
+                renderType(typeArguments.first())
+                symbol(".")
+                typeArguments = typeArguments.drop(1)
             }
-            symbol(")")
-            nbsp()
-            symbol("->")
-            nbsp()
-            renderType(typeArguments.last())
-            return
-        }
-        if (node.name == "ExtensionFunction${typeArguments.count() - 2}") {
-            // extension lambda
-            renderType(typeArguments.first())
-            symbol(".")
             symbol("(")
-            renderList(typeArguments.drop(1).take(typeArguments.size() - 2), noWrap = true) {
+            renderList(typeArguments.take(typeArguments.size() - 1), noWrap = true) {
                 renderType(it)
             }
             symbol(")")
-- 
cgit