From 6f3285d1867d7c9733703638bd488b59d78937fa Mon Sep 17 00:00:00 2001 From: Konstantin Bulenkov Date: Wed, 23 Oct 2013 14:49:37 +0200 Subject: [PATCH] public API for pattern transformation --- .../intellij/ide/util/gotoByName/ChooseByNameBase.java | 4 ++++ .../intellij/ide/util/gotoByName/ChooseByNamePopup.java | 9 +++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java index ca732427281e..6e485bfa8048 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java +++ b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java @@ -747,6 +747,10 @@ public abstract class ChooseByNameBase { } public String transformPattern(String pattern) { + final ChooseByNameModel model = getModel(); + if (model instanceof ContributorsBasedGotoByModel) { + return ((ContributorsBasedGotoByModel)model).transformPattern(pattern); + } return pattern; } diff --git a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNamePopup.java b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNamePopup.java index aa5302ca4b1c..9d1fe1b12b20 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNamePopup.java +++ b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNamePopup.java @@ -336,6 +336,11 @@ public class ChooseByNamePopup extends ChooseByNameBase implements ChooseByNameP @Override public String transformPattern(String pattern) { + final ChooseByNameModel model = getModel(); + return getTransformedPattern(pattern, model); + } + + public static String getTransformedPattern(String pattern, ChooseByNameModel model) { Pattern regex = null; if (pattern.indexOf(':') != -1 || pattern.indexOf(',') != -1 || @@ -345,7 +350,7 @@ public class ChooseByNamePopup extends ChooseByNameBase implements ChooseByNameP regex = patternToDetectLinesAndColumns; } - if (getModel() instanceof GotoClassModel2) { + if (model instanceof GotoClassModel2) { if (pattern.indexOf('#') != -1) { regex = patternToDetectMembers; } @@ -362,7 +367,7 @@ public class ChooseByNamePopup extends ChooseByNameBase implements ChooseByNameP } } - return super.transformPattern(pattern); + return pattern; } public int getLinePosition() {