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

Not rendering "final" for top-level functions and properties.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-12-27 20:51:17 +04:00
parent 60f8c8a343
commit 28c93f2912
8 changed files with 53 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java
+8 -2
View File
@@ -326,6 +326,12 @@ public class DescriptorRendererImpl implements DescriptorRenderer {
builder.append(renderKeyword(keyword)).append(" ");
}
private void renderModalityForCallable(@NotNull CallableMemberDescriptor callable, @NotNull StringBuilder builder) {
if (!(callable.getContainingDeclaration() instanceof NamespaceDescriptor) || callable.getModality() != Modality.FINAL) {
renderModality(callable.getModality(), builder);
}
}
private void renderOverrideAndMemberKind(@NotNull CallableMemberDescriptor callableMember, @NotNull StringBuilder builder) {
if (verbose) {
if (!callableMember.getOverriddenDescriptors().isEmpty()) {
@@ -425,7 +431,7 @@ public class DescriptorRendererImpl implements DescriptorRenderer {
if (!startFromName) {
renderAnnotations(function, builder);
renderVisibility(function.getVisibility(), builder);
renderModality(function.getModality(), builder);
renderModalityForCallable(function, builder);
renderOverrideAndMemberKind(function, builder);
builder.append(renderKeyword("fun")).append(" ");
@@ -541,7 +547,7 @@ public class DescriptorRendererImpl implements DescriptorRenderer {
if (!startFromName) {
renderAnnotations(property, builder);
renderVisibility(property.getVisibility(), builder);
renderModality(property.getModality(), builder);
renderModalityForCallable(property, builder);
renderOverrideAndMemberKind(property, builder);
renderValVarPrefix(property, builder);