From e17cfd9c45cafb0d8b202e69ed1e947516bcfd7b Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Wed, 30 Apr 2025 10:27:58 -0700
Subject: [PATCH] Fix leak warning for `ThemeFileWatcher`

We weren't tracking the onDidChangeFiles event
---
 .../themes/browser/workbenchThemeService.ts   | 25 +++++++++++--------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/vs/workbench/services/themes/browser/workbenchThemeService.ts b/src/vs/workbench/services/themes/browser/workbenchThemeService.ts
index 56a3b2d8f18..d85b23015f4 100644
--- a/src/vs/workbench/services/themes/browser/workbenchThemeService.ts
+++ b/src/vs/workbench/services/themes/browser/workbenchThemeService.ts
@@ -16,7 +16,7 @@ import { ColorThemeData } from '../common/colorThemeData.js';
 import { IColorTheme, Extensions as ThemingExtensions, IThemingRegistry } from '../../../../platform/theme/common/themeService.js';
 import { Event, Emitter } from '../../../../base/common/event.js';
 import { registerFileIconThemeSchemas } from '../common/fileIconThemeSchema.js';
-import { IDisposable, dispose, Disposable } from '../../../../base/common/lifecycle.js';
+import { IDisposable, Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
 import { FileIconThemeData, FileIconThemeLoader } from './fileIconThemeData.js';
 import { createStyleSheet } from '../../../../base/browser/domStylesheets.js';
 import { IBrowserWorkbenchEnvironmentService } from '../../environment/browser/environmentService.js';
@@ -761,30 +761,33 @@ export class WorkbenchThemeService extends Disposable implements IWorkbenchTheme
 class ThemeFileWatcher {
 
 	private watchedLocation: URI | undefined;
-	private watcherDisposable: IDisposable | undefined;
-	private fileChangeListener: IDisposable | undefined;
+	private readonly watcherDisposables = new DisposableStore();
 
-	constructor(private fileService: IFileService, private environmentService: IBrowserWorkbenchEnvironmentService, private onUpdate: () => void) {
-	}
+	constructor(
+		private readonly fileService: IFileService,
+		private readonly environmentService: IBrowserWorkbenchEnvironmentService,
+		private readonly onUpdate: () => void
+	) { }
 
 	update(theme: { location?: URI; watch?: boolean }) {
 		if (!resources.isEqual(theme.location, this.watchedLocation)) {
-			this.dispose();
+			this.watchedLocation = undefined;
+			this.watcherDisposables.clear();
+
 			if (theme.location && (theme.watch || this.environmentService.isExtensionDevelopment)) {
 				this.watchedLocation = theme.location;
-				this.watcherDisposable = this.fileService.watch(theme.location);
-				this.fileService.onDidFilesChange(e => {
+				this.watcherDisposables.add(this.fileService.watch(theme.location));
+				this.watcherDisposables.add(this.fileService.onDidFilesChange(e => {
 					if (this.watchedLocation && e.contains(this.watchedLocation, FileChangeType.UPDATED)) {
 						this.onUpdate();
 					}
-				});
+				}));
 			}
 		}
 	}
 
 	dispose() {
-		this.watcherDisposable = dispose(this.watcherDisposable);
-		this.fileChangeListener = dispose(this.fileChangeListener);
+		this.watcherDisposables.dispose();
 		this.watchedLocation = undefined;
 	}
 }