@codingame/monaco-vscode-xterm-common 24.3.0 → 25.0.0

package/vscode/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChat.js

@@ -43,26 +43,26 @@ var TerminalChatContextKeyStrings;
 })(TerminalChatContextKeyStrings || (TerminalChatContextKeyStrings = {}));
 var TerminalChatContextKeys;
 (function (TerminalChatContextKeys) {
-    TerminalChatContextKeys.focused = ( new RawContextKey(TerminalChatContextKeyStrings.ChatFocus, false, ( localize(11942, "Whether the chat view is focused."))));
-    TerminalChatContextKeys.visible = ( new RawContextKey(TerminalChatContextKeyStrings.ChatVisible, false, ( localize(11943, "Whether the chat view is visible."))));
-    TerminalChatContextKeys.requestActive = ( new RawContextKey(TerminalChatContextKeyStrings.ChatActiveRequest, false, ( localize(11944, "Whether there is an active chat request."))));
-    TerminalChatContextKeys.inputHasText = ( new RawContextKey(TerminalChatContextKeyStrings.ChatInputHasText, false, ( localize(11945, "Whether the chat input has text."))));
+    TerminalChatContextKeys.focused = ( new RawContextKey(TerminalChatContextKeyStrings.ChatFocus, false, ( localize(11967, "Whether the chat view is focused."))));
+    TerminalChatContextKeys.visible = ( new RawContextKey(TerminalChatContextKeyStrings.ChatVisible, false, ( localize(11968, "Whether the chat view is visible."))));
+    TerminalChatContextKeys.requestActive = ( new RawContextKey(TerminalChatContextKeyStrings.ChatActiveRequest, false, ( localize(11969, "Whether there is an active chat request."))));
+    TerminalChatContextKeys.inputHasText = ( new RawContextKey(TerminalChatContextKeyStrings.ChatInputHasText, false, ( localize(11970, "Whether the chat input has text."))));
     TerminalChatContextKeys.responseContainsCodeBlock = ( new RawContextKey(
         TerminalChatContextKeyStrings.ChatResponseContainsCodeBlock,
         false,
-        ( localize(11946, "Whether the chat response contains a code block."))
+        ( localize(11971, "Whether the chat response contains a code block."))
     ));
     TerminalChatContextKeys.responseContainsMultipleCodeBlocks = ( new RawContextKey(
         TerminalChatContextKeyStrings.ChatResponseContainsMultipleCodeBlocks,
         false,
-        ( localize(11947, "Whether the chat response contains multiple code blocks."))
+        ( localize(11972, "Whether the chat response contains multiple code blocks."))
     ));
-    TerminalChatContextKeys.hasChatAgent = ( new RawContextKey(TerminalChatContextKeyStrings.ChatAgentRegistered, false, ( localize(11948, "Whether a chat agent is registered for the terminal location."))));
-    TerminalChatContextKeys.hasChatTerminals = ( new RawContextKey(TerminalChatContextKeyStrings.ChatHasTerminals, false, ( localize(11949, "Whether there are any chat terminals."))));
+    TerminalChatContextKeys.hasChatAgent = ( new RawContextKey(TerminalChatContextKeyStrings.ChatAgentRegistered, false, ( localize(11973, "Whether a chat agent is registered for the terminal location."))));
+    TerminalChatContextKeys.hasChatTerminals = ( new RawContextKey(TerminalChatContextKeyStrings.ChatHasTerminals, false, ( localize(11974, "Whether there are any chat terminals."))));
     TerminalChatContextKeys.hasHiddenChatTerminals = ( new RawContextKey(
         TerminalChatContextKeyStrings.ChatHasHiddenTerminals,
         false,
-        ( localize(11950, "Whether there are any hidden chat terminals."))
+        ( localize(11975, "Whether there are any hidden chat terminals."))
     ));
 })(TerminalChatContextKeys || (TerminalChatContextKeys = {}));
 

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

