From d27eb680e082ed6458448df95c26bdc913fb1950 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Thu, 13 Dec 2012 22:22:07 +0400 Subject: [PATCH] Inlined hasDefaultValue(). --- .../jet/renderer/DescriptorRendererImpl.java | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java b/compiler/frontend/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java index fd404857ca7..84d05c2150d 100644 --- a/compiler/frontend/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java +++ b/compiler/frontend/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java @@ -76,16 +76,6 @@ public class DescriptorRendererImpl implements DescriptorRenderer { this.textFormat = textFormat; } - private boolean hasDefaultValue(ValueParameterDescriptor descriptor) { - if (debugMode) { - // hasDefaultValue() has effects - return descriptor.declaresDefaultValue(); - } - else { - return descriptor.hasDefaultValue(); - } - } - private String renderKeyword(String keyword) { switch (textFormat) { case PLAIN: @@ -296,7 +286,8 @@ public class DescriptorRendererImpl implements DescriptorRenderer { private void renderValueParameterOfFunction(ValueParameterDescriptor descriptor, StringBuilder builder) { rootVisitor.visitVariableDescriptor(descriptor, builder, true); - if (hasDefaultValue(descriptor)) { + boolean withDefaultValue = debugMode ? descriptor.declaresDefaultValue() : descriptor.hasDefaultValue(); + if (withDefaultValue) { builder.append(" = ..."); } }