@theia/core 1.75.0-next.4 → 1.75.0-next.43

package/src/browser/connection-status-service.ts

@@ -14,7 +14,7 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { inject, injectable, optional, postConstruct } from 'inversify';
+import { inject, injectable, optional, postConstruct, named } from 'inversify';
 import { ILogger } from '../common/logger';
 import { Event, Emitter } from '../common/event';
 import { DefaultFrontendApplicationContribution } from './frontend-application-contribution';
@@ -82,7 +82,7 @@ export abstract class AbstractConnectionStatusService implements ConnectionStatu
 
     protected connectionStatus: ConnectionStatus = ConnectionStatus.ONLINE;
 
-    @inject(ILogger)
+    @inject(ILogger) @named('core:AbstractConnectionStatusService')
     protected logger: ILogger;
 
     constructor(@inject(ConnectionStatusOptions) @optional() protected readonly options: ConnectionStatusOptions = ConnectionStatusOptions.DEFAULT) { }
@@ -122,6 +122,9 @@ export class FrontendConnectionStatusService extends AbstractConnectionStatusSer
     @inject(WebSocketConnectionSource) protected readonly wsConnectionProvider: WebSocketConnectionSource;
     @inject(PingService) protected readonly pingService: PingService;
 
+    @inject(ILogger) @named('core:FrontendConnectionStatusService')
+    protected override readonly logger: ILogger;
+
     @postConstruct()
     protected init(): void {
         this.wsConnectionProvider.onSocketDidOpen(() => {
@@ -177,7 +180,8 @@ export class ApplicationConnectionStatusContribution extends DefaultFrontendAppl
     constructor(
         @inject(ConnectionStatusService) protected readonly connectionStatusService: ConnectionStatusService,
         @inject(StatusBar) protected readonly statusBar: StatusBar,
-        @inject(ILogger) protected readonly logger: ILogger
+        @inject(ILogger) @named('core:ApplicationConnectionStatusContribution')
+        protected readonly logger: ILogger
     ) {
         super();
         this.connectionStatusService.onStatusChange(state => this.onStateChange(state));

package/src/browser/frontend-application-contribution.ts

@@ -52,7 +52,7 @@ export interface FrontendApplicationContribution {
     /**
      * Called when an application is stopped or unloaded.
      *
-     * Note that this is implemented using `window.beforeunload` which doesn't allow any asynchronous code anymore.
+     * Note that this is implemented using `window.pagehide` which doesn't allow any asynchronous code anymore.
      * I.e. this is the last tick.
      */
     onStop?(app: FrontendApplication): void;

package/src/browser/frontend-application-state.ts

@@ -14,7 +14,7 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { injectable, inject } from 'inversify';
+import { injectable, inject, named } from 'inversify';
 import { Emitter, Event } from '../common/event';
 import { Deferred } from '../common/promise-util';
 import { ILogger } from '../common/logger';
@@ -25,7 +25,7 @@ export { FrontendApplicationState };
 @injectable()
 export class FrontendApplicationStateService {
 
-    @inject(ILogger)
+    @inject(ILogger) @named('core:FrontendApplicationStateService')
     protected readonly logger: ILogger;
 
     private _state: FrontendApplicationState = 'init';

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

@@ -14,7 +14,7 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { injectable, inject, postConstruct } from 'inversify';
+import { injectable, inject, postConstruct, named } from 'inversify';
 import { Emitter } from '../common/event';
 import { Disposable, DisposableCollection } from '../common/disposable';
 import { LabelProviderContribution, DidChangeLabelEvent } from './label-provider';
@@ -22,6 +22,7 @@ import { FrontendApplicationConfigProvider } from './frontend-application-config
 import debounce = require('lodash.debounce');
 import { PreferenceSchemaService } from '../common/preferences/preference-schema';
 import { PreferenceService } from '../common/preferences';
+import { ILogger } from '../common';
 
 const ICON_THEME_PREFERENCE_KEY = 'workbench.iconTheme';
 
@@ -100,6 +101,9 @@ export class IconThemeService {
     @inject(PreferenceService) protected readonly preferences: PreferenceService;
     @inject(PreferenceSchemaService) protected readonly schemaProvider: PreferenceSchemaService;
 
+    @inject(ILogger) @named('core:IconThemeService')
+    protected readonly logger: ILogger;
+
     protected readonly onDidChangeCurrentEmitter = new Emitter<string>();
     readonly onDidChangeCurrent = this.onDidChangeCurrentEmitter.event;
 
@@ -124,7 +128,7 @@ export class IconThemeService {
 
     register(iconTheme: IconTheme): Disposable {
         if (this._iconThemes.has(iconTheme.id)) {
-            console.warn(new Error(`Icon theme '${iconTheme.id}' has already been registered, skipping.`));
+            this.logger.warn(new Error(`Icon theme '${iconTheme.id}' has already been registered, skipping.`));
             return Disposable.NULL;
         }
         this._iconThemes.set(iconTheme.id, iconTheme);

package/src/browser/keyboard/browser-keyboard-layout-provider.ts

@@ -14,7 +14,7 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { injectable, postConstruct, inject } from 'inversify';
+import { injectable, postConstruct, inject, named } from 'inversify';
 import { isOSX } from '../../common/os';
 import { Emitter, Event } from '../../common/event';
 import { ILogger } from '../../common/logger';
@@ -29,7 +29,7 @@ export type KeyboardLayoutSource = 'navigator.keyboard' | 'user-choice' | 'press
 @injectable()
 export class BrowserKeyboardLayoutProvider implements KeyboardLayoutProvider, KeyboardLayoutChangeNotifier, KeyValidator {
 
-    @inject(ILogger)
+    @inject(ILogger) @named('core:BrowserKeyboardLayoutProvider')
     protected readonly logger: ILogger;
 
     @inject(LocalStorageService)

package/src/browser/markdown-rendering/markdown-link-handler.ts

@@ -19,6 +19,19 @@ import { MarkdownString } from '../../common/markdown-rendering/markdown-string'
 import URI from '../../common/uri';
 import { open, OpenerService } from '../opener-service';
 
+/**
+ * Marks an element whose markdown links are already routed through an {@link OpenerService}.
+ *
+ * Renderers that install their own link handling declare it with {@link markMarkdownLinksWired},
+ * so that {@link wireMarkdownLinkHandler} does not add a second handler and open every link twice.
+ */
+export const MARKDOWN_LINKS_WIRED_ATTRIBUTE = 'data-theia-markdown-links-wired';
+
+/** Declares that the element's markdown links are already routed through an {@link OpenerService}. */
+export function markMarkdownLinksWired(root: HTMLElement): void {
+    root.setAttribute(MARKDOWN_LINKS_WIRED_ATTRIBUTE, 'true');
+}
+
 /**
  * Wires up anchor clicks inside a rendered markdown element so that they are routed
  * through the {@link OpenerService} instead of relying on default browser navigation.
@@ -27,6 +40,8 @@ import { open, OpenerService } from '../opener-service';
  * Also sets the `title` attribute on each anchor to its `href` (when no title is set)
  * so users can hover to see the link target.
  *
+ * Does nothing if the element's links are already wired, see {@link markMarkdownLinksWired}.
+ *
  * @returns a {@link Disposable} that removes the click listener.
  */
 export function wireMarkdownLinkHandler(
@@ -34,6 +49,10 @@ export function wireMarkdownLinkHandler(
     source: MarkdownString,
     openerService: OpenerService
 ): Disposable {
+    if (root.hasAttribute(MARKDOWN_LINKS_WIRED_ATTRIBUTE)) {
+        return Disposable.NULL;
+    }
+    markMarkdownLinksWired(root);
     for (const anchor of root.querySelectorAll('a')) {
         const href = anchor.getAttribute('href');
         if (href && !anchor.hasAttribute('title')) {
@@ -57,5 +76,8 @@ export function wireMarkdownLinkHandler(
         }
     };
     root.addEventListener('click', handleClick);
-    return Disposable.create(() => root.removeEventListener('click', handleClick));
+    return Disposable.create(() => {
+        root.removeEventListener('click', handleClick);
+        root.removeAttribute(MARKDOWN_LINKS_WIRED_ATTRIBUTE);
+    });
 }

package/src/browser/markdown-rendering/markdown-renderer.spec.ts

@@ -0,0 +1,88 @@
+// *****************************************************************************
+// Copyright (C) 2026 Safi Seid-Ahmad, K2view 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 '../test/jsdom';
+const disableJSDOM = enableJSDOM();
+
+import { Container } from 'inversify';
+import { expect } from 'chai';
+import { CommandService } from '../../common';
+import { MarkdownStringImpl } from '../../common/markdown-rendering/markdown-string';
+import { LabelParser } from '../label-parser';
+import { MarkdownRenderer, MarkdownRendererImpl } from './markdown-renderer';
+
+disableJSDOM();
+
+describe('MarkdownRendererImpl', () => {
+    let restoreJSDOM: () => void;
+    let renderer: MarkdownRenderer;
+
+    before(() => {
+        restoreJSDOM = enableJSDOM();
+        const container = new Container();
+        container.bind(LabelParser).toSelf().inSingletonScope();
+        container.bind(CommandService).toConstantValue({
+            executeCommand: <T>(): Promise<T | undefined> => Promise.resolve(undefined)
+        });
+        container.bind(MarkdownRendererImpl).toSelf().inSingletonScope();
+        container.bind(MarkdownRenderer).toService(MarkdownRendererImpl);
+        renderer = container.get<MarkdownRenderer>(MarkdownRenderer);
+    });
+
+    after(() => {
+        restoreJSDOM();
+    });
+
+    function renderImage(markdown: string): HTMLImageElement {
+        const { element } = renderer.render(new MarkdownStringImpl(markdown));
+        const image = element.querySelector('img');
+        expect(image, `image rendered for '${markdown}'`).to.not.be.null;
+        return image!;
+    }
+
+    it('applies the width and height of an image sizing suffix', () => {
+        const image = renderImage('![Jane](https://avatars.example.com/u/1|width=20,height=20)');
+        expect(image.getAttribute('src')).to.equal('https://avatars.example.com/u/1');
+        expect(image.getAttribute('width')).to.equal('20');
+        expect(image.getAttribute('height')).to.equal('20');
+    });
+
+    it('applies a suffix that sets only one dimension', () => {
+        const image = renderImage('![Jane](https://avatars.example.com/u/1|width=20)');
+        expect(image.getAttribute('src')).to.equal('https://avatars.example.com/u/1');
+        expect(image.getAttribute('width')).to.equal('20');
+        expect(image.hasAttribute('height')).to.be.false;
+    });
+
+    // markdown-it percent-encodes the link destination, so a pipe it keeps shows up as `%7C`.
+    it('keeps a literal pipe that is not a well-formed sizing suffix', () => {
+        const image = renderImage('![Jane](https://avatars.example.com/u/1|v=2)');
+        expect(image.getAttribute('src')).to.equal('https://avatars.example.com/u/1%7Cv=2');
+        expect(image.hasAttribute('width')).to.be.false;
+    });
+
+    it('ignores a non-numeric dimension', () => {
+        const image = renderImage('![Jane](https://avatars.example.com/u/1|width=20px)');
+        expect(image.getAttribute('src')).to.equal('https://avatars.example.com/u/1%7Cwidth=20px');
+        expect(image.hasAttribute('width')).to.be.false;
+    });
+
+    it('renders an image without a suffix unchanged', () => {
+        const image = renderImage('![Jane](https://avatars.example.com/u/1)');
+        expect(image.getAttribute('src')).to.equal('https://avatars.example.com/u/1');
+        expect(image.hasAttribute('width')).to.be.false;
+    });
+});

package/src/browser/markdown-rendering/markdown-renderer.ts

@@ -101,5 +101,48 @@ export class MarkdownRendererImpl implements MarkdownRenderer {
                 return `<i class="${codicon(chunk.name)} ${chunk.animation ? `fa-${chunk.animation}` : ''} icon-inline"></i>`;
             }).join('');
         };
+
+        // Support VS Code's `![alt](src|width=W,height=H)` image sizing syntax, which markdown-it
+        // would otherwise fold into the `src` attribute, yielding a broken image.
+        const renderImage = this.markdownIt.renderer.rules.image;
+        this.markdownIt.renderer.rules.image = (tokens, idx, options, env, self) => {
+            const token = tokens[idx];
+            const srcIndex = token.attrIndex('src');
+            if (srcIndex >= 0 && token.attrs) {
+                const src = token.attrs[srcIndex][1];
+                // markdown-it percent-encodes the link destination, so the separator may have
+                // become `%7C` by the time the token reaches the renderer.
+                const separator = /(?:\||%7c)(?![\s\S]*(?:\||%7c))/i.exec(src);
+                if (separator) {
+                    const dimensions = this.parseImageDimensions(src.substring(separator.index + separator[0].length));
+                    if (dimensions) {
+                        token.attrs[srcIndex][1] = src.substring(0, separator.index);
+                        for (const [name, value] of Object.entries(dimensions)) {
+                            token.attrSet(name, value);
+                        }
+                    }
+                }
+            }
+            return renderImage ? renderImage(tokens, idx, options, env, self) : self.renderToken(tokens, idx, options);
+        };
+    }
+
+    /**
+     * Parses the `width=W,height=H` parameter list of an image's sizing suffix.
+     *
+     * @returns the recognized dimensions, or `undefined` if the suffix is not a well-formed
+     * parameter list — in which case it is left as part of the `src`, since it may be a literal
+     * `|` in the URL.
+     */
+    protected parseImageDimensions(params: string): { width?: string, height?: string } | undefined {
+        const dimensions: { width?: string, height?: string } = {};
+        for (const param of params.split(',')) {
+            const match = /^\s*(width|height)\s*=\s*(\d+)\s*$/.exec(param);
+            if (!match) {
+                return undefined;
+            }
+            dimensions[match[1] as 'width' | 'height'] = match[2];
+        }
+        return Object.keys(dimensions).length > 0 ? dimensions : undefined;
     }
 }

package/src/browser/messaging/ws-connection-source.ts

@@ -14,6 +14,10 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
+// Manages the socket the frontend logger's RPC rides on, so logging through an ILogger here
+// would be circular.
+/* eslint-disable @theia/named-logger-check */
+
 import { Emitter, Event } from '../../common/event';
 import { ConnectionSource } from './connection-source';
 import { Socket, io } from 'socket.io-client';

package/src/browser/open-with-service.ts

@@ -14,14 +14,14 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { inject, injectable } from 'inversify';
+import { inject, injectable, named } from 'inversify';
 import { Disposable } from '../common/disposable';
 import { nls } from '../common/nls';
 import { MaybePromise } from '../common/types';
 import { URI } from '../common/uri';
 import { QuickInputService, QuickPickItem, QuickPickItemOrSeparator } from './quick-input';
 import { getDefaultHandler } from './opener-service';
-import { PreferenceService, PreferenceScope } from '../common';
+import { PreferenceService, PreferenceScope, ILogger } from '../common';
 
 export interface OpenWithHandler {
     /**
@@ -74,11 +74,14 @@ export class OpenWithService {
     @inject(PreferenceService)
     protected readonly preferenceService: PreferenceService;
 
+    @inject(ILogger) @named('core:OpenWithService')
+    protected readonly logger: ILogger;
+
     protected readonly handlers: OpenWithHandler[] = [];
 
     registerHandler(handler: OpenWithHandler): Disposable {
         if (this.handlers.some(h => h.id === handler.id)) {
-            console.warn('Duplicate OpenWithHandler registration: ' + handler.id);
+            this.logger.warn('Duplicate OpenWithHandler registration: ' + handler.id);
             return Disposable.NULL;
         }
         this.handlers.push(handler);

package/src/browser/performance/frontend-stopwatch.ts

@@ -14,12 +14,15 @@
 * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 *******************************************************************************/
 
-import { injectable } from 'inversify';
-import { Measurement, MeasurementOptions, Stopwatch } from '../../common';
+import { injectable, inject, named } from 'inversify';
+import { Measurement, MeasurementOptions, Stopwatch, ILogger } from '../../common';
 
 @injectable()
 export class FrontendStopwatch extends Stopwatch {
 
+    @inject(ILogger) @named('core:FrontendStopwatch')
+    protected override readonly logger: ILogger;
+
     constructor() {
         super({
             owner: 'frontend page',
@@ -51,7 +54,7 @@ export class FrontendStopwatch extends Stopwatch {
                 duration = entries[0].duration ?? Number.NaN;
                 startTime = entries[0].startTime ?? Number.NaN;
             } catch (e) {
-                console.warn(e);
+                this.logger.warn(e);
                 duration = Number.NaN;
                 startTime = Number.NaN;
             }

package/src/browser/perspective-service.ts

@@ -196,7 +196,7 @@ export class PerspectiveServiceImpl implements FrontendApplicationContribution,
     @inject(QuickInputService) @optional()
     protected readonly quickInputService: QuickInputService | undefined;
 
-    @inject(ILogger) @named('core:PerspectiveService')
+    @inject(ILogger) @named('core:PerspectiveServiceImpl')
     protected readonly logger: ILogger;
 
     @inject(WidgetAreaResolver)

package/src/browser/preferences/preference-proxy.spec.ts

@@ -28,6 +28,8 @@ import { PreferenceScope } from '../../common/preferences/preference-scope';
 import { FrontendApplicationConfigProvider } from '../frontend-application-config-provider';
 import { PreferenceProxyOptions, PreferenceProxy, PreferenceChangeEvent, createPreferenceProxy } from '../../common/preferences/preference-proxy';
 import { PreferenceProxyFactory } from '../../common/preferences/injectable-preference-proxy';
+import { ILogger } from '../../common/logger';
+import { MockLogger } from '../../common/test/mock-logger';
 
 disableJSDOM();
 
@@ -47,6 +49,7 @@ function createTestContainer(): Container {
     const result = new Container();
     bindPreferenceService(result.bind.bind(result));
     bindMockPreferenceProviders(result.bind.bind(result), result.unbind.bind(result));
+    result.bind(ILogger).to(MockLogger);
     return result;
 }
 

package/src/browser/preferences/preference-service.spec.ts

@@ -28,6 +28,8 @@ import { FrontendApplicationConfigProvider } from '../frontend-application-confi
 import { bindMockPreferenceProviders, MockPreferenceProvider } from './test';
 import { PreferenceChangeEvent, createPreferenceProxy } from '../../common/preferences/preference-proxy';
 import { bindPreferenceService } from '../frontend-application-bindings';
+import { ILogger } from '../../common/logger';
+import { MockLogger } from '../../common/test/mock-logger';
 
 disableJSDOM();
 
@@ -43,6 +45,7 @@ function createTestContainer(): Container {
     const result = new Container();
     bindPreferenceService(result.bind.bind(result));
     bindMockPreferenceProviders(result.bind.bind(result), result.unbind.bind(result));
+    result.bind(ILogger).to(MockLogger);
     return result;
 }
 

package/src/browser/preferences/preference-validation-service.ts

@@ -175,7 +175,7 @@ export class PreferenceValidationService {
             const configuredDefault = this.getDefaultFromSchema(schema);
             return this.validateOneOf(key, configuredDefault, { ...schema, default: undefined });
         }
-        console.log(`While validating ${key}, failed to find a valid value or default value. Using configured value ${value}.`);
+        this.logger.info(`While validating ${key}, failed to find a valid value or default value. Using configured value ${value}.`);
         return value;
     }
 

package/src/browser/saveable-service.ts

@@ -16,7 +16,7 @@
 
 import type { ApplicationShell } from './shell';
 import { inject, injectable, named } from 'inversify';
-import { ContributionProvider, UNTITLED_SCHEME, URI, Disposable, DisposableCollection, Emitter, Event } from '../common';
+import { ContributionProvider, UNTITLED_SCHEME, URI, Disposable, DisposableCollection, Emitter, Event, ILogger } from '../common';
 import { Navigatable, NavigatableWidget } from './navigatable-types';
 import { AutoSaveMode, Saveable, SaveableSource, SaveableWidget, SaveOptions, SaveReason, setDirty, close, PostCreationSaveableWidget, ShouldSaveDialog } from './saveable';
 import { waitForClosed, Widget } from './widgets';
@@ -53,6 +53,9 @@ export class SaveableService implements FrontendApplicationContribution {
     @inject(WindowFocusService)
     protected readonly windowFocusService: WindowFocusService;
 
+    @inject(ILogger) @named('core:SaveableService')
+    protected readonly logger: ILogger;
+
     protected saveThrottles = new Map<Widget, AutoSaveThrottle>();
     protected saveMode: AutoSaveMode = 'off';
     protected saveDelay = 1000;
@@ -284,7 +287,7 @@ export class SaveableService implements FrontendApplicationContribution {
         }
         const saveable = Saveable.get(widget);
         if (!saveable) {
-            console.warn('Saveable.get returned undefined on a known saveable widget. This is unexpected.');
+            this.logger.warn('Saveable.get returned undefined on a known saveable widget. This is unexpected.');
         }
         // Enter branch if saveable absent since we cannot check autosaveability more definitely.
         if (this.autoSave !== 'off' && (!saveable || this.shouldAutoSave(widget, saveable))) {

package/src/browser/shell/application-shell.spec.ts

@@ -0,0 +1,62 @@
+// *****************************************************************************
+// Copyright (C) 2026 Alec Timison.
+//
+// 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 '../test/jsdom';
+const disableJSDOM = enableJSDOM();
+
+import { expect } from 'chai';
+import { Widget } from '@theia/core/shared/@lumino/widgets';
+import * as sinon from 'sinon';
+import { DisposableCollection } from '../../common/disposable';
+import { ApplicationShell } from './application-shell';
+disableJSDOM();
+
+describe('ApplicationShell', () => {
+    let toTearDown: () => void;
+
+    beforeEach(() => {
+        toTearDown = enableJSDOM();
+    });
+
+    afterEach(() => {
+        sinon.restore();
+        toTearDown();
+    });
+
+    it('cancels the previous activation check', () => {
+        const shell = Object.create(ApplicationShell.prototype) as ApplicationShell;
+        Object.assign(shell, {
+            toDisposeOnActivationCheck: new DisposableCollection(),
+            logger: { warn: sinon.stub() }
+        });
+        const assertActivated = (shell as unknown as { assertActivated(widget: Widget): void }).assertActivated.bind(shell);
+        const firstWidget = new Widget();
+        const secondWidget = new Widget();
+        const request = {} as ReturnType<typeof window.setTimeout>;
+        sinon.stub(globalThis, 'setTimeout').returns(request);
+        sinon.stub(window, 'setTimeout').returns(request);
+        const clearTimeout = sinon.stub(window, 'clearTimeout');
+        window.cancelAnimationFrame = sinon.stub();
+
+        assertActivated(firstWidget);
+        assertActivated(secondWidget);
+
+        expect(clearTimeout.callCount).to.equal(1);
+        expect(clearTimeout.firstCall.args[0]).to.equal(request);
+        firstWidget.dispose();
+        secondWidget.dispose();
+    });
+});

package/src/browser/shell/application-shell.ts

@@ -1438,7 +1438,7 @@ export class ApplicationShell extends Widget {
         this.toDisposeOnActivationCheck.push(Disposable.create(() => widget.disposed.disconnect(onDispose)));
 
         let start = 0;
-        const step: FrameRequestCallback = () => {
+        const step = (): void => {
             const activeElement = widget.node.ownerDocument.activeElement;
             if (activeElement && widget.node.contains(activeElement)) {
                 return;
@@ -1449,13 +1449,13 @@ export class ApplicationShell extends Widget {
             }
             const delta = now - start;
             if (delta < this.activationTimeout) {
-                request = setTimeout(step, 0);
+                request = window.setTimeout(step, 0);
             } else {
                 this.logger.warn(`Widget was activated, but did not accept focus after ${this.activationTimeout}ms: ${widget.id}`);
             }
         };
-        let request = setTimeout(step, 0);
-        this.toDisposeOnActivationCheck.push(Disposable.create(() => window.cancelAnimationFrame(request)));
+        let request = window.setTimeout(step, 0);
+        this.toDisposeOnActivationCheck.push(Disposable.create(() => window.clearTimeout(request)));
     }
 
     /**

package/src/browser/shell/shell-layout-restorer.ts

@@ -154,7 +154,8 @@ export class ShellLayoutRestorer implements CommandContribution {
 
     constructor(
         @inject(WidgetManager) protected widgetManager: WidgetManager,
-        @inject(ILogger) protected logger: ILogger,
+        @inject(ILogger) @named('core:ShellLayoutRestorer')
+        protected readonly logger: ILogger,
         @inject(StorageService) protected storageService: StorageService) { }
 
     registerCommands(commands: CommandRegistry): void {
@@ -374,18 +375,18 @@ export class ShellLayoutRestorer implements CommandContribution {
         }
         if (layoutVersion !== applicationShellLayoutVersion) {
             if (layoutVersion < applicationShellLayoutVersion) {
-                console.warn(`Layout version ${layoutVersion} is behind current layout version ${applicationShellLayoutVersion}, trying to migrate...`);
+                this.logger.warn(`Layout version ${layoutVersion} is behind current layout version ${applicationShellLayoutVersion}, trying to migrate...`);
             } else {
-                console.warn(`Layout version ${layoutVersion} is ahead current layout version ${applicationShellLayoutVersion}, trying to load anyway...`);
+                this.logger.warn(`Layout version ${layoutVersion} is ahead current layout version ${applicationShellLayoutVersion}, trying to load anyway...`);
             }
-            console.info(`Please use '${RESET_LAYOUT.label}' command if the layout looks bogus.`);
+            this.logger.info(`Please use '${RESET_LAYOUT.label}' command if the layout looks bogus.`);
         }
 
         const migrations = this.migrations.getContributions()
             .filter(m => m.layoutVersion > layoutVersion && m.layoutVersion <= applicationShellLayoutVersion)
             .sort((m, m2) => m.layoutVersion - m2.layoutVersion);
         if (migrations.length) {
-            console.info(`Found ${migrations.length} migrations from layout version ${layoutVersion} to version ${applicationShellLayoutVersion}, migrating...`);
+            this.logger.info(`Found ${migrations.length} migrations from layout version ${layoutVersion} to version ${applicationShellLayoutVersion}, migrating...`);
         }
 
         const context = { layout, layoutVersion, migrations };

package/src/browser/shell/tab-bar-toolbar/tab-bar-toolbar-menu-adapters.tsx

@@ -96,8 +96,9 @@ abstract class AbstractToolbarMenuWrapper {
         const icon = this.icon || 'ellipsis';
         const contextMatcher: ContextMatcher = this.contextKeyService;
         const className = `${icon} ${ACTION_ITEM}`;
+        const itemClassName = TabBarToolbar.Styles.TAB_BAR_TOOLBAR_ITEM + ' enabled menu' + (this.isToggled(widget) ? ' toggled' : '');
         if (CompoundMenuNode.is(this.menuNode) && !this.menuNode.isEmpty(this.effectiveMenuPath, this.contextKeyService, widget.node, widget)) {
-            return <div key={this.id} className={TabBarToolbar.Styles.TAB_BAR_TOOLBAR_ITEM + ' enabled menu'}>
+            return <div key={this.id} className={itemClassName}>
                 <div id={this.id} className={className}
                     title={this.tooltip || this.text}
                     onClick={e => this.executeCommand(widget, e)}
@@ -107,7 +108,7 @@ abstract class AbstractToolbarMenuWrapper {
                 </div>
             </div>;
         } else {
-            return <div key={this.id} className={TabBarToolbar.Styles.TAB_BAR_TOOLBAR_ITEM + ' enabled menu'}>
+            return <div key={this.id} className={itemClassName}>
                 <div id={this.id} className={className}
                     title={this.tooltip || this.text}
                     onClick={e => this.executeCommand(widget, e)}

package/src/browser/shell/tab-bar-toolbar/tab-bar-toolbar-registry.ts

@@ -17,7 +17,7 @@
 import debounce = require('lodash.debounce');
 import { inject, injectable, named } from 'inversify';
 // eslint-disable-next-line max-len
-import { CommandRegistry, ContributionProvider, Disposable, DisposableCollection, Emitter, Event, MenuModelRegistry, MenuPath } from '../../../common';
+import { CommandRegistry, ContributionProvider, Disposable, DisposableCollection, Emitter, Event, MenuModelRegistry, MenuPath, ILogger } from '../../../common';
 import { ContextKeyService } from '../../context-key-service';
 import { FrontendApplicationContribution } from '../../frontend-application-contribution';
 import { Widget } from '../../widgets';
@@ -68,6 +68,9 @@ export class TabBarToolbarRegistry implements FrontendApplicationContribution {
     @inject(ContributionProvider) @named(TabBarToolbarContribution)
     protected readonly contributionProvider: ContributionProvider<TabBarToolbarContribution>;
 
+    @inject(ILogger) @named('core:TabBarToolbarRegistry')
+    protected readonly logger: ILogger;
+
     protected readonly onDidChangeEmitter = new Emitter<void>();
     readonly onDidChange: Event<void> = this.onDidChangeEmitter.event;
     // debounce in order to avoid to fire more than once in the same tick
@@ -223,7 +226,7 @@ export class TabBarToolbarRegistry implements FrontendApplicationContribution {
             this.fireOnDidChange();
             return { dispose: () => this.unregisterMenuDelegate(menuPath) };
         }
-        console.warn('Unable to register menu delegate. Delegate has already been registered', menuPath);
+        this.logger.warn('Unable to register menu delegate. Delegate has already been registered', menuPath);
         return Disposable.NULL;
     }