From dc363c8db4a013cbe4399bb4c7a6d198d6eeaffc Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Tue, 25 Dec 2012 02:42:23 +0400 Subject: [PATCH] Render member kind. --- .../jet/renderer/DescriptorRendererImpl.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java b/compiler/frontend/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java index 1d9b55ea175..fa543285a85 100644 --- a/compiler/frontend/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java +++ b/compiler/frontend/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java @@ -305,9 +305,14 @@ public class DescriptorRendererImpl implements DescriptorRenderer { builder.append(renderKeyword(keyword)).append(" "); } - private void renderOverride(@NotNull CallableDescriptor callable, @NotNull StringBuilder builder) { - if (verbose && !callable.getOverriddenDescriptors().isEmpty()) { - builder.append("override /*").append(callable.getOverriddenDescriptors().size()).append("*/ "); + private void renderOverrideAndMemberKind(@NotNull CallableMemberDescriptor callableMember, @NotNull StringBuilder builder) { + if (verbose) { + if (!callableMember.getOverriddenDescriptors().isEmpty()) { + builder.append("override /*").append(callableMember.getOverriddenDescriptors().size()).append("*/ "); + } + if (callableMember.getKind() != CallableMemberDescriptor.Kind.DECLARATION) { + builder.append("/*").append(callableMember.getKind().name().toLowerCase()).append("*/ "); + } } } @@ -396,7 +401,7 @@ public class DescriptorRendererImpl implements DescriptorRenderer { renderAnnotations(function, builder); renderVisibility(function.getVisibility(), builder); renderModality(function.getModality(), builder); - renderOverride(function, builder); + renderOverrideAndMemberKind(function, builder); builder.append(renderKeyword("fun")).append(" "); renderTypeParameters(function.getTypeParameters(), builder, true); @@ -505,7 +510,7 @@ public class DescriptorRendererImpl implements DescriptorRenderer { renderAnnotations(property, builder); renderVisibility(property.getVisibility(), builder); renderModality(property.getModality(), builder); - renderOverride(property, builder); + renderOverrideAndMemberKind(property, builder); renderValVarPrefix(property, builder); }