@codingame/monaco-vscode-notebook-service-override 37.1.0 → 37.3.0

package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookWorkerServiceImpl.js

@@ -72,7 +72,7 @@ class NotebookEditorModelManager extends Disposable {
             return;
         }
         const modelUrl = ( resource.toString());
-        this._proxy.$acceptNewModel(( model.uri.toString()), model.metadata, model.transientOptions.transientDocumentMetadata, ( model.cells.map(cell => ({
+        this._proxy.$acceptNewModel(( model.uri.toString()), model.metadata, model.transientOptions.transientDocumentMetadata, model.cells.map(cell => ({
             handle: cell.handle,
             url: ( cell.uri.toString()),
             source: cell.textBuffer.getLinesContent(),
@@ -81,13 +81,13 @@ class NotebookEditorModelManager extends Disposable {
             language: cell.language,
             mime: cell.mime,
             cellKind: cell.cellKind,
-            outputs: ( cell.outputs.map(op => ({
+            outputs: cell.outputs.map(op => ({
                 outputId: op.outputId,
                 outputs: op.outputs
-            }))),
+            })),
             metadata: cell.metadata,
             internalMetadata: cell.internalMetadata
-        }))));
+        })));
         const toDispose = ( new DisposableStore());
         const cellToDto = cell => {
             return {
@@ -98,10 +98,10 @@ class NotebookEditorModelManager extends Disposable {
                 versionId: 0,
                 language: cell.language,
                 cellKind: cell.cellKind,
-                outputs: ( cell.outputs.map(op => ({
+                outputs: cell.outputs.map(op => ({
                     outputId: op.outputId,
                     outputs: op.outputs
-                }))),
+                })),
                 metadata: cell.metadata,
                 internalMetadata: cell.internalMetadata
             };
@@ -140,7 +140,7 @@ class NotebookEditorModelManager extends Disposable {
                     {
                         dto.push({
                             kind: e.kind,
-                            changes: ( e.changes.map(diff => [diff[0], diff[1], ( diff[2].map(cell => cellToDto(cell)))]))
+                            changes: e.changes.map(diff => [diff[0], diff[1], diff[2].map(cell => cellToDto(cell))])
                         });
                         for (const change of e.changes) {
                             for (const cell of change[2]) {
@@ -156,7 +156,7 @@ class NotebookEditorModelManager extends Disposable {
                             index: e.index,
                             length: e.length,
                             newIdx: e.newIdx,
-                            cells: ( e.cells.map(cell => cellToDto(cell)))
+                            cells: e.cells.map(cell => cellToDto(cell))
                         });
                         break;
                     }

package/vscode/src/vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineEntryFactory.js

@@ -93,7 +93,7 @@ let NotebookOutlineEntryFactory = class NotebookOutlineEntryFactory {
             }
             if (entries.length === 0) {
                 if (preview.length === 0) {
-                    preview = ( localize(14848, "empty cell"));
+                    preview = ( localize(16987, "empty cell"));
                 }
                 entries.push(( new OutlineEntry(
                     index++,

package/vscode/src/vs/workbench/contrib/notebook/common/model/notebookTextModel.js

@@ -290,7 +290,7 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
         this._cells = [];
         this._versionId = 0;
         this._notebookSpecificAlternativeId = 0;
-        const mainCells = ( cells.map(cell => {
+        const mainCells = cells.map(cell => {
             const cellHandle = this._cellhandlePool++;
             const cellUri = CellUri.generate(this.uri, cellHandle);
             return ( new NotebookCellTextModel(
@@ -304,7 +304,7 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
                 this._languageDetectionService,
                 this._notebookLoggingService
             ));
-        }));
+        });
         for (let i = 0; i < mainCells.length; i++) {
             const dirtyStateListener = mainCells[i].onDidChangeContent(e => {
                 this._bindCellContentHandler(mainCells[i], e);
@@ -384,7 +384,7 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
         }
     }
     _generateAlternativeId() {
-        return `${this._notebookSpecificAlternativeId}_` + ( this.cells.map(cell => cell.handle + "," + cell.alternativeId)).join(";");
+        return `${this._notebookSpecificAlternativeId}_` + this.cells.map(cell => cell.handle + "," + cell.alternativeId).join(";");
     }
     dispose() {
         if (this._isDisposed) {
@@ -428,7 +428,7 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
     reset(cells, metadata, transientOptions) {
         this.transientOptions = transientOptions;
         const executions = this._notebookExecutionStateService.getCellExecutionsForNotebook(this.uri);
-        const executingCellHandles = ( executions.filter(exe => exe.state === NotebookCellExecutionState.Executing).map(exe => exe.cellHandle));
+        const executingCellHandles = executions.filter(exe => exe.state === NotebookCellExecutionState.Executing).map(exe => exe.cellHandle);
         const edits = NotebookTextModel_1.computeEdits(this, cells, executingCellHandles);
         this.applyEdits([...edits, {
             editType: CellEditType.DocumentMetadata,
@@ -548,14 +548,14 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
         if (a.length === 0) {
             return [];
         }
-        return ( b.map((output, i) => {
+        return b.map((output, i) => {
             return {
                 editType: CellEditType.OutputItems,
                 outputId: a[i].outputId,
                 items: output.outputs,
                 append: false
             };
-        }));
+        });
     }
     static _commonPrefix(a, aLen, aDelta, b, bLen, bDelta, isExecuting) {
         const maxResult = Math.min(aLen, bLen);
@@ -640,7 +640,7 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
         }
     }
     _doApplyEdits(rawEdits, synchronous, computeUndoRedo, beginSelectionState, undoRedoGroup) {
-        const editsWithDetails = ( rawEdits.map((edit, index) => {
+        const editsWithDetails = rawEdits.map((edit, index) => {
             let cellIndex = -1;
             if (hasKey(edit, {
                 index: true
@@ -670,8 +670,8 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
                 end: (edit.editType === CellEditType.DocumentMetadata) ? undefined : (edit.editType === CellEditType.Replace ? edit.index + edit.count : cellIndex),
                 originalIndex: index
             };
-        })).filter(isDefined);
-        const edits = ( this._mergeCellEdits(editsWithDetails).sort((a, b) => {
+        }).filter(isDefined);
+        const edits = this._mergeCellEdits(editsWithDetails).sort((a, b) => {
             if (a.end === undefined) {
                 return -1;
             }
@@ -703,7 +703,7 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
                 }
             });
             return [...otherEdits.reverse(), ...replaceEdits];
-        }));
+        });
         const flattenEdits = edits.flat();
         for (const {
             edit,
@@ -729,7 +729,7 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
                         this._spliceNotebookCellOutputs(cell, {
                             start: cell.outputs.length,
                             deleteCount: 0,
-                            newOutputs: ( edit.outputs.map(op => ( new NotebookCellOutputTextModel(op))))
+                            newOutputs: edit.outputs.map(op => ( new NotebookCellOutputTextModel(op)))
                         }, true, computeUndoRedo);
                     } else {
                         this._spliceNotebookCellOutputs2(cell, edit.outputs, computeUndoRedo);
@@ -841,7 +841,7 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
             this._cellListeners.get(cell.handle)?.dispose();
             this._cellListeners.delete(cell.handle);
         }
-        const cells = ( cellDtos.map(cellDto => {
+        const cells = cellDtos.map(cellDto => {
             const cellHandle = this._cellhandlePool++;
             const cellUri = CellUri.generate(this.uri, cellHandle);
             if (!cellDto.outputs) {
@@ -872,14 +872,14 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
             this._cellListeners.set(cell.handle, dirtyStateListener);
             this._register(cell);
             return cell;
-        }));
+        });
         const cellsCopy = this._cells.slice(0);
         cellsCopy.splice(index, count, ...cells);
-        const diffs = ( diff(this._cells, cellsCopy, cell => {
+        const diffs = diff(this._cells, cellsCopy, cell => {
             return ( oldSet.has(cell.handle));
         }).map(diff => {
             return [diff.start, diff.deleteCount, diff.toInsert];
-        }));
+        });
         this._onWillAddRemoveCells.fire({
             rawEvent: {
                 kind: NotebookCellsChangeType.ModelChange,
@@ -887,10 +887,10 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
             }
         });
         this._cells = cellsCopy;
-        const undoDiff = ( diffs.map(diff => {
+        const undoDiff = diffs.map(diff => {
             const deletedCells = oldViewCells.slice(diff[0], diff[0] + diff[1]);
             return [diff[0], deletedCells, diff[2]];
-        }));
+        });
         if (computeUndoRedo) {
             this._operationManager.pushEditOperation(( new SpliceCellsEdit(this.uri, undoDiff, {
                 insertCell: (index, cell, endSelections) => {
@@ -1194,17 +1194,17 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
             this._spliceNotebookCellOutputs(cell, {
                 start: 0,
                 deleteCount: cell.outputs.length,
-                newOutputs: ( outputs.map(op => ( new NotebookCellOutputTextModel(op))))
+                newOutputs: outputs.map(op => ( new NotebookCellOutputTextModel(op)))
             }, false, computeUndoRedo);
             return;
         }
         const diff = ( new LcsDiff(( new OutputSequence(cell.outputs)), ( new OutputSequence(outputs))));
         const diffResult = diff.ComputeDiff(false);
-        const splices = ( diffResult.changes.map(change => ({
+        const splices = diffResult.changes.map(change => ({
             start: change.originalStart,
             deleteCount: change.originalLength,
-            newOutputs: ( outputs.slice(change.modifiedStart, change.modifiedStart + change.modifiedLength).map(op => ( new NotebookCellOutputTextModel(op))))
-        })));
+            newOutputs: outputs.slice(change.modifiedStart, change.modifiedStart + change.modifiedLength).map(op => ( new NotebookCellOutputTextModel(op)))
+        }));
         splices.reverse().forEach(splice => {
             this._spliceNotebookCellOutputs(cell, splice, false, computeUndoRedo);
         });
@@ -1215,7 +1215,7 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
             rawEvents: [{
                 kind: NotebookCellsChangeType.Output,
                 index: this._cells.indexOf(cell),
-                outputs: ( cell.outputs.map(output => output.asDto())) ?? [],
+                outputs: cell.outputs.map(output => output.asDto()) ?? [],
                 append,
                 transient: this.transientOptions.transientOutputs
             }],
@@ -1381,12 +1381,12 @@ class OutputSequence {
         this.outputs = outputs;
     }
     getElements() {
-        return ( this.outputs.map(output => {
-            return hash(( output.outputs.map(output => ({
+        return this.outputs.map(output => {
+            return hash(output.outputs.map(output => ({
                 mime: output.mime,
                 data: output.data
-            }))));
-        }));
+            })));
+        });
     }
 }
 

package/vscode/src/vs/workbench/contrib/notebook/common/notebookEditorModel.d.ts

@@ -0,0 +1,87 @@
+import { VSBufferReadableStream } from "@codingame/monaco-vscode-api/vscode/vs/base/common/buffer";
+import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
+import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
+import { IMarkdownString } from "@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent";
+import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
+import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
+import { IWriteFileOptions, IFileStatWithMetadata } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files";
+import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
+import { IRevertOptions, ISaveOptions, IUntypedEditorInput } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor";
+import { EditorModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor/editorModel";
+import { NotebookTextModel } from "./model/notebookTextModel.js";
+import { INotebookEditorModel, INotebookLoadOptions, IResolvedNotebookEditorModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon";
+import { INotebookLoggingService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookLoggingService.service";
+import { INotebookSerializer } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService";
+import { INotebookService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service";
+import { IFilesConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/filesConfiguration/common/filesConfigurationService.service";
+import { IFileWorkingCopyModelConfiguration, SnapshotContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/workingCopy/common/fileWorkingCopy";
+import { IFileWorkingCopyManager } from "../../../services/workingCopy/common/fileWorkingCopyManager.js";
+import { IStoredFileWorkingCopyModel, IStoredFileWorkingCopyModelContentChangedEvent, IStoredFileWorkingCopyModelFactory, IStoredFileWorkingCopySaveEvent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/workingCopy/common/storedFileWorkingCopy";
+import { IUntitledFileWorkingCopyModel, IUntitledFileWorkingCopyModelContentChangedEvent, IUntitledFileWorkingCopyModelFactory } from "../../../services/workingCopy/common/untitledFileWorkingCopy.js";
+export declare class SimpleNotebookEditorModel extends EditorModel implements INotebookEditorModel {
+    readonly resource: URI;
+    private readonly _hasAssociatedFilePath;
+    readonly viewType: string;
+    private readonly _workingCopyManager;
+    private readonly _filesConfigurationService;
+    private readonly _onDidChangeDirty;
+    private readonly _onDidSave;
+    private readonly _onDidChangeOrphaned;
+    private readonly _onDidChangeReadonly;
+    private readonly _onDidRevertUntitled;
+    readonly onDidChangeDirty: Event<void>;
+    readonly onDidSave: Event<IStoredFileWorkingCopySaveEvent>;
+    readonly onDidChangeOrphaned: Event<void>;
+    readonly onDidChangeReadonly: Event<void>;
+    readonly onDidRevertUntitled: Event<void>;
+    private _workingCopy?;
+    private readonly _workingCopyListeners;
+    private readonly scratchPad;
+    constructor(resource: URI, _hasAssociatedFilePath: boolean, viewType: string, _workingCopyManager: IFileWorkingCopyManager<NotebookFileWorkingCopyModel, NotebookFileWorkingCopyModel>, scratchpad: boolean, _filesConfigurationService: IFilesConfigurationService);
+    dispose(): void;
+    get notebook(): NotebookTextModel | undefined;
+    isResolved(): this is IResolvedNotebookEditorModel;
+    canDispose(): Promise<boolean>;
+    isDirty(): boolean;
+    isModified(): boolean;
+    isOrphaned(): boolean;
+    hasAssociatedFilePath(): boolean;
+    isReadonly(): boolean | IMarkdownString;
+    get hasErrorState(): boolean;
+    revert(options?: IRevertOptions): Promise<void>;
+    save(options?: ISaveOptions): Promise<boolean>;
+    load(options?: INotebookLoadOptions): Promise<IResolvedNotebookEditorModel>;
+    saveAs(target: URI): Promise<IUntypedEditorInput | undefined>;
+    private static _isStoredFileWorkingCopy;
+}
+export declare class NotebookFileWorkingCopyModel extends Disposable implements IStoredFileWorkingCopyModel, IUntitledFileWorkingCopyModel {
+    private readonly _notebookModel;
+    private readonly _notebookService;
+    private readonly _configurationService;
+    private readonly _telemetryService;
+    private readonly _notebookLogService;
+    private readonly _onDidChangeContent;
+    readonly onDidChangeContent: Event<IStoredFileWorkingCopyModelContentChangedEvent & IUntitledFileWorkingCopyModelContentChangedEvent>;
+    readonly onWillDispose: Event<void>;
+    readonly configuration: IFileWorkingCopyModelConfiguration | undefined;
+    save: ((options: IWriteFileOptions, token: CancellationToken) => Promise<IFileStatWithMetadata>) | undefined;
+    constructor(_notebookModel: NotebookTextModel, _notebookService: INotebookService, _configurationService: IConfigurationService, _telemetryService: ITelemetryService, _notebookLogService: INotebookLoggingService);
+    private setSaveDelegate;
+    dispose(): void;
+    get notebookModel(): NotebookTextModel;
+    snapshot(context: SnapshotContext, token: CancellationToken): Promise<VSBufferReadableStream>;
+    update(stream: VSBufferReadableStream, token: CancellationToken): Promise<void>;
+    getNotebookSerializer(): Promise<INotebookSerializer>;
+    get versionId(): string;
+    pushStackElement(): void;
+}
+export declare class NotebookFileWorkingCopyModelFactory implements IStoredFileWorkingCopyModelFactory<NotebookFileWorkingCopyModel>, IUntitledFileWorkingCopyModelFactory<NotebookFileWorkingCopyModel> {
+    private readonly _viewType;
+    private readonly _notebookService;
+    private readonly _configurationService;
+    private readonly _telemetryService;
+    private readonly _notebookLogService;
+    constructor(_viewType: string, _notebookService: INotebookService, _configurationService: IConfigurationService, _telemetryService: ITelemetryService, _notebookLogService: INotebookLoggingService);
+    createModel(resource: URI, stream: VSBufferReadableStream, token: CancellationToken): Promise<NotebookFileWorkingCopyModel>;
+}