@codingame/monaco-vscode-notebook-service-override 25.1.2 → 26.0.1

package/vscode/src/vs/workbench/services/workingCopy/common/untitledFileWorkingCopy.js

@@ -12,8 +12,22 @@ import { IWorkingCopyBackupService } from '@codingame/monaco-vscode-api/vscode/v
 import { emptyStream } from '@codingame/monaco-vscode-api/vscode/vs/base/common/stream';
 
 let UntitledFileWorkingCopy = class UntitledFileWorkingCopy extends Disposable {
-    get model() { return this._model; }
-    constructor(typeId, resource, name, hasAssociatedFilePath, isScratchpad, initialContents, modelFactory, saveDelegate, workingCopyService, workingCopyBackupService, logService) {
+    get model() {
+        return this._model;
+    }
+    constructor(
+        typeId,
+        resource,
+        name,
+        hasAssociatedFilePath,
+        isScratchpad,
+        initialContents,
+        modelFactory,
+        saveDelegate,
+        workingCopyService,
+        workingCopyBackupService,
+        logService
+    ) {
         super();
         this.typeId = typeId;
         this.resource = resource;
@@ -56,34 +70,36 @@ let UntitledFileWorkingCopy = class UntitledFileWorkingCopy extends Disposable {
         }
     }
     async resolve() {
-        this.trace('resolve()');
+        this.trace("resolve()");
         if (this.isResolved()) {
-            this.trace('resolve() - exit (already resolved)');
+            this.trace("resolve() - exit (already resolved)");
             return;
         }
         let untitledContents;
         const backup = await this.workingCopyBackupService.resolve(this);
         if (backup) {
-            this.trace('resolve() - with backup');
+            this.trace("resolve() - with backup");
             untitledContents = backup.value;
-        }
-        else if (this.initialContents?.value) {
-            this.trace('resolve() - with initial contents');
+        } else if (this.initialContents?.value) {
+            this.trace("resolve() - with initial contents");
             untitledContents = this.initialContents.value;
-        }
-        else {
-            this.trace('resolve() - empty');
+        } else {
+            this.trace("resolve() - empty");
             untitledContents = emptyStream();
         }
         await this.doCreateModel(untitledContents);
-        this.setModified(this.hasAssociatedFilePath || !!backup || Boolean(this.initialContents && this.initialContents.markModified !== false));
+        this.setModified(
+            this.hasAssociatedFilePath || !!backup || Boolean(this.initialContents && this.initialContents.markModified !== false)
+        );
         if (!!backup || this.initialContents) {
             this._onDidChangeContent.fire();
         }
     }
     async doCreateModel(contents) {
-        this.trace('doCreateModel()');
-        this._model = this._register(await this.modelFactory.createModel(this.resource, contents, CancellationToken.None));
+        this.trace("doCreateModel()");
+        this._model = this._register(
+            await this.modelFactory.createModel(this.resource, contents, CancellationToken.None)
+        );
         this.installModelListeners(this._model);
     }
     installModelListeners(model) {
@@ -109,28 +125,32 @@ let UntitledFileWorkingCopy = class UntitledFileWorkingCopy extends Disposable {
         let content = undefined;
         if (this.isResolved()) {
             content = await raceCancellation(this.model.snapshot(SnapshotContext.Backup, token), token);
-        }
-        else if (this.initialContents) {
+        } else if (this.initialContents) {
             content = this.initialContents.value;
         }
-        return { content };
+        return {
+            content
+        };
     }
     async save(options) {
-        this.trace('save()');
+        this.trace("save()");
         const result = await this.saveDelegate(this, options);
         if (result) {
-            this._onDidSave.fire({ reason: options?.reason, source: options?.source });
+            this._onDidSave.fire({
+                reason: options?.reason,
+                source: options?.source
+            });
         }
         return result;
     }
     async revert() {
-        this.trace('revert()');
+        this.trace("revert()");
         this.setModified(false);
         this._onDidRevert.fire();
         this.dispose();
     }
     dispose() {
-        this.trace('dispose()');
+        this.trace("dispose()");
         this._onWillDispose.fire();
         super.dispose();
     }
@@ -138,10 +158,6 @@ let UntitledFileWorkingCopy = class UntitledFileWorkingCopy extends Disposable {
         this.logService.trace(`[untitled file working copy] ${msg}`, ( this.resource.toString()), this.typeId);
     }
 };
-UntitledFileWorkingCopy = ( __decorate([
-    ( __param(8, IWorkingCopyService)),
-    ( __param(9, IWorkingCopyBackupService)),
-    ( __param(10, ILogService))
-], UntitledFileWorkingCopy));
+UntitledFileWorkingCopy = ( __decorate([( __param(8, IWorkingCopyService)), ( __param(9, IWorkingCopyBackupService)), ( __param(10, ILogService))], UntitledFileWorkingCopy));
 
 export { UntitledFileWorkingCopy };

package/vscode/src/vs/workbench/services/workingCopy/common/untitledFileWorkingCopyManager.js

@@ -14,7 +14,16 @@ import { BaseFileWorkingCopyManager } from './abstractFileWorkingCopyManager.js'
 import { ResourceMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/map';
 
 let UntitledFileWorkingCopyManager = class UntitledFileWorkingCopyManager extends BaseFileWorkingCopyManager {
-    constructor(workingCopyTypeId, modelFactory, saveDelegate, fileService, labelService, logService, workingCopyBackupService, workingCopyService) {
+    constructor(
+        workingCopyTypeId,
+        modelFactory,
+        saveDelegate,
+        fileService,
+        labelService,
+        logService,
+        workingCopyBackupService,
+        workingCopyService
+    ) {
         super(fileService, logService, workingCopyBackupService);
         this.workingCopyTypeId = workingCopyTypeId;
         this.modelFactory = modelFactory;
@@ -74,8 +83,7 @@ let UntitledFileWorkingCopyManager = class UntitledFileWorkingCopyManager extend
                     scheme: Schemas.untitled,
                     path: options.isScratchpad ? `Scratchpad-${counter}` : `Untitled-${counter}`,
                     query: this.workingCopyTypeId ?
-                        `typeId=${this.workingCopyTypeId}` :
-                        undefined
+                    `typeId=${this.workingCopyTypeId}` : undefined
                 }));
                 counter++;
             } while (( this.has(untitledResource)));
@@ -98,7 +106,9 @@ let UntitledFileWorkingCopyManager = class UntitledFileWorkingCopyManager extend
     }
     registerWorkingCopy(workingCopy) {
         const workingCopyListeners = ( new DisposableStore());
-        workingCopyListeners.add(workingCopy.onDidChangeDirty(() => this._onDidChangeDirty.fire(workingCopy)));
+        workingCopyListeners.add(
+            workingCopy.onDidChangeDirty(() => this._onDidChangeDirty.fire(workingCopy))
+        );
         workingCopyListeners.add(workingCopy.onWillDispose(() => this._onWillDispose.fire(workingCopy)));
         this.mapResourceToWorkingCopyListeners.set(workingCopy.resource, workingCopyListeners);
         this.add(workingCopy.resource, workingCopy);
@@ -121,15 +131,12 @@ let UntitledFileWorkingCopyManager = class UntitledFileWorkingCopyManager extend
         this.mapResourceToWorkingCopyListeners.clear();
     }
     notifyDidSave(source, target) {
-        this._onDidSave.fire({ source, target });
+        this._onDidSave.fire({
+            source,
+            target
+        });
     }
 };
