From ae2ff5b82931666fc908750d39e31bd6dc39359f Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Tue, 27 Oct 2015 18:44:07 +0100 Subject: don't show Unit return type in signatures --- src/Kotlin/KotlinLanguageService.kt | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/Kotlin/KotlinLanguageService.kt b/src/Kotlin/KotlinLanguageService.kt index 0d1d6b85..038ade9c 100644 --- a/src/Kotlin/KotlinLanguageService.kt +++ b/src/Kotlin/KotlinLanguageService.kt @@ -341,19 +341,25 @@ class KotlinLanguageService : LanguageService { indentedSoftLineBreak() renderParameter(it, renderMode) } - softLineBreak() - symbol(")") if (needReturnType(node)) { + softLineBreak() + symbol(")") symbol(": ") renderType(node.detail(DocumentationNode.Kind.Type)) } + else { + symbol(")") + } } private fun needReturnType(node: DocumentationNode) = when(node.kind) { DocumentationNode.Kind.Constructor -> false - else -> true + else -> !node.isUnitReturnType() } + fun DocumentationNode.isUnitReturnType(): Boolean = + detail(DocumentationNode.Kind.Type).hiddenLinks.firstOrNull()?.qualifiedName() == "kotlin.Unit" + private fun ContentBlock.renderProperty(node: DocumentationNode, renderMode: RenderMode) { if (renderMode == RenderMode.FULL) { renderAnnotationsForNode(node) -- cgit