@@ -3,7 +3,7 @@ import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { registerColor } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colorUtils';
 
 const terminalStickyScrollBackground = registerColor('terminalStickyScroll.background', null, ( localize(
-    12216,
+    12259,
     'The background color of the sticky scroll overlay in the terminal.'
 )));
 const terminalStickyScrollHoverBackground = registerColor('terminalStickyScrollHover.background', {
@@ -12,7 +12,7 @@ const terminalStickyScrollHoverBackground = registerColor('terminalStickyScrollH
     hcDark: '#E48B39',
     hcLight: '#0f4a85'
 }, ( localize(
-    12217,
+    12260,
     'The background color of the sticky scroll overlay in the terminal when hovered.'
 )));
 registerColor('terminalStickyScroll.border', {
@@ -20,6 +20,6 @@ registerColor('terminalStickyScroll.border', {
     light: null,
     hcDark: '#6fc3df',
     hcLight: '#0f4a85'
-}, ( localize(12218, 'The border of the sticky scroll overlay in the terminal.')));
+}, ( localize(12261, 'The border of the sticky scroll overlay in the terminal.')));
 
 export { terminalStickyScrollBackground, terminalStickyScrollHoverBackground };

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

@@ -21,7 +21,8 @@ export declare class TerminalStickyScrollOverlay extends Disposable {
     private _stickyScrollOverlay?;
     private readonly _xtermAddonLoader;
     private _serializeAddon?;
-    private _webglAddon?;
+    private readonly _webglAddon;
+    private _webglAddonCustomGlyphs?;
     private _ligaturesAddon?;
     private _element?;
     private _currentStickyCommand?;

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

@@ -50,6 +50,7 @@ let TerminalStickyScrollOverlay = class TerminalStickyScrollOverlay extends Disp
         this._terminalConfigurationService = _terminalConfigurationService;
         this._themeService = _themeService;
         this._xtermAddonLoader = ( new XtermAddonImporter());
+        this._webglAddon = this._register(( new MutableDisposable()));
         this._refreshListeners = this._register(( new MutableDisposable()));
         this._state = OverlayState.Off;
         this._isRefreshQueued = false;
@@ -273,19 +274,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(12219, 'Navigate to Command'));
+        let hoverTitle = ( localize(12262, 'Navigate to Command'));
         const scrollToPreviousCommandKeybinding = this._keybindingService.lookupKeybinding(TerminalCommandId.ScrollToPreviousCommand);
         if (scrollToPreviousCommandKeybinding) {
             const label = scrollToPreviousCommandKeybinding.getLabel();
             if (label) {
-                hoverTitle += '\n' + ( localize(12220, "{0} ({1})", terminalStrings.scrollToPreviousCommand.value, label));
+                hoverTitle += '\n' + ( localize(12263, "{0} ({1})", terminalStrings.scrollToPreviousCommand.value, label));
             }
         }
         const scrollToNextCommandKeybinding = this._keybindingService.lookupKeybinding(TerminalCommandId.ScrollToNextCommand);
         if (scrollToNextCommandKeybinding) {
             const label = scrollToNextCommandKeybinding.getLabel();
             if (label) {
-                hoverTitle += '\n' + ( localize(12220, "{0} ({1})", terminalStrings.scrollToNextCommand.value, label));
+                hoverTitle += '\n' + ( localize(12263, "{0} ({1})", terminalStrings.scrollToNextCommand.value, label));
             }
         }
         hoverOverlay.title = hoverTitle;
@@ -351,21 +352,22 @@ let TerminalStickyScrollOverlay = class TerminalStickyScrollOverlay extends Disp
             drawBoldTextInBrightColors: o.drawBoldTextInBrightColors,
             minimumContrastRatio: o.minimumContrastRatio,
             tabStopWidth: o.tabStopWidth,
-            customGlyphs: o.customGlyphs,
         };
     }
     async _refreshGpuAcceleration() {
-        if (this._shouldLoadWebgl() && !this._webglAddon) {
+        if (this._shouldLoadWebgl() && (!this._webglAddon.value || this._webglAddonCustomGlyphs !== this._terminalConfigurationService.config.customGlyphs)) {
             const WebglAddon = await this._xtermAddonLoader.importAddon('webgl');
             if (this._store.isDisposed) {
                 return;
             }
-            this._webglAddon = this._register(( new WebglAddon()));
-            this._stickyScrollOverlay?.loadAddon(this._webglAddon);
+            this._webglAddon.value = ( new WebglAddon({
+                customGlyphs: this._terminalConfigurationService.config.customGlyphs
+            }));
+            this._webglAddonCustomGlyphs = this._terminalConfigurationService.config.customGlyphs;
+            this._stickyScrollOverlay?.loadAddon(this._webglAddon.value);
         }
-        else if (!this._shouldLoadWebgl() && this._webglAddon) {
-            this._webglAddon.dispose();
-            this._webglAddon = undefined;
+        else if (!this._shouldLoadWebgl() && this._webglAddon.value) {
+            this._webglAddon.clear();
         }
     }
     _shouldLoadWebgl() {