From e810d73286389432d35615e94d235b2786bc706e Mon Sep 17 00:00:00 2001
From: Evgeny Gerashchenko <Evgeny.Gerashchenko@jetbrains.com>
Date: Thu, 1 Mar 2012 21:25:02 +0400
Subject: [PATCH] Some minor fixes in presentation of decompiled namespaces.

---
 .../JetContentBasedFileSubstitutor.java       | 26 +++++++++++--------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/idea/src/org/jetbrains/jet/plugin/JetContentBasedFileSubstitutor.java b/idea/src/org/jetbrains/jet/plugin/JetContentBasedFileSubstitutor.java
index 18f7fdf06d4..8fb590c3515 100644
--- a/idea/src/org/jetbrains/jet/plugin/JetContentBasedFileSubstitutor.java
+++ b/idea/src/org/jetbrains/jet/plugin/JetContentBasedFileSubstitutor.java
@@ -70,7 +70,7 @@ public class JetContentBasedFileSubstitutor implements ContentBasedClassFileProc
         PsiJavaFileStub js = getJavaStub(project, file);
         if (js != null) {
             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];
@@ -81,23 +81,27 @@ public class JetContentBasedFileSubstitutor implements ContentBasedClassFileProc
 
                 if (nd != null) {
                     for (DeclarationDescriptor member : nd.getMemberScope().getAllDescriptors()) {
+                        if (member instanceof ClassDescriptor && member.getName().equals("namespace")) {
+                            continue;
+                        }
                         builder.append(DescriptorRenderer.COMPACT.render(member)).append("\n\n");
                     }
                 }
-            }
-            ClassDescriptor cd = jdr.resolveClass(psiClass);
-            if (cd != null) {
-                builder.append(DescriptorRenderer.COMPACT.render(cd));
+            } else {
+                ClassDescriptor cd = jdr.resolveClass(psiClass);
+                if (cd != null) {
+                    builder.append(DescriptorRenderer.COMPACT.render(cd));
 
-                builder.append(" {\n");
+                    builder.append(" {\n");
 
-                for (DeclarationDescriptor member : cd.getDefaultType().getMemberScope().getAllDescriptors()) {
-                    if (member.getContainingDeclaration() == cd) {
-                        builder.append("    ").append(DescriptorRenderer.COMPACT.render(member)).append("\n");
+                    for (DeclarationDescriptor member : cd.getDefaultType().getMemberScope().getAllDescriptors()) {
+                        if (member.getContainingDeclaration() == cd) {
+                            builder.append("    ").append(DescriptorRenderer.COMPACT.render(member)).append("\n\n");
+                        }
                     }
-                }
 
-                builder.append("}");
+                    builder.append("}");
+                }
             }
         }
         return builder.toString();