@codingame/monaco-vscode-xterm-addons-common 25.1.2 → 26.0.0

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

@@ -12,12 +12,12 @@ import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { TerminalContribSettingId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/terminalContribExports';
 
 var Boundary;
-(function (Boundary) {
+(function(Boundary) {
     Boundary[Boundary["Top"] = 0] = "Top";
     Boundary[Boundary["Bottom"] = 1] = "Bottom";
 })(Boundary || (Boundary = {}));
 var ScrollPosition;
-(function (ScrollPosition) {
+(function(ScrollPosition) {
     ScrollPosition[ScrollPosition["Top"] = 0] = "Top";
     ScrollPosition[ScrollPosition["Middle"] = 1] = "Middle";
 })(ScrollPosition || (ScrollPosition = {}));
@@ -48,8 +48,7 @@ let MarkNavigationAddon = class MarkNavigationAddon extends Disposable {
             if (commandCapability.currentCommand?.promptStartMarker && commandCapability.currentCommand.commandExecutedMarker) {
                 markers.push(commandCapability.currentCommand?.promptStartMarker);
             }
-        }
-        else if (partialCommandCapability) {
+        } else if (partialCommandCapability) {
             markers.push(...partialCommandCapability.commands);
         }
         if (markCapability && !skipEmptyCommands) {
@@ -66,7 +65,9 @@ let MarkNavigationAddon = class MarkNavigationAddon extends Disposable {
     _findCommand(marker) {
         const commandCapability = this._capabilities.get(TerminalCapability.CommandDetection);
         if (commandCapability) {
-            const command = commandCapability.commands.find(e => e.marker?.line === marker.line || e.promptStartMarker?.line === marker.line);
+            const command = commandCapability.commands.find(
+                e => e.marker?.line === marker.line || e.promptStartMarker?.line === marker.line
+            );
             if (command) {
                 return command;
             }
@@ -96,7 +97,11 @@ let MarkNavigationAddon = class MarkNavigationAddon extends Disposable {
         }
         return !this._getMarkers(true).includes(marker);
     }
-    scrollToPreviousMark(scrollPosition = ScrollPosition.Middle, retainSelection = false, skipEmptyCommands = true) {
+    scrollToPreviousMark(
+        scrollPosition = ScrollPosition.Middle,
+        retainSelection = false,
+        skipEmptyCommands = true
+    ) {
         if (!this._terminal) {
             return;
         }
@@ -104,30 +109,26 @@ let MarkNavigationAddon = class MarkNavigationAddon extends Disposable {
             this._selectionStart = null;
         }
         let markerIndex;
-        const currentLineY = typeof this._currentMarker === 'object'
-            ? this.getTargetScrollLine(this._currentMarker.line, scrollPosition)
-            : Math.min(getLine(this._terminal, this._currentMarker), this._terminal.buffer.active.baseY);
+        const currentLineY = typeof this._currentMarker === "object" ? 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) {
+        if (typeof this._currentMarker === "object" ? !this._isMarkerInViewport(this._terminal, this._currentMarker) : currentLineY !== viewportY) {
             const markersBelowViewport = this._getMarkers(skipEmptyCommands).filter(e => e.line >= viewportY).length;
             markerIndex = this._getMarkers(skipEmptyCommands).length - markersBelowViewport - 1;
-        }
-        else if (this._currentMarker === Boundary.Bottom) {
+        } else if (this._currentMarker === Boundary.Bottom) {
             markerIndex = this._getMarkers(skipEmptyCommands).length - 1;
-        }
-        else if (this._currentMarker === Boundary.Top) {
+        } else if (this._currentMarker === Boundary.Top) {
             markerIndex = -1;
-        }
-        else if (this._isDisposable) {
+        } else if (this._isDisposable) {
             markerIndex = this._findPreviousMarker(skipEmptyCommands);
             this._currentMarker.dispose();
             this._isDisposable = false;
-        }
-        else {
+        } else {
             if (skipEmptyCommands && this._isEmptyCommand(this._currentMarker)) {
                 markerIndex = this._findPreviousMarker(true);
-            }
-            else {
+            } else {
                 markerIndex = this._getMarkers(skipEmptyCommands).indexOf(this._currentMarker) - 1;
             }
         }
@@ -140,7 +141,11 @@ let MarkNavigationAddon = class MarkNavigationAddon extends Disposable {
         this._currentMarker = this._getMarkers(skipEmptyCommands)[markerIndex];
         this._scrollToCommand(this._currentMarker, scrollPosition);
     }
-    scrollToNextMark(scrollPosition = ScrollPosition.Middle, retainSelection = false, skipEmptyCommands = true) {
+    scrollToNextMark(
+        scrollPosition = ScrollPosition.Middle,
+        retainSelection = false,
+        skipEmptyCommands = true
+    ) {
         if (!this._terminal) {
             return;
         }
@@ -148,30 +153,26 @@ let MarkNavigationAddon = class MarkNavigationAddon extends Disposable {
             this._selectionStart = null;
         }
         let markerIndex;
-        const currentLineY = typeof this._currentMarker === 'object'
-            ? this.getTargetScrollLine(this._currentMarker.line, scrollPosition)
-            : Math.min(getLine(this._terminal, this._currentMarker), this._terminal.buffer.active.baseY);
+        const currentLineY = typeof this._currentMarker === "object" ? 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) {
+        if (typeof this._currentMarker === "object" ? !this._isMarkerInViewport(this._terminal, this._currentMarker) : currentLineY !== viewportY) {
             const markersAboveViewport = this._getMarkers(skipEmptyCommands).filter(e => e.line <= viewportY).length;
             markerIndex = markersAboveViewport;
-        }
-        else if (this._currentMarker === Boundary.Bottom) {
+        } else if (this._currentMarker === Boundary.Bottom) {
             markerIndex = this._getMarkers(skipEmptyCommands).length;
-        }
-        else if (this._currentMarker === Boundary.Top) {
+        } else if (this._currentMarker === Boundary.Top) {
             markerIndex = 0;
-        }
-        else if (this._isDisposable) {
+        } else if (this._isDisposable) {
             markerIndex = this._findNextMarker(skipEmptyCommands);
             this._currentMarker.dispose();
             this._isDisposable = false;
-        }
-        else {
+        } else {
             if (skipEmptyCommands && this._isEmptyCommand(this._currentMarker)) {
                 markerIndex = this._findNextMarker(true);
-            }
-            else {
+            } else {
                 markerIndex = this._getMarkers(skipEmptyCommands).indexOf(this._currentMarker) + 1;
             }
         }
@@ -188,8 +189,7 @@ let MarkNavigationAddon = class MarkNavigationAddon extends Disposable {
         const command = this._findCommand(marker);
         if (command) {
             this.revealCommand(command, position);
-        }
-        else {
+        } else {
             this._scrollToMarker(marker, position);
         }
     }
@@ -204,8 +204,7 @@ let MarkNavigationAddon = class MarkNavigationAddon extends Disposable {
         if (!options?.hideDecoration) {
             if (options?.bufferRange) {
                 this._highlightBufferRange(options.bufferRange);
-            }
-            else {
+            } else {
                 this.registerTemporaryDecoration(start, end, true);
             }
         }
@@ -213,13 +212,13 @@ let MarkNavigationAddon = class MarkNavigationAddon extends Disposable {
     _createMarkerForOffset(marker, offset) {
         if (offset === 0 && isMarker(marker)) {
             return marker;
-        }
-        else {
-            const offsetMarker = this._terminal?.registerMarker(-this._terminal.buffer.active.cursorY + toLineIndex(marker) - this._terminal.buffer.active.baseY + offset);
+        } else {
+            const offsetMarker = this._terminal?.registerMarker(
+                -this._terminal.buffer.active.cursorY + toLineIndex(marker) - this._terminal.buffer.active.baseY + offset
+            );
             if (offsetMarker) {
                 return offsetMarker;
-            }
-            else {
+            } else {
                 throw ( new Error(`Could not register marker with offset ${toLineIndex(marker)}, ${offset}`));
             }
         }
@@ -273,12 +272,12 @@ let MarkNavigationAddon = class MarkNavigationAddon extends Disposable {
                     store.add(decoration.onRender(element => {
                         if (!renderedElement) {
                             renderedElement = element;
-                            element.classList.add('terminal-command-guide');
+                            element.classList.add("terminal-command-guide");
                             if (i === 0) {
-                                element.classList.add('top');
+                                element.classList.add("top");
                             }
                             if (i === decorationCount - 1) {
-                                element.classList.add('bottom');
+                                element.classList.add("bottom");
                             }
                         }
                     }));
@@ -287,7 +286,9 @@ let MarkNavigationAddon = class MarkNavigationAddon extends Disposable {
         }
     }
     saveScrollState() {
-        this._scrollState = { viewportY: this._terminal?.buffer.active.viewportY ?? 0 };
+        this._scrollState = {
+            viewportY: this._terminal?.buffer.active.viewportY ?? 0
+        };
     }
     restoreScrollState() {
         if (this._scrollState && this._terminal) {
@@ -315,10 +316,12 @@ let MarkNavigationAddon = class MarkNavigationAddon extends Disposable {
                 decoration.onRender(element => {
                     if (!renderedElement) {
                         renderedElement = element;
-                        element.classList.add('terminal-range-highlight');
+                        element.classList.add("terminal-range-highlight");
                     }
                 });
-                decoration.onDispose(() => { this._navigationDecorations = this._navigationDecorations?.filter(d => d !== decoration); });
+                decoration.onDispose(() => {
+                    this._navigationDecorations = this._navigationDecorations?.filter(d => d !== decoration);
+                });
             }
         }
     }
@@ -335,7 +338,7 @@ let MarkNavigationAddon = class MarkNavigationAddon extends Disposable {
                 marker: this._createMarkerForOffset(marker, i),
                 width: this._terminal.cols,
                 overviewRulerOptions: i === 0 ? {
-                    color: color?.toString() || '#a0a0a0cc'
+                    color: color?.toString() || "#a0a0a0cc"
                 } : undefined
             });
             if (decoration) {
@@ -344,29 +347,30 @@ let MarkNavigationAddon = class MarkNavigationAddon extends Disposable {
                 decoration.onRender(element => {
                     if (!renderedElement) {
                         renderedElement = element;
-                        element.classList.add('terminal-scroll-highlight');
+                        element.classList.add("terminal-scroll-highlight");
                         if (showOutline) {
-                            element.classList.add('terminal-scroll-highlight-outline');
+                            element.classList.add("terminal-scroll-highlight-outline");
                         }
                         if (i === 0) {
-                            element.classList.add('top');
+                            element.classList.add("top");
                         }
                         if (i === decorationCount - 1) {
-                            element.classList.add('bottom');
+                            element.classList.add("bottom");
                         }
-                    }
-                    else {
-                        element.classList.add('terminal-scroll-highlight');
+                    } 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); });
+                decoration.onDispose(() => {
+                    this._navigationDecorations = this._navigationDecorations?.filter(d => d !== decoration);
+                });
                 if (showOutline) {
                     timeout(350).then(() => {
                         if (renderedElement) {
-                            renderedElement.classList.remove('terminal-scroll-highlight-outline');
+                            renderedElement.classList.remove("terminal-scroll-highlight-outline");
                         }
                     });
                 }
@@ -397,7 +401,9 @@ let MarkNavigationAddon = class MarkNavigationAddon extends Disposable {
             return;
         }
         const endMarker = endMarkerId ? detectionCapability.getMark(endMarkerId) : startMarker;
-        this._scrollToMarker(startMarker, ScrollPosition.Top, endMarker, { hideDecoration: !highlight });
+        this._scrollToMarker(startMarker, ScrollPosition.Top, endMarker, {
+            hideDecoration: !highlight
+        });
     }
     selectToPreviousMark() {
         if (!this._terminal) {
@@ -408,8 +414,7 @@ let MarkNavigationAddon = class MarkNavigationAddon extends Disposable {
         }
         if (( this._capabilities.has(TerminalCapability.CommandDetection))) {
             this.scrollToPreviousMark(ScrollPosition.Middle, true, true);
-        }
-        else {
+        } else {
             this.scrollToPreviousMark(ScrollPosition.Middle, true, false);
         }
         selectLines(this._terminal, this._currentMarker, this._selectionStart);
@@ -423,8 +428,7 @@ let MarkNavigationAddon = class MarkNavigationAddon extends Disposable {
         }
         if (( this._capabilities.has(TerminalCapability.CommandDetection))) {
             this.scrollToNextMark(ScrollPosition.Middle, true, true);
-        }
-        else {
+        } else {
             this.scrollToNextMark(ScrollPosition.Middle, true, false);
         }
         selectLines(this._terminal, this._currentMarker, this._selectionStart);
@@ -459,8 +463,7 @@ let MarkNavigationAddon = class MarkNavigationAddon extends Disposable {
         }
         if (this._currentMarker === Boundary.Bottom) {
             this._currentMarker = this._registerMarkerOrThrow(xterm, this._getOffset(xterm) - 1);
-        }
-        else {
+        } else {
             const offset = this._getOffset(xterm);
             if (this._isDisposable) {
                 this._currentMarker.dispose();
@@ -480,8 +483,7 @@ let MarkNavigationAddon = class MarkNavigationAddon extends Disposable {
         }
         if (this._currentMarker === Boundary.Top) {
             this._currentMarker = this._registerMarkerOrThrow(xterm, this._getOffset(xterm) + 1);
-        }
-        else {
+        } else {
             const offset = this._getOffset(xterm);
             if (this._isDisposable) {
                 this._currentMarker.dispose();
@@ -501,11 +503,9 @@ let MarkNavigationAddon = class MarkNavigationAddon extends Disposable {
     _getOffset(xterm) {
         if (this._currentMarker === Boundary.Bottom) {
             return 0;
-        }
-        else if (this._currentMarker === Boundary.Top) {
+        } else if (this._currentMarker === Boundary.Top) {
             return 0 - (xterm.buffer.active.baseY + xterm.buffer.active.cursorY);
-        }
-        else {
+        } else {
             let offset = getLine(xterm, this._currentMarker);
             offset -= xterm.buffer.active.baseY + xterm.buffer.active.cursorY;
             return offset;
@@ -514,8 +514,7 @@ let MarkNavigationAddon = class MarkNavigationAddon extends Disposable {
     _findPreviousMarker(skipEmptyCommands = false) {
         if (this._currentMarker === Boundary.Top) {
             return 0;
-        }
-        else if (this._currentMarker === Boundary.Bottom) {
+        } else if (this._currentMarker === Boundary.Bottom) {
             return this._getMarkers(skipEmptyCommands).length - 1;
         }
         let i;
@@ -529,8 +528,7 @@ let MarkNavigationAddon = class MarkNavigationAddon extends Disposable {
     _findNextMarker(skipEmptyCommands = false) {
         if (this._currentMarker === Boundary.Top) {
             return 0;
-        }
-        else if (this._currentMarker === Boundary.Bottom) {
+        } else if (this._currentMarker === Boundary.Bottom) {
             return this._getMarkers(skipEmptyCommands).length - 1;
         }
         let i;
@@ -542,10 +540,7 @@ let MarkNavigationAddon = class MarkNavigationAddon extends Disposable {
         return this._getMarkers(skipEmptyCommands).length;
     }
 };
-MarkNavigationAddon = ( __decorate([
-    ( __param(1, IConfigurationService)),
-    ( __param(2, IThemeService))
-], MarkNavigationAddon));
+MarkNavigationAddon = ( __decorate([( __param(1, IConfigurationService)), ( __param(2, IThemeService))], MarkNavigationAddon));
 function getLine(xterm, marker) {
     if (marker === Boundary.Bottom) {
         return xterm.buffer.active.baseY + xterm.rows - 1;
@@ -570,7 +565,7 @@ function selectLines(xterm, start, end) {
     xterm.selectLines(startLine, endLine);
 }
 function isMarker(value) {
-    return typeof value !== 'number';
+    return typeof value !== "number";
 }
 function toLineIndex(line) {
     return isMarker(line) ? line.line : line;

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

@@ -6,30 +6,30 @@ class XtermAddonImporter {
         let addon = importedAddons.get(name);
         if (!addon) {
             switch (name) {
-                case 'clipboard':
-                    addon = (await import('@xterm/addon-clipboard')).ClipboardAddon;
-                    break;
-                case 'image':
-                    addon = (await import('@xterm/addon-image')).ImageAddon;
-                    break;
-                case 'ligatures':
-                    addon = (await import('@xterm/addon-ligatures')).LigaturesAddon;
-                    break;
-                case 'progress':
-                    addon = (await import('@xterm/addon-progress')).ProgressAddon;
-                    break;
-                case 'search':
-                    addon = (await import('@xterm/addon-search')).SearchAddon;
-                    break;
-                case 'serialize':
-                    addon = (await import('@xterm/addon-serialize')).SerializeAddon;
-                    break;
-                case 'unicode11':
-                    addon = (await import('@xterm/addon-unicode11')).Unicode11Addon;
-                    break;
-                case 'webgl':
-                    addon = (await import('@xterm/addon-webgl')).WebglAddon;
-                    break;
+            case "clipboard":
+                addon = (await import('@xterm/addon-clipboard')).ClipboardAddon;
+                break;
+            case "image":
+                addon = (await import('@xterm/addon-image')).ImageAddon;
+                break;
+            case "ligatures":
+                addon = (await import('@xterm/addon-ligatures')).LigaturesAddon;
+                break;
+            case "progress":
+                addon = (await import('@xterm/addon-progress')).ProgressAddon;
+                break;
+            case "search":
+                addon = (await import('@xterm/addon-search')).SearchAddon;
+                break;
+            case "serialize":
+                addon = (await import('@xterm/addon-serialize')).SerializeAddon;
+                break;
+            case "unicode11":
+                addon = (await import('@xterm/addon-unicode11')).Unicode11Addon;
+                break;
+            case "webgl":
+                addon = (await import('@xterm/addon-webgl')).WebglAddon;
+                break;
             }
             if (!addon) {
                 throw ( new Error(`Could not load addon ${name}`));

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

@@ -68,6 +68,8 @@ export declare class XtermTerminal extends Disposable implements IXtermTerminal,
     get lastInputEvent(): string | undefined;
     private _progressState;
     get progressState(): IProgressState;
+    get buffer(): import("@xterm/xterm").IBufferNamespace;
+    get cols(): number;
     private _markNavigationAddon;
     private _shellIntegrationAddon;
     private _decorationAddon;
@@ -164,6 +166,7 @@ export declare class XtermTerminal extends Disposable implements IXtermTerminal,
     scrollToTop(): void;
     scrollToLine(line: number, position?: ScrollPosition): void;
     clearBuffer(): void;
+    reset(): void;
     hasSelection(): boolean;
     clearSelection(): void;
     selectMarkedRange(fromMarkerId: string, toMarkerId: string, scrollIntoView?: boolean): void;
@@ -178,7 +181,7 @@ export declare class XtermTerminal extends Disposable implements IXtermTerminal,
     private _refreshLigaturesAddon;
     private _refreshImageAddon;
     private _disposeOfWebglRenderer;
-    getRangeAsVT(startMarker: IXtermMarker, endMarker?: IXtermMarker, skipLastLine?: boolean): Promise<string>;
+    getRangeAsVT(startMarker?: IXtermMarker, endMarker?: IXtermMarker, skipLastLine?: boolean): Promise<string>;
     getXtermTheme(theme?: IColorTheme): ITheme;
     private _updateTheme;
     refresh(): void;