Extract and move method from StaticContext to Namer

This commit is contained in:
Pavel V. Talanov
2012-07-04 12:01:12 +04:00
parent 592b0e9c37
commit 35f5e8a075
2 changed files with 14 additions and 8 deletions
@@ -19,6 +19,9 @@ package org.jetbrains.k2js.translate.context;
import com.google.dart.compiler.backend.js.ast.*;
import com.google.dart.compiler.util.AstUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor;
import org.jetbrains.jet.lang.resolve.DescriptorUtils;
import static org.jetbrains.k2js.translate.utils.JsAstUtils.setQualifier;
@@ -208,4 +211,14 @@ public final class Namer {
/*package*/ JsScope getKotlinScope() {
return kotlinScope;
}
@NotNull
static String generateNamespaceName(DeclarationDescriptor descriptor) {
if (DescriptorUtils.isRootNamespace((NamespaceDescriptor) descriptor)) {
return getRootNamespaceName();
}
else {
return descriptor.getName().getName();
}
}
}
@@ -189,14 +189,7 @@ public final class StaticContext {
return null;
}
String name;
if (DescriptorUtils.isRootNamespace((NamespaceDescriptor) descriptor)) {
name = Namer.getRootNamespaceName();
}
else {
name = descriptor.getName().getName();
}
String name = Namer.generateNamespaceName(descriptor);
return getRootScope().declareUnobfuscatableName(name);
}
};