Merge pull request #100024 from edjeffreys/issue/98942-search-clear-exclude

#98942 Clear Search Pattern Fields

src/vs/workbench/contrib/search/browser/patternInputWidget.ts

@@ -115,6 +115,10 @@ export class PatternInputWidget extends Widget implements IThemable {
 		this.inputBox.clearHistory();
 	}
 
+	clear(): void {
+		this.setValue('');
+	}
+
 	onSearchSubmit(): void {
 		this.inputBox.addToHistory();
 	}

src/vs/workbench/contrib/search/browser/searchActions.ts

@@ -446,7 +446,7 @@ export class ClearSearchResultsAction extends Action {
 
 	update(): void {
 		const searchView = getSearchView(this.viewsService);
-		this.enabled = !!searchView && (!searchView.allSearchFieldsClear() || searchView.hasSearchResults());
+		this.enabled = !!searchView && (!searchView.allSearchFieldsClear() || searchView.hasSearchResults() || !searchView.allFilePatternFieldsClear());
 	}
 
 	run(): Promise<void> {

src/vs/workbench/contrib/search/browser/searchView.ts

@@ -1017,6 +1017,11 @@ export class SearchView extends ViewPane {
 			this.searchWidget.searchInput.getValue() === '';
 	}
 
+	allFilePatternFieldsClear(): boolean {
+		return this.searchExcludePattern.getValue() === '' &&
+			this.searchIncludePattern.getValue() === '';
+	}
+
 	hasSearchResults(): boolean {
 		return !this.viewModel.searchResult.isEmpty();
 	}
@@ -1032,6 +1037,9 @@ export class SearchView extends ViewPane {
 			this.showSearchWithoutFolderMessage();
 		}
 		if (clearInput) {
+			if (this.allSearchFieldsClear()) {
+				this.clearFilePatternFields();
+			}
 			this.searchWidget.clear();
 		}
 		this.viewModel.cancelSearch();
@@ -1041,6 +1049,11 @@ export class SearchView extends ViewPane {
 		aria.status(nls.localize('ariaSearchResultsClearStatus', "The search results have been cleared"));
 	}
 
+	clearFilePatternFields(): void {
+		this.searchExcludePattern.clear();
+		this.searchIncludePattern.clear();
+	}
+
 	cancelSearch(focus: boolean = true): boolean {
 		if (this.viewModel.cancelSearch()) {
 			if (focus) { this.searchWidget.focus(); }