@codingame/monaco-vscode-xterm-addons-common 37.6.0 → 38.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-xterm-addons-common",
-  "version": "37.6.0",
+  "version": "38.0.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - common package depending on xterm addons",
   "keywords": [],
@@ -15,7 +15,7 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-api": "37.6.0",
+    "@codingame/monaco-vscode-api": "38.0.0",
     "@xterm/addon-clipboard": "0.3.0-beta.303",
     "@xterm/addon-image": "0.10.0-beta.301",
     "@xterm/addon-ligatures": "0.11.0-beta.301",

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

@@ -40,6 +40,8 @@ export interface IXtermTerminalOptions {
     xtermAddonImporter?: XtermAddonImporter;
     /** Whether to disable the overview ruler. */
     disableOverviewRuler?: boolean;
+    /** The rows of scrollback to keep, overriding the `terminal.integrated.scrollback` setting. */
+    scrollback?: number;
     /**
      * When true, skips registering listeners on global singleton services
      * (configuration, theme, log level) to avoid accumulating listeners when
@@ -71,6 +73,7 @@ export declare class XtermTerminal extends Disposable implements IXtermTerminal,
     private readonly _xtermColorProvider;
     private readonly _capabilities;
     private readonly _disableOverviewRuler;
+    private readonly _scrollback;
     private static _suggestedRendererType;
     private _attached?;
     private _isPhysicalMouseWheel;

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

@@ -46,6 +46,7 @@ import { isNumber } from '@codingame/monaco-vscode-api/vscode/vs/base/common/typ
 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';
+import { updateTerminalFontRendering } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/xterm/terminalFontRendering';
 
 var XtermTerminal_1;
 var RenderConstants;
@@ -198,6 +199,7 @@ let XtermTerminal = class XtermTerminal extends Disposable {
         this._xtermColorProvider = options.xtermColorProvider;
         this._capabilities = options.capabilities;
         this._disableOverviewRuler = options.disableOverviewRuler ?? false;
+        this._scrollback = options.scrollback;
         const font = this._terminalConfigurationService.getFont(getActiveWindow(), undefined, true);
         const config = this._terminalConfigurationService.config;
         const editorOptions = this._configurationService.getValue("editor");
@@ -207,7 +209,7 @@ let XtermTerminal = class XtermTerminal extends Disposable {
             rows: options.rows,
             documentOverride: layoutService.mainContainer.ownerDocument,
             altClickMovesCursor: config.altClickMovesCursor && editorOptions.multiCursorModifier === "alt",
-            scrollback: config.scrollback,
+            scrollback: this._scrollback ?? config.scrollback,
             theme: this.getXtermTheme(),
             drawBoldTextInBrightColors: config.drawBoldTextInBrightColors,
             fontFamily: font.fontFamily,
@@ -480,6 +482,7 @@ let XtermTerminal = class XtermTerminal extends Disposable {
         if (!this._attached) {
             this.raw.open(container);
         }
+        updateTerminalFontRendering(this.raw, this._terminalConfigurationService.config.fontRendering);
         if (options.enableGpu) {
             if (this._shouldLoadWebgl()) {
                 this._enableWebglRenderer();
@@ -556,7 +559,7 @@ let XtermTerminal = class XtermTerminal extends Disposable {
         this._setCursorStyle(config.cursorStyle);
         this._setCursorStyleInactive(config.cursorStyleInactive);
         this._setCursorWidth(config.cursorWidth);
-        this.raw.options.scrollback = config.scrollback;
+        this.raw.options.scrollback = this._scrollback ?? config.scrollback;
         this.raw.options.drawBoldTextInBrightColors = config.drawBoldTextInBrightColors;
         this.raw.options.minimumContrastRatio = config.minimumContrastRatio;
         this.raw.options.tabStopWidth = config.tabStopWidth;
@@ -572,6 +575,7 @@ let XtermTerminal = class XtermTerminal extends Disposable {
         this.raw.options.ignoreBracketedPasteMode = config.ignoreBracketedPasteMode;
         this.raw.options.rescaleOverlappingGlyphs = config.rescaleOverlappingGlyphs;
         this.raw.options.allowTransparency = config.enableImages;
+        updateTerminalFontRendering(this.raw, config.fontRendering);
         this.raw.options.vtExtensions = {
             kittyKeyboard: config.enableKittyKeyboardProtocol,
             win32InputMode: config.enableWin32InputMode
@@ -721,9 +725,17 @@ let XtermTerminal = class XtermTerminal extends Disposable {
         this.markTracker.scrollToLine(line, position);
     }
     clearBuffer() {
+        const isNormalBuffer = this.raw.buffer.active.type === "normal";
+        if (isNormalBuffer) {
+            this._decorationAddon.clearDecorations();
+            this._capabilities.get(TerminalCapability.CommandDetection)?.clearCommands();
+            this._capabilities.get(TerminalCapability.PartialCommandDetection)?.clearCommands();
+        }
         this.raw.clear();
-        this._capabilities.get(TerminalCapability.CommandDetection)?.handlePromptStart();
-        this._capabilities.get(TerminalCapability.CommandDetection)?.handleCommandStart();
+        if (isNormalBuffer) {
+            this._capabilities.get(TerminalCapability.CommandDetection)?.handlePromptStart();
+            this._capabilities.get(TerminalCapability.CommandDetection)?.handleCommandStart();
+        }
         this._accessibilitySignalService.playSignal(AccessibilitySignal.clear);
     }
     reset() {
@@ -778,7 +790,7 @@ let XtermTerminal = class XtermTerminal extends Disposable {
                 await this._clipboardService.writeText(this.raw.getSelection());
             }
         } else {
-            this._notificationService.warn(( localize(19288, "The terminal has no selection to copy")));
+            this._notificationService.warn(( localize(21824, "The terminal has no selection to copy")));
         }
     }
     _setCursorBlink(blink) {

package/vscode/src/vs/workbench/contrib/terminalContrib/stickyScroll/browser/terminalStickyScrollOverlay.d.ts

@@ -37,6 +37,7 @@ export declare class TerminalStickyScrollOverlay extends Disposable {
     constructor(_instance: ITerminalInstance, _xterm: IXtermTerminal & {
         raw: RawXtermTerminal;
     }, _xtermColorProvider: IXtermColorProvider, _commandDetection: ICommandDetectionCapability, xtermCtor: Promise<typeof XTermTerminal>, configurationService: IConfigurationService, contextKeyService: IContextKeyService, _contextMenuService: IContextMenuService, _keybindingService: IKeybindingService, menuService: IMenuService, _terminalConfigurationService: ITerminalConfigurationService, _themeService: IThemeService);
+    layout(): void;
     lockHide(): void;
     unlockHide(): void;
     private _setState;

package/vscode/src/vs/workbench/contrib/terminalContrib/stickyScroll/browser/terminalStickyScrollOverlay.js

@@ -23,6 +23,7 @@ import { terminalStrings } from '@codingame/monaco-vscode-api/vscode/vs/workbenc
 import { TerminalStickyScrollSettingId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminalContrib/stickyScroll/common/terminalStickyScrollConfiguration';
 import { terminalStickyScrollHoverBackground, terminalStickyScrollBackground } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminalContrib/stickyScroll/browser/terminalStickyScrollColorRegistry';
 import { XtermAddonImporter } from '../../../terminal/browser/xterm/xtermAddonImporter.js';
+import { updateTerminalFontRendering } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/xterm/terminalFontRendering';
 
 registerCss(stickyScroll, 1);
 var OverlayState;
@@ -127,6 +128,11 @@ let TerminalStickyScrollOverlay = class TerminalStickyScrollOverlay extends Disp
             });
         });
     }
+    layout() {
+        if (this._state === OverlayState.On) {
+            this._refresh();
+        }
+    }
     lockHide() {
         this._element?.classList.add("lock-hide");
     }
@@ -172,6 +178,7 @@ let TerminalStickyScrollOverlay = class TerminalStickyScrollOverlay extends Disp
     }
     _setVisible(isVisible) {
         if (isVisible) {
+            this._ensureElement();
             this._pendingShowOperation = true;
             this._show();
         } else {
@@ -180,7 +187,6 @@ let TerminalStickyScrollOverlay = class TerminalStickyScrollOverlay extends Disp
     }
     _show() {
         if (this._pendingShowOperation) {
-            this._ensureElement();
             this._element?.classList.toggle(CssClasses.Visible, true);
         }
         this._pendingShowOperation = false;
@@ -274,10 +280,8 @@ let TerminalStickyScrollOverlay = class TerminalStickyScrollOverlay extends Disp
             this._currentStickyCommand = command;
             this._setVisible(true);
             if (this._element) {
-                const termBox = xterm.element.getBoundingClientRect();
-                if (termBox.height > 0) {
-                    const rowHeight = termBox.height / xterm.rows;
-                    const overlayHeight = stickyScrollLineCount * rowHeight;
+                const rowHeight = xterm.dimensions?.css.cell.height;
+                if (rowHeight && xterm.element.offsetHeight > 0) {
                     let endMarkerOffset = 0;
                     if (!isPartialCommand && command.endMarker && command.endMarker.line !== -1) {
                         const lastLine = Math.min(command.endMarker.line, buffer.baseY + buffer.cursorY);
@@ -286,7 +290,7 @@ let TerminalStickyScrollOverlay = class TerminalStickyScrollOverlay extends Disp
                             endMarkerOffset = diff * rowHeight;
                         }
                     }
-                    this._element.style.bottom = `${termBox.height - overlayHeight + 1 + endMarkerOffset}px`;
+                    this._element.style.top = `${xterm.element.offsetTop - endMarkerOffset}px`;
                 }
             }
         } else {
@@ -305,19 +309,19 @@ let TerminalStickyScrollOverlay = class TerminalStickyScrollOverlay extends Disp
         this._element = $(".terminal-sticky-scroll", undefined, hoverOverlay);
         this._xterm.raw.element.parentElement.append(this._element);
         this._register(toDisposable(() => this._element?.remove()));
-        let hoverTitle = ( localize(20007, "Navigate to Command"));
+        let hoverTitle = ( localize(22554, "Navigate to Command"));
         const scrollToPreviousCommandKeybinding = this._keybindingService.lookupKeybinding(TerminalCommandId.ScrollToPreviousCommand);
         if (scrollToPreviousCommandKeybinding) {
             const label = scrollToPreviousCommandKeybinding.getLabel();
             if (label) {
-                hoverTitle += "\n" + ( localize(20008, "{0} ({1})", terminalStrings.scrollToPreviousCommand.value, label));
+                hoverTitle += "\n" + ( localize(22555, "{0} ({1})", terminalStrings.scrollToPreviousCommand.value, label));
             }
         }
         const scrollToNextCommandKeybinding = this._keybindingService.lookupKeybinding(TerminalCommandId.ScrollToNextCommand);
         if (scrollToNextCommandKeybinding) {
             const label = scrollToNextCommandKeybinding.getLabel();
             if (label) {
-                hoverTitle += "\n" + ( localize(20008, "{0} ({1})", terminalStrings.scrollToNextCommand.value, label));
+                hoverTitle += "\n" + ( localize(22555, "{0} ({1})", terminalStrings.scrollToNextCommand.value, label));
             }
         }
         hoverOverlay.title = hoverTitle;
@@ -326,6 +330,10 @@ let TerminalStickyScrollOverlay = class TerminalStickyScrollOverlay extends Disp
             this._element.style.right = `${scrollBarWidth}px`;
         }
         this._stickyScrollOverlay.open(this._element);
+        updateTerminalFontRendering(
+            this._stickyScrollOverlay,
+            this._terminalConfigurationService.config.fontRendering
+        );
         this._stickyScrollOverlay.attachCustomKeyEventHandler(event => {
             if (event.key === "Tab") {
                 return false;
@@ -382,6 +390,10 @@ let TerminalStickyScrollOverlay = class TerminalStickyScrollOverlay extends Disp
         }
         this._stickyScrollOverlay.resize(this._xterm.raw.cols, this._stickyScrollOverlay.rows);
         this._stickyScrollOverlay.options = this._getOptions();
+        updateTerminalFontRendering(
+            this._stickyScrollOverlay,
+            this._terminalConfigurationService.config.fontRendering
+        );
         this._refreshGpuAcceleration();
     }
     _getOptions() {