maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixes quick find symbol finder shows 'no matching results' after backspace (#101844)

Browse source 
* Fixes #101708

* small polish

Co-authored-by: Benjamin Pasero <benjpas@microsoft.com>
This commit is contained in:
Jean Pierre 2020-07-07 06:20:41 -05:00 committed by GitHub
parent 2e802ebcfe
commit ccd33c15d0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/vs/workbench/contrib/search/browser/anythingQuickAccess.ts
View file

@ -67,6 +67,10 @@ export class AnythingQuickAccessProvider extends PickerQuickAccessProvider<IAnyt
static PREFIX = '';
private static readonly NO_RESULTS_PICK: IAnythingQuickPickItem = {
label: localize('noAnythingResults', "No matching results")
};
private static readonly MAX_RESULTS = 512;
private static readonly TYPING_SEARCH_DELAY = 200; // this delay accommodates for the user typing a word and then stops typing to start searching
@ -173,9 +177,7 @@ export class AnythingQuickAccessProvider extends PickerQuickAccessProvider<IAnyt
) {
super(AnythingQuickAccessProvider.PREFIX, {
canAcceptInBackground: true,
noResultsPick: {
label: localize('noAnythingResults', "No matching results")
}
noResultsPick: AnythingQuickAccessProvider.NO_RESULTS_PICK
});
}
@ -278,13 +280,15 @@ export class AnythingQuickAccessProvider extends PickerQuickAccessProvider<IAnyt
this.pickState.lastFilter = filter;
// Remember our pick state before returning new picks
// unless an editor symbol is selected. We can use this
// state to return back to the global pick when the
// user is narrowing back out of editor symbols.
// unless we are inside an editor symbol filter or result.
// We can use this state to return back to the global pick
// when the user is narrowing back out of editor symbols.
const picks = this.pickState.picker?.items;
const activePick = this.pickState.picker?.activeItems[0];
if (picks && activePick) {
if (!isEditorSymbolQuickPickItem(activePick)) {
const activePickIsEditorSymbol = isEditorSymbolQuickPickItem(activePick);
const activePickIsNoResultsInEditorSymbols = activePick === AnythingQuickAccessProvider.NO_RESULTS_PICK && filter.indexOf(GotoSymbolQuickAccessProvider.PREFIX) >= 0;
if (!activePickIsEditorSymbol && !activePickIsNoResultsInEditorSymbols) {
this.pickState.lastGlobalPicks = {
items: picks,
active: activePick