@theia/core 1.45.0 → 1.46.0-next.106

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@theia/core",
-  "version": "1.45.0",
+  "version": "1.46.0-next.106+cf038c17c",
   "description": "Theia is a cloud & desktop IDE framework implemented in TypeScript.",
   "main": "lib/common/index.js",
   "typings": "lib/common/index.d.ts",
@@ -16,8 +16,8 @@
     "@phosphor/signaling": "1",
     "@phosphor/virtualdom": "1",
     "@phosphor/widgets": "1",
-    "@theia/application-package": "1.45.0",
-    "@theia/request": "1.45.0",
+    "@theia/application-package": "1.46.0-next.106+cf038c17c",
+    "@theia/request": "1.46.0-next.106+cf038c17c",
     "@types/body-parser": "^1.16.4",
     "@types/cookie": "^0.3.3",
     "@types/dompurify": "^2.2.2",
@@ -30,6 +30,7 @@
     "@types/react-dom": "^18.0.6",
     "@types/route-parser": "^0.1.1",
     "@types/safer-buffer": "^2.1.0",
+    "@types/uuid": "^9.0.8",
     "@types/ws": "^8.5.5",
     "@types/yargs": "^15",
     "@vscode/codicons": "*",
@@ -55,7 +56,7 @@
     "lodash.debounce": "^4.0.8",
     "lodash.throttle": "^4.1.1",
     "markdown-it": "^12.3.2",
-    "msgpackr": "1.6.1",
+    "msgpackr": "^1.10.1",
     "nsfw": "^2.2.4",
     "p-debounce": "^2.1.0",
     "perfect-scrollbar": "^1.3.0",
@@ -68,7 +69,8 @@
     "safer-buffer": "^2.1.2",
     "socket.io": "^4.5.3",
     "socket.io-client": "^4.5.3",
-    "uuid": "^8.3.2",
+    "tslib": "^2.6.2",
+    "uuid": "^9.0.1",
     "vscode-languageserver-protocol": "^3.17.2",
     "vscode-uri": "^2.1.1",
     "ws": "^8.14.1",
@@ -134,8 +136,12 @@
       "frontendPreload": "lib/browser/preload/preload-module",
       "preload": "lib/electron-browser/preload"
     },
+    {
+      "frontendOnlyPreload": "lib/browser-only/preload/frontend-only-preload-module"
+    },
     {
       "frontend": "lib/browser/i18n/i18n-frontend-module",
+      "frontendOnly": "lib/browser-only/i18n/i18n-frontend-only-module",
       "backend": "lib/node/i18n/i18n-backend-module"
     },
     {
@@ -200,12 +206,12 @@
     "watch": "theiaext watch"
   },
   "devDependencies": {
-    "@theia/ext-scripts": "1.45.0",
-    "@theia/re-exports": "1.45.0",
+    "@theia/ext-scripts": "1.47.0",
+    "@theia/re-exports": "1.47.0",
     "minimist": "^1.2.0"
   },
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "2b20a60a0f9b54b19838a0f71760989a19622495"
+  "gitHead": "cf038c17c3b3b210d9ae02b09d64921f639247f9"
 }

package/src/browser/browser.ts

@@ -18,6 +18,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { environment } from '../common';
+
 const userAgent = typeof navigator !== 'undefined' ? navigator.userAgent : '';
 
 export const isIE = (userAgent.indexOf('Trident') >= 0);
@@ -31,7 +33,10 @@ export const isChrome = (userAgent.indexOf('Chrome') >= 0);
 export const isSafari = (userAgent.indexOf('Chrome') === -1) && (userAgent.indexOf('Safari') >= 0);
 export const isIPad = (userAgent.indexOf('iPad') >= 0);
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-export const isNative = typeof (window as any).process !== 'undefined';
+/**
+ * @deprecated us Environment.electron.is
+ */
+export const isNative = environment.electron.is();
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export const isBasicWasmSupported = typeof (window as any).WebAssembly !== 'undefined';
 

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

@@ -351,12 +351,12 @@ export namespace CommonCommands {
     });
 }
 
