From 5afb808f984542bb550d124f87c65c71a9148b83 Mon Sep 17 00:00:00 2001
From: Krystian Ujma <krystianujma@gmail.com>
Date: Fri, 15 Feb 2019 14:10:27 +0100
Subject: Nullable left off function type parameter with default value (#401)
 (#328)

---
 core/src/main/kotlin/Kotlin/KotlinLanguageService.kt | 16 +++++++++++++---
 core/src/test/kotlin/format/MarkdownFormatTest.kt    |  4 ++++
 2 files changed, 17 insertions(+), 3 deletions(-)

(limited to 'core/src')

diff --git a/core/src/main/kotlin/Kotlin/KotlinLanguageService.kt b/core/src/main/kotlin/Kotlin/KotlinLanguageService.kt
index f57708ed..5f43c22e 100644
--- a/core/src/main/kotlin/Kotlin/KotlinLanguageService.kt
+++ b/core/src/main/kotlin/Kotlin/KotlinLanguageService.kt
@@ -166,8 +166,18 @@ class KotlinLanguageService : CommonLanguageService() {
             keyword("dynamic")
             return
         }
+
+        val nullabilityModifier = node.detailOrNull(NodeKind.NullabilityModifier)
+
         if (node.isFunctionalType()) {
-            renderFunctionalType(node, renderMode)
+            if (nullabilityModifier != null) {
+                symbol("(")
+                renderFunctionalType(node, renderMode)
+                symbol(")")
+                symbol(nullabilityModifier.name)
+            } else {
+                renderFunctionalType(node, renderMode)
+            }
             return
         }
         if (renderMode == RenderMode.FULL) {
@@ -185,8 +195,8 @@ class KotlinLanguageService : CommonLanguageService() {
             }
             symbol(">")
         }
-        val nullabilityModifier = node.details(NodeKind.NullabilityModifier).singleOrNull()
-        if (nullabilityModifier != null) {
+
+        nullabilityModifier ?.apply {
             symbol(nullabilityModifier.name)
         }
     }
diff --git a/core/src/test/kotlin/format/MarkdownFormatTest.kt b/core/src/test/kotlin/format/MarkdownFormatTest.kt
index 9fb34e95..b078292b 100644
--- a/core/src/test/kotlin/format/MarkdownFormatTest.kt
+++ b/core/src/test/kotlin/format/MarkdownFormatTest.kt
@@ -539,4 +539,8 @@ class MarkdownFormatTest: FileGeneratorTestCase() {
             nodesWithName
         }
     }
+
+    @Test fun nullableTypeParameterFunction() {
+        verifyMarkdownNode("nullableTypeParameterFunction", withKotlinRuntime = true)
+    }
 }
-- 
cgit