development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-09-13 21:55:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't include non-resource entries in history quick pick

Browse source 
Makes sure webviews don't show up in the history quick pick. We already do this filtering properly when there is a query, just not when there is no query
This commit is contained in:
Matt Bierner 2018-07-25 15:24:48 -07:00
parent 627d459690
commit 37209a838e
1 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/vs/workbench/browser/parts/quickopen/quickOpenController.ts
View file

@ -1075,17 +1075,7 @@ class EditorHistoryHandler {
// Massage search for scoring
const query = prepareQuery(searchValue);
// Just return all if we are not searching
const history = this.historyService.getHistory();
if (!query.value) {
return history.map(input => this.instantiationService.createInstance(EditorHistoryEntry, input));
}
// Otherwise filter by search value and sort by score. Include matches on description
// in case the user is explicitly including path separators.
const accessor = query.containsPathSeparator ? MatchOnDescription : DoNotMatchOnDescription;
return history
const history = this.historyService.getHistory()
// For now, only support to match on inputs that provide resource information
.filter(input => {
let resource: URI;
@ -1099,8 +1089,17 @@ class EditorHistoryHandler {
})
// Conver to quick open entries
.map(input => this.instantiationService.createInstance(EditorHistoryEntry, input))
.map(input => this.instantiationService.createInstance(EditorHistoryEntry, input));
// Just return all if we are not searching
if (!query.value) {
return history;
}
// Otherwise filter by search value and sort by score. Include matches on description
// in case the user is explicitly including path separators.
const accessor = query.containsPathSeparator ? MatchOnDescription : DoNotMatchOnDescription;
return history
// Make sure the search value is matching
.filter(e => {
const itemScore = scoreItem(e, query, false, accessor, this.scorerCache);