fix leaking event listeners (#207738)

* fix leaking event listeners * add mutabledisposable
microsoft · Mar 19, 2024 · 6feba91 · 6feba91
1 parent 2aa0f1c
commit 6feba91
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 14 deletions.
diff --git a/src/vs/workbench/contrib/search/browser/searchView.ts b/src/vs/workbench/contrib/search/browser/searchView.ts
@@ -240,7 +240,7 @@ export class SearchView extends ViewPane {
 		this.instantiationService = this.instantiationService.createChild(
 			new ServiceCollection([IContextKeyService, this.contextKeyService]));
 
-		this.configurationService.onDidChangeConfiguration(e => {
+		this._register(this.configurationService.onDidChangeConfiguration(e => {
 			if (e.affectsConfiguration('search.sortOrder')) {
 				if (this.searchConfig.sortOrder === SearchSortOrder.Modified) {
 					// If changing away from modified, remove all fileStats
@@ -251,7 +251,7 @@ export class SearchView extends ViewPane {
 			} else if (e.affectsConfiguration('search.aiResults')) {
 				this.refreshHasAISetting();
 			}
-		});
+		}));
 
 		this.viewModel = this._register(this.searchViewModelWorkbenchService.searchModel);
 		this.queryBuilder = this.instantiationService.createInstance(QueryBuilder);

diff --git a/src/vs/workbench/contrib/search/browser/searchWidget.ts b/src/vs/workbench/contrib/search/browser/searchWidget.ts
@@ -43,6 +43,7 @@ import { NotebookEditorInput } from 'vs/workbench/contrib/notebook/common/notebo
 import { GroupModelChangeKind } from 'vs/workbench/common/editor';
 import { SearchFindInput } from 'vs/workbench/contrib/search/browser/searchFindInput';
 import { getDefaultHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
+import { IDisposable, MutableDisposable } from 'vs/base/common/lifecycle';
 
 /** Specified in searchview.css */
 const SingleLineInputHeight = 26;
@@ -171,6 +172,7 @@ export class SearchWidget extends Widget {
 	public contextLinesInput!: InputBox;
 
 	private _notebookFilters: NotebookFindFilters;
+	private _toggleReplaceButtonListener: MutableDisposable<IDisposable>;
 
 	constructor(
 		container: HTMLElement,
@@ -220,6 +222,7 @@ export class SearchWidget extends Widget {
 		}));
 
 		this._replaceHistoryDelayer = new Delayer<void>(500);
+		this._toggleReplaceButtonListener = this._register(new MutableDisposable<IDisposable>());
 
 		this.render(container, options);
 
@@ -380,8 +383,7 @@ export class SearchWidget extends Widget {
 		this.toggleReplaceButton.element.setAttribute('aria-expanded', 'false');
 		this.toggleReplaceButton.element.classList.add('toggle-replace-button');
 		this.toggleReplaceButton.icon = searchHideReplaceIcon;
-		// TODO@joao need to dispose this listener eventually
-		this.toggleReplaceButton.onDidClick(() => this.onToggleReplaceButton());
+		this._toggleReplaceButtonListener.value = this.toggleReplaceButton.onDidClick(() => this.onToggleReplaceButton());
 	}
 
 	private renderSearchInput(parent: HTMLElement, options: ISearchWidgetOptions): void {

diff --git a/src/vs/workbench/services/search/common/searchService.ts b/src/vs/workbench/services/search/common/searchService.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as arrays from 'vs/base/common/arrays';
-import { DeferredPromise } from 'vs/base/common/async';
+import { DeferredPromise, raceCancellationError } from 'vs/base/common/async';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { CancellationError } from 'vs/base/common/errors';
 import { Disposable, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
@@ -207,15 +207,7 @@ export class SearchService extends Disposable implements ISearchService {
 			};
 		})();
 
-		return new Promise((resolve, reject) => {
-			if (token) {
-				token.onCancellationRequested(() => {
-					reject(new CancellationError());
-				});
-			}
-
-			providerPromise.then(resolve, reject);
-		});
+		return token ? raceCancellationError<ISearchComplete>(providerPromise, token) : providerPromise;
 	}
 
 	private getSchemesInQuery(query: ISearchQuery): Set<string> {