Avoid an unnecessary settings target search, and correctly clear the …

…lastFilterResult
microsoft · Jun 9, 2018 · 36f3337 · 36f3337
1 parent 539e5c9
commit 36f3337
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts
@@ -469,10 +469,9 @@ class PreferencesRenderersController extends Disposable {
 		if (!editableContentOnly) {
 			filterPs.push(
 				this._filterOrSearchPreferences(query, this.defaultPreferencesRenderer, searchProvider, groupId, groupLabel, groupOrder));
+			filterPs.push(this.searchAllSettingsTargets(query, searchProvider, groupId, groupLabel, groupOrder));
 		}
 
-		filterPs.push(this.searchAllSettingsTargets(query, searchProvider, groupId, groupLabel, groupOrder));
-
 		return TPromise.join(filterPs).then(results => {
 			let [editableFilterResult, defaultFilterResult] = results;
 
@@ -481,9 +480,7 @@ class PreferencesRenderersController extends Disposable {
 			}
 
 			this.consolidateAndUpdate(defaultFilterResult, editableFilterResult);
-			if (defaultFilterResult) {
-				this._lastFilterResult = defaultFilterResult;
-			}
+			this._lastFilterResult = defaultFilterResult;
 		});
 	}
 

diff --git a/src/vs/workbench/parts/preferences/browser/preferencesWidgets.ts b/src/vs/workbench/parts/preferences/browser/preferencesWidgets.ts
@@ -633,7 +633,7 @@ export class SearchWidget extends Widget {
 	}
 
 	public showMessage(message: string, count: number): void {
-		// Avoid setting the aria-label unnecessarily, the screenreader will read the count every time it's set. #50968
+		// Avoid setting the aria-label unnecessarily, the screenreader will read the count every time it's set, since it's aria-live:assertive. #50968
 		if (this.countElement && message !== this.countElement.textContent) {
 			this.countElement.textContent = message;
 			this.inputBox.inputElement.setAttribute('aria-label', message);