Improve language filter placement, fixes #145711 (#147727)

microsoft · Apr 20, 2022 · f171e5e · f171e5e
1 parent d7dbb0b
commit f171e5e
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts b/src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts
@@ -838,7 +838,11 @@ export class SettingsEditor2 extends EditorPane {
 			}
 		}));
 		this._register(this.settingRenderers.onApplyLanguageFilter((lang: string) => {
-			this.focusSearch(`@${LANGUAGE_SETTING_TAG}${lang}`);
+			if (this.searchWidget) {
+				// Prepend the language filter to the query.
+				const newQuery = `@${LANGUAGE_SETTING_TAG}${lang} ${this.searchWidget.getValue().trimStart()}`;
+				this.focusSearch(newQuery, false);
+			}
 		}));
 
 		this.settingsTree = this._register(this.instantiationService.createInstance(SettingsTree,