MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

assign info to a reference element instead of element at pointer

Browse Source
This commit is contained in:
Eugene Kudelevsky
2011-04-05 18:55:52 +04:00
parent 590b62cc91
commit e3c06c670a
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/codeInsight/navigation/CtrlMouseHandler.java
+6 -7
View File
@@ -353,6 +353,9 @@ public class CtrlMouseHandler extends AbstractProjectComponent {
}
}
else if (browseMode == BrowseMode.Declaration) {
final PsiReference ref = TargetElementUtilBase.findReference(editor, offset);
final PsiElement resolvedElement = ref != null ? ref.resolve() : null;
final PsiElement[] targetElements = GotoDeclarationAction.findTargetElementsNoVS(myProject, editor, offset);
final PsiElement elementAtPointer = file.findElementAt(offset);
@@ -361,7 +364,7 @@ public class CtrlMouseHandler extends AbstractProjectComponent {
return null;
}
else if (targetElements.length == 1) {
if (elementAtPointer != null && targetElements[0].isPhysical()) {
if (targetElements[0] != resolvedElement && elementAtPointer != null && targetElements[0].isPhysical()) {
return new InfoSingle(elementAtPointer, targetElements[0]);
}
}
@@ -370,12 +373,8 @@ public class CtrlMouseHandler extends AbstractProjectComponent {
}
}
PsiReference ref = TargetElementUtilBase.findReference(editor, offset);
if (ref != null) {
PsiElement resolvedElement = resolve(ref);
if (resolvedElement != null) {
return new InfoSingle(ref, resolvedElement);
}
if (resolvedElement != null) {
return new InfoSingle(ref, resolvedElement);
}
}
else if (browseMode == BrowseMode.Implementation) {