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

EA-58395 - NPE: PerlMatcher.matches

Browse Source
This commit is contained in:
peter
2014-07-21 22:14:07 +02:00
parent d203d8f937
commit c0d216205b
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/ide/actions/SearchEverywhereAction.java
+3 -2
View File
@@ -1796,8 +1796,9 @@ public class SearchEverywhereAction extends AnAction implements CustomComponentA
GotoActionModel model = new GotoActionModel(project, myFocusComponent, myEditor, myFile) {
@Override
protected MatchMode actionMatches(String pattern, @NotNull AnAction anAction) {
return NameUtil.buildMatcher("*" + pattern, NameUtil.MatchingCaseSensitivity.NONE)
.matches(anAction.getTemplatePresentation().getText()) ? MatchMode.NAME : MatchMode.NONE;
String text = anAction.getTemplatePresentation().getText();
return text != null && NameUtil.buildMatcher("*" + pattern, NameUtil.MatchingCaseSensitivity.NONE)
.matches(text) ? MatchMode.NAME : MatchMode.NONE;
}
};
return new GotoActionItemProvider(model);
platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoActionModel.java
+1 -1
View File
@@ -459,7 +459,7 @@ public class GotoActionModel implements ChooseByNameModel, CustomMatcherModel, C
}
final String groupName = myActionsMap.get(anAction);
if (groupName == null) {
return matcher.matches(text, compiledPattern) ? MatchMode.NON_MENU : MatchMode.NONE;
return text != null && matcher.matches(text, compiledPattern) ? MatchMode.NON_MENU : MatchMode.NONE;
}
return text != null && matcher.matches(groupName + " " + text, compiledPattern) ? MatchMode.GROUP : MatchMode.NONE;
}