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

Added class objects support in JetDecompiledData.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-03-10 20:29:24 +04:00
parent e9bac5ce16
commit 126c3d0033
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/libraries/JetDecompiledData.java
+13 -5
View File
@@ -176,8 +176,6 @@ public class JetDecompiledData {
private void appendDescriptor(StringBuilder builder, DeclarationDescriptor descriptor, BindingContext bindingContext, String indent) { private void appendDescriptor(StringBuilder builder, DeclarationDescriptor descriptor, BindingContext bindingContext, String indent) {
String decompiledComment = "/* " + PsiBundle.message("psi.decompiled.method.body") + " */"; String decompiledComment = "/* " + PsiBundle.message("psi.decompiled.method.body") + " */";
builder.append(indent);
int startOffset = builder.length(); int startOffset = builder.length();
builder.append(DescriptorRenderer.COMPACT.render(descriptor)); builder.append(DescriptorRenderer.COMPACT.render(descriptor));
int endOffset = builder.length(); int endOffset = builder.length();
@@ -189,15 +187,23 @@ public class JetDecompiledData {
builder.append(" ").append(decompiledComment); builder.append(" ").append(decompiledComment);
} else if (descriptor instanceof ClassDescriptor) { } else if (descriptor instanceof ClassDescriptor) {
builder.append(" {\n"); builder.append(" {\n");
ClassDescriptor classDescriptor = (ClassDescriptor) descriptor;
boolean firstPassed = false; boolean firstPassed = false;
for (DeclarationDescriptor member : ((ClassDescriptor) descriptor).getDefaultType().getMemberScope().getAllDescriptors()) { String subindent = indent + " ";
if (classDescriptor.getClassObjectDescriptor() != null) {
firstPassed = true;
builder.append(subindent).append("class ");
appendDescriptor(builder, classDescriptor.getClassObjectDescriptor(), bindingContext, subindent);
}
for (DeclarationDescriptor member : classDescriptor.getDefaultType().getMemberScope().getAllDescriptors()) {
if (member.getContainingDeclaration() == descriptor) { if (member.getContainingDeclaration() == descriptor) {
if (firstPassed) { if (firstPassed) {
builder.append("\n"); builder.append("\n");
} else { } else {
firstPassed = true; firstPassed = true;
} }
appendDescriptor(builder, member, bindingContext, indent + " "); builder.append(subindent);
appendDescriptor(builder, member, bindingContext, subindent);
} }
} }
builder.append(indent).append("}"); builder.append(indent).append("}");
@@ -206,7 +212,9 @@ public class JetDecompiledData {
builder.append("\n"); builder.append("\n");
PsiElement clsMember = bindingContext.get(BindingContext.DESCRIPTOR_TO_DECLARATION, descriptor); PsiElement clsMember = bindingContext.get(BindingContext.DESCRIPTOR_TO_DECLARATION, descriptor);
myClsMembersToRanges.put(clsMember, new TextRange(startOffset, endOffset)); if (clsMember != null) {
myClsMembersToRanges.put(clsMember, new TextRange(startOffset, endOffset));
}
} }
private static boolean hasAnnotation(PsiModifierListOwner modifierListOwner, String qualifiedName) { private static boolean hasAnnotation(PsiModifierListOwner modifierListOwner, String qualifiedName) {