From 739f3b2a36919c29cfcd40d9e1c8917e391b542d Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Tue, 13 Dec 2011 17:38:57 +0400 Subject: [PATCH] Root namespace naming problems fixed. Failing test reverted to the initial state --- .../src/org/jetbrains/jet/lang/psi/JetPsiUtil.java | 8 ++++++-- idea/testData/completion/basic/ExtendClassName.kt | 2 -- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiUtil.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiUtil.java index 2a7c167d0fb..47cdc05dfdf 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiUtil.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiUtil.java @@ -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(); + } } diff --git a/idea/testData/completion/basic/ExtendClassName.kt b/idea/testData/completion/basic/ExtendClassName.kt index e25d7e3528f..c4ae4f6575d 100644 --- a/idea/testData/completion/basic/ExtendClassName.kt +++ b/idea/testData/completion/basic/ExtendClassName.kt @@ -1,5 +1,3 @@ -namespace foo - open class MySecondClass() { }