From e4d5984cf04b9c5f2a1092977cd72c8ff2117a2e Mon Sep 17 00:00:00 2001 From: Natalia Ukhorskaya Date: Wed, 22 Jul 2015 16:36:44 +0300 Subject: [PATCH] Descriptor renderer: add option to render function without return type --- .../src/org/jetbrains/kotlin/renderer/DescriptorRenderer.kt | 1 + .../src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt | 2 +- .../jetbrains/kotlin/renderer/DescriptorRendererOptionsImpl.kt | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRenderer.kt b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRenderer.kt index 422e3036d08..8ce92021afc 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRenderer.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRenderer.kt @@ -156,6 +156,7 @@ public interface DescriptorRendererOptions { public var classWithPrimaryConstructor: Boolean public var verbose: Boolean public var unitReturnType: Boolean + public var withoutReturnType: Boolean public var normalizedVisibilities: Boolean public var showInternalKeyword: Boolean public var prettyFunctionTypes: Boolean diff --git a/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt index 9179d91944b..d010d877312 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt @@ -543,7 +543,7 @@ internal class DescriptorRendererImpl( renderReceiverAfterName(function, builder) val returnType = function.getReturnType() - if (unitReturnType || (returnType == null || !KotlinBuiltIns.isUnit(returnType))) { + if (!withoutReturnType && (unitReturnType || (returnType == null || !KotlinBuiltIns.isUnit(returnType)))) { builder.append(": ").append(if (returnType == null) "[NULL]" else escape(renderType(returnType))) } diff --git a/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererOptionsImpl.kt b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererOptionsImpl.kt index 29613c13b51..c38f80916a3 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererOptionsImpl.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererOptionsImpl.kt @@ -67,6 +67,7 @@ internal class DescriptorRendererOptionsImpl : DescriptorRendererOptions { override var classWithPrimaryConstructor by property(false) override var verbose by property(false) override var unitReturnType by property(true) + override var withoutReturnType by property(false) override var normalizedVisibilities by property(false) override var showInternalKeyword by property(true) override var prettyFunctionTypes by property(true)