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

Extracted method rendering class name.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-12-25 00:27:34 +04:00
parent bd16ce4634
commit e69fe6f7d1
1 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java
+24 -22
View File
@@ -143,6 +143,24 @@ public class DescriptorRendererImpl implements DescriptorRenderer {
return buf.toString();
}
@NotNull
private String renderClassName(@NotNull ClassDescriptor klass) {
if (shortNames) {
List<Name> qualifiedNameElements = Lists.newArrayList();
// for nested classes qualified name should be used
DeclarationDescriptor current = klass;
do {
qualifiedNameElements.add(current.getName());
current = current.getContainingDeclaration();
}
while (current instanceof ClassDescriptor);
Collections.reverse(qualifiedNameElements);
return renderFqName(qualifiedNameElements);
}
return renderFqName(DescriptorUtils.getFQName(klass));
}
/* TYPES RENDERING */
@Override
@@ -189,31 +207,15 @@ public class DescriptorRendererImpl implements DescriptorRenderer {
private String renderTypeName(@NotNull TypeConstructor typeConstructor) {
ClassifierDescriptor cd = typeConstructor.getDeclarationDescriptor();
if (cd == null) {
return typeConstructor.toString();
}
else if (cd instanceof TypeParameterDescriptor) {
if (cd instanceof TypeParameterDescriptor) {
return renderName(cd.getName());
}
else if (cd instanceof ClassDescriptor) {
return renderClassName((ClassDescriptor) cd);
}
else {
if (shortNames) {
List<Name> qualifiedNameElements = Lists.newArrayList();
// for nested classes qualified name should be used
DeclarationDescriptor current = cd;
do {
qualifiedNameElements.add(current.getName());
current = current.getContainingDeclaration();
}
while (current instanceof ClassDescriptor);
Collections.reverse(qualifiedNameElements);
return renderFqName(qualifiedNameElements);
}
else {
return renderFqName(DescriptorUtils.getFQName(cd));
}
assert cd == null: "Unexpected classifier: " + cd.getClass();
return typeConstructor.toString();
}
}