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

IDEA-177179 Navigate | Class... - navigation by a method reference navigates to the class declaration

Browse Source
This commit is contained in:
peter
2018-05-02 11:38:58 +02:00
parent df915d8685
commit 8719be91ef
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/ide/actions/GotoClassAction.java
+10 -3
View File
@@ -118,7 +118,7 @@ public class GotoClassAction extends GotoActionBase implements DumbAware {
if (file != null && popup.getMemberPattern() != null) {
NavigationUtil.activateFileWithPsiElement(psiElement, !popup.isOpenInCurrentWindowRequested());
Navigatable member = findMember(popup.getMemberPattern(), psiElement, file);
Navigatable member = findMember(popup.getMemberPattern(), popup.getTrimmedText(), psiElement, file);
if (member != null) {
member.navigate(true);
}
@@ -132,7 +132,7 @@ public class GotoClassAction extends GotoActionBase implements DumbAware {
}
@Nullable
private static Navigatable findMember(String pattern, PsiElement psiElement, VirtualFile file) {
private static Navigatable findMember(String memberPattern, String fullPattern, PsiElement psiElement, VirtualFile file) {
final PsiStructureViewFactory factory = LanguageStructureViewBuilder.INSTANCE.forLanguage(psiElement.getLanguage());
final StructureViewBuilder builder = factory == null ? null : factory.getStructureViewBuilder(psiElement.getContainingFile());
final FileEditor[] editors = FileEditorManager.getInstance(psiElement.getProject()).getEditors(file);
@@ -146,11 +146,18 @@ public class GotoClassAction extends GotoActionBase implements DumbAware {
if (element == null) {
return null;
}
final MinusculeMatcher matcher = NameUtil.buildMatcher(pattern).build();
MinusculeMatcher matcher = NameUtil.buildMatcher(memberPattern).build();
int max = Integer.MIN_VALUE;
Object target = null;
for (TreeElement treeElement : element.getChildren()) {
if (treeElement instanceof StructureViewTreeElement) {
Object value = ((StructureViewTreeElement)treeElement).getValue();
if (value instanceof PsiElement && value instanceof Navigatable &&
fullPattern.equals(CopyReferenceAction.elementToFqn((PsiElement)value))) {
return (Navigatable)value;
}
String presentableText = treeElement.getPresentation().getPresentableText();
if (presentableText != null) {
final int degree = matcher.matchingDegree(presentableText);