-UntitledFileWorkingCopyManager = ( __decorate([
-    ( __param(3, IFileService)),
-    ( __param(4, ILabelService)),
-    ( __param(5, ILogService)),
-    ( __param(6, IWorkingCopyBackupService)),
-    ( __param(7, IWorkingCopyService))
-], UntitledFileWorkingCopyManager));
+UntitledFileWorkingCopyManager = ( __decorate([( __param(3, IFileService)), ( __param(4, ILabelService)), ( __param(5, ILogService)), ( __param(6, IWorkingCopyBackupService)), ( __param(7, IWorkingCopyService))], UntitledFileWorkingCopyManager));
 
 export { UntitledFileWorkingCopyManager };

package/vscode/src/vs/workbench/contrib/notebook/browser/controller/chat/cellChatActions.d.ts

@@ -1,7 +0,0 @@
-import { ServicesAccessor } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
-import { ICodeEditor } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorBrowser";
-import { EditorAction2 } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorExtensions";
-export declare class AcceptChangesAndRun extends EditorAction2 {
-    constructor();
-    runEditorCommand(accessor: ServicesAccessor, codeEditor: ICodeEditor): Promise<void> | undefined;
-}

package/vscode/src/vs/workbench/contrib/notebook/browser/controller/chat/cellChatActions.js

