@codingame/monaco-vscode-api 1.83.16 → 1.85.0-next.0

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

@@ -1,9 +1,10 @@
 import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
 import { coalesce } from 'monaco-editor/esm/vs/base/common/arrays.js';
-import { Disposable, dispose } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
+import { Disposable, MutableDisposable, dispose, DisposableStore } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
 import { timeout } from 'monaco-editor/esm/vs/base/common/async.js';
 import { IThemeService } from 'monaco-editor/esm/vs/platform/theme/common/themeService.js';
 import { TERMINAL_OVERVIEW_RULER_CURSOR_FOREGROUND_COLOR } from '../../common/terminalColorRegistry.js';
+import { getWindow } from 'monaco-editor/esm/vs/base/browser/dom.js';
 var Boundary;
 ( (function(Boundary) {
     Boundary[Boundary["Top"] = 0] = "Top";
@@ -23,6 +24,7 @@ let MarkNavigationAddon = class MarkNavigationAddon extends Disposable {
         this._currentMarker = Boundary.Bottom;
         this._selectionStart = null;
         this._isDisposable = false;
+        this._commandGuideDecorations = this._register(( new MutableDisposable()));
     }
     _getMarkers(skipEmptyCommands) {
         const commandCapability = this._capabilities.get(2 );
@@ -30,7 +32,10 @@ let MarkNavigationAddon = class MarkNavigationAddon extends Disposable {
         const markCapability = this._capabilities.get(4 );
         let markers = [];
         if (commandCapability) {
-            markers = coalesce(( commandCapability.commands.map(e => e.marker)));
+            markers = coalesce(( commandCapability.commands.filter(e => skipEmptyCommands ? e.exitCode !== undefined : true).map(e => e.promptStartMarker ?? e.marker)));
+            if (commandCapability.currentCommand?.promptStartMarker && commandCapability.currentCommand.commandExecutedMarker) {
+                markers.push(commandCapability.currentCommand?.promptStartMarker);
+            }
         }
         else if (partialCommandCapability) {
             markers.push(...partialCommandCapability.commands);
@@ -46,6 +51,19 @@ let MarkNavigationAddon = class MarkNavigationAddon extends Disposable {
         }
         return markers;
     }
+    _findCommand(marker) {
+        const commandCapability = this._capabilities.get(2 );
+        if (commandCapability) {
+            const command = commandCapability.commands.find(e => e.marker?.line === marker.line || e.promptStartMarker?.line === marker.line);
+            if (command) {
+                return command;
+            }
+            if (commandCapability.currentCommand) {
+                return commandCapability.currentCommand;
+            }
+        }
+        return undefined;
+    }
     clearMarker() {
         this._currentMarker = Boundary.Bottom;
         this._resetNavigationDecorations();
@@ -66,7 +84,7 @@ let MarkNavigationAddon = class MarkNavigationAddon extends Disposable {
         }
         return !this._getMarkers(true).includes(marker);
     }
-    scrollToPreviousMark(scrollPosition = 1 , retainSelection = false, skipEmptyCommands = false) {
+    scrollToPreviousMark(scrollPosition = 1 , retainSelection = false, skipEmptyCommands = true) {
         if (!this._terminal) {
             return;
         }
@@ -75,7 +93,7 @@ let MarkNavigationAddon = class MarkNavigationAddon extends Disposable {
         }
         let markerIndex;
         const currentLineY = typeof this._currentMarker === 'object'
-            ? this._getTargetScrollLine(this._terminal, this._currentMarker, scrollPosition)
+            ? this.getTargetScrollLine(this._currentMarker.line, scrollPosition)
             : Math.min(getLine(this._terminal, this._currentMarker), this._terminal.buffer.active.baseY);
         const viewportY = this._terminal.buffer.active.viewportY;
         if (typeof this._currentMarker === 'object' ? !this._isMarkerInViewport(this._terminal, this._currentMarker) : currentLineY !== viewportY) {
@@ -89,13 +107,13 @@ let MarkNavigationAddon = class MarkNavigationAddon extends Disposable {
             markerIndex = -1;
         }
         else if (this._isDisposable) {
-            markerIndex = this._findPreviousMarker(this._terminal, skipEmptyCommands);
+            markerIndex = this._findPreviousMarker(skipEmptyCommands);
             this._currentMarker.dispose();
             this._isDisposable = false;
         }
         else {
             if (skipEmptyCommands && this._isEmptyCommand(this._currentMarker)) {
-                markerIndex = this._findPreviousMarker(this._terminal, true);
+                markerIndex = this._findPreviousMarker(true);
             }
             else {
                 markerIndex = this._getMarkers(skipEmptyCommands).indexOf(this._currentMarker) - 1;
@@ -108,7 +126,7 @@ let MarkNavigationAddon = class MarkNavigationAddon extends Disposable {
             return;
         }
         this._currentMarker = this._getMarkers(skipEmptyCommands)[markerIndex];
-        this._scrollToMarker(this._currentMarker, scrollPosition);
+        this._scrollToCommand(this._currentMarker, scrollPosition);
     }
     scrollToNextMark(scrollPosition = 1 , retainSelection = false, skipEmptyCommands = true) {
         if (!this._terminal) {
@@ -119,7 +137,7 @@ let MarkNavigationAddon = class MarkNavigationAddon extends Disposable {
         }
         let markerIndex;
         const currentLineY = typeof this._currentMarker === 'object'
-            ? this._getTargetScrollLine(this._terminal, this._currentMarker, scrollPosition)
+            ? this.getTargetScrollLine(this._currentMarker.line, scrollPosition)
             : Math.min(getLine(this._terminal, this._currentMarker), this._terminal.buffer.active.baseY);
         const viewportY = this._terminal.buffer.active.viewportY;
         if (typeof this._currentMarker === 'object' ? !this._isMarkerInViewport(this._terminal, this._currentMarker) : currentLineY !== viewportY) {
@@ -133,13 +151,13 @@ let MarkNavigationAddon = class MarkNavigationAddon extends Disposable {
             markerIndex = 0;
         }
         else if (this._isDisposable) {
-            markerIndex = this._findNextMarker(this._terminal, skipEmptyCommands);
+            markerIndex = this._findNextMarker(skipEmptyCommands);
             this._currentMarker.dispose();
             this._isDisposable = false;
         }
         else {
             if (skipEmptyCommands && this._isEmptyCommand(this._currentMarker)) {
-                markerIndex = this._findNextMarker(this._terminal, true);
+                markerIndex = this._findNextMarker(true);
             }
             else {
                 markerIndex = this._getMarkers(skipEmptyCommands).indexOf(this._currentMarker) + 1;
@@ -152,49 +170,114 @@ let MarkNavigationAddon = class MarkNavigationAddon extends Disposable {
             return;
         }
         this._currentMarker = this._getMarkers(skipEmptyCommands)[markerIndex];
-        this._scrollToMarker(this._currentMarker, scrollPosition);
+        this._scrollToCommand(this._currentMarker, scrollPosition);
+    }
+    _scrollToCommand(marker, position) {
+        const command = this._findCommand(marker);
+        if (command) {
+            this.revealCommand(command, position);
+        }
+        else {
+            this._scrollToMarker(marker, position);
+        }
     }
-    _scrollToMarker(marker, position, endMarker, hideDecoration) {
+    _scrollToMarker(start, position, end, hideDecoration) {
         if (!this._terminal) {
             return;
         }
-        if (!this._isMarkerInViewport(this._terminal, marker)) {
-            const line = this._getTargetScrollLine(this._terminal, marker, position);
+        if (!this._isMarkerInViewport(this._terminal, start)) {
+            const line = this.getTargetScrollLine(toLineIndex(start), position);
             this._terminal.scrollToLine(line);
         }
         if (!hideDecoration) {
-            this._registerTemporaryDecoration(marker, endMarker);
+            this.registerTemporaryDecoration(start, end, true);
         }
     }
     _createMarkerForOffset(marker, offset) {
-        if (offset === 0) {
+        if (offset === 0 && isMarker(marker)) {
             return marker;
         }
         else {
-            const offsetMarker = this._terminal?.registerMarker(-this._terminal.buffer.active.cursorY + marker.line - this._terminal.buffer.active.baseY + offset);
+            const offsetMarker = this._terminal?.registerMarker(-this._terminal.buffer.active.cursorY + toLineIndex(marker) - this._terminal.buffer.active.baseY + offset);
             if (offsetMarker) {
                 return offsetMarker;
             }
             else {
-                throw new Error(`Could not register marker with offset ${marker.line}, ${offset}`);
+                throw new Error(`Could not register marker with offset ${toLineIndex(marker)}, ${offset}`);
             }
         }
     }
-    _registerTemporaryDecoration(marker, endMarker) {
+    revealCommand(command, position = 1 ) {
+        const marker = 'getOutput' in command ? command.marker : command.commandStartMarker;
+        if (!this._terminal || !marker) {
+            return;
+        }
+        const line = toLineIndex(marker);
+        const promptRowCount = command.getPromptRowCount();
+        const commandRowCount = command.getCommandRowCount();
+        this._scrollToMarker(line - (promptRowCount - 1), position, line + (commandRowCount - 1));
+    }
+    showCommandGuide(command) {
+        if (!this._terminal) {
+            return;
+        }
+        if (!command) {
+            this._commandGuideDecorations.clear();
+            this._activeCommandGuide = undefined;
+            return;
+        }
+        if (this._activeCommandGuide === command) {
+            return;
+        }
+        if (command.marker) {
+            this._activeCommandGuide = command;
+            const store = this._commandGuideDecorations.value = ( new DisposableStore());
+            if (!command.executedMarker || !command.endMarker) {
+                return;
+            }
+            const startLine = command.marker.line - (command.getPromptRowCount() - 1);
+            const decorationCount = toLineIndex(command.endMarker) - startLine;
+            for (let i = 0; i < decorationCount; i++) {
+                const decoration = this._terminal.registerDecoration({
+                    marker: this._createMarkerForOffset(startLine, i)
+                });
+                if (decoration) {
+                    store.add(decoration);
+                    let renderedElement;
+                    store.add(decoration.onRender(element => {
+                        if (!renderedElement) {
+                            renderedElement = element;
+                            element.classList.add('terminal-command-guide');
+                            if (i === 0) {
+                                element.classList.add('top');
+                            }
+                            if (i === decorationCount - 1) {
+                                element.classList.add('bottom');
+                            }
+                        }
+                        if (this._terminal?.element) {
+                            element.style.marginLeft = `-${getWindow(this._terminal.element).getComputedStyle(this._terminal.element).paddingLeft}`;
+                        }
+                    }));
+                }
+            }
+        }
+    }
+    registerTemporaryDecoration(marker, endMarker, showOutline) {
         if (!this._terminal) {
             return;
         }
         this._resetNavigationDecorations();
         const color = this._themeService.getColorTheme().getColor(TERMINAL_OVERVIEW_RULER_CURSOR_FOREGROUND_COLOR);
-        const startLine = marker.line;
-        const decorationCount = endMarker ? endMarker.line - startLine + 1 : 1;
+        const startLine = toLineIndex(marker);
+        const decorationCount = endMarker ? toLineIndex(endMarker) - startLine + 1 : 1;
         for (let i = 0; i < decorationCount; i++) {
             const decoration = this._terminal.registerDecoration({
                 marker: this._createMarkerForOffset(marker, i),
                 width: this._terminal.cols,
-                overviewRulerOptions: {
+                overviewRulerOptions: i === 0 ? {
                     color: color?.toString() || '#a0a0a0cc'
-                }
+                } : undefined
             });
             if (decoration) {
                 this._navigationDecorations?.push(decoration);
@@ -202,35 +285,48 @@ let MarkNavigationAddon = class MarkNavigationAddon extends Disposable {
                 decoration.onRender(element => {
                     if (!renderedElement) {
                         renderedElement = element;
-                        if (decorationCount > 1) {
-                            element.classList.add('terminal-scroll-highlight');
+                        element.classList.add('terminal-scroll-highlight');
+                        if (showOutline) {
+                            element.classList.add('terminal-scroll-highlight-outline');
                         }
-                        else {
-                            element.classList.add('terminal-scroll-highlight', 'terminal-scroll-highlight-outline');
+                        if (i === 0) {
+                            element.classList.add('top');
                         }
-                        if (this._terminal?.element) {
-                            element.style.marginLeft = `-${getComputedStyle(this._terminal.element).paddingLeft}`;
+                        if (i === decorationCount - 1) {
+                            element.classList.add('bottom');
                         }
                     }
-                });
-                decoration.onDispose(() => { this._navigationDecorations = this._navigationDecorations?.filter(d => d !== decoration); });
-                timeout(350).then(() => {
-                    if (renderedElement) {
-                        renderedElement.classList.remove('terminal-scroll-highlight-outline');
+                    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); });
+                if (showOutline) {
+                    timeout(350).then(() => {
+                        if (renderedElement) {
+                            renderedElement.classList.remove('terminal-scroll-highlight-outline');
+                        }
+                    });
+                }
             }
         }
     }
-    _getTargetScrollLine(terminal, marker, position) {
-        if (position === 1 ) {
-            return Math.max(marker.line - Math.floor(terminal.rows / 4), 0);
+    scrollToLine(line, position) {
+        this._terminal?.scrollToLine(this.getTargetScrollLine(line, position));
+    }
+    getTargetScrollLine(line, position) {
+        if (this._terminal && position === 1 ) {
+            return Math.max(line - Math.floor(this._terminal.rows / 4), 0);
         }
-        return marker.line;
+        return line;
     }
     _isMarkerInViewport(terminal, marker) {
         const viewportY = terminal.buffer.active.viewportY;
-        return marker.line >= viewportY && marker.line < viewportY + terminal.rows;
+        const line = toLineIndex(marker);
+        return line >= viewportY && line < viewportY + terminal.rows;
     }
     scrollToClosestMarker(startMarkerId, endMarkerId, highlight) {
         const detectionCapability = this._capabilities.get(4 );
@@ -356,7 +452,7 @@ let MarkNavigationAddon = class MarkNavigationAddon extends Disposable {
             return offset;
         }
     }
-    _findPreviousMarker(xterm, skipEmptyCommands = false) {
+    _findPreviousMarker(skipEmptyCommands = false) {
         if (this._currentMarker === Boundary.Top) {
             return 0;
         }
@@ -371,7 +467,7 @@ let MarkNavigationAddon = class MarkNavigationAddon extends Disposable {
         }
         return -1;
     }
-    _findNextMarker(xterm, skipEmptyCommands = false) {
+    _findNextMarker(skipEmptyCommands = false) {
         if (this._currentMarker === Boundary.Top) {
             return 0;
         }
@@ -413,4 +509,10 @@ function selectLines(xterm, start, end) {
     endLine -= 1;
     xterm.selectLines(startLine, endLine);
 }
+function isMarker(value) {
+    return typeof value !== 'number';
+}
+function toLineIndex(line) {
+    return isMarker(line) ? line.line : line;
+}
 export { MarkNavigationAddon, getLine, selectLines };

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

@@ -1,11 +1,11 @@
 import { Event } from '../../../../../base/common/event.js';
-import { Terminal } from '../../../../../../../../external/xterm/typings/xterm.js';
-import { CanvasAddon } from '../../../../../../../../external/xterm-addon-canvas/typings/xterm-addon-canvas.js';
-import { ISearchOptions, SearchAddon } from '../../../../../../../../external/xterm-addon-search/typings/xterm-addon-search.js';
-import { Unicode11Addon } from '../../../../../../../../external/xterm-addon-unicode11/typings/xterm-addon-unicode11.js';
-import { WebglAddon } from '../../../../../../../../external/xterm-addon-webgl/typings/xterm-addon-webgl.js';
-import { SerializeAddon } from '../../../../../../../../external/xterm-addon-serialize/typings/xterm-addon-serialize.js';
-import { ImageAddon } from '../../../../../../../../external/xterm-addon-image/typings/xterm-addon-image.js';
+import { Terminal, ITheme } from '../../../../../../../../external/@xterm/xterm/typings/xterm.js';
+import { CanvasAddon } from '../../../../../../../../external/@xterm/addon-canvas/typings/addon-canvas.js';
+import { ISearchOptions, SearchAddon } from '../../../../../../../../external/@xterm/addon-search/typings/addon-search.js';
+import { Unicode11Addon } from '../../../../../../../../external/@xterm/addon-unicode11/typings/addon-unicode11.js';
+import { WebglAddon } from '../../../../../../../../external/@xterm/addon-webgl/typings/addon-webgl.js';
+import { SerializeAddon } from '../../../../../../../../external/@xterm/addon-serialize/typings/addon-serialize.js';
+import { ImageAddon } from '../../../../../../../../external/@xterm/addon-image/typings/addon-image.js';
 import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
 import { TerminalConfigHelper } from '../terminalConfigHelper.js';
 import { Disposable } from '../../../../../base/common/lifecycle.js';
@@ -14,12 +14,15 @@ import { ITerminalFont } from '../../common/terminal.js';
 import { IXtermTerminal, IDetachedXtermTerminal, IInternalXtermTerminal, IMarkTracker, ISuggestController, IXtermColorProvider, IXtermAttachToElementOptions } from '../terminal.js';
 import { IStorageService } from '../../../../../platform/storage/common/storage.js';
 import { INotificationService } from '../../../../../platform/notification/common/notification.js';
-import { IThemeService } from '../../../../../platform/theme/common/themeService.js';
+import { ScrollPosition } from './markNavigationAddon.js';
+import { IThemeService, IColorTheme } from '../../../../../platform/theme/common/themeService.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 import { ITerminalCommand, ITerminalCapabilityStore } from '../../../../../platform/terminal/common/capabilities/capabilities.js';
 import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
 import { IContextKey, IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
 import { IClipboardService } from '../../../../../platform/clipboard/common/clipboardService.js';
+import { IAccessibleNotificationService } from '../../../../../platform/accessibility/common/accessibility.js';
+import { ILayoutService } from '../../../../../platform/layout/browser/layoutService.js';
 
 /**
  * Wraps the xterm object with additional functionality. Interaction with the backing process is out
@@ -27,7 +30,7 @@ import { IClipboardService } from '../../../../../platform/clipboard/common/clip
  */
 declare class XtermTerminal extends Disposable implements IXtermTerminal, IDetachedXtermTerminal, IInternalXtermTerminal {
     private readonly _configHelper;
-    private readonly _backgroundColorProvider;
+    private readonly _xtermColorProvider;
     private readonly _capabilities;
     private readonly _terminalSuggestWidgetVisibleContextKey;
     private readonly _configurationService;
@@ -38,6 +41,7 @@ declare class XtermTerminal extends Disposable implements IXtermTerminal, IDetac
     private readonly _themeService;
     private readonly _telemetryService;
     private readonly _clipboardService;
+    private readonly _accessibleNotificationService;
     /** The raw xterm.js instance */
     readonly raw: Terminal;
     private _core;
@@ -64,6 +68,7 @@ declare class XtermTerminal extends Disposable implements IXtermTerminal, IDetac
         resultCount: number;
     } | undefined;
     get isStdinDisabled(): boolean;
+    get isGpuAccelerated(): boolean;
     private readonly _onDidRequestRunCommand;
     readonly onDidRequestRunCommand: Event<{
         command: ITerminalCommand;
@@ -96,7 +101,7 @@ declare class XtermTerminal extends Disposable implements IXtermTerminal, IDetac
      * @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(xtermCtor: typeof Terminal, _configHelper: TerminalConfigHelper, cols: number, rows: number, _backgroundColorProvider: IXtermColorProvider, _capabilities: ITerminalCapabilityStore, shellIntegrationNonce: string, _terminalSuggestWidgetVisibleContextKey: IContextKey<boolean> | undefined, disableShellIntegrationReporting: boolean, _configurationService: IConfigurationService, _instantiationService: IInstantiationService, _logService: ITerminalLogService, _notificationService: INotificationService, _storageService: IStorageService, _themeService: IThemeService, _telemetryService: ITelemetryService, _clipboardService: IClipboardService, contextKeyService: IContextKeyService);
+    constructor(xtermCtor: typeof Terminal, _configHelper: TerminalConfigHelper, cols: number, rows: number, _xtermColorProvider: IXtermColorProvider, _capabilities: ITerminalCapabilityStore, shellIntegrationNonce: string, _terminalSuggestWidgetVisibleContextKey: IContextKey<boolean> | undefined, disableShellIntegrationReporting: boolean, _configurationService: IConfigurationService, _instantiationService: IInstantiationService, _logService: ITerminalLogService, _notificationService: INotificationService, _storageService: IStorageService, _themeService: IThemeService, _telemetryService: ITelemetryService, _clipboardService: IClipboardService, contextKeyService: IContextKeyService, _accessibleNotificationService: IAccessibleNotificationService, layoutService: ILayoutService);
     getBufferReverseIterator(): IterableIterator<string>;
     getContentsAsHtml(): Promise<string>;
     getSelectionAsHtml(command?: ITerminalCommand): Promise<string>;
@@ -128,6 +133,7 @@ declare class XtermTerminal extends Disposable implements IXtermTerminal, IDetac
     scrollUpLine(): void;
     scrollUpPage(): void;
     scrollToTop(): void;
+    scrollToLine(line: number, position?: ScrollPosition): void;
     clearBuffer(): void;
     hasSelection(): boolean;
     clearSelection(): void;
@@ -152,7 +158,7 @@ declare class XtermTerminal extends Disposable implements IXtermTerminal, IDetac
     private _disposeOfCanvasRenderer;
     private _disposeOfWebglRenderer;
     private _measureRenderTime;
-    private _getXtermTheme;
+    getXtermTheme(theme?: IColorTheme): ITheme;
     private _updateTheme;
     refresh(): void;
     private _updateUnicodeVersion;

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

@@ -24,6 +24,8 @@ import { IClipboardService } from 'monaco-editor/esm/vs/platform/clipboard/commo
 import { debounce } from 'monaco-editor/esm/vs/base/common/decorators.js';
 import { MouseWheelClassifier } from 'monaco-editor/esm/vs/base/browser/ui/scrollbar/scrollableElement.js';
 import { StandardWheelEvent } from 'monaco-editor/esm/vs/base/browser/mouseEvent.js';
+import { IAccessibleNotificationService } from 'monaco-editor/esm/vs/platform/accessibility/common/accessibility.js';
+import { ILayoutService } from 'monaco-editor/esm/vs/platform/layout/browser/layoutService.js';
 var XtermTerminal_1;
 let CanvasAddon;
 let ImageAddon;
@@ -52,6 +54,7 @@ let XtermTerminal = class XtermTerminal extends Disposable {
     static { this._checkedWebglCompatible = false; }
     get findResult() { return this._lastFindResult; }
     get isStdinDisabled() { return !!this.raw.options.disableStdin; }
+    get isGpuAccelerated() { return !!(this._canvasAddon || this._webglAddon); }
     get markTracker() { return this._markNavigationAddon; }
     get shellIntegration() { return this._shellIntegrationAddon; }
     get suggestController() { return this._suggestAddon; }
@@ -63,12 +66,15 @@ let XtermTerminal = class XtermTerminal extends Disposable {
         return createImageBitmap(canvas);
     }
     get isFocused() {
-        return !!this.raw.element?.contains(document.activeElement);
+        if (!this.raw.element) {
+            return false;
+        }
+        return dom.isAncestorOfActiveElement(this.raw.element);
     }
-    constructor(xtermCtor, _configHelper, cols, rows, _backgroundColorProvider, _capabilities, shellIntegrationNonce, _terminalSuggestWidgetVisibleContextKey, disableShellIntegrationReporting, _configurationService, _instantiationService, _logService, _notificationService, _storageService, _themeService, _telemetryService, _clipboardService, contextKeyService) {
+    constructor(xtermCtor, _configHelper, cols, rows, _xtermColorProvider, _capabilities, shellIntegrationNonce, _terminalSuggestWidgetVisibleContextKey, disableShellIntegrationReporting, _configurationService, _instantiationService, _logService, _notificationService, _storageService, _themeService, _telemetryService, _clipboardService, contextKeyService, _accessibleNotificationService, layoutService) {
         super();
         this._configHelper = _configHelper;
-        this._backgroundColorProvider = _backgroundColorProvider;
+        this._xtermColorProvider = _xtermColorProvider;
         this._capabilities = _capabilities;
         this._terminalSuggestWidgetVisibleContextKey = _terminalSuggestWidgetVisibleContextKey;
         this._configurationService = _configurationService;
@@ -79,6 +85,7 @@ let XtermTerminal = class XtermTerminal extends Disposable {
         this._themeService = _themeService;
         this._telemetryService = _telemetryService;
         this._clipboardService = _clipboardService;
+        this._accessibleNotificationService = _accessibleNotificationService;
         this._isPhysicalMouseWheel = MouseWheelClassifier.INSTANCE.isPhysicalMouseWheel();
         this._attachedDisposables = this._register(( new DisposableStore()));
         this._onDidRequestRunCommand = this._register(( new Emitter()));
@@ -97,16 +104,17 @@ let XtermTerminal = class XtermTerminal extends Disposable {
         this.onDidChangeFocus = this._onDidChangeFocus.event;
         this._onDidDispose = this._register(( new Emitter()));
         this.onDidDispose = this._onDidDispose.event;
-        const font = this._configHelper.getFont(undefined, true);
+        const font = this._configHelper.getFont(dom.getActiveWindow(), undefined, true);
         const config = this._configHelper.config;
         const editorOptions = this._configurationService.getValue('editor');
         this.raw = this._register(( new xtermCtor({
             allowProposedApi: true,
             cols,
             rows,
+            documentOverride: layoutService.mainContainer.ownerDocument,
             altClickMovesCursor: config.altClickMovesCursor && editorOptions.multiCursorModifier === 'alt',
             scrollback: config.scrollback,
-            theme: this._getXtermTheme(),
+            theme: this.getXtermTheme(),
             drawBoldTextInBrightColors: config.drawBoldTextInBrightColors,
             fontFamily: font.fontFamily,
             fontWeight: config.fontWeight,
@@ -367,7 +375,7 @@ let XtermTerminal = class XtermTerminal extends Disposable {
         this._searchAddon?.clearActiveDecoration();
     }
     getFont() {
-        return this._configHelper.getFont(this._core);
+        return this._configHelper.getFont(dom.getWindow(this.raw.element), this._core);
     }
     getLongestViewportWrappedLineLength() {
         let maxLineLength = 0;
@@ -417,10 +425,14 @@ let XtermTerminal = class XtermTerminal extends Disposable {
     scrollToTop() {
         this.raw.scrollToTop();
     }
+    scrollToLine(line, position = 0 ) {
+        this.markTracker.scrollToLine(line, position);
+    }
     clearBuffer() {
         this.raw.clear();
         this._capabilities.get(2 )?.handlePromptStart();
         this._capabilities.get(2 )?.handleCommandStart();
+        this._accessibleNotificationService.notify("clear" );
     }
     hasSelection() {
         return this.raw.hasSelection();
@@ -461,9 +473,10 @@ let XtermTerminal = class XtermTerminal extends Disposable {
                     e.clipboardData.setData('text/html', textAsHtml);
                     e.preventDefault();
                 }
-                document.addEventListener('copy', listener);
-                document.execCommand('copy');
-                document.removeEventListener('copy', listener);
+                const doc = dom.getDocument(this.raw.element);
+                doc.addEventListener('copy', listener);
+                doc.execCommand('copy');
+                doc.removeEventListener('copy', listener);
             }
             else {
                 await this._clipboardService.writeText(this.raw.getSelection());
@@ -567,7 +580,7 @@ let XtermTerminal = class XtermTerminal extends Disposable {
     }
     async _getCanvasAddonConstructor() {
         if (!CanvasAddon) {
-            CanvasAddon = (await import('xterm-addon-canvas').then(module => module.default ?? module)).CanvasAddon;
+            CanvasAddon = (await import('@xterm/addon-canvas').then(module => module.default ?? module)).CanvasAddon;
         }
         return CanvasAddon;
     }
@@ -590,31 +603,31 @@ let XtermTerminal = class XtermTerminal extends Disposable {
     }
     async _getImageAddonConstructor() {
         if (!ImageAddon) {
-            ImageAddon = (await import('xterm-addon-image').then(module => module.default ?? module)).ImageAddon;
+            ImageAddon = (await import('@xterm/addon-image').then(module => module.default ?? module)).ImageAddon;
         }
         return ImageAddon;
     }
     async _getSearchAddonConstructor() {
         if (!SearchAddon) {
-            SearchAddon = (await import('xterm-addon-search').then(module => module.default ?? module)).SearchAddon;
+            SearchAddon = (await import('@xterm/addon-search').then(module => module.default ?? module)).SearchAddon;
         }
         return SearchAddon;
     }
     async _getUnicode11Constructor() {
         if (!Unicode11Addon) {
-            Unicode11Addon = (await import('xterm-addon-unicode11').then(module => module.default ?? module)).Unicode11Addon;
+            Unicode11Addon = (await import('@xterm/addon-unicode11').then(module => module.default ?? module)).Unicode11Addon;
         }
         return Unicode11Addon;
     }
     async _getWebglAddonConstructor() {
         if (!WebglAddon) {
-            WebglAddon = (await import('xterm-addon-webgl').then(module => module.default ?? module)).WebglAddon;
+            WebglAddon = (await import('@xterm/addon-webgl').then(module => module.default ?? module)).WebglAddon;
         }
         return WebglAddon;
     }
     async _getSerializeAddonConstructor() {
         if (!SerializeAddon) {
-            SerializeAddon = (await import('xterm-addon-serialize').then(module => module.default ?? module)).SerializeAddon;
+            SerializeAddon = (await import('@xterm/addon-serialize').then(module => module.default ?? module)).SerializeAddon;
         }
         return SerializeAddon;
     }
@@ -638,10 +651,10 @@ let XtermTerminal = class XtermTerminal extends Disposable {
     }
     async _measureRenderTime() {
         const frameTimes = [];
-        if (!this._core._renderService?._renderer._renderLayers) {
+        if (!this._core._renderService?._renderer.value?._renderLayers) {
             return;
         }
-        const textRenderLayer = this._core._renderService._renderer._renderLayers[0];
+        const textRenderLayer = this._core._renderService._renderer.value._renderLayers[0];
         const originalOnGridChanged = textRenderLayer?.onGridChanged;
         const evaluateCanvasRenderer = () => {
             frameTimes.shift();
@@ -689,12 +702,12 @@ let XtermTerminal = class XtermTerminal extends Disposable {
             }
         };
     }
-    _getXtermTheme(theme) {
+    getXtermTheme(theme) {
         if (!theme) {
             theme = this._themeService.getColorTheme();
         }
         const foregroundColor = theme.getColor(TERMINAL_FOREGROUND_COLOR);
-        const backgroundColor = this._backgroundColorProvider.getBackgroundColor(theme);
+        const backgroundColor = this._xtermColorProvider.getBackgroundColor(theme);
         const cursorColor = theme.getColor(TERMINAL_CURSOR_FOREGROUND_COLOR) || foregroundColor;
         const cursorAccentColor = theme.getColor(TERMINAL_CURSOR_BACKGROUND_COLOR) || backgroundColor;
         const selectionBackgroundColor = theme.getColor(TERMINAL_SELECTION_BACKGROUND_COLOR);
@@ -727,7 +740,7 @@ let XtermTerminal = class XtermTerminal extends Disposable {
         };
     }
     _updateTheme(theme) {
-        this.raw.options.theme = this._getXtermTheme(theme);
+        this.raw.options.theme = this.getXtermTheme(theme);
     }
     refresh() {
         this._updateTheme();
@@ -765,17 +778,19 @@ XtermTerminal = XtermTerminal_1 = ( __decorate([
     ( __param(14, IThemeService)),
     ( __param(15, ITelemetryService)),
     ( __param(16, IClipboardService)),
-    ( __param(17, IContextKeyService))
+    ( __param(17, IContextKeyService)),
+    ( __param(18, IAccessibleNotificationService)),
+    ( __param(19, ILayoutService))
 ], XtermTerminal));
-function getXtermScaledDimensions(font, width, height) {
+function getXtermScaledDimensions(w, font, width, height) {
     if (!font.charWidth || !font.charHeight) {
         return null;
     }
-    const scaledWidthAvailable = width * window.devicePixelRatio;
-    const scaledCharWidth = font.charWidth * window.devicePixelRatio + font.letterSpacing;
+    const scaledWidthAvailable = width * w.devicePixelRatio;
+    const scaledCharWidth = font.charWidth * w.devicePixelRatio + font.letterSpacing;
     const cols = Math.max(Math.floor(scaledWidthAvailable / scaledCharWidth), 1);
-    const scaledHeightAvailable = height * window.devicePixelRatio;
-    const scaledCharHeight = Math.ceil(font.charHeight * window.devicePixelRatio);
+    const scaledHeightAvailable = height * w.devicePixelRatio;
+    const scaledCharHeight = Math.ceil(font.charHeight * w.devicePixelRatio);
     const scaledLineHeight = Math.floor(scaledCharHeight * font.lineHeight);
     const rows = Math.max(Math.floor(scaledHeightAvailable / scaledLineHeight), 1);
     return { rows, cols };