MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-05 01:50:56 +07:00
Code Issues Packages Projects Releases Wiki Activity

allow providing custom qualified names also in Goto Symbol

Browse Source
This commit is contained in:
Dmitry Jemerov
2012-01-12 10:11:44 +01:00
parent 352a2f1dc5
commit 57de8db439
2 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoClassModel2.java
View File

@@ -105,18 +105,22 @@ public class GotoClassModel2 extends FilteringGotoByModel<Language> {
@NotNull
public String[] getSeparators() {
if (mySeparators == null) {
final Set<String> separators = new HashSet<String>();
separators.add(".");
for(ChooseByNameContributor c: getContributors()) {
if (c instanceof GotoClassContributor) {
separators.add(((GotoClassContributor)c).getQualifiedNameSeparator());
}
}
mySeparators = separators.toArray(new String[separators.size()]);
mySeparators = getSeparatorsFromContributors(getContributors());
}
return mySeparators;
}
public static String[] getSeparatorsFromContributors(ChooseByNameContributor[] contributors) {
final Set<String> separators = new HashSet<String>();
separators.add(".");
for(ChooseByNameContributor c: contributors) {
if (c instanceof GotoClassContributor) {
separators.add(((GotoClassContributor)c).getQualifiedNameSeparator());
}
}
return separators.toArray(new String[separators.size()]);
}
@Override
public String getHelpId() {
return "procedures.navigating.goto.class";

16
platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoSymbolModel2.java
View File

@@ -17,7 +17,9 @@ package com.intellij.ide.util.gotoByName;
import com.intellij.ide.IdeBundle;
import com.intellij.lang.Language;
import com.intellij.navigation.ChooseByNameContributor;
import com.intellij.navigation.ChooseByNameRegistry;
import com.intellij.navigation.GotoClassContributor;
import com.intellij.navigation.NavigationItem;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.SystemInfo;
@@ -30,6 +32,8 @@ import java.util.Collection;
import java.util.HashSet;
public class GotoSymbolModel2 extends FilteringGotoByModel<Language> {
private String[] mySeparators;
public GotoSymbolModel2(Project project) {
super(project, ChooseByNameRegistry.getInstance().getSymbolModelContributors());
}
@@ -81,6 +85,13 @@ public class GotoSymbolModel2 extends FilteringGotoByModel<Language> {
}
public String getFullName(final Object element) {
for(ChooseByNameContributor c: getContributors()) {
if (c instanceof GotoClassContributor) {
String result = ((GotoClassContributor) c).getQualifiedName((NavigationItem) element);
if (result != null) return result;
}
}
if (element instanceof PsiElement) {
final PsiElement psiElement = (PsiElement)element;
@@ -93,7 +104,10 @@ public class GotoSymbolModel2 extends FilteringGotoByModel<Language> {
@NotNull
public String[] getSeparators() {
return new String[] {"."};
if (mySeparators == null) {
mySeparators = GotoClassModel2.getSeparatorsFromContributors(getContributors());
}
return mySeparators;
}
@Override