Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-03-01 06:06:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #247887 from mjbvz/obnoxious-kiwi

Browse Source 
Fix leak warning for `ThemeFileWatcher`
This commit is contained in:
Matt Bierner
2025-04-30 11:01:15 -07:00
committed by GitHub
parent 01b448faf9 e17cfd9c45
commit c19669a598
1 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/vs/workbench/services/themes/browser/workbenchThemeService.ts
View File

@@ -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;
}
}