@theia/terminal 1.77.0-next.84 → 1.77.0-next.88

package/lib/browser/terminal-theme-service.d.ts

@@ -2,11 +2,21 @@ import { ITheme } from 'xterm';
 import { ColorRegistry } from '@theia/core/lib/browser/color-registry';
 import { ThemeService } from '@theia/core/lib/browser/theming';
 import { ThemeChangeEvent } from '@theia/core/lib/common/theme';
-import { Event } from '@theia/core';
+import { Emitter, Event } from '@theia/core';
 export declare class TerminalThemeService {
     protected readonly colorRegistry: ColorRegistry;
     protected readonly themeService: ThemeService;
+    protected readonly onDidChangeEmitter: Emitter<ThemeChangeEvent>;
+    protected appliedTheme: string | undefined;
+    /**
+     * Fires when the color theme changes, and when a change in the `ColorRegistry` changes the terminal colors.
+     */
     get onDidChange(): Event<ThemeChangeEvent>;
+    /**
+     * Subscribes on first use rather than at construction, so that the theme listener runs after the one that applies
+     * a new theme to Monaco, whose color registry the terminal colors are read from.
+     */
+    protected listenForChanges(): void;
     get theme(): ITheme;
 }
 //# sourceMappingURL=terminal-theme-service.d.ts.map

