Merge pull request microsoft#232975 from microsoft/tyriar/227111

Clear texture atlas when theme changes

Author: Tyriar

src/vs/editor/browser/gpu/atlas/textureAtlas.ts

@@ -5,6 +5,7 @@
 
 import { getActiveWindow } from '../../../../base/browser/dom.js';
 import { CharCode } from '../../../../base/common/charCode.js';
+import { BugIndicatingError } from '../../../../base/common/errors.js';
 import { Emitter, Event } from '../../../../base/common/event.js';
 import { Disposable, dispose, MutableDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
 import { ThreeKeyMap } from '../../../../base/common/map.js';
@@ -22,7 +23,7 @@ export interface ITextureAtlasOptions {
 }
 
 export class TextureAtlas extends Disposable {
-	private _colorMap!: string[];
+	private _colorMap?: string[];
 	private readonly _warmUpTask: MutableDisposable<IdleTaskQueue> = this._register(new MutableDisposable());
 	private readonly _warmedUpRasterizers = new Set<number>();
 	private readonly _allocatorType: AllocatorType;
@@ -60,7 +61,9 @@ export class TextureAtlas extends Disposable {
 		this._allocatorType = options?.allocatorType ?? 'slab';
 
 		this._register(Event.runAndSubscribe(this._themeService.onDidColorThemeChange, () => {
-			// TODO: Clear entire atlas on theme change
+			if (this._colorMap) {
+				this.clear();
+			}
 			this._colorMap = this._themeService.getColorTheme().tokenColorMap;
 		}));
 
@@ -147,29 +150,33 @@ export class TextureAtlas extends Disposable {
 	 * is distrubuted over multiple idle callbacks to avoid blocking the main thread.
 	 */
 	private _warmUpAtlas(rasterizer: IGlyphRasterizer): void {
+		const colorMap = this._colorMap;
+		if (!colorMap) {
+			throw new BugIndicatingError('Cannot warm atlas without color map');
+		}
 		this._warmUpTask.value?.clear();
 		const taskQueue = this._warmUpTask.value = new IdleTaskQueue();
 		// Warm up using roughly the larger glyphs first to help optimize atlas allocation
 		// A-Z
 		for (let code = CharCode.A; code <= CharCode.Z; code++) {
 			taskQueue.enqueue(() => {
-				for (const fgColor of this._colorMap.keys()) {
+				for (const fgColor of colorMap.keys()) {
 					this.getGlyph(rasterizer, String.fromCharCode(code), (fgColor << MetadataConsts.FOREGROUND_OFFSET) & MetadataConsts.FOREGROUND_MASK);
 				}
 			});
 		}
 		// a-z
 		for (let code = CharCode.a; code <= CharCode.z; code++) {
 			taskQueue.enqueue(() => {
-				for (const fgColor of this._colorMap.keys()) {
+				for (const fgColor of colorMap.keys()) {
 					this.getGlyph(rasterizer, String.fromCharCode(code), (fgColor << MetadataConsts.FOREGROUND_OFFSET) & MetadataConsts.FOREGROUND_MASK);
 				}
 			});
 		}
 		// Remaining ascii
 		for (let code = CharCode.ExclamationMark; code <= CharCode.Tilde; code++) {
 			taskQueue.enqueue(() => {
-				for (const fgColor of this._colorMap.keys()) {
+				for (const fgColor of colorMap.keys()) {
 					this.getGlyph(rasterizer, String.fromCharCode(code), (fgColor << MetadataConsts.FOREGROUND_OFFSET) & MetadataConsts.FOREGROUND_MASK);
 				}
 			});

src/vs/editor/browser/gpu/atlas/textureAtlasPage.ts

@@ -3,7 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Event } from '../../../../base/common/event.js';
 import { Disposable, toDisposable } from '../../../../base/common/lifecycle.js';
 import { ThreeKeyMap } from '../../../../base/common/map.js';
 import { ILogService, LogLevel } from '../../../../platform/log/common/log.js';
@@ -46,23 +45,19 @@ export class TextureAtlasPage extends Disposable implements IReadableTextureAtla
 		pageSize: number,
 		allocatorType: AllocatorType,
 		@ILogService private readonly _logService: ILogService,
-		@IThemeService private readonly _themeService: IThemeService,
+		@IThemeService themeService: IThemeService,
 	) {
 		super();
 
 		this._canvas = new OffscreenCanvas(pageSize, pageSize);
+		this._colorMap = themeService.getColorTheme().tokenColorMap;
 
 		switch (allocatorType) {
 			case 'shelf': this._allocator = new TextureAtlasShelfAllocator(this._canvas, textureIndex); break;
 			case 'slab': this._allocator = new TextureAtlasSlabAllocator(this._canvas, textureIndex); break;
 			default: this._allocator = allocatorType(this._canvas, textureIndex); break;
 		}
 
-		this._register(Event.runAndSubscribe(this._themeService.onDidColorThemeChange, () => {
-			// TODO: Clear entire atlas on theme change
-			this._colorMap = this._themeService.getColorTheme().tokenColorMap;
-		}));
-
 		// Reduce impact of a memory leak if this object is not released
 		this._register(toDisposable(() => {
 			this._canvas.width = 1;