From 40568da0ecbb64a49ad9c8ea179044e4bd5ad85e Mon Sep 17 00:00:00 2001 From: Konstantin Bulenkov Date: Wed, 23 Oct 2013 17:30:32 +0200 Subject: [PATCH] refactor ChooseByName (from ChooseByNameBase to Model) --- .../util/gotoByName/DefaultChooseByNameItemProvider.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/DefaultChooseByNameItemProvider.java b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/DefaultChooseByNameItemProvider.java index 595f2de8773c..bf0b3f7d19a2 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/DefaultChooseByNameItemProvider.java +++ b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/DefaultChooseByNameItemProvider.java @@ -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); }