@codingame/monaco-vscode-xterm-addons-common 26.2.2 → 27.0.0

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

@@ -410,7 +410,7 @@ let DecorationAddon = class DecorationAddon extends Disposable {
         })];
     }
     _getContextMenuActions() {
-        const label = ( localize(12193, "Toggle Visibility"));
+        const label = ( localize(13005, "Toggle Visibility"));
         return [{
             class: undefined,
             tooltip: label,
@@ -433,7 +433,7 @@ let DecorationAddon = class DecorationAddon extends Disposable {
             actions.push(attachToChatAction, ( new Separator()));
         }
         if (command.command !== "") {
-            const labelRun = ( localize(12194, "Rerun Command"));
+            const labelRun = ( localize(13006, "Rerun Command"));
             actions.push({
                 class: undefined,
                 tooltip: labelRun,
@@ -446,11 +446,11 @@ let DecorationAddon = class DecorationAddon extends Disposable {
                     }
                     if (!command.isTrusted) {
                         const shouldRun = await ( new Promise(r => {
-                            this._notificationService.prompt(Severity.Info, ( localize(12195, "Do you want to run the command: {0}", command.command)), [{
-                                label: ( localize(12196, "Yes")),
+                            this._notificationService.prompt(Severity.Info, ( localize(13007, "Do you want to run the command: {0}", command.command)), [{
+                                label: ( localize(13008, "Yes")),
                                 run: () => r(true)
                             }, {
-                                label: ( localize(12197, "No")),
+                                label: ( localize(13009, "No")),
                                 run: () => r(false)
                             }]);
                         }));
@@ -464,7 +464,7 @@ let DecorationAddon = class DecorationAddon extends Disposable {
                 }
             });
             actions.push(( new Separator()));
-            const labelCopy = ( localize(12198, "Copy Command"));
+            const labelCopy = ( localize(13010, "Copy Command"));
             actions.push({
                 class: undefined,
                 tooltip: labelCopy,
@@ -475,7 +475,7 @@ let DecorationAddon = class DecorationAddon extends Disposable {
             });
         }
         if (command.hasOutput()) {
-            const labelCopyCommandAndOutput = ( localize(12199, "Copy Command and Output"));
+            const labelCopyCommandAndOutput = ( localize(13011, "Copy Command and Output"));
             actions.push({
                 class: undefined,
                 tooltip: labelCopyCommandAndOutput,
@@ -489,7 +489,7 @@ let DecorationAddon = class DecorationAddon extends Disposable {
                     }
                 }
             });
-            const labelText = ( localize(12200, "Copy Output"));
+            const labelText = ( localize(13012, "Copy Output"));
             actions.push({
                 class: undefined,
                 tooltip: labelText,
@@ -503,7 +503,7 @@ let DecorationAddon = class DecorationAddon extends Disposable {
                     }
                 }
             });
-            const labelHtml = ( localize(12201, "Copy Output as HTML"));
+            const labelHtml = ( localize(13013, "Copy Output as HTML"));
             actions.push({
                 class: undefined,
                 tooltip: labelHtml,
@@ -518,7 +518,7 @@ let DecorationAddon = class DecorationAddon extends Disposable {
         if (actions.length > 0) {
             actions.push(( new Separator()));
         }
-        const labelRunRecent = ( localize(12202, "Run Recent Command"));
+        const labelRunRecent = ( localize(13014, "Run Recent Command"));
         actions.push({
             class: undefined,
             tooltip: labelRunRecent,
@@ -527,7 +527,7 @@ let DecorationAddon = class DecorationAddon extends Disposable {
             enabled: true,
             run: () => this._commandService.executeCommand("workbench.action.terminal.runRecentCommand")
         });
-        const labelGoToRecent = ( localize(12203, "Go To Recent Directory"));
+        const labelGoToRecent = ( localize(13015, "Go To Recent Directory"));
         actions.push({
             class: undefined,
             tooltip: labelRunRecent,
@@ -537,7 +537,7 @@ let DecorationAddon = class DecorationAddon extends Disposable {
             run: () => this._commandService.executeCommand("workbench.action.terminal.goToRecentDirectory")
         });
         actions.push(( new Separator()));
-        const labelAbout = ( localize(12204, "Learn About Shell Integration"));
+        const labelAbout = ( localize(13016, "Learn About Shell Integration"));
         actions.push({
             class: undefined,
             tooltip: labelAbout,
@@ -553,7 +553,7 @@ let DecorationAddon = class DecorationAddon extends Disposable {
         if (!chatIsEnabled) {
             return undefined;
         }
-        const labelAttachToChat = ( localize(12205, "Attach To Chat"));
+        const labelAttachToChat = ( localize(13017, "Attach To Chat"));
         return {
             class: undefined,
             tooltip: labelAttachToChat,
@@ -595,14 +595,14 @@ let DecorationAddon = class DecorationAddon extends Disposable {
         quickPick.hideInput = true;
         quickPick.hideCheckAll = true;
         quickPick.canSelectMany = true;
-        quickPick.title = ( localize(12206, "Toggle visibility"));
+        quickPick.title = ( localize(13018, "Toggle visibility"));
         const configValue = this._configurationService.getValue(TerminalSettingId.ShellIntegrationDecorationsEnabled);
         const gutterIcon = {
-            label: ( localize(12207, "Gutter command decorations")),
+            label: ( localize(13019, "Gutter command decorations")),
             picked: configValue !== "never" && configValue !== "overviewRuler"
         };
         const overviewRulerIcon = {
-            label: ( localize(12208, "Overview ruler command decorations")),
+            label: ( localize(13020, "Overview ruler command decorations")),
             picked: configValue !== "never" && configValue !== "gutter"
         };
         quickPick.items = [gutterIcon, overviewRulerIcon];

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

@@ -174,6 +174,7 @@ export declare class XtermTerminal extends Disposable implements IXtermTerminal,
     focus(): void;
     copySelection(asHtml?: boolean, command?: ITerminalCommand): Promise<void>;
     private _setCursorBlink;
+    private _setTextBlinking;
     private _setCursorStyle;
     private _setCursorStyleInactive;
     private _setCursorWidth;

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

@@ -49,6 +49,10 @@ var RenderConstants;
 (function(RenderConstants) {
     RenderConstants[RenderConstants["SmoothScrollDuration"] = 125] = "SmoothScrollDuration";
 })(RenderConstants || (RenderConstants = {}));
+var TextBlinkConstants;
+(function(TextBlinkConstants) {
+    TextBlinkConstants[TextBlinkConstants["IntervalDuration"] = 600] = "IntervalDuration";
+})(TextBlinkConstants || (TextBlinkConstants = {}));
 function getFullBufferLineAsString(lineIndex, buffer) {
     let line = buffer.getLine(lineIndex);
     if (!line) {
@@ -202,6 +206,7 @@ let XtermTerminal = class XtermTerminal extends Disposable {
             minimumContrastRatio: config.minimumContrastRatio,
             tabStopWidth: config.tabStopWidth,
             cursorBlink: config.cursorBlinking,
+            blinkIntervalDuration: config.textBlinking ? TextBlinkConstants.IntervalDuration : 0,
             cursorStyle: vscodeToXtermCursorStyle(config.cursorStyle),
             cursorInactiveStyle: vscodeToXtermCursorStyle(config.cursorStyleInactive),
             cursorWidth: config.cursorWidth,
@@ -212,11 +217,11 @@ let XtermTerminal = class XtermTerminal extends Disposable {
             scrollSensitivity: config.mouseWheelScrollSensitivity,
             scrollOnEraseInDisplay: true,
             wordSeparator: config.wordSeparators,
-            overviewRuler: options.disableOverviewRuler ? {
-                width: 0
-            } : {
+            scrollbar: options.disableOverviewRuler ? undefined : {
                 width: 14,
-                showTopBorder: true
+                overviewRuler: {
+                    showTopBorder: true
+                }
             },
             ignoreBracketedPasteMode: config.ignoreBracketedPasteMode,
             rescaleOverlappingGlyphs: config.rescaleOverlappingGlyphs,
@@ -224,6 +229,7 @@ let XtermTerminal = class XtermTerminal extends Disposable {
                 kittyKeyboard: config.enableKittyKeyboardProtocol,
                 win32InputMode: config.enableWin32InputMode
             },
+            allowTransparency: config.enableImages,
             windowOptions: {
                 getWinSizePixels: true,
                 getCellSizePixels: true,
@@ -515,6 +521,7 @@ let XtermTerminal = class XtermTerminal extends Disposable {
         const config = this._terminalConfigurationService.config;
         this.raw.options.altClickMovesCursor = config.altClickMovesCursor;
         this._setCursorBlink(config.cursorBlinking);
+        this._setTextBlinking(config.textBlinking);
         this._setCursorStyle(config.cursorStyle);
         this._setCursorStyleInactive(config.cursorStyleInactive);
         this._setCursorWidth(config.cursorWidth);
@@ -532,6 +539,7 @@ let XtermTerminal = class XtermTerminal extends Disposable {
         this.raw.options.wordSeparator = config.wordSeparators;
         this.raw.options.ignoreBracketedPasteMode = config.ignoreBracketedPasteMode;
         this.raw.options.rescaleOverlappingGlyphs = config.rescaleOverlappingGlyphs;
+        this.raw.options.allowTransparency = config.enableImages;
         this.raw.options.vtExtensions = {
             kittyKeyboard: config.enableKittyKeyboardProtocol,
             win32InputMode: config.enableWin32InputMode
@@ -599,16 +607,16 @@ let XtermTerminal = class XtermTerminal extends Disposable {
                     highlightLimit: XtermTerminalConstants.SearchHighlightLimit
                 }));
                 this.raw.loadAddon(this._searchAddon);
-                this._searchAddon.onDidChangeResults(results => {
+                this._store.add(this._searchAddon.onDidChangeResults(results => {
                     this._lastFindResult = results;
                     this._onDidChangeFindResults.fire(results);
-                });
-                this._searchAddon.onBeforeSearch(() => {
+                }));
+                this._store.add(this._searchAddon.onBeforeSearch(() => {
                     this._onBeforeSearch.fire();
-                });
-                this._searchAddon.onAfterSearch(() => {
+                }));
+                this._store.add(this._searchAddon.onAfterSearch(() => {
                     this._onAfterSearch.fire();
-                });
+                }));
                 return this._searchAddon;
             });
         }
@@ -738,7 +746,7 @@ let XtermTerminal = class XtermTerminal extends Disposable {
                 await this._clipboardService.writeText(this.raw.getSelection());
             }
         } else {
-            this._notificationService.warn(( localize(12219, "The terminal has no selection to copy")));
+            this._notificationService.warn(( localize(13031, "The terminal has no selection to copy")));
         }
     }
     _setCursorBlink(blink) {
@@ -747,6 +755,13 @@ let XtermTerminal = class XtermTerminal extends Disposable {
             this.raw.refresh(0, this.raw.rows - 1);
         }
     }
+    _setTextBlinking(enabled) {
+        const blinkIntervalDuration = enabled ? TextBlinkConstants.IntervalDuration : 0;
+        const options = this.raw.options;
+        if (options.blinkIntervalDuration !== blinkIntervalDuration) {
+            options.blinkIntervalDuration = blinkIntervalDuration;
+        }
+    }
     _setCursorStyle(style) {
         const mapped = vscodeToXtermCursorStyle(style);
         if (this.raw.options.cursorStyle !== mapped) {
@@ -778,10 +793,10 @@ let XtermTerminal = class XtermTerminal extends Disposable {
         try {
             this.raw.loadAddon(this._webglAddon);
             this._logService.trace("Webgl was loaded");
-            this._webglAddon.onContextLoss(() => {
+            this._store.add(this._webglAddon.onContextLoss(() => {
                 this._logService.info(`Webgl lost context, disposing of webgl renderer`);
                 this._disposeOfWebglRenderer();
-            });
+            }));
             this._refreshImageAddon();
             this._onDidRequestRefreshDimensions.fire();
         } catch (e) {

package/vscode/src/vs/workbench/contrib/chat/browser/attachments/chatDynamicVariables.d.ts

@@ -1,42 +0,0 @@
-import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
-import { IRange } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range";
-import { Command } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages";
-import { Action2 } from "@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions";
-import { ServicesAccessor } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
-import { ILabelService } from "@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service";
-import { IChatRequestVariableValue, IDynamicVariable } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/attachments/chatVariables";
-import { IChatWidget } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat";
-import { IChatWidgetContrib } from "@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/widget/chatWidget";
-export declare const dynamicVariableDecorationType = "chat-dynamic-variable";
-export declare class ChatDynamicVariableModel extends Disposable implements IChatWidgetContrib {
-    private readonly widget;
-    private readonly labelService;
-    static readonly ID = "chatDynamicVariableModel";
-    private _variables;
-    get variables(): ReadonlyArray<IDynamicVariable>;
-    get id(): string;
-    private decorationData;
-    constructor(widget: IChatWidget, labelService: ILabelService);
-    getInputState(contrib: Record<string, unknown>): void;
-    setInputState(contrib: Readonly<Record<string, unknown>>): void;
-    addReference(ref: IDynamicVariable): void;
-    private updateDecorations;
-    private getHoverForReference;
-    /**
-     * Dispose all existing variables.
-     */
-    private disposeVariables;
-    dispose(): void;
-}
-export interface IAddDynamicVariableContext {
-    id: string;
-    widget: IChatWidget;
-    range: IRange;
-    variableData: IChatRequestVariableValue;
-    command?: Command;
-}
-export declare class AddDynamicVariableAction extends Action2 {
-    static readonly ID = "workbench.action.chat.addDynamicVariable";
-    constructor();
-    run(accessor: ServicesAccessor, ...args: unknown[]): Promise<void>;
-}

package/vscode/src/vs/workbench/contrib/chat/browser/attachments/chatDynamicVariables.js

@@ -1,209 +0,0 @@
-
-import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-import { coalesce } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
-import { MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
-import { Disposable, dispose, isDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
-import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
-import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
-import { isLocation } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages';
-import { Action2, registerAction2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
-import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
-import { ILabelService } from '@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service';
-import { addDynamicVariableActionId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/input/editor/chatDynamicVariablesConstant';
-
-var ChatDynamicVariableModel_1;
-const dynamicVariableDecorationType = "chat-dynamic-variable";
-let ChatDynamicVariableModel = class ChatDynamicVariableModel extends Disposable {
-    static {
-        ChatDynamicVariableModel_1 = this;
-    }
-    static {
-        this.ID = "chatDynamicVariableModel";
-    }
-    get variables() {
-        return [...this._variables];
-    }
-    get id() {
-        return ChatDynamicVariableModel_1.ID;
-    }
-    constructor(widget, labelService) {
-        super();
-        this.widget = widget;
-        this.labelService = labelService;
-        this._variables = [];
-        this.decorationData = [];
-        this._register(widget.inputEditor.onDidChangeModelContent(e => {
-            const removed = [];
-            let didChange = false;
-            this._variables = coalesce(( this._variables.map((ref, idx) => {
-                const model = widget.inputEditor.getModel();
-                if (!model) {
-                    removed.push(ref);
-                    return null;
-                }
-                const data = this.decorationData[idx];
-                const newRange = model.getDecorationRange(data.id);
-                if (!newRange) {
-                    removed.push(ref);
-                    return null;
-                }
-                const newText = model.getValueInRange(newRange);
-                if (newText !== data.text) {
-                    this.widget.inputEditor.executeEdits(this.id, [{
-                        range: newRange,
-                        text: ""
-                    }]);
-                    this.widget.refreshParsedInput();
-                    removed.push(ref);
-                    return null;
-                }
-                if (newRange.equalsRange(ref.range)) {
-                    return ref;
-                }
-                didChange = true;
-                return {
-                    ...ref,
-                    range: newRange
-                };
-            })));
-            dispose(removed.filter(isDisposable));
-            if (didChange || removed.length > 0) {
-                this.widget.refreshParsedInput();
-            }
-            this.updateDecorations();
-        }));
-    }
-    getInputState(contrib) {
-        contrib[ChatDynamicVariableModel_1.ID] = this.variables;
-    }
-    setInputState(contrib) {
-        let s = contrib[ChatDynamicVariableModel_1.ID];
-        if (!Array.isArray(s)) {
-            s = [];
-        }
-        this.disposeVariables();
-        this._variables = [];
-        for (const variable of s) {
-            if (!isDynamicVariable(variable)) {
-                continue;
-            }
-            this.addReference(variable);
-        }
-    }
-    addReference(ref) {
-        this._variables.push(ref);
-        this.updateDecorations();
-        this.widget.refreshParsedInput();
-    }
-    updateDecorations() {
-        const decorationIds = this.widget.inputEditor.setDecorationsByType("chat", dynamicVariableDecorationType, ( this._variables.map(r => ({
-            range: r.range,
-            hoverMessage: this.getHoverForReference(r)
-        }))));
-        this.decorationData = [];
-        for (let i = 0; i < decorationIds.length; i++) {
-            this.decorationData.push({
-                id: decorationIds[i],
-                text: this.widget.inputEditor.getModel().getValueInRange(this._variables[i].range)
-            });
-        }
-    }
-    getHoverForReference(ref) {
-        const value = ref.data;
-        if (URI.isUri(value)) {
-            return ( new MarkdownString(this.labelService.getUriLabel(value, {
-                relative: true
-            })));
-        } else if (isLocation(value)) {
-            const prefix = ref.fullName ? ` ${ref.fullName}` : "";
-            const rangeString = `#${value.range.startLineNumber}-${value.range.endLineNumber}`;
-            return ( new MarkdownString(prefix + this.labelService.getUriLabel(value.uri, {
-                relative: true
-            }) + rangeString));
-        } else {
-            return undefined;
-        }
-    }
-    disposeVariables() {
-        for (const variable of this._variables) {
-            if (isDisposable(variable)) {
-                variable.dispose();
-            }
-        }
-    }
-    dispose() {
-        this.disposeVariables();
-        super.dispose();
-    }
-};
-ChatDynamicVariableModel = ChatDynamicVariableModel_1 = ( __decorate([( __param(1, ILabelService))], ChatDynamicVariableModel));
-function isDynamicVariable(obj) {
-    return obj && typeof obj.id === "string" && Range.isIRange(obj.range) && "data" in obj;
-}
-function isAddDynamicVariableContext(context) {
-    return "widget" in context && "range" in context && "variableData" in context;
-}
-class AddDynamicVariableAction extends Action2 {
-    static {
-        this.ID = addDynamicVariableActionId;
-    }
-    constructor() {
-        super({
-            id: AddDynamicVariableAction.ID,
-            title: ""
-        });
-    }
-    async run(accessor, ...args) {
-        const context = args[0];
-        if (!isAddDynamicVariableContext(context)) {
-            return;
-        }
-        let range = context.range;
-        const variableData = context.variableData;
-        const doCleanup = () => {
-            context.widget.inputEditor.executeEdits("chatInsertDynamicVariableWithArguments", [{
-                range: context.range,
-                text: ``
-            }]);
-        };
-        if (context.command) {
-            const commandService = accessor.get(ICommandService);
-            const selection = await commandService.executeCommand(context.command.id, ...(context.command.arguments ?? []));
-            if (!selection) {
-                doCleanup();
-                return;
-            }
-            const insertText = ":" + selection;
-            const insertRange = ( new Range(
-                range.startLineNumber,
-                range.endColumn,
-                range.endLineNumber,
-                range.endColumn + insertText.length
-            ));
-            range = ( new Range(
-                range.startLineNumber,
-                range.startColumn,
-                range.endLineNumber,
-                range.endColumn + insertText.length
-            ));
-            const editor = context.widget.inputEditor;
-            const success = editor.executeEdits("chatInsertDynamicVariableWithArguments", [{
-                range: insertRange,
-                text: insertText + " "
-            }]);
-            if (!success) {
-                doCleanup();
-                return;
-            }
-        }
-        context.widget.getContrib(ChatDynamicVariableModel.ID)?.addReference({
-            id: context.id,
-            range: range,
-            isFile: true,
-            data: variableData
-        });
-    }
-}
-registerAction2(AddDynamicVariableAction);
-
-export { AddDynamicVariableAction, ChatDynamicVariableModel, dynamicVariableDecorationType };