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

choose by name: highlight matched fragments for case-insensitive pattern (IDEA-142744)

Browse Source
This commit is contained in:
peter
2015-07-17 13:34:56 +02:00
parent 04885d20c9
commit 07585a7210
1 changed files with 9 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/ChooseByNameBase.java
+9 -4
View File
@@ -1007,7 +1007,7 @@ public abstract class ChooseByNameBase {
cellRenderer = ((ExpandedItemListCellRendererWrapper)cellRenderer).getWrappee();
}
if (cellRenderer instanceof MatcherHolder) {
final String pattern = transformPattern(text);
final String pattern = patternToLowerCase(transformPattern(text));
final Matcher matcher = buildPatternMatcher(isSearchInAnyPlace() ? "*" + pattern : pattern);
((MatcherHolder)cellRenderer).setPatternMatcher(matcher);
}
@@ -1529,7 +1529,7 @@ public abstract class ChooseByNameBase {
boolean scopeExpanded = fillWithScopeExpansion(elements, myPattern);
String lowerCased = myPattern.toLowerCase(Locale.US);
String lowerCased = patternToLowerCase(myPattern);
if (elements.isEmpty() && !lowerCased.equals(myPattern)) {
scopeExpanded = fillWithScopeExpansion(elements, lowerCased);
}
@@ -1625,6 +1625,11 @@ public abstract class ChooseByNameBase {
}
@NotNull
private String patternToLowerCase(String pattern) {
return pattern.toLowerCase(Locale.US);
}
public boolean canShowListForEmptyPattern() {
return isShowListForEmptyPattern() || isShowListAfterCompletionKeyStroke() && lastKeyStrokeIsCompletion();
@@ -1635,7 +1640,7 @@ public abstract class ChooseByNameBase {
}
private static Matcher buildPatternMatcher(@NotNull String pattern) {
return NameUtil.buildMatcher(pattern, 0, true, true, pattern.toLowerCase().equals(pattern));
return NameUtil.buildMatcher(pattern, NameUtil.MatchingCaseSensitivity.NONE);
}
private static class HintLabel extends JLabel {
@@ -1690,7 +1695,7 @@ public abstract class ChooseByNameBase {
presentation.setDynamicUsagesString(nonPrefixPattern);
presentation.setTabName(prefixPattern);
presentation.setTabText(prefixPattern);
presentation.setTargetsNodeText("Unsorted " + StringUtil.toLowerCase(prefixPattern.toLowerCase()));
presentation.setTargetsNodeText("Unsorted " + StringUtil.toLowerCase(patternToLowerCase(prefixPattern)));
final Object[][] elements = getElements();
final List<PsiElement> targets = new ArrayList<PsiElement>();
final List<Usage> usages = new ArrayList<Usage>();