Respond to theme updates for tree sitter

src/vs/editor/common/viewModel/viewModelImpl.ts

@@ -153,9 +153,9 @@ export class ViewModel extends Disposable implements IViewModel {
 			this._eventDispatcher.emitSingleViewEvent(new viewEvents.ViewTokensColorsChangedEvent());
 		}));
 
-		this._register(this._themeService.onDidColorThemeChange((theme) => {
+		this._register(this._themeService.onDidColorThemeChange((e) => {
 			this._invalidateDecorationsColorCache();
-			this._eventDispatcher.emitSingleViewEvent(new viewEvents.ViewThemeChangedEvent(theme));
+			this._eventDispatcher.emitSingleViewEvent(new viewEvents.ViewThemeChangedEvent(e.theme));
 		}));
 
 		this._updateConfigurationViewLineCountNow();

src/vs/editor/contrib/colorPicker/browser/colorPickerParts/colorPickerHeader.ts

@@ -43,8 +43,8 @@ export class ColorPickerHeader extends Disposable {
 		this._originalColorNode.style.backgroundColor = Color.Format.CSS.format(this.model.originalColor) || '';
 
 		this.backgroundColor = themeService.getColorTheme().getColor(editorHoverBackground) || Color.white;
-		this._register(themeService.onDidColorThemeChange(theme => {
-			this.backgroundColor = theme.getColor(editorHoverBackground) || Color.white;
+		this._register(themeService.onDidColorThemeChange(e => {
+			this.backgroundColor = e.theme.getColor(editorHoverBackground) || Color.white;
 		}));
 
 		this._register(dom.addDisposableListener(this._pickedColorNode, dom.EventType.CLICK, () => this.model.selectNextColorPresentation()));

src/vs/editor/contrib/gotoError/browser/gotoErrorWidget.ts

@@ -28,7 +28,7 @@ import { IMarker, IRelatedInformation, MarkerSeverity } from '../../../../platfo
 import { IOpenerService } from '../../../../platform/opener/common/opener.js';
 import { SeverityIcon } from '../../../../platform/severityIcon/browser/severityIcon.js';
 import { contrastBorder, editorBackground, editorErrorBorder, editorErrorForeground, editorInfoBorder, editorInfoForeground, editorWarningBorder, editorWarningForeground, oneOf, registerColor, transparent } from '../../../../platform/theme/common/colorRegistry.js';
-import { IColorTheme, IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { IColorTheme, IThemeChangeEvent, IThemeService } from '../../../../platform/theme/common/themeService.js';
 
 class MessageWidget {
 
@@ -255,11 +255,15 @@ export class MarkerNavigationWidget extends PeekViewWidget {
 		this._backgroundColor = Color.white;
 
 		this._applyTheme(_themeService.getColorTheme());
-		this._callOnDispose.add(_themeService.onDidColorThemeChange(this._applyTheme.bind(this)));
+		this._callOnDispose.add(_themeService.onDidColorThemeChange(this._ondDidColorThemeChange.bind(this)));
 
 		this.create();
 	}
 
+	private _ondDidColorThemeChange(e: IThemeChangeEvent) {
+		this._applyTheme(e.theme);
+	}
+
 	private _applyTheme(theme: IColorTheme) {
 		this._backgroundColor = theme.getColor(editorMarkerNavigationBackground);
 		let colorId = editorMarkerNavigationError;

src/vs/editor/contrib/gotoSymbol/browser/peek/referencesWidget.ts

@@ -32,7 +32,7 @@ import { IInstantiationService } from '../../../../../platform/instantiation/com
 import { IKeybindingService } from '../../../../../platform/keybinding/common/keybinding.js';
 import { ILabelService } from '../../../../../platform/label/common/label.js';
 import { IWorkbenchAsyncDataTreeOptions, WorkbenchAsyncDataTree } from '../../../../../platform/list/browser/listService.js';
-import { IColorTheme, IThemeService } from '../../../../../platform/theme/common/themeService.js';
+import { IColorTheme, IThemeChangeEvent, IThemeService } from '../../../../../platform/theme/common/themeService.js';
 import { FileReferences, OneReference, ReferencesModel } from '../referencesModel.js';
 import { ITreeDragAndDrop, ITreeDragOverReaction } from '../../../../../base/browser/ui/tree/tree.js';
 import { DataTransfers, IDragAndDropData } from '../../../../../base/browser/dnd.js';
@@ -276,7 +276,7 @@ export class ReferenceWidget extends peekView.PeekViewWidget {
 		super(editor, { showFrame: false, showArrow: true, isResizeable: true, isAccessible: true, supportOnTitleClick: true }, _instantiationService);
 
 		this._applyTheme(themeService.getColorTheme());
-		this._callOnDispose.add(themeService.onDidColorThemeChange(this._applyTheme.bind(this)));
+		this._callOnDispose.add(themeService.onDidColorThemeChange(this._onDidColorThemeChange.bind(this)));
 		this._peekViewService.addExclusiveWidget(editor, this);
 		this.create();
 	}
@@ -298,6 +298,10 @@ export class ReferenceWidget extends peekView.PeekViewWidget {
 		super.dispose();
 	}
 
+	private _onDidColorThemeChange(e: IThemeChangeEvent): void {
+		this._applyTheme(e.theme);
+	}
+
 	private _applyTheme(theme: IColorTheme) {
 		const borderColor = theme.getColor(peekView.peekViewBorder) || Color.transparent;
 		this.style({

src/vs/editor/contrib/rename/browser/renameWidget.ts

@@ -181,7 +181,7 @@ export class RenameWidget implements IRenameWidget, IContentWidget, IDisposable
 			}
 		}));
 
-		this._disposables.add(_themeService.onDidColorThemeChange(this._updateStyles, this));
+		this._disposables.add(_themeService.onDidColorThemeChange(e => this._updateStyles(e.theme)));
 	}
 
 	dispose(): void {

src/vs/editor/contrib/suggest/browser/suggestWidget.ts

@@ -270,7 +270,7 @@ export class SuggestWidget implements IDisposable {
 		const applyStatusBarStyle = () => this.element.domNode.classList.toggle('with-status-bar', this.editor.getOption(EditorOption.suggest).showStatusBar);
 		applyStatusBarStyle();
 
-		this._disposables.add(_themeService.onDidColorThemeChange(t => this._onThemeChange(t)));
+		this._disposables.add(_themeService.onDidColorThemeChange(t => this._onThemeChange(t.theme)));
 		this._onThemeChange(_themeService.getColorTheme());
 
 		this._disposables.add(this._list.onMouseDown(e => this._onListMouseDownOrTap(e)));

src/vs/editor/standalone/browser/standaloneThemeService.ts

@@ -16,7 +16,7 @@ import { hc_black, hc_light, vs, vs_dark } from '../common/themes.js';
 import { IEnvironmentService } from '../../../platform/environment/common/environment.js';
 import { Registry } from '../../../platform/registry/common/platform.js';
 import { asCssVariableName, ColorIdentifier, Extensions, IColorRegistry } from '../../../platform/theme/common/colorRegistry.js';
-import { Extensions as ThemingExtensions, ICssStyleCollector, IFileIconTheme, IProductIconTheme, IThemingRegistry, ITokenStyle } from '../../../platform/theme/common/themeService.js';
+import { Extensions as ThemingExtensions, ICssStyleCollector, IFileIconTheme, IProductIconTheme, IThemingRegistry, ITokenStyle, IThemeChangeEvent } from '../../../platform/theme/common/themeService.js';
 import { IDisposable, Disposable } from '../../../base/common/lifecycle.js';
 import { ColorScheme, isDark, isHighContrast } from '../../../platform/theme/common/theme.js';
 import { getIconsStyleSheet, UnthemedProductIconTheme } from '../../../platform/theme/browser/iconsStyleSheet.js';
@@ -213,7 +213,7 @@ export class StandaloneThemeService extends Disposable implements IStandaloneThe
 
 	declare readonly _serviceBrand: undefined;
 
-	private readonly _onColorThemeChange = this._register(new Emitter<IStandaloneTheme>());
+	private readonly _onColorThemeChange = this._register(new Emitter<IThemeChangeEvent>());
 	public readonly onDidColorThemeChange = this._onColorThemeChange.event;
 
 	private readonly _onFileIconThemeChange = this._register(new Emitter<IFileIconTheme>());
@@ -403,7 +403,7 @@ export class StandaloneThemeService extends Disposable implements IStandaloneThe
 		this._updateCSS();
 
 		TokenizationRegistry.setColorMap(colorMap);
-		this._onColorThemeChange.fire(this._theme);
+		this._onColorThemeChange.fire({ theme: this._theme });
 	}
 
 	private _updateCSS(): void {

src/vs/editor/standalone/test/browser/standaloneLanguages.test.ts

@@ -17,7 +17,7 @@ import { IStandaloneTheme, IStandaloneThemeData, IStandaloneThemeService } from
 import { UnthemedProductIconTheme } from '../../../../platform/theme/browser/iconsStyleSheet.js';
 import { ColorIdentifier } from '../../../../platform/theme/common/colorRegistry.js';
 import { ColorScheme } from '../../../../platform/theme/common/theme.js';
-import { IColorTheme, IFileIconTheme, IProductIconTheme, ITokenStyle } from '../../../../platform/theme/common/themeService.js';
+import { IFileIconTheme, IProductIconTheme, IThemeChangeEvent, ITokenStyle } from '../../../../platform/theme/common/themeService.js';
 
 suite('TokenizationSupport2Adapter', () => {
 
@@ -92,7 +92,7 @@ suite('TokenizationSupport2Adapter', () => {
 		public getProductIconTheme(): IProductIconTheme {
 			return this._builtInProductIconTheme;
 		}
-		public readonly onDidColorThemeChange = new Emitter<IColorTheme>().event;
+		public readonly onDidColorThemeChange = new Emitter<IThemeChangeEvent>().event;
 		public readonly onDidFileIconThemeChange = new Emitter<IFileIconTheme>().event;
 		public readonly onDidProductIconThemeChange = new Emitter<IProductIconTheme>().event;
 	}

src/vs/platform/theme/common/themeService.ts

@@ -100,12 +100,14 @@ export interface IThemingParticipant {
 	(theme: IColorTheme, collector: ICssStyleCollector, environment: IEnvironmentService): void;
 }
 
+export type IThemeChangeEvent = { theme: IColorTheme };
+
 export interface IThemeService {
 	readonly _serviceBrand: undefined;
 
 	getColorTheme(): IColorTheme;
 
-	readonly onDidColorThemeChange: Event<IColorTheme>;
+	readonly onDidColorThemeChange: Event<IThemeChangeEvent>;
 
 	getFileIconTheme(): IFileIconTheme;
 
@@ -182,7 +184,7 @@ export class Themable extends Disposable {
 		this.theme = themeService.getColorTheme();
 
 		// Hook up to theme changes
-		this._register(this.themeService.onDidColorThemeChange(theme => this.onThemeChange(theme)));
+		this._register(this.themeService.onDidColorThemeChange(e => this.onThemeChange(e.theme)));
 	}
 
 	protected onThemeChange(theme: IColorTheme): void {

src/vs/platform/theme/test/common/testThemeService.ts

@@ -7,7 +7,7 @@ import { Color } from '../../../../base/common/color.js';
 import { Emitter, Event } from '../../../../base/common/event.js';
 import { IconContribution } from '../../common/iconRegistry.js';
 import { ColorScheme } from '../../common/theme.js';
-import { IColorTheme, IFileIconTheme, IProductIconTheme, IThemeService, ITokenStyle } from '../../common/themeService.js';
+import { IColorTheme, IFileIconTheme, IProductIconTheme, IThemeChangeEvent, IThemeService, ITokenStyle } from '../../common/themeService.js';
 
 export class TestColorTheme implements IColorTheme {
 
@@ -58,7 +58,7 @@ export class TestThemeService implements IThemeService {
 	_colorTheme: IColorTheme;
 	_fileIconTheme: IFileIconTheme;
 	_productIconTheme: IProductIconTheme;
-	_onThemeChange = new Emitter<IColorTheme>();
+	_onThemeChange = new Emitter<IThemeChangeEvent>();
 	_onFileIconThemeChange = new Emitter<IFileIconTheme>();
 	_onProductIconThemeChange = new Emitter<IProductIconTheme>();
 
@@ -78,10 +78,10 @@ export class TestThemeService implements IThemeService {
 	}
 
 	fireThemeChange() {
-		this._onThemeChange.fire(this._colorTheme);
+		this._onThemeChange.fire({ theme: this._colorTheme });
 	}
 
-	public get onDidColorThemeChange(): Event<IColorTheme> {
+	public get onDidColorThemeChange(): Event<IThemeChangeEvent> {
 		return this._onThemeChange.event;
 	}
 

src/vs/workbench/browser/parts/compositeBarActions.ts

@@ -9,7 +9,7 @@ import { $, addDisposableListener, append, clearNode, EventHelper, EventType, ge
 import { ICommandService } from '../../../platform/commands/common/commands.js';
 import { toDisposable, DisposableStore, MutableDisposable } from '../../../base/common/lifecycle.js';
 import { IContextMenuService } from '../../../platform/contextview/browser/contextView.js';
-import { IThemeService, IColorTheme } from '../../../platform/theme/common/themeService.js';
+import { IThemeService, IColorTheme, IThemeChangeEvent } from '../../../platform/theme/common/themeService.js';
 import { NumberBadge, IBadge, IActivity, ProgressBadge, IconBadge } from '../../services/activity/common/activity.js';
 import { IInstantiationService, ServicesAccessor } from '../../../platform/instantiation/common/instantiation.js';
 import { DelayedDragHandler } from '../../../base/browser/dnd.js';
@@ -289,7 +289,7 @@ export class CompositeBarActionViewItem extends BaseActionViewItem {
 		this.updateTitle();
 	}
 
-	private onThemeChange(theme: IColorTheme): void {
+	private onThemeChange(theme: IThemeChangeEvent): void {
 		this.updateStyles();
 	}
 

src/vs/workbench/browser/parts/statusbar/statusbarItem.ts

@@ -253,8 +253,8 @@ export class StatusbarEntryItem extends Disposable {
 			if (isThemeColor(color)) {
 				colorResult = this.themeService.getColorTheme().getColor(color.id)?.toString();
 
-				const listener = this.themeService.onDidColorThemeChange(theme => {
-					const colorValue = theme.getColor(color.id)?.toString();
+				const listener = this.themeService.onDidColorThemeChange(e => {
+					const colorValue = e.theme.getColor(color.id)?.toString();
 
 					if (isBackground) {
 						container.style.backgroundColor = colorValue ?? '';

src/vs/workbench/contrib/callHierarchy/browser/callHierarchyPeek.ts

@@ -96,7 +96,7 @@ export class CallHierarchyTreePeekWidget extends peekView.PeekViewWidget {
 		this.create();
 		this._peekViewService.addExclusiveWidget(editor, this);
 		this._applyTheme(themeService.getColorTheme());
-		this._disposables.add(themeService.onDidColorThemeChange(this._applyTheme, this));
+		this._disposables.add(themeService.onDidColorThemeChange(e => this._applyTheme(e.theme)));
 		this._disposables.add(this._previewDisposable);
 	}
 

src/vs/workbench/contrib/comments/browser/commentThreadZoneWidget.ts

@@ -157,7 +157,7 @@ export class ReviewZoneWidget extends ZoneWidget implements ICommentThreadWidget
 		this._commentThreadDisposables = [];
 		this.create();
 
-		this._globalToDispose.add(this.themeService.onDidColorThemeChange(this._applyTheme, this));
+		this._globalToDispose.add(this.themeService.onDidColorThemeChange(e => this._applyTheme(e.theme)));
 		this._globalToDispose.add(this.editor.onDidChangeConfiguration(e => {
 			if (e.hasChanged(EditorOption.fontInfo)) {
 				this._applyTheme(this.themeService.getColorTheme());

src/vs/workbench/contrib/debug/browser/disassemblyView.ts

@@ -775,8 +775,8 @@ class InstructionRenderer extends Disposable implements ITableRenderer<IDisassem
 		this._focusedStackFrameColor = themeService.getColorTheme().getColor(focusedStackFrameColor);
 
 		this._register(themeService.onDidColorThemeChange(e => {
-			this._topStackFrameColor = e.getColor(topStackFrameColor);
-			this._focusedStackFrameColor = e.getColor(focusedStackFrameColor);
+			this._topStackFrameColor = e.theme.getColor(topStackFrameColor);
+			this._focusedStackFrameColor = e.theme.getColor(focusedStackFrameColor);
 		}));
 	}
 

src/vs/workbench/contrib/debug/browser/exceptionWidget.ts

@@ -10,7 +10,7 @@ import { ZoneWidget } from '../../../../editor/contrib/zoneWidget/browser/zoneWi
 import { ICodeEditor } from '../../../../editor/browser/editorBrowser.js';
 import { IExceptionInfo, IDebugSession, IDebugEditorContribution, EDITOR_CONTRIBUTION_ID } from '../common/debug.js';
 import { RunOnceScheduler } from '../../../../base/common/async.js';
-import { IThemeService, IColorTheme } from '../../../../platform/theme/common/themeService.js';
+import { IThemeService, IColorTheme, IThemeChangeEvent } from '../../../../platform/theme/common/themeService.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
 import { Color } from '../../../../base/common/color.js';
 import { registerColor } from '../../../../platform/theme/common/colorRegistry.js';
@@ -41,14 +41,18 @@ export class ExceptionWidget extends ZoneWidget {
 		super(editor, { showFrame: true, showArrow: true, isAccessible: true, frameWidth: 1, className: 'exception-widget-container' });
 
 		this.applyTheme(themeService.getColorTheme());
-		this._disposables.add(themeService.onDidColorThemeChange(this.applyTheme.bind(this)));
+		this._disposables.add(themeService.onDidColorThemeChange(this.onDidColorThemeChange.bind(this)));
 
 		this.create();
 		const onDidLayoutChangeScheduler = new RunOnceScheduler(() => this._doLayout(undefined, undefined), 50);
 		this._disposables.add(this.editor.onDidLayoutChange(() => onDidLayoutChangeScheduler.schedule()));
 		this._disposables.add(onDidLayoutChangeScheduler);
 	}
 
+	private onDidColorThemeChange(e: IThemeChangeEvent): void {
+		this.applyTheme(e.theme);
+	}
+
 	private applyTheme(theme: IColorTheme): void {
 		this.backgroundColor = theme.getColor(debugExceptionWidgetBackground);
 		const frameColor = theme.getColor(debugExceptionWidgetBorder);

src/vs/workbench/contrib/notebook/browser/diff/notebookDiffOverviewRuler.ts

@@ -57,7 +57,7 @@ export class NotebookDiffOverviewRuler extends Themable {
 		}));
 
 		this._register(this.themeService.onDidColorThemeChange(e => {
-			const colorChanged = this.applyColors(e);
+			const colorChanged = this.applyColors(e.theme);
 			if (colorChanged) {
 				this._scheduleRender();
 			}

src/vs/workbench/contrib/scm/browser/quickDiffWidget.ts

@@ -172,7 +172,7 @@ class QuickDiffWidget extends PeekViewWidget {
 	) {
 		super(editor, { isResizeable: true, frameWidth: 1, keepEditorSelection: true, className: 'dirty-diff' }, instantiationService);
 
-		this._disposables.add(themeService.onDidColorThemeChange(this._applyTheme, this));
+		this._disposables.add(themeService.onDidColorThemeChange(e => this._applyTheme(e.theme)));
 		this._applyTheme(themeService.getColorTheme());
 
 		if (!Iterable.isEmpty(this.model.originalTextModels)) {

src/vs/workbench/contrib/terminal/browser/xterm/xtermTerminal.ts

@@ -256,7 +256,7 @@ export class XtermTerminal extends Disposable implements IXtermTerminal, IDetach
 			}
 		}));
 
-		this._register(this._themeService.onDidColorThemeChange(theme => this._updateTheme(theme)));
+		this._register(this._themeService.onDidColorThemeChange(e => this._updateTheme(e.theme)));
 		this._register(this._logService.onDidChangeLogLevel(e => this.raw.options.logLevel = vscodeToXtermLogLevel(e)));
 
 		// Refire events

src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchyPeek.ts

@@ -97,7 +97,7 @@ export class TypeHierarchyTreePeekWidget extends peekView.PeekViewWidget {
 		this.create();
 		this._peekViewService.addExclusiveWidget(editor, this);
 		this._applyTheme(themeService.getColorTheme());
-		this._disposables.add(themeService.onDidColorThemeChange(this._applyTheme, this));
+		this._disposables.add(themeService.onDidColorThemeChange(e => this._applyTheme(e.theme), this));
 		this._disposables.add(this._previewDisposable);
 	}