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

Rendering member kind for constructor.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2013-06-06 23:29:14 +04:00
parent fea85476b7
commit 50eb14c525
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java
+10 -3
View File
@@ -355,7 +355,7 @@ public class DescriptorRendererImpl implements DescriptorRenderer {
return !callable.getOverriddenDescriptors().isEmpty(); return !callable.getOverriddenDescriptors().isEmpty();
} }
private void renderOverrideAndMemberKind(@NotNull CallableMemberDescriptor callableMember, @NotNull StringBuilder builder) { private void renderOverride(@NotNull CallableMemberDescriptor callableMember, @NotNull StringBuilder builder) {
if (!modifiers) return; if (!modifiers) return;
if (overridesSomething(callableMember)) { if (overridesSomething(callableMember)) {
if (overrideRenderingPolicy != OverrideRenderingPolicy.RENDER_OPEN) { if (overrideRenderingPolicy != OverrideRenderingPolicy.RENDER_OPEN) {
@@ -365,6 +365,10 @@ public class DescriptorRendererImpl implements DescriptorRenderer {
} }
} }
} }
}
private void renderMemberKind(CallableMemberDescriptor callableMember, StringBuilder builder) {
if (!modifiers) return;
if (verbose && callableMember.getKind() != CallableMemberDescriptor.Kind.DECLARATION) { if (verbose && callableMember.getKind() != CallableMemberDescriptor.Kind.DECLARATION) {
builder.append("/*").append(callableMember.getKind().name().toLowerCase()).append("*/ "); builder.append("/*").append(callableMember.getKind().name().toLowerCase()).append("*/ ");
} }
@@ -460,7 +464,8 @@ public class DescriptorRendererImpl implements DescriptorRenderer {
renderAnnotations(function, builder); renderAnnotations(function, builder);
renderVisibility(function.getVisibility(), builder); renderVisibility(function.getVisibility(), builder);
renderModalityForCallable(function, builder); renderModalityForCallable(function, builder);
renderOverrideAndMemberKind(function, builder); renderOverride(function, builder);
renderMemberKind(function, builder);
builder.append(renderKeyword("fun")).append(" "); builder.append(renderKeyword("fun")).append(" ");
renderTypeParameters(function.getTypeParameters(), builder, true); renderTypeParameters(function.getTypeParameters(), builder, true);
@@ -483,6 +488,7 @@ public class DescriptorRendererImpl implements DescriptorRenderer {
private void renderConstructor(@NotNull ConstructorDescriptor constructor, @NotNull StringBuilder builder) { private void renderConstructor(@NotNull ConstructorDescriptor constructor, @NotNull StringBuilder builder) {
renderAnnotations(constructor, builder); renderAnnotations(constructor, builder);
renderVisibility(constructor.getVisibility(), builder); renderVisibility(constructor.getVisibility(), builder);
renderMemberKind(constructor, builder);
builder.append(renderKeyword("constructor")).append(" "); builder.append(renderKeyword("constructor")).append(" ");
@@ -582,7 +588,8 @@ public class DescriptorRendererImpl implements DescriptorRenderer {
renderAnnotations(property, builder); renderAnnotations(property, builder);
renderVisibility(property.getVisibility(), builder); renderVisibility(property.getVisibility(), builder);
renderModalityForCallable(property, builder); renderModalityForCallable(property, builder);
renderOverrideAndMemberKind(property, builder); renderOverride(property, builder);
renderMemberKind(property, builder);
renderValVarPrefix(property, builder); renderValVarPrefix(property, builder);
} }