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

refactor ChooseByName (from ChooseByNameBase to Model)

Browse Source
This commit is contained in:
Konstantin Bulenkov
2013-10-23 17:31:44 +02:00
parent ee5aec5cbc
commit 40568da0ec
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/ide/util/gotoByName/DefaultChooseByNameItemProvider.java
+3 -4
View File
@@ -58,7 +58,7 @@ public class DefaultChooseByNameItemProvider implements ChooseByNameItemProvider
String namePattern = getNamePattern(base, pattern);
String qualifierPattern = getQualifierPattern(base, pattern);
if (removeModelSpecificMarkup(base, namePattern).isEmpty() && !base.canShowListForEmptyPattern()) return true;
if (removeModelSpecificMarkup(base.getModel(), namePattern).isEmpty() && !base.canShowListForEmptyPattern()) return true;
final ChooseByNameModel model = base.getModel();
String matchingPattern = convertToMatchingPattern(base, namePattern);
@@ -330,7 +330,7 @@ public class DefaultChooseByNameItemProvider implements ChooseByNameItemProvider
@NotNull
private static String convertToMatchingPattern(@NotNull ChooseByNameBase base, @NotNull String pattern) {
pattern = removeModelSpecificMarkup(base, pattern);
pattern = removeModelSpecificMarkup(base.getModel(), pattern);
if (!base.canShowListForEmptyPattern()) {
LOG.assertTrue(!pattern.isEmpty(), base);
@@ -349,8 +349,7 @@ public class DefaultChooseByNameItemProvider implements ChooseByNameItemProvider
}
@NotNull
private static String removeModelSpecificMarkup(@NotNull ChooseByNameBase base, @NotNull String pattern) {
ChooseByNameModel model = base.getModel();
private static String removeModelSpecificMarkup(@NotNull ChooseByNameModel model, @NotNull String pattern) {
if (model instanceof ContributorsBasedGotoByModel) {
pattern = ((ContributorsBasedGotoByModel)model).removeModelSpecificMarkup(pattern);
}