@codingame/monaco-vscode-xterm-addons-common 36.2.7 → 37.1.0

package/vscode/src/vs/workbench/contrib/git/common/utils.js

@@ -0,0 +1,105 @@
+
+import { equalsIgnoreCase } from '@codingame/monaco-vscode-api/vscode/vs/base/common/strings';
+import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
+
+const DEFAULT_GITHUB_HOSTS = ["github.com", "www.github.com"];
+function getGitHubRemoteInfo(repositoryState, supportedHosts = DEFAULT_GITHUB_HOSTS) {
+    for (const remote of getOrderedRemotes(repositoryState)) {
+        if (remote.fetchUrl) {
+            const repository = getGitHubRepositoryFromRemoteUrl(remote.fetchUrl, supportedHosts);
+            if (repository) {
+                return repository;
+            }
+        }
+    }
+    return undefined;
+}
+function getGitHubRepositoryFromRemoteUrl(remoteUrl, supportedHosts = DEFAULT_GITHUB_HOSTS) {
+    const remote = parseRemoteUrl(remoteUrl);
+    if (!remote) {
+        return undefined;
+    }
+    const host = equalsIgnoreCase(remote.scheme, "ssh") ? remote.host : remote.rawHost;
+    if (!( ( supportedHosts.map(normalizeHost)).some(supportedHost => equalsIgnoreCase(host, supportedHost)))) {
+        return undefined;
+    }
+    const segments = remote.path.replace(/^\/+/, "").replace(/\/+$/, "").replace(/\.git$/i, "").split("/");
+    return segments.length === 2 && segments[0] && segments[1] ? {
+        owner: segments[0],
+        repo: segments[1]
+    } : undefined;
+}
+function normalizeHost(host) {
+    return host.trim().replace(/:\d+$/, "");
+}
+function getOrderedRemotes(repositoryState) {
+    if (repositoryState.remotes.length < 2) {
+        return repositoryState.remotes;
+    }
+    const remotes = ( new Map());
+    const remoteIndex = repositoryState.remotes.findIndex(r => r.name === repositoryState.HEAD?.upstream?.remote);
+    if (remoteIndex !== -1) {
+        const fetchUrl = repositoryState.remotes[remoteIndex].fetchUrl;
+        if (fetchUrl) {
+            remotes.set(
+                repositoryState.remotes[remoteIndex].name,
+                repositoryState.remotes[remoteIndex]
+            );
+        }
+    }
+    const originIndex = repositoryState.remotes.findIndex(r => r.name === "origin");
+    if (originIndex !== -1) {
+        const fetchUrl = repositoryState.remotes[originIndex].fetchUrl;
+        if (fetchUrl) {
+            remotes.set(
+                repositoryState.remotes[originIndex].name,
+                repositoryState.remotes[originIndex]
+            );
+        }
+    }
+    for (const remote of repositoryState.remotes) {
+        if (!( remotes.has(remote.name))) {
+            remotes.set(remote.name, remote);
+        }
+    }
+    return Array.from(( remotes.values()));
+}
+function parseRemoteUrl(fetchUrl) {
+    fetchUrl = fetchUrl.trim();
+    try {
+        if (/^[\w\d\-]+@/i.test(fetchUrl)) {
+            const parts = fetchUrl.split(":");
+            if (parts.length !== 2) {
+                return undefined;
+            }
+            fetchUrl = "ssh://" + parts[0] + "/" + parts[1];
+        }
+        const repoUrl = ( URI.parse(fetchUrl));
+        const authority = repoUrl.authority;
+        const path = repoUrl.path;
+        if (!(equalsIgnoreCase(repoUrl.scheme, "ssh") || equalsIgnoreCase(repoUrl.scheme, "https") || equalsIgnoreCase(repoUrl.scheme, "http"))) {
+            return;
+        }
+        const splitAuthority = authority.split("@");
+        if (splitAuthority.length > 2) {
+            return undefined;
+        }
+        const extractedHost = splitAuthority.at(-1);
+        if (!extractedHost) {
+            return;
+        }
+        const rawHost = extractedHost.toLowerCase().replace(/:\d+$/, "");
+        const normalizedHost =
+        rawHost.replace(/^[\w\-]+-/, "").replace(/-[\w\-]+$/, "");
+        return {
+            scheme: repoUrl.scheme,
+            host: normalizedHost,
+            rawHost,
+            path: path
+        };
+    } catch (err) {
+        return undefined;
+    }
+}
+
+export { getGitHubRemoteInfo, getGitHubRepositoryFromRemoteUrl };

