提交 b59970a6 编写于 作者: S Stepan Koltsov

JDR: work with names, not with PsiSomething

This should fix (or hide) problems like
http://ea.jetbrains.com/browser/ea_problems/33857
上级 ac281ad1
......@@ -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) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册