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

unhardcode <root> identifiers

Browse Source
This commit is contained in:
Stepan Koltsov
2012-03-30 01:11:03 +04:00
parent 8526397338
commit 87847fac85
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.translator/src/org/jetbrains/k2js/translate/utils/DescriptorUtils.java
+2 -3
View File
@@ -241,8 +241,7 @@ public final class DescriptorUtils {
if (containedInModule) { if (containedInModule) {
return true; return true;
} }
//TODO return containingDeclaration.getContainingDeclaration() instanceof ModuleDescriptor;
return containingDeclaration.getName().equals("<root>");
} }
@NotNull @NotNull
@@ -276,7 +275,7 @@ public final class DescriptorUtils {
public static List<NamespaceDescriptor> getNamespaceDescriptorHierarchy(@NotNull NamespaceDescriptor namespaceDescriptor) { public static List<NamespaceDescriptor> getNamespaceDescriptorHierarchy(@NotNull NamespaceDescriptor namespaceDescriptor) {
List<NamespaceDescriptor> result = Lists.newArrayList(namespaceDescriptor); List<NamespaceDescriptor> result = Lists.newArrayList(namespaceDescriptor);
NamespaceDescriptor current = namespaceDescriptor; NamespaceDescriptor current = namespaceDescriptor;
while (!current.getName().equals("<root>")) { while (!(current.getContainingDeclaration() instanceof ModuleDescriptor)) {
result.add(current); result.add(current);
if (current.getContainingDeclaration() instanceof NamespaceDescriptor) { if (current.getContainingDeclaration() instanceof NamespaceDescriptor) {
current = (NamespaceDescriptor)current.getContainingDeclaration(); current = (NamespaceDescriptor)current.getContainingDeclaration();