Root namespace naming problems fixed. Failing test reverted to the initial state

This commit is contained in:
Andrey Breslav
2011-12-13 17:38:57 +04:00
parent c4fd2e564f
commit 739f3b2a36
2 changed files with 6 additions and 4 deletions
@@ -131,11 +131,15 @@ public class JetPsiUtil {
public static String getFQName(JetClass jetClass) {
JetNamedDeclaration parent = PsiTreeUtil.getParentOfType(jetClass, JetNamespace.class, JetClass.class);
if (parent instanceof JetNamespace) {
return getFQName(((JetNamespace) parent)) + "." + jetClass.getName();
return makeFQName(getFQName(((JetNamespace) parent)), jetClass);
}
if (parent instanceof JetClass) {
return getFQName(((JetClass) parent)) + "." + jetClass.getName();
return makeFQName(getFQName(((JetClass) parent)), jetClass);
}
return jetClass.getName();
}
private static String makeFQName(String prefix, JetClass jetClass) {
return (prefix.length() == 0 ? "" : prefix + ".") + jetClass.getName();
}
}
@@ -1,5 +1,3 @@
namespace foo
open class MySecondClass() {
}