From 5126ba502d9f3621e624b582afd93d0f23331f91 Mon Sep 17 00:00:00 2001 From: Rob Lourens Date: Mon, 13 Feb 2017 10:20:12 -0800 Subject: [PATCH] Fix #20411 - Ensure result count updated at end --- .../parts/search/browser/searchViewlet.ts | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/vs/workbench/parts/search/browser/searchViewlet.ts b/src/vs/workbench/parts/search/browser/searchViewlet.ts index 5af6f77e762..12dad4f11d8 100644 --- a/src/vs/workbench/parts/search/browser/searchViewlet.ts +++ b/src/vs/workbench/parts/search/browser/searchViewlet.ts @@ -1092,7 +1092,8 @@ export class SearchViewlet extends Viewlet { } else { this.viewModel.searchResult.toggleHighlights(true); // show highlights - // Indicate as status to ARIA + // Indicate final search result count in viewlet label and ARIA + this.updateSearchResultCount(); aria.status(nls.localize('ariaSearchResultsStatus', "Search returned {0} results in {1} files", this.viewModel.searchResult.count(), this.viewModel.searchResult.fileCount())); } }; @@ -1158,13 +1159,7 @@ export class SearchViewlet extends Viewlet { autoExpand(false); }).done(null, errors.onUnexpectedError); - // Update results text - const msgWasHidden = this.messages.isHidden(); - const div = this.clearMessage(); - $(div).p({ text: this.buildResultCountMessage(this.viewModel.searchResult.count(), fileCount) }); - if (msgWasHidden) { - this.reLayout(); - } + this.updateSearchResultCount(); } if (fileCount > 0) { // since we have results now, enable some actions @@ -1179,6 +1174,15 @@ export class SearchViewlet extends Viewlet { this.viewModel.search(query).done(onComplete, onError, onProgress); } + private updateSearchResultCount(): void { + const msgWasHidden = this.messages.isHidden(); + const div = this.clearMessage(); + $(div).p({ text: this.buildResultCountMessage(this.viewModel.searchResult.count(), this.viewModel.searchResult.fileCount()) }); + if (msgWasHidden) { + this.reLayout(); + } + } + private buildResultCountMessage(resultCount: number, fileCount: number): string { if (resultCount === 1 && fileCount === 1) { return nls.localize('search.file.result', "Found {0} result in {1} file", resultCount, fileCount); -- GitLab