IDEA-56727 ctrl-hover provides preview hint for element different from actual navigation target

This commit is contained in:
Gregory Shrago
2010-07-23 15:48:55 +04:00
parent e005a2df9a
commit d87341eab3
@@ -401,9 +401,10 @@ public class CtrlMouseHandler extends AbstractProjectComponent {
@Nullable
private static PsiElement resolve(final PsiReference ref) {
PsiElement resolvedElement = null;
// IDEA-56727 try resolve first as in GotoDeclarationAction
PsiElement resolvedElement = ref.resolve();
if (ref instanceof PsiPolyVariantReference) {
if (resolvedElement == null && ref instanceof PsiPolyVariantReference) {
final ResolveResult[] psiElements = ((PsiPolyVariantReference)ref).multiResolve(false);
if (psiElements.length > 0) {
final ResolveResult resolveResult = psiElements[0];
@@ -412,9 +413,6 @@ public class CtrlMouseHandler extends AbstractProjectComponent {
}
}
}
else {
resolvedElement = ref.resolve();
}
return resolvedElement;
}