@@ -1,198 +0,0 @@
-
-import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
-import { KeyChord, KeyMod, KeyCode } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
-import { localize, localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
-import { registerAction2, MenuId, MenuRegistry } 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 { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
-import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
-import { InputFocusedContextKey } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkeys';
-import { KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
-import { MENU_INLINE_CHAT_WIDGET_STATUS, CTX_INLINE_CHAT_REQUEST_IN_PROGRESS, CTX_INLINE_CHAT_RESPONSE_TYPE, InlineChatResponseType, CTX_INLINE_CHAT_VISIBLE } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
-import { CTX_NOTEBOOK_CHAT_HAS_AGENT } from './notebookChatContext.js';
-import { NotebookAction, getEditorFromArgsOrActivePane, getContextFromActiveEditor } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
-import { insertNewCell } from '../insertCellActions.js';
-import { NotebookSetting, CellKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
-import { NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_EDITOR_FOCUSED } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
-import { Iterable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/iterator';
-import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
-import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
-import { InlineChatController } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
-import { EditorAction2 } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorExtensions';
-
-async function startChat(accessor, context, index, input, autoSend, source) {
-    const configurationService = accessor.get(IConfigurationService);
-    const commandService = accessor.get(ICommandService);
-    if (configurationService.getValue(NotebookSetting.cellGenerate) || configurationService.getValue(NotebookSetting.cellChat)) {
-        const activeCell = context.notebookEditor.getActiveCell();
-        const targetCell = activeCell?.getTextLength() === 0 && source !== 'insertToolbar' ? activeCell : (await insertNewCell(accessor, context, CellKind.Code, 'below'));
-        if (targetCell) {
-            targetCell.enableAutoLanguageDetection();
-            await context.notebookEditor.revealFirstLineIfOutsideViewport(targetCell);
-            const codeEditor = context.notebookEditor.codeEditors.find(ce => ce[0] === targetCell)?.[1];
-            if (codeEditor) {
-                codeEditor.focus();
-                commandService.executeCommand('inlineChat.start');
-            }
-        }
-    }
-}
-registerAction2(class extends NotebookAction {
-    constructor() {
-        super({
-            id: 'notebook.cell.chat.start',
-            title: {
-                value: '$(sparkle) ' + ( localize(9356, "Generate")),
-                original: '$(sparkle) Generate',
-            },
-            tooltip: ( localize(9357, "Start Chat to Generate Code")),
-            metadata: {
-                description: ( localize(9357, "Start Chat to Generate Code")),
-                args: [
-                    {
-                        name: 'args',
-                        schema: {
-                            type: 'object',
-                            required: ['index'],
-                            properties: {
-                                'index': {
-                                    type: 'number'
-                                },
-                                'input': {
-                                    type: 'string'
-                                },
-                                'autoSend': {
-                                    type: 'boolean'
-                                }
-                            }
-                        }
-                    }
-                ]
-            },
-            f1: false,
-            keybinding: {
-                when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ( NOTEBOOK_EDITOR_EDITABLE.isEqualTo(true)), ContextKeyExpr.not(InputFocusedContextKey), CTX_NOTEBOOK_CHAT_HAS_AGENT, ( ContextKeyExpr.or(( ContextKeyExpr.equals(`config.${NotebookSetting.cellChat}`, true)), ( ContextKeyExpr.equals(`config.${NotebookSetting.cellGenerate}`, true)))))),
-                weight: KeybindingWeight.WorkbenchContrib,
-                primary: KeyMod.CtrlCmd | KeyCode.KeyI,
-                secondary: [KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyCode.KeyI)],
-            },
-            menu: [
-                {
-                    id: MenuId.NotebookCellBetween,
-                    group: 'inline',
-                    order: -1,
-                    when: ( ContextKeyExpr.and(( NOTEBOOK_EDITOR_EDITABLE.isEqualTo(true)), CTX_NOTEBOOK_CHAT_HAS_AGENT, ( ContextKeyExpr.or(( ContextKeyExpr.equals(`config.${NotebookSetting.cellChat}`, true)), ( ContextKeyExpr.equals(`config.${NotebookSetting.cellGenerate}`, true))))))
-                }
-            ]
-        });
-    }
-    getEditorContextFromArgsOrActive(accessor, ...args) {
-        const [firstArg] = args;
-        if (!firstArg) {
-            const notebookEditor = getEditorFromArgsOrActivePane(accessor);
-            if (!notebookEditor) {
-                return undefined;
-            }
-            const activeCell = notebookEditor.getActiveCell();
-            if (!activeCell) {
-                return undefined;
-            }
-            return {
-                cell: activeCell,
-                notebookEditor,
-                input: undefined,
-                autoSend: undefined
-            };
-        }
-        if (typeof firstArg !== 'object' || typeof firstArg.index !== 'number') {
-            return undefined;
-        }
-        const notebookEditor = getEditorFromArgsOrActivePane(accessor);
-        if (!notebookEditor) {
-            return undefined;
-        }
-        const cell = firstArg.index <= 0 ? undefined : notebookEditor.cellAt(firstArg.index - 1);
-        return {
-            cell,
-            notebookEditor,
-            input: firstArg.input,
-            autoSend: firstArg.autoSend
-        };
-    }
-    async runWithContext(accessor, context) {
-        const index = Math.max(0, context.cell ? context.notebookEditor.getCellIndex(context.cell) + 1 : 0);
-        await startChat(accessor, context, index, context.input, context.autoSend, context.source);
-    }
-});
-registerAction2(class extends NotebookAction {
-    constructor() {
-        super({
-            id: 'notebook.cell.chat.startAtTop',
-            title: {
-                value: '$(sparkle) ' + ( localize(9356, "Generate")),
-                original: '$(sparkle) Generate',
-            },
-            tooltip: ( localize(9357, "Start Chat to Generate Code")),
-            f1: false,
-            menu: [
-                {
-                    id: MenuId.NotebookCellListTop,
-                    group: 'inline',
-                    order: -1,
-                    when: ( ContextKeyExpr.and(( NOTEBOOK_EDITOR_EDITABLE.isEqualTo(true)), CTX_NOTEBOOK_CHAT_HAS_AGENT, ( ContextKeyExpr.or(( ContextKeyExpr.equals(`config.${NotebookSetting.cellChat}`, true)), ( ContextKeyExpr.equals(`config.${NotebookSetting.cellGenerate}`, true))))))
-                },
-            ]
-        });
-    }
-    async runWithContext(accessor, context) {
-        await startChat(accessor, context);
-    }
-});
-MenuRegistry.appendMenuItem(MenuId.NotebookToolbar, {
-    command: {
-        id: 'notebook.cell.chat.start',
-        icon: Codicon.sparkle,
-        title: ( localize(9358, "Generate")),
-        tooltip: ( localize(9359, "Start Chat to Generate Code"))
-    },
-    order: -10,
-    group: 'navigation/add',
-    when: ( ContextKeyExpr.and(( NOTEBOOK_EDITOR_EDITABLE.isEqualTo(true)), ( ContextKeyExpr.notEquals('config.notebook.insertToolbarLocation', 'betweenCells')), ( ContextKeyExpr.notEquals('config.notebook.insertToolbarLocation', 'hidden')), CTX_NOTEBOOK_CHAT_HAS_AGENT, ( ContextKeyExpr.or(( ContextKeyExpr.equals(`config.${NotebookSetting.cellChat}`, true)), ( ContextKeyExpr.equals(`config.${NotebookSetting.cellGenerate}`, true))))))
-});
-class AcceptChangesAndRun extends EditorAction2 {
-    constructor() {
-        super({
-            id: 'notebook.inlineChat.acceptChangesAndRun',
-            title: ( localize2(9360, "Accept and Run")),
-            shortTitle: ( localize(9361, 'Accept & Run')),
-            tooltip: ( localize(9362, 'Accept the changes and run the cell')),
-            icon: Codicon.check,
-            f1: true,
-            precondition: ( ContextKeyExpr.and(( NOTEBOOK_EDITOR_EDITABLE.isEqualTo(true)), CTX_INLINE_CHAT_VISIBLE)),
-            keybinding: undefined,
-            menu: [{
-                    id: MENU_INLINE_CHAT_WIDGET_STATUS,
-                    group: '0_main',
-                    order: 2,
-                    when: ( ContextKeyExpr.and(( NOTEBOOK_EDITOR_EDITABLE.isEqualTo(true)), ( ChatContextKeys.inputHasText.toNegated()), ( CTX_INLINE_CHAT_REQUEST_IN_PROGRESS.toNegated()), ( CTX_INLINE_CHAT_RESPONSE_TYPE.isEqualTo(InlineChatResponseType.MessagesAndEdits))))
-                }]
-        });
-    }
-    runEditorCommand(accessor, codeEditor) {
-        const editor = getContextFromActiveEditor(accessor.get(IEditorService));
-        const ctrl = InlineChatController.get(codeEditor);
-        if (!editor || !ctrl) {
-            return;
-        }
-        const matchedCell = editor.notebookEditor.codeEditors.find(e => e[1] === codeEditor);
-        const cell = matchedCell?.[0];
-        if (!cell) {
-            return;
-        }
-        ctrl.acceptSession();
-        return editor.notebookEditor.executeNotebookCells(Iterable.single(cell));
-    }
-}
-registerAction2(AcceptChangesAndRun);
-
-export { AcceptChangesAndRun };

package/vscode/src/vs/workbench/contrib/notebook/browser/controller/chat/notebook.chat.contribution.d.ts

@@ -1,8 +0,0 @@
-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";
-export declare class SelectAndInsertKernelVariableAction extends Action2 {
-    constructor();
-    static readonly ID = "notebook.chat.selectAndInsertKernelVariable";
-    run(accessor: ServicesAccessor, ...args: unknown[]): Promise<void>;
-    private addVariableReference;
-}