package/lib/browser/terminal-theme-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"terminal-theme-service.d.ts","sourceRoot":"","sources":["../../src/browser/terminal-theme-service.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AAE/B,OAAO,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAC;AACvE,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAGpC,qBACa,oBAAoB;IAEN,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IACjD,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;IAEpE,IAAI,WAAW,IAAI,KAAK,CAAC,gBAAgB,CAAC,CAEzC;IAED,IAAI,KAAK,IAAI,MAAM,CA0BlB;CAEJ"}
+{"version":3,"file":"terminal-theme-service.d.ts","sourceRoot":"","sources":["../../src/browser/terminal-theme-service.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AAE/B,OAAO,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAC;AACvE,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAG7C,qBACa,oBAAoB;IAEN,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IACjD,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;IAEpE,SAAS,CAAC,QAAQ,CAAC,kBAAkB,4BAAmC;IACxE,SAAS,CAAC,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;IAE3C;;OAEG;IACH,IAAI,WAAW,IAAI,KAAK,CAAC,gBAAgB,CAAC,CAGzC;IAED;;;OAGG;IACH,SAAS,CAAC,gBAAgB,IAAI,IAAI;IAoBlC,IAAI,KAAK,IAAI,MAAM,CA0BlB;CAEJ"}

package/lib/browser/terminal-theme-service.js

@@ -20,10 +20,41 @@ const tslib_1 = require("tslib");
 const inversify_1 = require("@theia/core/shared/inversify");
 const color_registry_1 = require("@theia/core/lib/browser/color-registry");
 const theming_1 = require("@theia/core/lib/browser/theming");
+const core_1 = require("@theia/core");
 const terminal_preferences_1 = require("../common/terminal-preferences");
 let TerminalThemeService = class TerminalThemeService {
+    constructor() {
+        this.onDidChangeEmitter = new core_1.Emitter();
+    }
+    /**
+     * Fires when the color theme changes, and when a change in the `ColorRegistry` changes the terminal colors.
+     */
     get onDidChange() {
-        return this.themeService.onDidColorThemeChange;
+        this.listenForChanges();
+        return this.onDidChangeEmitter.event;
+    }
+    /**
+     * Subscribes on first use rather than at construction, so that the theme listener runs after the one that applies
+     * a new theme to Monaco, whose color registry the terminal colors are read from.
+     */
+    listenForChanges() {
+        if (this.appliedTheme !== undefined) {
+            return;
+        }
+        this.appliedTheme = JSON.stringify(this.theme);
+        this.themeService.onDidColorThemeChange(event => {
+            this.appliedTheme = JSON.stringify(this.theme);
+            this.onDidChangeEmitter.fire(event);
+        });
+        // The registry fires on every register() call and assigning the xterm theme repaints the whole terminal,
+        // so only fire when the resolved terminal colors change.
+        this.colorRegistry.onDidChange(() => {
+            const theme = JSON.stringify(this.theme);
+            if (theme !== this.appliedTheme) {
+                this.appliedTheme = theme;
+                this.onDidChangeEmitter.fire({ newTheme: this.themeService.getCurrentTheme() });
+            }
+        });
     }
     get theme() {
         const foregroundColor = this.colorRegistry.getCurrentColor('terminal.foreground');

package/lib/browser/terminal-theme-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"terminal-theme-service.js","sourceRoot":"","sources":["../../src/browser/terminal-theme-service.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;AAGhF,4DAAkE;AAClE,2EAAuE;AACvE,6DAA+D;AAG/D,yEAAsE;AAG/D,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAK7B,IAAI,WAAW;QACX,OAAO,IAAI,CAAC,YAAY,CAAC,qBAAqB,CAAC;IACnD,CAAC;IAED,IAAI,KAAK;QACL,MAAM,eAAe,GAAG,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC,qBAAqB,CAAC,CAAC;QAClF,MAAM,eAAe,GAAG,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC,qBAAqB,CAAC,IAAI,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC,kBAAkB,CAAC,CAAC;QAC5I,MAAM,WAAW,GAAG,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC,2BAA2B,CAAC,IAAI,eAAe,CAAC;QACvG,MAAM,iBAAiB,GAAG,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC,2BAA2B,CAAC,IAAI,eAAe,CAAC;QAC7G,MAAM,wBAAwB,GAAG,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC,8BAA8B,CAAC,CAAC;QACpG,MAAM,2BAA2B,GAAG,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC,sCAAsC,CAAC,CAAC;QAC/G,MAAM,wBAAwB,GAAG,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC,8BAA8B,CAAC,CAAC;QAEpG,MAAM,KAAK,GAAW;YAClB,UAAU,EAAE,eAAe;YAC3B,UAAU,EAAE,eAAe;YAC3B,MAAM,EAAE,WAAW;YACnB,YAAY,EAAE,iBAAiB;YAC/B,mBAAmB,EAAE,wBAAwB;YAC7C,2BAA2B,EAAE,2BAA2B;YACxD,mBAAmB,EAAE,wBAAwB;SAChD,CAAC;QACF,wCAAwC;QACxC,KAAK,MAAM,EAAE,IAAI,2CAAoB,EAAE,CAAC;YACpC,MAAM,OAAO,GAAG,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;YACjC,MAAM,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACrE,8DAA8D;YAC7D,KAAa,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;QACvE,CAAC;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;CAEJ,CAAA;AArCY,oDAAoB;AAEa;IAAzC,IAAA,kBAAM,EAAC,8BAAa,CAAC;sCAAmC,8BAAa;2DAAC;AAC9B;IAAxC,IAAA,kBAAM,EAAC,sBAAY,CAAC;sCAAkC,sBAAY;0DAAC;+BAH3D,oBAAoB;IADhC,IAAA,sBAAU,GAAE;GACA,oBAAoB,CAqChC"}
+{"version":3,"file":"terminal-theme-service.js","sourceRoot":"","sources":["../../src/browser/terminal-theme-service.ts"],"names":[],"mappings":"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"}

package/lib/browser/terminal-theme-service.spec.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=terminal-theme-service.spec.d.ts.map

package/lib/browser/terminal-theme-service.spec.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"terminal-theme-service.spec.d.ts","sourceRoot":"","sources":["../../src/browser/terminal-theme-service.spec.ts"],"names":[],"mappings":""}

package/lib/browser/terminal-theme-service.spec.js

@@ -0,0 +1,113 @@
+"use strict";
+// *****************************************************************************
+// Copyright (C) 2026 CodeSignal and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const jsdom_1 = require("@theia/core/lib/browser/test/jsdom");
+let disableJSDOM = (0, jsdom_1.enableJSDOM)();
+const chai_1 = require("chai");
+const inversify_1 = require("@theia/core/shared/inversify");
+const core_1 = require("@theia/core");
+const color_registry_1 = require("@theia/core/lib/browser/color-registry");
+const theming_1 = require("@theia/core/lib/browser/theming");
+const terminal_theme_service_1 = require("./terminal-theme-service");
+disableJSDOM();
+class TestColorRegistry extends color_registry_1.ColorRegistry {
+    constructor() {
+        super(...arguments);
+        this.colors = new Map();
+    }
+    getCurrentColor(id) {
+        return this.colors.get(id);
+    }
+    set(id, value) {
+        this.colors.set(id, value);
+        this.fireDidChange();
+    }
+    touch() {
+        this.fireDidChange();
+    }
+}
+let SubclassWithPostConstruct = class SubclassWithPostConstruct extends terminal_theme_service_1.TerminalThemeService {
+    setup() { }
+};
+tslib_1.__decorate([
+    (0, inversify_1.postConstruct)(),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", []),
+    tslib_1.__metadata("design:returntype", void 0)
+], SubclassWithPostConstruct.prototype, "setup", null);
+SubclassWithPostConstruct = tslib_1.__decorate([
+    (0, inversify_1.injectable)()
+], SubclassWithPostConstruct);
+const DARK = { id: 'dark', type: 'dark', label: 'Dark' };
+describe('TerminalThemeService', () => {
+    let colors;
+    let themeChange;
+    let service;
+    let changes;
+    before(() => disableJSDOM = (0, jsdom_1.enableJSDOM)());
+    after(() => disableJSDOM());
+    function create(serviceClass) {
+        colors = new TestColorRegistry();
+        themeChange = new core_1.Emitter();
+        const themeService = { onDidColorThemeChange: themeChange.event, getCurrentTheme: () => DARK };
+        const container = new inversify_1.Container();
+        container.bind(color_registry_1.ColorRegistry).toConstantValue(colors);
+        container.bind(theming_1.ThemeService).toConstantValue(themeService);
+        container.bind(terminal_theme_service_1.TerminalThemeService).to(serviceClass).inSingletonScope();
+        const created = container.get(terminal_theme_service_1.TerminalThemeService);
+        changes = [];
+        created.onDidChange(event => changes.push(event));
+        return created;
+    }
+    beforeEach(() => service = create(terminal_theme_service_1.TerminalThemeService));
+    it('should report a terminal color that changes in the color registry', () => {
+        colors.set('terminal.selectionForeground', '#ff0000');
+        (0, chai_1.expect)(changes).to.have.lengthOf(1);
+        (0, chai_1.expect)(service.theme.selectionForeground).to.equal('#ff0000');
+    });
+    it('should not report color registry changes that leave the terminal colors as they are', () => {
+        colors.set('editor.background', '#000000');
+        colors.touch();
+        (0, chai_1.expect)(changes).to.be.empty;
+    });
+    it('should report color theme changes', () => {
+        const event = { newTheme: DARK };
+        themeChange.fire(event);
+        (0, chai_1.expect)(changes).to.deep.equal([event]);
+    });
+    it('should report each change once to each of several listeners', () => {
+        const second = [];
+        service.onDidChange(event => second.push(event));
+        colors.set('terminal.selectionForeground', '#ff0000');
+        themeChange.fire({ newTheme: DARK });
+        (0, chai_1.expect)([changes.length, second.length]).to.deep.equal([2, 2]);
+    });
+    it('should report changes for a subclass with its own post-construct method', () => {
+        service = create(SubclassWithPostConstruct);
+        themeChange.fire({ newTheme: DARK });
+        colors.set('terminal.selectionForeground', '#ff0000');
+        (0, chai_1.expect)(changes).to.have.lengthOf(2);
+    });
+    it('should not report a color registry change that a color theme change already applied', () => {
+        colors.colors.set('terminal.background', '#111111');
+        themeChange.fire({ newTheme: DARK });
+        colors.touch();
+        (0, chai_1.expect)(changes).to.have.lengthOf(1);
+    });
+});
+//# sourceMappingURL=terminal-theme-service.spec.js.map

package/lib/browser/terminal-theme-service.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"terminal-theme-service.spec.js","sourceRoot":"","sources":["../../src/browser/terminal-theme-service.spec.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@theia/terminal",
-  "version": "1.77.0-next.84+28288b6e7",
+  "version": "1.77.0-next.88+99b9e381a",
   "description": "Theia - Terminal Extension",
   "dependencies": {
-    "@theia/core": "1.77.0-next.84+28288b6e7",
-    "@theia/editor": "1.77.0-next.84+28288b6e7",
-    "@theia/file-search": "1.77.0-next.84+28288b6e7",
-    "@theia/filesystem": "1.77.0-next.84+28288b6e7",
-    "@theia/process": "1.77.0-next.84+28288b6e7",
-    "@theia/variable-resolver": "1.77.0-next.84+28288b6e7",
-    "@theia/workspace": "1.77.0-next.84+28288b6e7",
+    "@theia/core": "1.77.0-next.88+99b9e381a",
+    "@theia/editor": "1.77.0-next.88+99b9e381a",
+    "@theia/file-search": "1.77.0-next.88+99b9e381a",
+    "@theia/filesystem": "1.77.0-next.88+99b9e381a",
+    "@theia/process": "1.77.0-next.88+99b9e381a",
+    "@theia/variable-resolver": "1.77.0-next.88+99b9e381a",
+    "@theia/workspace": "1.77.0-next.88+99b9e381a",
     "tslib": "^2.8.1",
     "xterm": "^5.3.0",
     "xterm-addon-fit": "^0.8.0",
@@ -59,5 +59,5 @@
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "28288b6e714db6a4941d4aee74680ea6a6ceaff9"
+  "gitHead": "99b9e381abb93101610d188372fb8a9023ea80bd"
 }

package/src/browser/terminal-theme-service.spec.ts

@@ -0,0 +1,128 @@
+// *****************************************************************************
+// Copyright (C) 2026 CodeSignal and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { enableJSDOM } from '@theia/core/lib/browser/test/jsdom';
+let disableJSDOM = enableJSDOM();
+
+import { expect } from 'chai';
+import { Container, injectable, postConstruct } from '@theia/core/shared/inversify';
+import { Emitter } from '@theia/core';
+import { ColorRegistry } from '@theia/core/lib/browser/color-registry';
+import { ThemeService } from '@theia/core/lib/browser/theming';
+import { Theme, ThemeChangeEvent } from '@theia/core/lib/common/theme';
+import { TerminalThemeService } from './terminal-theme-service';
+
+disableJSDOM();
+
+class TestColorRegistry extends ColorRegistry {
+    readonly colors = new Map<string, string>();
+
+    override getCurrentColor(id: string): string | undefined {
+        return this.colors.get(id);
+    }
+
+    set(id: string, value: string): void {
+        this.colors.set(id, value);
+        this.fireDidChange();
+    }
+
+    touch(): void {
+        this.fireDidChange();
+    }
+}
+
+@injectable()
+class SubclassWithPostConstruct extends TerminalThemeService {
+    @postConstruct()
+    protected setup(): void { }
+}
+
+const DARK: Theme = { id: 'dark', type: 'dark', label: 'Dark' };
+
+describe('TerminalThemeService', () => {
+
+    let colors: TestColorRegistry;
+    let themeChange: Emitter<ThemeChangeEvent>;
+    let service: TerminalThemeService;
+    let changes: ThemeChangeEvent[];
+
+    before(() => disableJSDOM = enableJSDOM());
+    after(() => disableJSDOM());
+
+    function create(serviceClass: typeof TerminalThemeService): TerminalThemeService {
+        colors = new TestColorRegistry();
+        themeChange = new Emitter<ThemeChangeEvent>();
+        const themeService = { onDidColorThemeChange: themeChange.event, getCurrentTheme: () => DARK } as unknown as ThemeService;
+        const container = new Container();
+        container.bind(ColorRegistry).toConstantValue(colors);
+        container.bind(ThemeService).toConstantValue(themeService);
+        container.bind(TerminalThemeService).to(serviceClass).inSingletonScope();
+        const created = container.get(TerminalThemeService);
+        changes = [];
+        created.onDidChange(event => changes.push(event));
+        return created;
+    }
+
+    beforeEach(() => service = create(TerminalThemeService));
+
+    it('should report a terminal color that changes in the color registry', () => {
+        colors.set('terminal.selectionForeground', '#ff0000');
+
+        expect(changes).to.have.lengthOf(1);
+        expect(service.theme.selectionForeground).to.equal('#ff0000');
+    });
+
+    it('should not report color registry changes that leave the terminal colors as they are', () => {
+        colors.set('editor.background', '#000000');
+        colors.touch();
+
+        expect(changes).to.be.empty;
+    });
+
+    it('should report color theme changes', () => {
+        const event = { newTheme: DARK };
+        themeChange.fire(event);
+
+        expect(changes).to.deep.equal([event]);
+    });
+
+    it('should report each change once to each of several listeners', () => {
+        const second: ThemeChangeEvent[] = [];
+        service.onDidChange(event => second.push(event));
+
+        colors.set('terminal.selectionForeground', '#ff0000');
+        themeChange.fire({ newTheme: DARK });
+
+        expect([changes.length, second.length]).to.deep.equal([2, 2]);
+    });
+
+    it('should report changes for a subclass with its own post-construct method', () => {
+        service = create(SubclassWithPostConstruct);
+
+        themeChange.fire({ newTheme: DARK });
+        colors.set('terminal.selectionForeground', '#ff0000');
+
+        expect(changes).to.have.lengthOf(2);
+    });
+
+    it('should not report a color registry change that a color theme change already applied', () => {
+        colors.colors.set('terminal.background', '#111111');
+        themeChange.fire({ newTheme: DARK });
+        colors.touch();
+
+        expect(changes).to.have.lengthOf(1);
+    });
+});

package/src/browser/terminal-theme-service.ts

@@ -19,7 +19,7 @@ import { injectable, inject } from '@theia/core/shared/inversify';
 import { ColorRegistry } from '@theia/core/lib/browser/color-registry';
 import { ThemeService } from '@theia/core/lib/browser/theming';
 import { ThemeChangeEvent } from '@theia/core/lib/common/theme';
-import { Event } from '@theia/core';
+import { Emitter, Event } from '@theia/core';
 import { terminalAnsiColorMap } from '../common/terminal-preferences';
 
 @injectable()
@@ -28,8 +28,39 @@ export class TerminalThemeService {
     @inject(ColorRegistry) protected readonly colorRegistry: ColorRegistry;
     @inject(ThemeService) protected readonly themeService: ThemeService;
 
+    protected readonly onDidChangeEmitter = new Emitter<ThemeChangeEvent>();
+    protected appliedTheme: string | undefined;
+
+    /**
+     * Fires when the color theme changes, and when a change in the `ColorRegistry` changes the terminal colors.
+     */
     get onDidChange(): Event<ThemeChangeEvent> {
-        return this.themeService.onDidColorThemeChange;
+        this.listenForChanges();
+        return this.onDidChangeEmitter.event;
+    }
+
+    /**
+     * Subscribes on first use rather than at construction, so that the theme listener runs after the one that applies
+     * a new theme to Monaco, whose color registry the terminal colors are read from.
+     */
+    protected listenForChanges(): void {
+        if (this.appliedTheme !== undefined) {
+            return;
+        }
+        this.appliedTheme = JSON.stringify(this.theme);
+        this.themeService.onDidColorThemeChange(event => {
+            this.appliedTheme = JSON.stringify(this.theme);
+            this.onDidChangeEmitter.fire(event);
+        });
+        // The registry fires on every register() call and assigning the xterm theme repaints the whole terminal,
+        // so only fire when the resolved terminal colors change.
+        this.colorRegistry.onDidChange(() => {
+            const theme = JSON.stringify(this.theme);
+            if (theme !== this.appliedTheme) {
+                this.appliedTheme = theme;
+                this.onDidChangeEmitter.fire({ newTheme: this.themeService.getCurrentTheme() });
+            }
+        });
     }
 
     get theme(): ITheme {