azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Render member kind.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-12-25 02:42:23 +04:00
parent 12473576b7
commit dc363c8db4
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java
+10 -5
View File
@@ -305,9 +305,14 @@ public class DescriptorRendererImpl implements DescriptorRenderer {
builder.append(renderKeyword(keyword)).append(" "); builder.append(renderKeyword(keyword)).append(" ");
} }
private void renderOverride(@NotNull CallableDescriptor callable, @NotNull StringBuilder builder) { private void renderOverrideAndMemberKind(@NotNull CallableMemberDescriptor callableMember, @NotNull StringBuilder builder) {
if (verbose && !callable.getOverriddenDescriptors().isEmpty()) { if (verbose) {
builder.append("override /*").append(callable.getOverriddenDescriptors().size()).append("*/ "); 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); renderAnnotations(function, builder);
renderVisibility(function.getVisibility(), builder); renderVisibility(function.getVisibility(), builder);
renderModality(function.getModality(), builder); renderModality(function.getModality(), builder);
renderOverride(function, builder); renderOverrideAndMemberKind(function, builder);
builder.append(renderKeyword("fun")).append(" "); builder.append(renderKeyword("fun")).append(" ");
renderTypeParameters(function.getTypeParameters(), builder, true); renderTypeParameters(function.getTypeParameters(), builder, true);
@@ -505,7 +510,7 @@ public class DescriptorRendererImpl implements DescriptorRenderer {
renderAnnotations(property, builder); renderAnnotations(property, builder);
renderVisibility(property.getVisibility(), builder); renderVisibility(property.getVisibility(), builder);
renderModality(property.getModality(), builder); renderModality(property.getModality(), builder);
renderOverride(property, builder); renderOverrideAndMemberKind(property, builder);
renderValVarPrefix(property, builder); renderValVarPrefix(property, builder);
} }