-export const supportCut = browser.isNative || document.queryCommandSupported('cut');
-export const supportCopy = browser.isNative || document.queryCommandSupported('copy');
+export const supportCut = environment.electron.is() || document.queryCommandSupported('cut');
+export const supportCopy = environment.electron.is() || document.queryCommandSupported('copy');
 // Chrome incorrectly returns true for document.queryCommandSupported('paste')
 // when the paste feature is available but the calling script has insufficient
 // privileges to actually perform the action
-export const supportPaste = browser.isNative || (!browser.isChrome && document.queryCommandSupported('paste'));
+export const supportPaste = environment.electron.is() || (!browser.isChrome && document.queryCommandSupported('paste'));
 
 export const RECENT_COMMANDS_STORAGE_KEY = 'commands';
 

package/src/browser/context-key-service.ts

@@ -15,7 +15,6 @@
 // *****************************************************************************
 
 import { injectable } from 'inversify';
-import { Disposable } from '../common';
 import { Emitter, Event } from '../common/event';
 
 export type ContextKeyValue = null | undefined | boolean | number | string
@@ -43,7 +42,7 @@ export interface ContextKeyChangeEvent {
 
 export const ContextKeyService = Symbol('ContextKeyService');
 
-export interface ContextMatcher extends Disposable {
+export interface ContextMatcher {
     /**
      * Whether the expression is satisfied. If `context` provided, the service will attempt to retrieve a context object associated with that element.
      */

package/src/browser/context-menu-renderer.ts

@@ -26,10 +26,6 @@ export const Coordinate = Symbol('Coordinate');
 
 export type Anchor = MouseEvent | Coordinate;
 
-export function toAnchor(anchor: HTMLElement | Coordinate): Anchor {
-    return anchor instanceof HTMLElement ? { x: anchor.offsetLeft, y: anchor.offsetTop } : anchor;
-}
-
 export function coordinateFromAnchor(anchor: Anchor): Coordinate {
     const { x, y } = anchor instanceof MouseEvent ? { x: anchor.clientX, y: anchor.clientY } : anchor;
     return { x, y };

package/src/browser/core-preferences.ts

@@ -200,6 +200,11 @@ export const corePreferenceSchema: PreferenceSchema = {
             'description': nls.localizeByDefault('Controls whether an editor is revealed in any of the visible groups if opened. If disabled, an editor will prefer to open in the currently active editor group. If enabled, an already opened editor will be revealed instead of opened again in the currently active editor group. Note that there are some cases where this setting is ignored, such as when forcing an editor to open in a specific group or to the side of the currently active group.'),
             'default': false
         },
+        'workbench.editor.decorations.badges': {
+            'type': 'boolean',
+            'description': nls.localizeByDefault('Controls whether editor file decorations should use badges.'),
+            'default': true
+        },
         'workbench.commandPalette.history': {
             type: 'number',
             default: 50,
@@ -295,6 +300,7 @@ export interface CoreConfiguration {
     'workbench.editor.mouseBackForwardToNavigate': boolean;
     'workbench.editor.closeOnFileDelete': boolean;
     'workbench.editor.revealIfOpen': boolean;
+    'workbench.editor.decorations.badges': boolean;
     'workbench.colorTheme': string;
     'workbench.iconTheme': string;
     'workbench.silentNotifications': boolean;

package/src/browser/decorations-service.ts

@@ -78,7 +78,7 @@ class DecorationProviderWrapper {
                 this.data.clear();
             } else {
                 for (const uri of uris) {
-                    this.fetchData(new URI(uri.toString()));
+                    this.fetchData(uri);
                     const decoration = await provider.provideDecorations(uri, CancellationToken.None);
                     if (decoration) {
                         this.decorations.set(uri.toString(), decoration);
@@ -131,14 +131,14 @@ class DecorationProviderWrapper {
     private fetchData(uri: URI): Decoration | undefined {
 
         // check for pending request and cancel it
-        const pendingRequest = this.data.get(new URI(uri.toString()));
+        const pendingRequest = this.data.get(uri);
         if (pendingRequest instanceof DecorationDataRequest) {
             pendingRequest.source.cancel();
             this.data.delete(uri);
         }
 
         const source = new CancellationTokenSource();
-        const dataOrThenable = this.provider.provideDecorations(new URI(uri.toString()), source.token);
+        const dataOrThenable = this.provider.provideDecorations(uri, source.token);
         if (!isThenable<Decoration | Promise<Decoration | undefined> | undefined>(dataOrThenable)) {
             // sync -> we have a result now
             return this.keepItem(uri, dataOrThenable);
@@ -197,7 +197,7 @@ export class DecorationsServiceImpl implements DecorationsService {
         const data: Decoration[] = [];
         let containsChildren: boolean = false;
         for (const wrapper of this.data) {
-            wrapper.getOrRetrieve(new URI(uri.toString()), includeChildren, (deco, isChild) => {
+            wrapper.getOrRetrieve(uri, includeChildren, (deco, isChild) => {
                 if (!isChild || deco.bubble) {
                     data.push(deco);
                     containsChildren = isChild || containsChildren;

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

@@ -139,6 +139,7 @@ import { bindCommonStylingParticipants } from './common-styling-participants';
 import { HoverService } from './hover-service';
 import { AdditionalViewsMenuWidget, AdditionalViewsMenuWidgetFactory } from './shell/additional-views-menu-widget';
 import { LanguageIconLabelProvider } from './language-icon-provider';
+import { bindTreePreferences } from './tree';
 
 export { bindResourceProvider, bindMessageService, bindPreferenceService };
 
@@ -199,7 +200,9 @@ export const frontendApplicationModule = new ContainerModule((bind, _unbind, _is
         const commandService = container.get<CommandService>(CommandService);
         const corePreferences = container.get<CorePreferences>(CorePreferences);
         const hoverService = container.get(HoverService);
-        return new TabBarRenderer(contextMenuRenderer, tabBarDecoratorService, iconThemeService, selectionService, commandService, corePreferences, hoverService);
+        const contextKeyService: ContextKeyService = container.get(ContextKeyService);
+        return new TabBarRenderer(contextMenuRenderer, tabBarDecoratorService, iconThemeService,
+            selectionService, commandService, corePreferences, hoverService, contextKeyService);
     });
     bind(TheiaDockPanel.Factory).toFactory(({ container }) => (options?: DockPanel.IOptions) => {
         const corePreferences = container.get<CorePreferences>(CorePreferences);
@@ -346,7 +349,6 @@ export const frontendApplicationModule = new ContainerModule((bind, _unbind, _is
     });
     bind(FrontendConnectionStatusService).toSelf().inSingletonScope();
     bind(ConnectionStatusService).toService(FrontendConnectionStatusService);
-    bind(FrontendApplicationContribution).toService(FrontendConnectionStatusService);
     bind(ApplicationConnectionStatusContribution).toSelf().inSingletonScope();
     bind(FrontendApplicationContribution).toService(ApplicationConnectionStatusContribution);
 
@@ -366,6 +368,7 @@ export const frontendApplicationModule = new ContainerModule((bind, _unbind, _is
     bind(ThemeService).toSelf().inSingletonScope();
 
     bindCorePreferences(bind);
+    bindTreePreferences(bind);
 
     bind(MimeService).toSelf().inSingletonScope();
 

package/src/browser/icon-registry.ts

@@ -19,6 +19,7 @@
  *--------------------------------------------------------------------------------------------*/
 // code copied and modified from https://github.com/Microsoft/vscode/blob/main/src/vs/platform/theme/common/iconRegistry.ts
 
+import { ThemeIcon } from '../common/theme';
 import { URI } from 'vscode-uri';
 
 export interface IconDefinition {
@@ -48,16 +49,6 @@ export interface IconFontSource {
     readonly location: URI;
     readonly format: string;
 }
-
-export interface ThemeIcon {
-    readonly id: string;
-    readonly color?: ThemeColor;
-}
-
-export interface ThemeColor {
-    id: string;
-}
-
 export const IconRegistry = Symbol('IconRegistry');
 export interface IconRegistry {
     /**

package/src/browser/keybinding.ts

@@ -497,6 +497,9 @@ export class KeybindingRegistry {
 
     isEnabledInScope(binding: common.Keybinding, target: HTMLElement | undefined): boolean {
         const context = binding.context && this.contexts[binding.context];
+        if (binding.command && !this.commandRegistry.isEnabled(binding.command, binding.args)) {
+            return false;
+        }
         if (context && !context.isEnabled(binding)) {
             return false;
         }

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

@@ -24,7 +24,7 @@ import { codicon } from '../widgets';
 
 // #region Copied from Copied from https://github.com/microsoft/vscode/blob/7d9b1c37f8e5ae3772782ba3b09d827eb3fdd833/src/vs/base/browser/formattedTextRenderer.ts
 export interface ContentActionHandler {
-    callback: (content: string, event?: MouseEvent) => void;
+    callback: (content: string, event?: MouseEvent | KeyboardEvent) => void;
     readonly disposables: DisposableGroup;
 }
 

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

@@ -87,38 +87,58 @@ export class WebSocketConnectionSource implements ConnectionSource {
         this._socket.connect();
     }
 
-    protected handleSocketConnected(): void {
-        if (this.currentChannel) {
-            const reconnectListener = (hasConnection: boolean) => {
-                this._socket.off(ConnectionManagementMessages.RECONNECT, reconnectListener);
-                if (hasConnection) {
-                    this.writeBuffer.flush(this.socket);
+    protected negogiateReconnect(): void {
+        const reconnectListener = (hasConnection: boolean) => {
+            this._socket.off(ConnectionManagementMessages.RECONNECT, reconnectListener);
+            if (hasConnection) {
+                console.info(`reconnect succeeded on ${this.socket.id}`);
+                this.writeBuffer!.flush(this.socket);
+            } else {
+                if (FrontendApplicationConfigProvider.get().reloadOnReconnect) {
+                    window.location.reload(); // this might happen in the preload module, when we have no window service yet
                 } else {
-                    if (FrontendApplicationConfigProvider.get().reloadOnReconnect) {
-                        window.location.reload(); // this might happen in the preload module, when we have no window service yet
-                    } else {
-                        this.connectNewChannel();
-                    }
+                    console.info(`reconnect failed on ${this.socket.id}`);
+                    this.currentChannel.onCloseEmitter.fire({ reason: 'reconnecting channel' });
+                    this.currentChannel.close();
+                    this.writeBuffer.drain();
+                    this.socket.disconnect();
+                    this.socket.connect();
+                    this.negotiateInitialConnect();
                 }
-            };
-            this._socket.on(ConnectionManagementMessages.RECONNECT, reconnectListener);
-            this._socket.emit(ConnectionManagementMessages.RECONNECT, this.frontendIdProvider.getId());
+            }
+        };
+        this._socket.on(ConnectionManagementMessages.RECONNECT, reconnectListener);
+        console.info(`sending reconnect on ${this.socket.id}`);
+        this._socket.emit(ConnectionManagementMessages.RECONNECT, this.frontendIdProvider.getId());
+    }
+
+    protected negotiateInitialConnect(): void {
+        const initialConnectListener = () => {
+            console.info(`initial connect received on ${this.socket.id}`);
+
+            this._socket.off(ConnectionManagementMessages.INITIAL_CONNECT, initialConnectListener);
+            this.connectNewChannel();
+        };
+        this._socket.on(ConnectionManagementMessages.INITIAL_CONNECT, initialConnectListener);
+        console.info(`sending initial connect on ${this.socket.id}`);
+
+        this._socket.emit(ConnectionManagementMessages.INITIAL_CONNECT, this.frontendIdProvider.getId());
+    }
+
+    protected handleSocketConnected(): void {
+        if (this.currentChannel) {
+            this.negogiateReconnect();
         } else {
-            const initialConnectListener = () => {
-                this._socket.off(ConnectionManagementMessages.INITIAL_CONNECT, initialConnectListener);
-                this.connectNewChannel();
-            };
-            this._socket.on(ConnectionManagementMessages.INITIAL_CONNECT, initialConnectListener);
-            this._socket.emit(ConnectionManagementMessages.INITIAL_CONNECT, this.frontendIdProvider.getId());
+            this.negotiateInitialConnect();
         }
     }
 
     connectNewChannel(): void {
         if (this.currentChannel) {
-            this.writeBuffer.drain();
             this.currentChannel.close();
             this.currentChannel.onCloseEmitter.fire({ reason: 'reconnecting channel' });
         }
+        this.writeBuffer.drain();
         this.currentChannel = this.createChannel();
         this.onConnectionDidOpenEmitter.fire(this.currentChannel);
     }

package/src/browser/save-resource-service.ts

@@ -15,7 +15,7 @@
  ********************************************************************************/
 
 import { inject, injectable } from 'inversify';
-import { MessageService, UNTITLED_SCHEME } from '../common';
+import { MessageService, UNTITLED_SCHEME, URI } from '../common';
 import { Navigatable, NavigatableWidget } from './navigatable-types';
 import { Saveable, SaveableSource, SaveOptions } from './saveable';
 import { Widget } from './widgets';
@@ -41,11 +41,12 @@ export class SaveResourceService {
      *
      * No op if the widget is not saveable.
      */
-    async save(widget: Widget | undefined, options?: SaveOptions): Promise<void> {
+    async save(widget: Widget | undefined, options?: SaveOptions): Promise<URI | undefined> {
         if (this.canSaveNotSaveAs(widget)) {
             await Saveable.save(widget, options);
+            return NavigatableWidget.getUri(widget);
         } else if (this.canSaveAs(widget)) {
-            await this.saveAs(widget, options);
+            return this.saveAs(widget, options);
         }
     }
 
@@ -53,7 +54,7 @@ export class SaveResourceService {
         return false;
     }
 
-    saveAs(sourceWidget: Widget & SaveableSource & Navigatable, options?: SaveOptions): Promise<void> {
+    saveAs(sourceWidget: Widget & SaveableSource & Navigatable, options?: SaveOptions): Promise<URI | undefined> {
         return Promise.reject('Unsupported: The base SaveResourceService does not support saveAs action.');
     }
 }

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

@@ -132,16 +132,19 @@ export class DockPanelRenderer implements DockLayout.IRenderer {
             getDynamicTabOptions());
         this.tabBarClasses.forEach(c => tabBar.addClass(c));
         renderer.tabBar = tabBar;
-        tabBar.disposed.connect(() => renderer.dispose());
         renderer.contextMenuPath = SHELL_TABBAR_CONTEXT_MENU;
         tabBar.currentChanged.connect(this.onCurrentTabChanged, this);
-        this.corePreferences.onPreferenceChanged(change => {
+        const prefChangeDisposable = this.corePreferences.onPreferenceChanged(change => {
             if (change.preferenceName === 'workbench.tab.shrinkToFit.enabled' ||
                 change.preferenceName === 'workbench.tab.shrinkToFit.minimumSize' ||
                 change.preferenceName === 'workbench.tab.shrinkToFit.defaultSize') {
                 tabBar.dynamicTabOptions = getDynamicTabOptions();
             }
         });
+        tabBar.disposed.connect(() => {
+            prefChangeDisposable.dispose();
+            renderer.dispose();
+        });
         this.onDidCreateTabBarEmitter.fire(tabBar);
         return tabBar;
     }
@@ -1229,7 +1232,9 @@ export class ApplicationShell extends Widget {
         Saveable.apply(
             widget,
             () => this.widgets.filter((maybeSaveable): maybeSaveable is Widget & SaveableSource => !!Saveable.get(maybeSaveable)),
-            (toSave, options) => this.saveResourceService.save(toSave, options),
+            async (toSave, options) => {
+                await this.saveResourceService.save(toSave, options);
+            },
         );
         if (ApplicationShell.TrackableWidgetProvider.is(widget)) {
             for (const toTrack of widget.getTrackableWidgets()) {

package/src/browser/shell/tab-bar-decorator.ts

@@ -17,9 +17,12 @@
 import debounce = require('lodash.debounce');
 import { Title, Widget } from '@phosphor/widgets';
 import { inject, injectable, named } from 'inversify';
-import { Event, Emitter, ContributionProvider } from '../../common';
-import { WidgetDecoration } from '../widget-decoration';
+import { ContributionProvider, Emitter, Event } from '../../common';
+import { ColorRegistry } from '../color-registry';
+import { Decoration, DecorationsService, DecorationsServiceImpl } from '../decorations-service';
 import { FrontendApplicationContribution } from '../frontend-application-contribution';
+import { Navigatable } from '../navigatable-types';
+import { WidgetDecoration } from '../widget-decoration';
 
 export const TabBarDecorator = Symbol('TabBarDecorator');
 
@@ -53,6 +56,12 @@ export class TabBarDecoratorService implements FrontendApplicationContribution {
     @inject(ContributionProvider) @named(TabBarDecorator)
     protected readonly contributions: ContributionProvider<TabBarDecorator>;
 
+    @inject(DecorationsService)
+    protected readonly decorationsService: DecorationsServiceImpl;
+
+    @inject(ColorRegistry)
+    protected readonly colors: ColorRegistry;
+
     initialize(): void {
         this.contributions.getContributions().map(decorator => decorator.onDidChangeDecorations(this.fireDidChangeDecorations));
     }
@@ -66,11 +75,32 @@ export class TabBarDecoratorService implements FrontendApplicationContribution {
      */
     getDecorations(title: Title<Widget>): WidgetDecoration.Data[] {
         const decorators = this.contributions.getContributions();
-        let all: WidgetDecoration.Data[] = [];
+        const decorations: WidgetDecoration.Data[] = [];
         for (const decorator of decorators) {
-            const decorations = decorator.decorate(title);
-            all = all.concat(decorations);
+            decorations.push(...decorator.decorate(title));
         }
-        return all;
+        if (Navigatable.is(title.owner)) {
+            const resourceUri = title.owner.getResourceUri();
+            if (resourceUri) {
+                const serviceDecorations = this.decorationsService.getDecoration(resourceUri, false);
+                decorations.push(...serviceDecorations.map(d => this.fromDecoration(d)));
+            }
+        }
+        return decorations;
+    }
+
+    protected fromDecoration(decoration: Decoration): WidgetDecoration.Data {
+        const colorVariable = decoration.colorId && this.colors.toCssVariableName(decoration.colorId);
+        return {
+            tailDecorations: [
+                {
+                    data: decoration.letter ? decoration.letter : '',
+                    fontData: {
+                        color: colorVariable && `var(${colorVariable})`
+                    },
+                    tooltip: decoration.tooltip ? decoration.tooltip : ''
+                }
+            ]
+        };
     }
 }

package/src/browser/shell/tab-bars.ts

@@ -17,7 +17,7 @@
 import PerfectScrollbar from 'perfect-scrollbar';
 import { TabBar, Title, Widget } from '@phosphor/widgets';
 import { VirtualElement, h, VirtualDOM, ElementInlineStyle } from '@phosphor/virtualdom';
-import { Disposable, DisposableCollection, MenuPath, notEmpty, SelectionService, CommandService, nls } from '../../common';
+import { Disposable, DisposableCollection, MenuPath, notEmpty, SelectionService, CommandService, nls, ArrayUtils } from '../../common';
 import { ContextMenuRenderer } from '../context-menu-renderer';
 import { Signal, Slot } from '@phosphor/signaling';
 import { Message, MessageLoop } from '@phosphor/messaging';
@@ -39,6 +39,7 @@ import { SelectComponent } from '../widgets/select-component';
 import { createElement } from 'react';
 import { PreviewableWidget } from '../widgets/previewable-widget';
 import { EnhancedPreviewWidget } from '../widgets/enhanced-preview-widget';
+import { ContextKeyService } from '../context-key-service';
 
 /** The class name added to hidden content nodes, which are required to render vertical side bars. */
 const HIDDEN_CONTENT_CLASS = 'theia-TabBar-hidden-content';
@@ -102,7 +103,8 @@ export class TabBarRenderer extends TabBar.Renderer {
         protected readonly selectionService?: SelectionService,
         protected readonly commandService?: CommandService,
         protected readonly corePreferences?: CorePreferences,
-        protected readonly hoverService?: HoverService
+        protected readonly hoverService?: HoverService,
+        protected readonly contextKeyService?: ContextKeyService,
     ) {
         super();
         if (this.decoratorService) {
@@ -170,8 +172,8 @@ export class TabBarRenderer extends TabBar.Renderer {
         const hover = this.tabBar && (this.tabBar.orientation === 'horizontal' && this.corePreferences?.['window.tabbar.enhancedPreview'] === 'classic')
             ? { title: title.caption }
             : {
-            onmouseenter: this.handleMouseEnterEvent
-        };
+                onmouseenter: this.handleMouseEnterEvent
+            };
 
         return h.li(
             {
@@ -188,6 +190,7 @@ export class TabBarRenderer extends TabBar.Renderer {
                 { className: 'theia-tab-icon-label' },
                 this.renderIcon(data, isInSidePanel),
                 this.renderLabel(data, isInSidePanel),
+                this.renderTailDecorations(data, isInSidePanel),
                 this.renderBadge(data, isInSidePanel),
                 this.renderLock(data, isInSidePanel)
             ),
@@ -289,6 +292,37 @@ export class TabBarRenderer extends TabBar.Renderer {
         return h.div({ className: 'p-TabBar-tabLabel', style }, data.title.label);
     }
 
+    protected renderTailDecorations(renderData: SideBarRenderData, isInSidePanel?: boolean): VirtualElement[] {
+        if (!this.corePreferences?.get('workbench.editor.decorations.badges')) {
+            return [];
+        }
+        const tailDecorations = ArrayUtils.coalesce(this.getDecorationData(renderData.title, 'tailDecorations')).flat();
+        if (tailDecorations === undefined || tailDecorations.length === 0) {
+            return [];
+        }
+        let dotDecoration: WidgetDecoration.TailDecoration.AnyPartial | undefined;
+        const otherDecorations: WidgetDecoration.TailDecoration.AnyPartial[] = [];
+        tailDecorations.reverse().forEach(decoration => {
+            const partial = decoration as WidgetDecoration.TailDecoration.AnyPartial;
+            if (WidgetDecoration.TailDecoration.isDotDecoration(partial)) {
+                dotDecoration ||= partial;
+            } else if (partial.data || partial.icon || partial.iconClass) {
+                otherDecorations.push(partial);
+            }
+        });
+        const decorationsToRender = dotDecoration ? [dotDecoration, ...otherDecorations] : otherDecorations;
+        return decorationsToRender.map((decoration, index) => {
+            const { tooltip, data, fontData, color, icon, iconClass } = decoration;
+            const iconToRender = icon ?? iconClass;
+            const className = ['p-TabBar-tail', 'flex'].join(' ');
+            const style = fontData ? fontData : color ? { color } : undefined;
+            const content = (data ? data : iconToRender
+                ? h.span({ className: this.getIconClass(iconToRender, iconToRender === 'circle' ? [WidgetDecoration.Styles.DECORATOR_SIZE_CLASS] : []) })
+                : '') + (index !== decorationsToRender.length - 1 ? ',' : '');
+            return h.span({ key: ('tailDecoration_' + index), className, style, title: tooltip ?? content }, content);
+        });
+    }
+
     renderBadge(data: SideBarRenderData, isInSidePanel?: boolean): VirtualElement {
         const totalBadge = this.getDecorationData(data.title, 'badge').reduce((sum, badge) => sum! + badge!, 0);
         if (!totalBadge) {
@@ -614,10 +648,12 @@ export class TabBarRenderer extends TabBar.Renderer {
                 this.selectionService.selection = NavigatableWidget.is(widget) ? { uri: widget.getResourceUri() } : widget;
             }
 
+            const contextKeyServiceOverlay = this.contextKeyService?.createOverlay([['isTerminalTab', widget && 'terminalId' in widget]]);
             this.contextMenuRenderer.render({
                 menuPath: this.contextMenuPath!,
                 anchor: event,
                 args: [event],
+                contextKeyService: contextKeyServiceOverlay,
                 // We'd like to wait until the command triggered by the context menu has been run, but this should let it get through the preamble, at least.
                 onHide: () => setTimeout(() => { if (this.selectionService) { this.selectionService.selection = oldSelection; } })
             });
@@ -967,7 +1003,7 @@ export class ToolbarAwareTabBar extends ScrollableTabBar {
 
     protected override onBeforeDetach(msg: Message): void {
         if (this.toolbar && this.toolbar.isAttached) {
-            Widget.detach(this.toolbar);
+            this.toolbar.dispose();
         }
         super.onBeforeDetach(msg);
     }