package/vscode/src/vs/workbench/contrib/terminal/browser/xterm/decorationAddon.d.ts

@@ -12,7 +12,6 @@ import { IQuickInputService } from "@codingame/monaco-vscode-api/vscode/vs/platf
 import { IMarkProperties, ITerminalCapabilityStore, ITerminalCommand } from "@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/capabilities/capabilities";
 import { type IDecorationAddon } from "@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/terminal";
 import { IThemeService } from "@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service";
-import { ILifecycleService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle.service";
 import { IHoverService } from "@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service";
 import { IChatContextPickService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/attachments/chatContextPickService.service";
 import { IChatWidgetService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service";
@@ -50,7 +49,7 @@ export declare class DecorationAddon extends Disposable implements ITerminalAddo
     readonly onDidRequestCopyAsHtml: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<{
         command: ITerminalCommand;
     }>;
-    constructor(_resource: URI | undefined, _capabilities: ITerminalCapabilityStore, _clipboardService: IClipboardService, _contextMenuService: IContextMenuService, _configurationService: IConfigurationService, _themeService: IThemeService, _openerService: IOpenerService, _quickInputService: IQuickInputService, lifecycleService: ILifecycleService, _commandService: ICommandService, _accessibilitySignalService: IAccessibilitySignalService, _notificationService: INotificationService, _hoverService: IHoverService, _contextPickService: IChatContextPickService, _chatWidgetService: IChatWidgetService, _instantiationService: IInstantiationService);
+    constructor(_resource: URI | undefined, _capabilities: ITerminalCapabilityStore, _clipboardService: IClipboardService, _contextMenuService: IContextMenuService, _configurationService: IConfigurationService, _themeService: IThemeService, _openerService: IOpenerService, _quickInputService: IQuickInputService, _commandService: ICommandService, _accessibilitySignalService: IAccessibilitySignalService, _notificationService: INotificationService, _hoverService: IHoverService, _contextPickService: IChatContextPickService, _chatWidgetService: IChatWidgetService, _instantiationService: IInstantiationService);
     private _createCapabilityDisposables;
     private _removeCapabilityDisposables;
     registerMarkDecoration(mark: IMarkProperties): IDecoration | undefined;

package/vscode/src/vs/workbench/contrib/terminal/browser/xterm/decorationAddon.js

@@ -22,7 +22,6 @@ import { IThemeService } from '@codingame/monaco-vscode-api/vscode/vs/platform/t
 import { terminalDecorationMark } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminalIcons';
 import { DecorationSelector, updateLayout, getTerminalDecorationHoverContent, getTerminalCommandDecorationState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/xterm/decorationStyles';
 import { TERMINAL_COMMAND_DECORATION_DEFAULT_BACKGROUND_COLOR, TERMINAL_COMMAND_DECORATION_ERROR_BACKGROUND_COLOR, TERMINAL_COMMAND_DECORATION_SUCCESS_BACKGROUND_COLOR } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/common/terminalColorRegistry';
-import { ILifecycleService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle.service';
 import { IHoverService } from '@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service';
 import { MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
 import { IChatContextPickService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/attachments/chatContextPickService.service';
@@ -44,7 +43,6 @@ let DecorationAddon = class DecorationAddon extends Disposable {
         _themeService,
         _openerService,
         _quickInputService,
-        lifecycleService,
         _commandService,
         _accessibilitySignalService,
         _notificationService,
@@ -95,7 +93,6 @@ let DecorationAddon = class DecorationAddon extends Disposable {
         this._register(
             this._capabilities.onDidRemoveCapability(c => this._removeCapabilityDisposables(c.id))
         );
-        this._register(lifecycleService.onWillShutdown(() => this._disposeAllDecorations()));
     }
     _createCapabilityDisposables(c) {
         const capability = this._capabilities.get(c);
@@ -306,7 +303,13 @@ let DecorationAddon = class DecorationAddon extends Disposable {
                 return;
             }
             if (!this._decorations.get(decoration.marker.id)) {
-                decoration.onDispose(() => this._decorations.delete(decoration.marker.id));
+                decoration.onDispose(() => {
+                    const disposableDecoration = this._decorations.get(decoration.marker.id);
+                    if (disposableDecoration) {
+                        dispose(disposableDecoration.disposables);
+                        this._decorations.delete(decoration.marker.id);
+                    }
+                });
                 this._decorations.set(decoration.marker.id, {
                     decoration,
                     disposables: this._createDisposables(element, command, markProperties),
@@ -410,7 +413,7 @@ let DecorationAddon = class DecorationAddon extends Disposable {
         })];
     }
     _getContextMenuActions() {
-        const label = ( localize(14932, "Toggle Visibility"));
+        const label = ( localize(16997, "Toggle Visibility"));
         return [{
             class: undefined,
             tooltip: label,
@@ -433,7 +436,7 @@ let DecorationAddon = class DecorationAddon extends Disposable {
             actions.push(attachToChatAction, ( new Separator()));
         }
         if (command.command !== "") {
-            const labelRun = ( localize(14933, "Rerun Command"));
+            const labelRun = ( localize(16998, "Rerun Command"));
             actions.push({
                 class: undefined,
                 tooltip: labelRun,
@@ -446,11 +449,11 @@ let DecorationAddon = class DecorationAddon extends Disposable {
                     }
                     if (!command.isTrusted) {
                         const shouldRun = await ( new Promise(r => {
-                            this._notificationService.prompt(Severity.Info, ( localize(14934, "Do you want to run the command: {0}", command.command)), [{
-                                label: ( localize(14935, "Yes")),
+                            this._notificationService.prompt(Severity.Info, ( localize(16999, "Do you want to run the command: {0}", command.command)), [{
+                                label: ( localize(17000, "Yes")),
                                 run: () => r(true)
                             }, {
-                                label: ( localize(14936, "No")),
+                                label: ( localize(17001, "No")),
                                 run: () => r(false)
                             }]);
                         }));
@@ -464,7 +467,7 @@ let DecorationAddon = class DecorationAddon extends Disposable {
                 }
             });
             actions.push(( new Separator()));
-            const labelCopy = ( localize(14937, "Copy Command"));
+            const labelCopy = ( localize(17002, "Copy Command"));
             actions.push({
                 class: undefined,
                 tooltip: labelCopy,
@@ -475,7 +478,7 @@ let DecorationAddon = class DecorationAddon extends Disposable {
             });
         }
         if (command.hasOutput()) {
-            const labelCopyCommandAndOutput = ( localize(14938, "Copy Command and Output"));
+            const labelCopyCommandAndOutput = ( localize(17003, "Copy Command and Output"));
             actions.push({
                 class: undefined,
                 tooltip: labelCopyCommandAndOutput,
@@ -489,7 +492,7 @@ let DecorationAddon = class DecorationAddon extends Disposable {
                     }
                 }
             });
-            const labelText = ( localize(14939, "Copy Output"));
+            const labelText = ( localize(17004, "Copy Output"));
             actions.push({
                 class: undefined,
                 tooltip: labelText,
@@ -503,7 +506,7 @@ let DecorationAddon = class DecorationAddon extends Disposable {
                     }
                 }
             });
-            const labelHtml = ( localize(14940, "Copy Output as HTML"));
+            const labelHtml = ( localize(17005, "Copy Output as HTML"));
             actions.push({
                 class: undefined,
                 tooltip: labelHtml,
@@ -518,7 +521,7 @@ let DecorationAddon = class DecorationAddon extends Disposable {
         if (actions.length > 0) {
             actions.push(( new Separator()));
         }
-        const labelRunRecent = ( localize(14941, "Run Recent Command"));
+        const labelRunRecent = ( localize(17006, "Run Recent Command"));
         actions.push({
             class: undefined,
             tooltip: labelRunRecent,
@@ -527,7 +530,7 @@ let DecorationAddon = class DecorationAddon extends Disposable {
             enabled: true,
             run: () => this._commandService.executeCommand("workbench.action.terminal.runRecentCommand")
         });
-        const labelGoToRecent = ( localize(14942, "Go To Recent Directory"));
+        const labelGoToRecent = ( localize(17007, "Go To Recent Directory"));
         actions.push({
             class: undefined,
             tooltip: labelRunRecent,
@@ -537,7 +540,7 @@ let DecorationAddon = class DecorationAddon extends Disposable {
             run: () => this._commandService.executeCommand("workbench.action.terminal.goToRecentDirectory")
         });
         actions.push(( new Separator()));
-        const labelAbout = ( localize(14943, "Learn About Shell Integration"));
+        const labelAbout = ( localize(17008, "Learn About Shell Integration"));
         actions.push({
             class: undefined,
             tooltip: labelAbout,
@@ -553,7 +556,7 @@ let DecorationAddon = class DecorationAddon extends Disposable {
         if (!chatIsEnabled) {
             return undefined;
         }
-        const labelAttachToChat = ( localize(14944, "Attach To Chat"));
+        const labelAttachToChat = ( localize(17009, "Attach To Chat"));
         return {
             class: undefined,
             tooltip: labelAttachToChat,
@@ -595,14 +598,14 @@ let DecorationAddon = class DecorationAddon extends Disposable {
         quickPick.hideInput = true;
         quickPick.hideCheckAll = true;
         quickPick.canSelectMany = true;
-        quickPick.title = ( localize(14945, "Toggle visibility"));
+        quickPick.title = ( localize(17010, "Toggle visibility"));
         const configValue = this._configurationService.getValue(TerminalSettingId.ShellIntegrationDecorationsEnabled);
         const gutterIcon = {
-            label: ( localize(14946, "Gutter command decorations")),
+            label: ( localize(17011, "Gutter command decorations")),
             picked: configValue !== "never" && configValue !== "overviewRuler"
         };
         const overviewRulerIcon = {
-            label: ( localize(14947, "Overview ruler command decorations")),
+            label: ( localize(17012, "Overview ruler command decorations")),
             picked: configValue !== "never" && configValue !== "gutter"
         };
         quickPick.items = [gutterIcon, overviewRulerIcon];
@@ -642,6 +645,6 @@ let DecorationAddon = class DecorationAddon extends Disposable {
         return this._themeService.getColorTheme().getColor(colorId)?.toString();
     }
 };
-DecorationAddon = ( __decorate([( __param(2, IClipboardService)), ( __param(3, IContextMenuService)), ( __param(4, IConfigurationService)), ( __param(5, IThemeService)), ( __param(6, IOpenerService)), ( __param(7, IQuickInputService)), ( __param(8, ILifecycleService)), ( __param(9, ICommandService)), ( __param(10, IAccessibilitySignalService)), ( __param(11, INotificationService)), ( __param(12, IHoverService)), ( __param(13, IChatContextPickService)), ( __param(14, IChatWidgetService)), ( __param(15, IInstantiationService))], DecorationAddon));
+DecorationAddon = ( __decorate([( __param(2, IClipboardService)), ( __param(3, IContextMenuService)), ( __param(4, IConfigurationService)), ( __param(5, IThemeService)), ( __param(6, IOpenerService)), ( __param(7, IQuickInputService)), ( __param(8, ICommandService)), ( __param(9, IAccessibilitySignalService)), ( __param(10, INotificationService)), ( __param(11, IHoverService)), ( __param(12, IChatContextPickService)), ( __param(13, IChatWidgetService)), ( __param(14, IInstantiationService))], DecorationAddon));
 
 export { DecorationAddon };

package/vscode/src/vs/workbench/contrib/terminal/browser/xterm/markNavigationAddon.js

@@ -6,7 +6,6 @@ import { TerminalCapability } from '@codingame/monaco-vscode-api/vscode/vs/platf
 import { timeout } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import { IThemeService } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service';
 import { TERMINAL_OVERVIEW_RULER_CURSOR_FOREGROUND_COLOR } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/common/terminalColorRegistry';
-import { getWindow } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { isFullTerminalCommand } from '@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/capabilities/commandDetection/terminalCommand';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { TerminalContribSettingId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/terminalContribExports';
@@ -52,13 +51,7 @@ let MarkNavigationAddon = class MarkNavigationAddon extends Disposable {
             markers.push(...partialCommandCapability.commands);
         }
         if (markCapability && !skipEmptyCommands) {
-            let next = markCapability.markers().next()?.value;
-            const arr = [];
-            while (next) {
-                arr.push(next);
-                next = markCapability.markers().next()?.value;
-            }
-            markers = arr;
+            markers = [...markCapability.markers()];
         }
         return markers;
     }
@@ -360,9 +353,6 @@ let MarkNavigationAddon = class MarkNavigationAddon extends Disposable {
                     } else {
                         element.classList.add("terminal-scroll-highlight");
                     }
-                    if (this._terminal?.element) {
-                        element.style.marginLeft = `-${getWindow(this._terminal.element).getComputedStyle(this._terminal.element).paddingLeft}`;
-                    }
                 });
                 decoration.onDispose(() => {
                     this._navigationDecorations = this._navigationDecorations?.filter(d => d !== decoration);

package/vscode/src/vs/workbench/contrib/terminal/browser/xterm/xtermTerminal.d.ts

@@ -22,6 +22,7 @@ import { IAccessibilitySignalService } from "@codingame/monaco-vscode-api/vscode
 import { XtermAddonImporter } from "./xtermAddonImporter.js";
 import type { IProgressState } from "@xterm/addon-progress";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
+import { ILifecycleService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle.service";
 export interface IXtermTerminalOptions {
     /** The columns to initialize the terminal with. */
     cols: number;
@@ -69,6 +70,7 @@ export declare class XtermTerminal extends Disposable implements IXtermTerminal,
     private readonly _xtermAddonLoader;
     private readonly _xtermColorProvider;
     private readonly _capabilities;
+    private readonly _disableOverviewRuler;
     private static _suggestedRendererType;
     private _attached?;
     private _isPhysicalMouseWheel;
@@ -85,7 +87,10 @@ export declare class XtermTerminal extends Disposable implements IXtermTerminal,
     private _searchAddon?;
     private _unicode11Addon?;
     private _webglAddon?;
+    private readonly _webglContextLossListener;
     private _webglAddonCustomGlyphs?;
+    private _webglAddonLoading;
+    private _webglAddonLoadId;
     private _serializeAddon?;
     private _imageAddon?;
     private readonly _ligaturesAddon;
@@ -138,7 +143,7 @@ export declare class XtermTerminal extends Disposable implements IXtermTerminal,
      * @param xtermCtor The xterm.js constructor, this is passed in so it can be fetched lazily
      * outside of this class such that {@link raw} is not nullable.
      */
-    constructor(resource: URI | undefined, xtermCtor: typeof RawXtermTerminal, options: IXtermTerminalOptions, _onDidExecuteText: Event<void> | undefined, _configurationService: IConfigurationService, _instantiationService: IInstantiationService, _logService: ITerminalLogService, _notificationService: INotificationService, _themeService: IThemeService, _telemetryService: ITelemetryService, _terminalConfigurationService: ITerminalConfigurationService, _clipboardService: IClipboardService, contextKeyService: IContextKeyService, _accessibilitySignalService: IAccessibilitySignalService, layoutService: ILayoutService);
+    constructor(resource: URI | undefined, xtermCtor: typeof RawXtermTerminal, options: IXtermTerminalOptions, _onDidExecuteText: Event<void> | undefined, _configurationService: IConfigurationService, _instantiationService: IInstantiationService, _logService: ITerminalLogService, _notificationService: INotificationService, _themeService: IThemeService, _telemetryService: ITelemetryService, _terminalConfigurationService: ITerminalConfigurationService, _clipboardService: IClipboardService, contextKeyService: IContextKeyService, _accessibilitySignalService: IAccessibilitySignalService, lifecycleService: ILifecycleService, layoutService: ILayoutService);
     getBufferReverseIterator(): IterableIterator<string>;
     getContentsAsText(startMarker?: IXtermMarker, endMarker?: IXtermMarker): string;
     getContentsAsHtml(): Promise<string>;
@@ -152,6 +157,16 @@ export declare class XtermTerminal extends Disposable implements IXtermTerminal,
     write(data: string | Uint8Array, callback?: () => void): void;
     resize(columns: number, rows: number): void;
     updateLogLevel(): void;
+    /**
+     * The width, in pixels, of the vertical scrollbar. Narrower under the Modern
+     * UI Update experiment so it matches the modernized workbench scrollbars.
+     */
+    get scrollbarWidth(): number;
+    /**
+     * Builds the xterm.js `scrollbar` option using {@link scrollbarWidth}. Returns
+     * `undefined` when the overview ruler is disabled (e.g. detached terminals).
+     */
+    private _getScrollbarOptions;
     updateConfig(): void;
     private _updateSmoothScrolling;
     private _shouldLoadWebgl;

package/vscode/src/vs/workbench/contrib/terminal/browser/xterm/xtermTerminal.js

@@ -44,12 +44,19 @@ import { XtermAddonImporter } from './xtermAddonImporter.js';
 import { equals } from '@codingame/monaco-vscode-api/vscode/vs/base/common/objects';
 import { isNumber } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
 import { clamp } from '@codingame/monaco-vscode-api/vscode/vs/base/common/numbers';
+import { LayoutSettings } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService';
+import { ILifecycleService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle.service';
 
 var XtermTerminal_1;
 var RenderConstants;
 (function(RenderConstants) {
     RenderConstants[RenderConstants["SmoothScrollDuration"] = 125] = "SmoothScrollDuration";
 })(RenderConstants || (RenderConstants = {}));
+var TerminalScrollbarWidth;
+(function(TerminalScrollbarWidth) {
+    TerminalScrollbarWidth[TerminalScrollbarWidth["Default"] = 14] = "Default";
+    TerminalScrollbarWidth[TerminalScrollbarWidth["ModernUI"] = 10] = "ModernUI";
+})(TerminalScrollbarWidth || (TerminalScrollbarWidth = {}));
 var TextBlinkConstants;
 (function(TextBlinkConstants) {
     TextBlinkConstants[TextBlinkConstants["IntervalDuration"] = 600] = "IntervalDuration";
@@ -143,6 +150,7 @@ let XtermTerminal = class XtermTerminal extends Disposable {
         _clipboardService,
         contextKeyService,
         _accessibilitySignalService,
+        lifecycleService,
         layoutService
     ) {
         super();
@@ -161,7 +169,9 @@ let XtermTerminal = class XtermTerminal extends Disposable {
             state: 0,
             value: 0
         };
-        this._webglAddonCustomGlyphs = false;
+        this._webglContextLossListener = this._register(( new MutableDisposable()));
+        this._webglAddonLoading = false;
+        this._webglAddonLoadId = 0;
         this._ligaturesAddon = this._register(( new MutableDisposable()));
         this._attachedDisposables = this._register(( new DisposableStore()));
         this._onDidRequestRunCommand = this._register(( new Emitter()));
@@ -187,6 +197,7 @@ let XtermTerminal = class XtermTerminal extends Disposable {
         this._xtermAddonLoader = options.xtermAddonImporter ?? ( new XtermAddonImporter());
         this._xtermColorProvider = options.xtermColorProvider;
         this._capabilities = options.capabilities;
+        this._disableOverviewRuler = options.disableOverviewRuler ?? false;
         const font = this._terminalConfigurationService.getFont(getActiveWindow(), undefined, true);
         const config = this._terminalConfigurationService.config;
         const editorOptions = this._configurationService.getValue("editor");
@@ -221,12 +232,7 @@ let XtermTerminal = class XtermTerminal extends Disposable {
             scrollSensitivity: config.mouseWheelScrollSensitivity,
             scrollOnEraseInDisplay: true,
             wordSeparator: config.wordSeparators,
-            scrollbar: options.disableOverviewRuler ? undefined : {
-                width: 14,
-                overviewRuler: {
-                    showTopBorder: true
-                }
-            },
+            scrollbar: this._getScrollbarOptions(),
             ignoreBracketedPasteMode: config.ignoreBracketedPasteMode,
             rescaleOverlappingGlyphs: config.rescaleOverlappingGlyphs,
             vtExtensions: {
@@ -247,7 +253,7 @@ let XtermTerminal = class XtermTerminal extends Disposable {
                 if (e.affectsConfiguration(TerminalSettingId.GpuAcceleration)) {
                     XtermTerminal_1._suggestedRendererType = undefined;
                 }
-                if (e.affectsConfiguration("terminal.integrated") || e.affectsConfiguration("editor.fastScrollSensitivity") || e.affectsConfiguration("editor.mouseWheelScrollSensitivity") || e.affectsConfiguration("editor.multiCursorModifier")) {
+                if (e.affectsConfiguration("terminal.integrated") || e.affectsConfiguration("editor.fastScrollSensitivity") || e.affectsConfiguration("editor.mouseWheelScrollSensitivity") || e.affectsConfiguration("editor.multiCursorModifier") || e.affectsConfiguration(LayoutSettings.MODERN_UI)) {
                     this.updateConfig();
                 }
                 if (e.affectsConfiguration(TerminalSettingId.UnicodeVersion)) {
@@ -282,6 +288,11 @@ let XtermTerminal = class XtermTerminal extends Disposable {
             this._decorationAddon.onDidRequestCopyAsHtml(e => this._onDidRequestCopyAsHtml.fire(e))
         );
         this.raw.loadAddon(this._decorationAddon);
+        if (!options.detached) {
+            this._register(
+                lifecycleService.onWillShutdown(() => this._decorationAddon.clearDecorations())
+            );
+        }
         this._shellIntegrationAddon = ( new ShellIntegrationAddon(
             options.shellIntegrationNonce ?? "",
             options.disableShellIntegrationReporting,
@@ -523,6 +534,20 @@ let XtermTerminal = class XtermTerminal extends Disposable {
     updateLogLevel() {
         this.raw.options.logLevel = vscodeToXtermLogLevel(this._logService.getLevel());
     }
+    get scrollbarWidth() {
+        return this._configurationService.getValue(LayoutSettings.MODERN_UI) === true ? TerminalScrollbarWidth.ModernUI : TerminalScrollbarWidth.Default;
+    }
+    _getScrollbarOptions() {
+        if (this._disableOverviewRuler) {
+            return undefined;
+        }
+        return {
+            width: this.scrollbarWidth,
+            overviewRuler: {
+                showTopBorder: true
+            }
+        };
+    }
     updateConfig() {
         const config = this._terminalConfigurationService.config;
         this.raw.options.altClickMovesCursor = config.altClickMovesCursor;
@@ -543,6 +568,7 @@ let XtermTerminal = class XtermTerminal extends Disposable {
         this.raw.options.macOptionClickForcesSelection = config.macOptionClickForcesSelection;
         this.raw.options.rightClickSelectsWord = config.rightClickBehavior === "selectWord";
         this.raw.options.wordSeparator = config.wordSeparators;
+        this.raw.options.scrollbar = this._getScrollbarOptions();
         this.raw.options.ignoreBracketedPasteMode = config.ignoreBracketedPasteMode;
         this.raw.options.rescaleOverlappingGlyphs = config.rescaleOverlappingGlyphs;
         this.raw.options.allowTransparency = config.enableImages;
@@ -752,7 +778,7 @@ let XtermTerminal = class XtermTerminal extends Disposable {
                 await this._clipboardService.writeText(this.raw.getSelection());
             }
         } else {
-            this._notificationService.warn(( localize(14958, "The terminal has no selection to copy")));
+            this._notificationService.warn(( localize(17023, "The terminal has no selection to copy")));
         }
     }
     _setCursorBlink(blink) {
@@ -786,23 +812,52 @@ let XtermTerminal = class XtermTerminal extends Disposable {
         }
     }
     async _enableWebglRenderer() {
-        if (!this.raw.element || this._webglAddon && this._webglAddonCustomGlyphs === this._terminalConfigurationService.config.customGlyphs) {
+        if (!this.raw.element) {
+            return;
+        }
+        const customGlyphs = this._terminalConfigurationService.config.customGlyphs;
+        if ((this._webglAddon || this._webglAddonLoading) && this._webglAddonCustomGlyphs === customGlyphs) {
             return;
         }
         this._disposeOfWebglRenderer();
-        this._webglAddonCustomGlyphs = this._terminalConfigurationService.config.customGlyphs;
-        const Addon = await this._xtermAddonLoader.importAddon("webgl");
+        const loadId = this._webglAddonLoadId;
+        this._webglAddonLoading = true;
+        this._webglAddonCustomGlyphs = customGlyphs;
+        let Addon;
+        try {
+            Addon = await this._xtermAddonLoader.importAddon("webgl");
+        } catch (error) {
+            if (loadId === this._webglAddonLoadId) {
+                this._webglAddonLoading = false;
+                this._webglAddonCustomGlyphs = undefined;
+            }
+            throw error;
+        }
+        if (loadId !== this._webglAddonLoadId) {
+            return;
+        }
+        this._webglAddonLoading = false;
+        if (!this.raw.element) {
+            this._webglAddonCustomGlyphs = undefined;
+            return;
+        }
+        const currentCustomGlyphs = this._terminalConfigurationService.config.customGlyphs;
+        if (customGlyphs !== currentCustomGlyphs) {
+            this._webglAddonCustomGlyphs = undefined;
+            await this._enableWebglRenderer();
+            return;
+        }
         this._webglAddon = ( new Addon({
-            customGlyphs: this._terminalConfigurationService.config.customGlyphs,
+            customGlyphs,
             preserveDrawingBuffer: this._terminalConfigurationService.config.preserveDrawingBuffer
         }));
         try {
             this.raw.loadAddon(this._webglAddon);
             this._logService.trace("Webgl was loaded");
-            this._store.add(this._webglAddon.onContextLoss(() => {
+            this._webglContextLossListener.value = this._webglAddon.onContextLoss(() => {
                 this._logService.info(`Webgl lost context, disposing of webgl renderer`);
                 this._disposeOfWebglRenderer();
-            }));
+            });
             this._refreshImageAddon();
             this._onDidRequestRefreshDimensions.fire();
         } catch (e) {
@@ -868,6 +923,10 @@ let XtermTerminal = class XtermTerminal extends Disposable {
         }
     }
     _disposeOfWebglRenderer() {
+        this._webglAddonLoadId++;
+        this._webglAddonLoading = false;
+        this._webglAddonCustomGlyphs = undefined;
+        this._webglContextLossListener.clear();
         if (!this._webglAddon) {
             return;
         }
@@ -875,7 +934,6 @@ let XtermTerminal = class XtermTerminal extends Disposable {
             this._webglAddon?.dispose();
         } catch {}
         this._webglAddon = undefined;
-        this._webglAddonCustomGlyphs = undefined;
         this._refreshImageAddon();
         this._onDidRequestRefreshDimensions.fire();
     }
@@ -983,7 +1041,7 @@ let XtermTerminal = class XtermTerminal extends Disposable {
 };
 XtermTerminal.__decorator = ( __decorate([debounce(100)], XtermTerminal.prototype, "_refreshLigaturesAddon", null));
 XtermTerminal.__decorator = ( __decorate([debounce(100)], XtermTerminal.prototype, "_refreshImageAddon", null));
-XtermTerminal = XtermTerminal_1 = ( __decorate([( __param(4, IConfigurationService)), ( __param(5, IInstantiationService)), ( __param(6, ITerminalLogService)), ( __param(7, INotificationService)), ( __param(8, IThemeService)), ( __param(9, ITelemetryService)), ( __param(10, ITerminalConfigurationService)), ( __param(11, IClipboardService)), ( __param(12, IContextKeyService)), ( __param(13, IAccessibilitySignalService)), ( __param(14, ILayoutService))], XtermTerminal));
+XtermTerminal = XtermTerminal_1 = ( __decorate([( __param(4, IConfigurationService)), ( __param(5, IInstantiationService)), ( __param(6, ITerminalLogService)), ( __param(7, INotificationService)), ( __param(8, IThemeService)), ( __param(9, ITelemetryService)), ( __param(10, ITerminalConfigurationService)), ( __param(11, IClipboardService)), ( __param(12, IContextKeyService)), ( __param(13, IAccessibilitySignalService)), ( __param(14, ILifecycleService)), ( __param(15, ILayoutService))], XtermTerminal));
 function getXtermScaledDimensions(w, font, width, height) {
     if (!font.charWidth || !font.charHeight) {
         return null;