JDR: work with names, not with PsiSomething

This should fix (or hide) problems like http://ea.jetbrains.com/browser/ea_problems/33857
2012-02-21 21:10:15 +04:00
parent ac281ad1a9
commit b59970a610
1 changed files with 11 additions and 4 deletions
@@ -610,10 +610,17 @@ public class JavaDescriptorResolver {
        if (containingClass != null) {
            return resolveClass(containingClass);
        }
-        
-        PsiJavaFile containingFile = (PsiJavaFile) psiClass.getContainingFile();
-        String packageName = containingFile.getPackageName();
-        return resolveNamespace(packageName);
+
+        return resolveNamespace(packageNameOfClass(psiClass.getQualifiedName()));
+    }
+
+    private static String packageNameOfClass(@NotNull String qualifiedName) {
+        int lastDot = qualifiedName.lastIndexOf('.');
+        if (lastDot < 0) {
+            return "";
+        } else {
+            return qualifiedName.substring(0, lastDot);
+        }
    }

    private List<TypeParameterDescriptorInitialization> makeUninitializedTypeParameters(@NotNull DeclarationDescriptor containingDeclaration, @NotNull PsiTypeParameter[] typeParameters) {