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

Simplified method.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-12-25 02:11:04 +04:00
parent 08d2002277
commit 204b9e3d2f
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java
+8 -11
View File
@@ -352,7 +352,7 @@ public class DescriptorRendererImpl implements DescriptorRenderer {
} }
} }
private boolean renderTypeParameters(List<TypeParameterDescriptor> typeParameters, StringBuilder builder) { private void renderTypeParameters(List<TypeParameterDescriptor> typeParameters, boolean withSpace, StringBuilder builder) {
if (!typeParameters.isEmpty()) { if (!typeParameters.isEmpty()) {
builder.append(lt()); builder.append(lt());
for (Iterator<TypeParameterDescriptor> iterator = typeParameters.iterator(); iterator.hasNext(); ) { for (Iterator<TypeParameterDescriptor> iterator = typeParameters.iterator(); iterator.hasNext(); ) {
@@ -363,9 +363,10 @@ public class DescriptorRendererImpl implements DescriptorRenderer {
} }
} }
builder.append(">"); builder.append(">");
return true; if (withSpace) {
builder.append(" ");
}
} }
return false;
} }
/* FUNCTIONS */ /* FUNCTIONS */
@@ -375,9 +376,7 @@ public class DescriptorRendererImpl implements DescriptorRenderer {
renderVisibility(descriptor.getVisibility(), builder); renderVisibility(descriptor.getVisibility(), builder);
renderModality(descriptor.getModality(), builder); renderModality(descriptor.getModality(), builder);
builder.append(renderKeyword("fun")).append(" "); builder.append(renderKeyword("fun")).append(" ");
if (renderTypeParameters(descriptor.getTypeParameters(), builder)) { renderTypeParameters(descriptor.getTypeParameters(), true, builder);
builder.append(" ");
}
ReceiverParameterDescriptor receiver = descriptor.getReceiverParameter(); ReceiverParameterDescriptor receiver = descriptor.getReceiverParameter();
if (receiver != null) { if (receiver != null) {
@@ -400,7 +399,7 @@ public class DescriptorRendererImpl implements DescriptorRenderer {
ClassDescriptor classDescriptor = constructorDescriptor.getContainingDeclaration(); ClassDescriptor classDescriptor = constructorDescriptor.getContainingDeclaration();
renderName(classDescriptor, builder); renderName(classDescriptor, builder);
renderTypeParameters(classDescriptor.getTypeConstructor().getParameters(), builder); renderTypeParameters(classDescriptor.getTypeConstructor().getParameters(), false, builder);
renderValueParameters(constructorDescriptor, builder); renderValueParameters(constructorDescriptor, builder);
} }
@@ -485,9 +484,7 @@ public class DescriptorRendererImpl implements DescriptorRenderer {
renderValVarPrefix(descriptor, builder); renderValVarPrefix(descriptor, builder);
} }
if (renderTypeParameters(descriptor.getTypeParameters(), builder)) { renderTypeParameters(descriptor.getTypeParameters(), true, builder);
builder.append(" ");
}
ReceiverParameterDescriptor receiver = descriptor.getReceiverParameter(); ReceiverParameterDescriptor receiver = descriptor.getReceiverParameter();
if (receiver != null) { if (receiver != null) {
@@ -520,7 +517,7 @@ public class DescriptorRendererImpl implements DescriptorRenderer {
List<TypeParameterDescriptor> typeParameters = descriptor.getTypeConstructor().getParameters(); List<TypeParameterDescriptor> typeParameters = descriptor.getTypeConstructor().getParameters();
if (!classObject) { if (!classObject) {
renderName(descriptor, builder); renderName(descriptor, builder);
renderTypeParameters(typeParameters, builder); renderTypeParameters(typeParameters, false, builder);
if (classWithPrimaryConstructor) { if (classWithPrimaryConstructor) {
ConstructorDescriptor primaryConstructor = descriptor.getUnsubstitutedPrimaryConstructor(); ConstructorDescriptor primaryConstructor = descriptor.getUnsubstitutedPrimaryConstructor();
if (primaryConstructor != null) { if (primaryConstructor != null) {