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

Some minor fixes in presentation of decompiled namespaces.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-03-01 21:25:02 +04:00
parent 61639e577e
commit e810d73286
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/JetContentBasedFileSubstitutor.java
+15 -11
View File
@@ -70,7 +70,7 @@ public class JetContentBasedFileSubstitutor implements ContentBasedClassFileProc
PsiJavaFileStub js = getJavaStub(project, file); PsiJavaFileStub js = getJavaStub(project, file);
if (js != null) { if (js != null) {
if (js.getPackageName() != null && js.getPackageName().length() > 0) { if (js.getPackageName() != null && js.getPackageName().length() > 0) {
builder.append("package ").append(js.getPackageName()).append("\n\n"); builder.append("package ").append(js.getPackageName()).append("\n\n\n");
} }
PsiClass psiClass = js.getClasses()[0]; PsiClass psiClass = js.getClasses()[0];
@@ -81,23 +81,27 @@ public class JetContentBasedFileSubstitutor implements ContentBasedClassFileProc
if (nd != null) { if (nd != null) {
for (DeclarationDescriptor member : nd.getMemberScope().getAllDescriptors()) { for (DeclarationDescriptor member : nd.getMemberScope().getAllDescriptors()) {
if (member instanceof ClassDescriptor && member.getName().equals("namespace")) {
continue;
}
builder.append(DescriptorRenderer.COMPACT.render(member)).append("\n\n"); builder.append(DescriptorRenderer.COMPACT.render(member)).append("\n\n");
} }
} }
} } else {
ClassDescriptor cd = jdr.resolveClass(psiClass); ClassDescriptor cd = jdr.resolveClass(psiClass);
if (cd != null) { if (cd != null) {
builder.append(DescriptorRenderer.COMPACT.render(cd)); builder.append(DescriptorRenderer.COMPACT.render(cd));
builder.append(" {\n"); builder.append(" {\n");
for (DeclarationDescriptor member : cd.getDefaultType().getMemberScope().getAllDescriptors()) { for (DeclarationDescriptor member : cd.getDefaultType().getMemberScope().getAllDescriptors()) {
if (member.getContainingDeclaration() == cd) { if (member.getContainingDeclaration() == cd) {
builder.append(" ").append(DescriptorRenderer.COMPACT.render(member)).append("\n"); builder.append(" ").append(DescriptorRenderer.COMPACT.render(member)).append("\n\n");
}
} }
}
builder.append("}"); builder.append("}");
}
} }
} }
return builder.toString(); return builder.toString();