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

render "val" and "val", was rendered as "var"

Browse Source
This commit is contained in:
Stepan Koltsov
2012-03-01 05:13:45 +04:00
parent 14ab3ff2d5
commit cd019ac889
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/resolve/DescriptorRenderer.java
+11 -7
View File
@@ -147,7 +147,12 @@ public class DescriptorRenderer implements Renderer<DeclarationDescriptor> {
@Override @Override
public Void visitVariableDescriptor(VariableDescriptor descriptor, StringBuilder builder) { 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); renderName(descriptor, builder);
builder.append(" : ").append(escape(typeString)); builder.append(" : ").append(escape(typeString));
return super.visitVariableDescriptor(descriptor, builder); return super.visitVariableDescriptor(descriptor, builder);
@@ -155,16 +160,13 @@ public class DescriptorRenderer implements Renderer<DeclarationDescriptor> {
private String renderPropertyPrefixAndComputeTypeString( private String renderPropertyPrefixAndComputeTypeString(
@NotNull StringBuilder builder, @NotNull StringBuilder builder,
boolean isVar,
@NotNull List<TypeParameterDescriptor> typeParameters, @NotNull List<TypeParameterDescriptor> typeParameters,
@NotNull ReceiverDescriptor receiver, @NotNull ReceiverDescriptor receiver,
@Nullable JetType outType) { @Nullable JetType outType) {
String typeString = lt() + "no type>"; String typeString = lt() + "no type>";
if (outType != null) { if (outType != null) {
builder.append(renderKeyword("var")).append(" "); builder.append(renderKeyword(isVar ? "var" : "val")).append(" ");
typeString = renderType(outType);
}
else if (outType != null) {
builder.append(renderKeyword("val")).append(" ");
typeString = renderType(outType); typeString = renderType(outType);
} }
@@ -181,7 +183,9 @@ public class DescriptorRenderer implements Renderer<DeclarationDescriptor> {
public Void visitPropertyDescriptor(PropertyDescriptor descriptor, StringBuilder builder) { public Void visitPropertyDescriptor(PropertyDescriptor descriptor, StringBuilder builder) {
renderModality(descriptor.getModality(), builder); renderModality(descriptor.getModality(), builder);
String typeString = renderPropertyPrefixAndComputeTypeString( String typeString = renderPropertyPrefixAndComputeTypeString(
builder, descriptor.getTypeParameters(), builder,
descriptor.isVar(),
descriptor.getTypeParameters(),
descriptor.getReceiverParameter(), descriptor.getReceiverParameter(),
descriptor.getType()); descriptor.getType());
renderName(descriptor, builder); renderName(descriptor, builder);