move code

compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java

@@ -303,4 +303,14 @@ public class DescriptorUtils {
             addSuperTypes(jetType, set);
         }
     }
+
+    public static boolean isTopLevelNamespace(@NotNull NamespaceDescriptor namespaceDescriptor) {
+        return namespaceDescriptor.getContainingDeclaration() instanceof NamespaceDescriptor
+                && namespaceDescriptor.getContainingDeclaration().getContainingDeclaration() instanceof ModuleDescriptor;
+    }
+
+    public static boolean isRootNamespace(@NotNull NamespaceDescriptor namespaceDescriptor) {
+        return namespaceDescriptor.getContainingDeclaration() instanceof ModuleDescriptor;
+    }
+
 }

js/js.translator/src/org/jetbrains/k2js/translate/context/StaticContext.java

@@ -22,12 +22,12 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.resolve.BindingContext;
+import org.jetbrains.jet.lang.resolve.DescriptorUtils;
 import org.jetbrains.jet.lang.types.lang.JetStandardLibrary;
 import org.jetbrains.k2js.translate.context.generator.Generator;
 import org.jetbrains.k2js.translate.context.generator.Rule;
 import org.jetbrains.k2js.translate.intrinsic.Intrinsics;
 import org.jetbrains.k2js.translate.utils.AnnotationsUtils;
-import org.jetbrains.k2js.translate.utils.JsDescriptorUtils;
 import org.jetbrains.k2js.translate.utils.JsAstUtils;
 import org.jetbrains.k2js.translate.utils.PredefinedAnnotation;
 
@@ -437,7 +437,7 @@ public final class StaticContext {
                     if (!(descriptor instanceof NamespaceDescriptor)) {
                         return null;
                     }
-                    if (JsDescriptorUtils.isTopLevelNamespace((NamespaceDescriptor) descriptor)) {
+                    if (DescriptorUtils.isTopLevelNamespace((NamespaceDescriptor) descriptor)) {
                         return true;
                     }
                     return null;

js/js.translator/src/org/jetbrains/k2js/translate/declaration/NamespaceDeclarationTranslator.java

@@ -24,6 +24,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
 import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor;
 import org.jetbrains.jet.lang.psi.JetFile;
+import org.jetbrains.jet.lang.resolve.DescriptorUtils;
 import org.jetbrains.k2js.translate.context.Namer;
 import org.jetbrains.k2js.translate.context.TranslationContext;
 import org.jetbrains.k2js.translate.general.AbstractTranslator;
@@ -126,7 +127,7 @@ public final class NamespaceDeclarationTranslator extends AbstractTranslator {
     private static List<NamespaceDescriptor> filterTopLevelAndRootNamespaces(@NotNull List<NamespaceDescriptor> namespaceDescriptors) {
         List<NamespaceDescriptor> result = Lists.newArrayList();
         for (NamespaceDescriptor descriptor : namespaceDescriptors) {
-            if (JsDescriptorUtils.isTopLevelNamespace(descriptor) || JsDescriptorUtils.isRootNamespace(descriptor)) {
+            if (DescriptorUtils.isTopLevelNamespace(descriptor) || DescriptorUtils.isRootNamespace(descriptor)) {
                 result.add(descriptor);
             }
         }

js/js.translator/src/org/jetbrains/k2js/translate/declaration/NamespaceTranslator.java

@@ -97,7 +97,7 @@ public final class NamespaceTranslator extends AbstractTranslator {
 
     @NotNull
     private List<JsPropertyInitializer> getNestedNamespaceDeclarations() {
-        if (JsDescriptorUtils.isRootNamespace(descriptor)) {
+        if (DescriptorUtils.isRootNamespace(descriptor)) {
             return Lists.newArrayList();
         }
         List<JsPropertyInitializer> result = Lists.newArrayList();

js/js.translator/src/org/jetbrains/k2js/translate/utils/JsDescriptorUtils.java

@@ -236,15 +236,6 @@ public final class JsDescriptorUtils {
         }
     }
 
-    public static boolean isTopLevelNamespace(@NotNull NamespaceDescriptor namespaceDescriptor) {
-        return namespaceDescriptor.getContainingDeclaration() instanceof NamespaceDescriptor
-                && namespaceDescriptor.getContainingDeclaration().getContainingDeclaration() instanceof ModuleDescriptor;
-    }
-
-    public static boolean isRootNamespace(@NotNull NamespaceDescriptor namespaceDescriptor) {
-        return namespaceDescriptor.getContainingDeclaration() instanceof ModuleDescriptor;
-    }
-
     @NotNull
     public static List<DeclarationDescriptor> getContainedDescriptorsWhichAreNotPredefined(@NotNull NamespaceDescriptor namespace) {
         List<DeclarationDescriptor> result = Lists.newArrayList();