@codingame/monaco-vscode-katex-common 24.1.0

package/vscode/src/vs/workbench/contrib/notebook/common/notebookDiffEditorInput.js

@@ -0,0 +1,108 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { isResourceDiffEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
+import { EditorModel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor/editorModel';
+import { DiffEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor/diffEditorInput';
+import { NotebookEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookEditorInput';
+import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
+
+var NotebookDiffEditorInput_1;
+class NotebookDiffEditorModel extends EditorModel {
+    constructor(original, modified) {
+        super();
+        this.original = original;
+        this.modified = modified;
+    }
+}
+let NotebookDiffEditorInput = class NotebookDiffEditorInput extends DiffEditorInput {
+    static { NotebookDiffEditorInput_1 = this; }
+    static create(instantiationService, resource, name, description, originalResource, viewType) {
+        const original = NotebookEditorInput.getOrCreate(instantiationService, originalResource, undefined, viewType);
+        const modified = NotebookEditorInput.getOrCreate(instantiationService, resource, undefined, viewType);
+        return instantiationService.createInstance(NotebookDiffEditorInput_1, name, description, original, modified, viewType);
+    }
+    static { this.ID = 'workbench.input.diffNotebookInput'; }
+    get resource() {
+        return this.modified.resource;
+    }
+    get editorId() {
+        return this.viewType;
+    }
+    constructor(name, description, original, modified, viewType, editorService) {
+        super(name, description, original, modified, undefined, editorService);
+        this.original = original;
+        this.modified = modified;
+        this.viewType = viewType;
+        this._modifiedTextModel = null;
+        this._originalTextModel = null;
+        this._cachedModel = undefined;
+    }
+    get typeId() {
+        return NotebookDiffEditorInput_1.ID;
+    }
+    async resolve() {
+        const [originalEditorModel, modifiedEditorModel] = await Promise.all([
+            this.original.resolve(),
+            this.modified.resolve(),
+        ]);
+        this._cachedModel?.dispose();
+        if (!modifiedEditorModel) {
+            throw ( new Error(
+                `Fail to resolve modified editor model for resource ${this.modified.resource} with notebookType ${this.viewType}`
+            ));
+        }
+        if (!originalEditorModel) {
+            throw ( new Error(
+                `Fail to resolve original editor model for resource ${this.original.resource} with notebookType ${this.viewType}`
+            ));
+        }
+        this._originalTextModel = originalEditorModel;
+        this._modifiedTextModel = modifiedEditorModel;
+        this._cachedModel = ( new NotebookDiffEditorModel(this._originalTextModel, this._modifiedTextModel));
+        return this._cachedModel;
+    }
+    toUntyped() {
+        const original = { resource: this.original.resource };
+        const modified = { resource: this.resource };
+        return {
+            original,
+            modified,
+            primary: modified,
+            secondary: original,
+            options: {
+                override: this.viewType
+            }
+        };
+    }
+    matches(otherInput) {
+        if (this === otherInput) {
+            return true;
+        }
+        if (otherInput instanceof NotebookDiffEditorInput_1) {
+            return this.modified.matches(otherInput.modified)
+                && this.original.matches(otherInput.original)
+                && this.viewType === otherInput.viewType;
+        }
+        if (isResourceDiffEditorInput(otherInput)) {
+            return this.modified.matches(otherInput.modified)
+                && this.original.matches(otherInput.original)
+                && this.editorId !== undefined
+                && (this.editorId === otherInput.options?.override || otherInput.options?.override === undefined);
+        }
+        return false;
+    }
+    dispose() {
+        super.dispose();
+        this._cachedModel?.dispose();
+        this._cachedModel = undefined;
+        this.original.dispose();
+        this.modified.dispose();
+        this._originalTextModel = null;
+        this._modifiedTextModel = null;
+    }
+};
+NotebookDiffEditorInput = NotebookDiffEditorInput_1 = ( __decorate([
+    ( __param(5, IEditorService))
+], NotebookDiffEditorInput));
+
+export { NotebookDiffEditorInput };

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

@@ -0,0 +1,34 @@
+import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import type { ITerminalCommand } from "@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/capabilities/capabilities";
+import { ITerminalService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service";
+import { XtermTerminal } from "@codingame/monaco-vscode-xterm-addons-common/vscode/vs/workbench/contrib/terminal/browser/xterm/xtermTerminal";
+import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
+export declare function getCommandOutputSnapshot(xtermTerminal: XtermTerminal, command: ITerminalCommand, log?: (reason: "fallback" | "primary", error: unknown) => void): Promise<{
+    text: string;
+    lineCount: number;
+} | undefined>;
+interface IDetachedTerminalCommandMirror {
+    attach(container: HTMLElement): Promise<void>;
+    renderCommand(): Promise<{
+        lineCount?: number;
+    } | undefined>;
+}
+/**
+ * Mirrors a terminal command's output into a detached terminal instance.
+ * Used in the chat terminal tool progress part to show command output for example.
+ */
+export declare class DetachedTerminalCommandMirror extends Disposable implements IDetachedTerminalCommandMirror {
+    private readonly _xtermTerminal;
+    private readonly _command;
+    private readonly _terminalService;
+    private readonly _contextKeyService;
+    private _detachedTerminal;
+    private _attachedContainer?;
+    constructor(_xtermTerminal: XtermTerminal, _command: ITerminalCommand, _terminalService: ITerminalService, _contextKeyService: IContextKeyService);
+    attach(container: HTMLElement): Promise<void>;
+    renderCommand(): Promise<{
+        lineCount?: number;
+    } | undefined>;
+    private _createTerminal;
+}
+export {};

package/vscode/src/vs/workbench/contrib/terminal/browser/chatTerminalCommandMirror.js

@@ -0,0 +1,145 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { ITerminalService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service';
+import { DetachedProcessInfo } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/detachedTerminal';
+import { TerminalCapabilityStore } from '@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/capabilities/terminalCapabilityStore';
+import { TERMINAL_BACKGROUND_COLOR } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/common/terminalColorRegistry';
+import { PANEL_BACKGROUND } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/theme';
+import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
+import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colorUtils';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/baseColors';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/chartsColors';
+import { editorBackground } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/editorColors';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/inputColors';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/listColors';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/menuColors';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/minimapColors';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/miscColors';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/quickpickColors';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/searchColors';
+
+async function getCommandOutputSnapshot(xtermTerminal, command, log) {
+    const executedMarker = command.executedMarker;
+    const endMarker = command.endMarker;
+    if (!endMarker || endMarker.isDisposed) {
+        return undefined;
+    }
+    if (!executedMarker || executedMarker.isDisposed) {
+        const raw = xtermTerminal.raw;
+        const buffer = raw.buffer.active;
+        const offsets = [
+            -(buffer.baseY + buffer.cursorY),
+            -buffer.baseY,
+            0
+        ];
+        let startMarker;
+        for (const offset of offsets) {
+            startMarker = raw.registerMarker(offset);
+            if (startMarker) {
+                break;
+            }
+        }
+        if (!startMarker || startMarker.isDisposed) {
+            return { text: '', lineCount: 0 };
+        }
+        const startLine = startMarker.line;
+        let text;
+        try {
+            text = await xtermTerminal.getRangeAsVT(startMarker, endMarker, true);
+        }
+        catch (error) {
+            log?.('fallback', error);
+            return undefined;
+        }
+        finally {
+            startMarker.dispose();
+        }
+        if (!text) {
+            return { text: '', lineCount: 0 };
+        }
+        const endLine = endMarker.line - 1;
+        const lineCount = Math.max(endLine - startLine + 1, 0);
+        return { text, lineCount };
+    }
+    const startLine = executedMarker.line;
+    const endLine = endMarker.line - 1;
+    const lineCount = Math.max(endLine - startLine + 1, 0);
+    let text;
+    try {
+        text = await xtermTerminal.getRangeAsVT(executedMarker, endMarker, true);
+    }
+    catch (error) {
+        log?.('primary', error);
+        return undefined;
+    }
+    if (!text) {
+        return { text: '', lineCount: 0 };
+    }
+    return { text, lineCount };
+}
+let DetachedTerminalCommandMirror = class DetachedTerminalCommandMirror extends Disposable {
+    constructor(_xtermTerminal, _command, _terminalService, _contextKeyService) {
+        super();
+        this._xtermTerminal = _xtermTerminal;
+        this._command = _command;
+        this._terminalService = _terminalService;
+        this._contextKeyService = _contextKeyService;
+        this._detachedTerminal = this._createTerminal();
+    }
+    async attach(container) {
+        const terminal = await this._detachedTerminal;
+        container.classList.add('chat-terminal-output-terminal');
+        const needsAttach = this._attachedContainer !== container || container.firstChild === null;
+        if (needsAttach) {
+            terminal.attachToElement(container);
+            this._attachedContainer = container;
+        }
+    }
+    async renderCommand() {
+        const vt = await getCommandOutputSnapshot(this._xtermTerminal, this._command);
+        if (!vt) {
+            return undefined;
+        }
+        if (!vt.text) {
+            return { lineCount: 0 };
+        }
+        const detached = await this._detachedTerminal;
+        detached.xterm.clearBuffer();
+        detached.xterm.clearSearchDecorations?.();
+        await ( new Promise(resolve => {
+            detached.xterm.write(vt.text, () => resolve());
+        }));
+        return { lineCount: vt.lineCount };
+    }
+    async _createTerminal() {
+        const processInfo = this._register(( new DetachedProcessInfo({ initialCwd: '' })));
+        const capabilities = this._register(( new TerminalCapabilityStore()));
+        const detached = await this._terminalService.createDetachedTerminal({
+            cols: this._xtermTerminal.raw.cols,
+            rows: 10,
+            readonly: true,
+            processInfo,
+            disableOverviewRuler: true,
+            capabilities,
+            colorProvider: {
+                getBackgroundColor: theme => {
+                    const terminalBackground = theme.getColor(TERMINAL_BACKGROUND_COLOR);
+                    if (terminalBackground) {
+                        return terminalBackground;
+                    }
+                    const isInEditor = ChatContextKeys.inChatEditor.getValue(this._contextKeyService);
+                    return theme.getColor(isInEditor ? editorBackground : PANEL_BACKGROUND);
+                },
+            }
+        });
+        return this._register(detached);
+    }
+};
+DetachedTerminalCommandMirror = ( __decorate([
+    ( __param(2, ITerminalService)),
+    ( __param(3, IContextKeyService))
+], DetachedTerminalCommandMirror));
+
+export { DetachedTerminalCommandMirror, getCommandOutputSnapshot };