From cd019ac889ad74f6e4403f5f337760a50d213c4c Mon Sep 17 00:00:00 2001
From: Stepan Koltsov <stepan.koltsov@jetbrains.com>
Date: Thu, 1 Mar 2012 05:13:45 +0400
Subject: [PATCH] render "val" and "val", was rendered as "var"

---
 .../jet/resolve/DescriptorRenderer.java        | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/jet/resolve/DescriptorRenderer.java b/compiler/frontend/src/org/jetbrains/jet/resolve/DescriptorRenderer.java
index 6477acaf619..033de136db7 100644
--- a/compiler/frontend/src/org/jetbrains/jet/resolve/DescriptorRenderer.java
+++ b/compiler/frontend/src/org/jetbrains/jet/resolve/DescriptorRenderer.java
@@ -147,7 +147,12 @@ public class DescriptorRenderer implements Renderer<DeclarationDescriptor> {
 
         @Override
         public Void visitVariableDescriptor(VariableDescriptor descriptor, StringBuilder builder) {
-            String typeString = renderPropertyPrefixAndComputeTypeString(builder, Collections.<TypeParameterDescriptor>emptyList(), ReceiverDescriptor.NO_RECEIVER, descriptor.getType());
+            String typeString = renderPropertyPrefixAndComputeTypeString(
+                    builder,
+                    descriptor.isVar(),
+                    Collections.<TypeParameterDescriptor>emptyList(),
+                    ReceiverDescriptor.NO_RECEIVER,
+                    descriptor.getType());
             renderName(descriptor, builder);
             builder.append(" : ").append(escape(typeString));
             return super.visitVariableDescriptor(descriptor, builder);
@@ -155,16 +160,13 @@ public class DescriptorRenderer implements Renderer<DeclarationDescriptor> {
 
         private String renderPropertyPrefixAndComputeTypeString(
                 @NotNull StringBuilder builder,
+                boolean isVar,
                 @NotNull List<TypeParameterDescriptor> typeParameters,
                 @NotNull ReceiverDescriptor receiver,
                 @Nullable JetType outType) {
             String typeString = lt() + "no type>";
             if (outType != null) {
-                builder.append(renderKeyword("var")).append(" ");
-                typeString = renderType(outType);
-            }
-            else if (outType != null) {
-                builder.append(renderKeyword("val")).append(" ");
+                builder.append(renderKeyword(isVar ? "var" : "val")).append(" ");
                 typeString = renderType(outType);
             }
 
@@ -181,7 +183,9 @@ public class DescriptorRenderer implements Renderer<DeclarationDescriptor> {
         public Void visitPropertyDescriptor(PropertyDescriptor descriptor, StringBuilder builder) {
             renderModality(descriptor.getModality(), builder);
             String typeString = renderPropertyPrefixAndComputeTypeString(
-                    builder, descriptor.getTypeParameters(),
+                    builder,
+                    descriptor.isVar(),
+                    descriptor.getTypeParameters(),
                     descriptor.getReceiverParameter(),
                     descriptor.getType());
             renderName(descriptor, builder);