@codingame/monaco-vscode-notebook-service-override 3.2.2 → 4.0.0

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

@@ -17,13 +17,17 @@ import { isDefined } from 'vscode/vscode/vs/base/common/types';
 
 var NotebookTextModel_1;
 class StackOperation {
-    constructor(textModel, label, undoRedoGroup, _pauseableEmitter, _postUndoRedo, selectionState, beginAlternativeVersionId) {
+    get code() {
+        return this._operations.length === 1 ? this._operations[0].code : 'undoredo.notebooks.stackOperation';
+    }
+    get label() {
+        return this._operations.length === 1 ? this._operations[0].label : 'edit';
+    }
+    constructor(textModel, undoRedoGroup, _pauseableEmitter, _postUndoRedo, selectionState, beginAlternativeVersionId) {
         this.textModel = textModel;
-        this.label = label;
         this.undoRedoGroup = undoRedoGroup;
         this._pauseableEmitter = _pauseableEmitter;
         this._postUndoRedo = _postUndoRedo;
-        this.code = 'undoredo.notebooks.stackOperation';
         this._operations = [];
         this._beginSelectionState = undefined;
         this._resultSelectionState = undefined;
@@ -40,14 +44,15 @@ class StackOperation {
     }
     pushEndState(alternativeVersionId, selectionState) {
         this._resultAlternativeVersionId = alternativeVersionId;
-        this._resultSelectionState = selectionState;
+        this._resultSelectionState = selectionState || this._resultSelectionState;
     }
-    pushEditOperation(element, beginSelectionState, resultSelectionState) {
+    pushEditOperation(element, beginSelectionState, resultSelectionState, alternativeVersionId) {
         if (this._operations.length === 0) {
             this._beginSelectionState = this._beginSelectionState ?? beginSelectionState;
         }
         this._operations.push(element);
         this._resultSelectionState = resultSelectionState;
+        this._resultAlternativeVersionId = alternativeVersionId;
     }
     async undo() {
         this._pauseableEmitter.pause();
@@ -89,31 +94,26 @@ class NotebookOperationManager {
     isUndoStackEmpty() {
         return this._pendingStackOperation === null || this._pendingStackOperation.isEmpty;
     }
-    pushStackElement(label, selectionState, undoRedoGroup, alternativeVersionId) {
-        if (this._pendingStackOperation) {
+    pushStackElement(alternativeVersionId, selectionState) {
+        if (this._pendingStackOperation && !this._pendingStackOperation.isEmpty) {
             this._pendingStackOperation.pushEndState(alternativeVersionId, selectionState);
-            if (!this._pendingStackOperation.isEmpty) {
-                this._undoService.pushElement(this._pendingStackOperation, this._pendingStackOperation.undoRedoGroup);
-            }
-            this._pendingStackOperation = null;
-            return;
+            this._undoService.pushElement(this._pendingStackOperation, this._pendingStackOperation.undoRedoGroup);
         }
-        this._pendingStackOperation = ( new StackOperation(
+        this._pendingStackOperation = null;
+    }
+    _getOrCreateEditStackElement(beginSelectionState, undoRedoGroup, alternativeVersionId) {
+        return this._pendingStackOperation ??= ( new StackOperation(
             this._textModel,
-            label,
             undoRedoGroup,
             this._pauseableEmitter,
             this._postUndoRedo,
-            selectionState,
-            alternativeVersionId
+            beginSelectionState,
+            alternativeVersionId || ''
         ));
     }
-    pushEditOperation(element, beginSelectionState, resultSelectionState) {
-        if (this._pendingStackOperation) {
-            this._pendingStackOperation.pushEditOperation(element, beginSelectionState, resultSelectionState);
-            return;
-        }
-        this._undoService.pushElement(element);
+    pushEditOperation(element, beginSelectionState, resultSelectionState, alternativeVersionId, undoRedoGroup) {
+        const pendingStackOperation = this._getOrCreateEditStackElement(beginSelectionState, undoRedoGroup, alternativeVersionId);
+        pendingStackOperation.pushEditOperation(element, beginSelectionState, resultSelectionState, alternativeVersionId);
     }
 }
 class NotebookEventEmitter extends PauseableEmitter {
@@ -301,8 +301,7 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
         this._cells = [];
         super.dispose();
     }
-    pushStackElement(label, selectionState, undoRedoGroup) {
-        this._operationManager.pushStackElement(label, selectionState, undoRedoGroup, this.alternativeVersionId);
+    pushStackElement() {
     }
     _getCellIndexByHandle(handle) {
         return this.cells.findIndex(c => c.handle === handle);
@@ -409,20 +408,20 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
     }
     applyEdits(rawEdits, synchronous, beginSelectionState, endSelectionsComputer, undoRedoGroup, computeUndoRedo) {
         this._pauseableEmitter.pause();
-        this.pushStackElement('edit', beginSelectionState, undoRedoGroup);
+        this._operationManager.pushStackElement(this._alternativeVersionId, undefined);
         try {
-            this._doApplyEdits(rawEdits, synchronous, computeUndoRedo);
+            this._doApplyEdits(rawEdits, synchronous, computeUndoRedo, beginSelectionState, undoRedoGroup);
             return true;
         }
         finally {
             const endSelections = endSelectionsComputer();
             this._increaseVersionId(this._operationManager.isUndoStackEmpty() && !this._pauseableEmitter.isDirtyEvent());
-            this.pushStackElement('edit', endSelections, undefined);
+            this._operationManager.pushStackElement(this._alternativeVersionId, endSelections);
             this._pauseableEmitter.fire({ rawEvents: [], versionId: this.versionId, synchronous: synchronous, endSelectionState: endSelections });
             this._pauseableEmitter.resume();
         }
     }
-    _doApplyEdits(rawEdits, synchronous, computeUndoRedo) {
+    _doApplyEdits(rawEdits, synchronous, computeUndoRedo, beginSelectionState, undoRedoGroup) {
         const editsWithDetails = ( rawEdits.map((edit, index) => {
             let cellIndex = -1;
             if ('index' in edit) {
@@ -494,7 +493,7 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
         for (const { edit, cellIndex } of flattenEdits) {
             switch (edit.editType) {
                 case 1 :
-                    this._replaceCells(edit.index, edit.count, edit.cells, synchronous, computeUndoRedo);
+                    this._replaceCells(edit.index, edit.count, edit.cells, synchronous, computeUndoRedo, beginSelectionState, undoRedoGroup);
                     break;
                 case 2 : {
                     this._assertIndex(cellIndex);
@@ -521,11 +520,11 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
                     break;
                 case 3 :
                     this._assertIndex(edit.index);
-                    this._changeCellMetadata(this._cells[edit.index], edit.metadata, computeUndoRedo);
+                    this._changeCellMetadata(this._cells[edit.index], edit.metadata, computeUndoRedo, beginSelectionState, undoRedoGroup);
                     break;
                 case 8 :
                     this._assertIndex(cellIndex);
-                    this._changeCellMetadataPartial(this._cells[cellIndex], edit.metadata, computeUndoRedo);
+                    this._changeCellMetadataPartial(this._cells[cellIndex], edit.metadata, computeUndoRedo, beginSelectionState, undoRedoGroup);
                     break;
                 case 9 :
                     this._assertIndex(cellIndex);
@@ -533,13 +532,13 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
                     break;
                 case 4 :
                     this._assertIndex(edit.index);
-                    this._changeCellLanguage(this._cells[edit.index], edit.language, computeUndoRedo);
+                    this._changeCellLanguage(this._cells[edit.index], edit.language, computeUndoRedo, beginSelectionState, undoRedoGroup);
                     break;
                 case 5 :
-                    this._updateNotebookMetadata(edit.metadata, computeUndoRedo);
+                    this._updateNotebookCellMetadata(edit.metadata, computeUndoRedo, beginSelectionState, undoRedoGroup);
                     break;
                 case 6 :
-                    this._moveCellToIdx(edit.index, edit.length, edit.newIdx, synchronous, computeUndoRedo, undefined, undefined);
+                    this._moveCellToIdx(edit.index, edit.length, edit.newIdx, synchronous, computeUndoRedo, beginSelectionState, undefined, undoRedoGroup);
                     break;
             }
         }
@@ -579,7 +578,7 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
         const defaultConfig = cellDto.cellKind === CellKind.Code ? this._defaultCollapseConfig?.codeCell : this._defaultCollapseConfig?.markupCell;
         return cellDto.collapseState ?? (defaultConfig ?? undefined);
     }
-    _replaceCells(index, count, cellDtos, synchronous, computeUndoRedo) {
+    _replaceCells(index, count, cellDtos, synchronous, computeUndoRedo, beginSelectionState, undoRedoGroup) {
         if (count === 0 && cellDtos.length === 0) {
             return;
         }
@@ -643,7 +642,7 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
                 insertCell: (index, cell, endSelections) => { this._insertNewCell(index, [cell], true, endSelections); },
                 deleteCell: (index, endSelections) => { this._removeCell(index, 1, true, endSelections); },
                 replaceCell: (index, count, cells, endSelections) => { this._replaceNewCells(index, count, cells, true, endSelections); },
-            }, undefined, undefined)), undefined, undefined);
+            }, undefined, undefined)), beginSelectionState, undefined, this._alternativeVersionId, undoRedoGroup);
         }
         this._pauseableEmitter.fire({
             rawEvents: [{ kind: NotebookCellsChangeType.ModelChange, changes: diffs, transient: false }],
@@ -663,7 +662,7 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
         this._alternativeVersionId = newAlternativeVersionId;
         this._notebookSpecificAlternativeId = Number(newAlternativeVersionId.substring(0, newAlternativeVersionId.indexOf('_')));
     }
-    _updateNotebookMetadata(metadata, computeUndoRedo) {
+    _updateNotebookCellMetadata(metadata, computeUndoRedo, beginSelectionState, undoRedoGroup) {
         const oldMetadata = this.metadata;
         const triggerDirtyChange = this._isDocumentMetadataChanged(this.metadata, metadata);
         if (triggerDirtyChange) {
@@ -672,19 +671,19 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
                 this._operationManager.pushEditOperation(new (class {
                     constructor() {
                         this.type = 0 ;
-                        this.label = 'Update Notebook Metadata';
-                        this.code = 'undoredo.notebooks.updateCellMetadata';
+                        this.label = 'Update Cell Metadata';
+                        this.code = 'undoredo.textBufferEdit';
                     }
                     get resource() {
                         return that.uri;
                     }
                     undo() {
-                        that._updateNotebookMetadata(oldMetadata, false);
+                        that._updateNotebookCellMetadata(oldMetadata, false, beginSelectionState, undoRedoGroup);
                     }
                     redo() {
-                        that._updateNotebookMetadata(metadata, false);
+                        that._updateNotebookCellMetadata(metadata, false, beginSelectionState, undoRedoGroup);
                     }
-                })(), undefined, undefined);
+                })(), beginSelectionState, undefined, this._alternativeVersionId, undoRedoGroup);
             }
         }
         this.metadata = metadata;
@@ -800,7 +799,7 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
         }
         return true;
     }
-    _changeCellMetadataPartial(cell, metadata, computeUndoRedo) {
+    _changeCellMetadataPartial(cell, metadata, computeUndoRedo, beginSelectionState, undoRedoGroup) {
         const newMetadata = {
             ...cell.metadata
         };
@@ -809,9 +808,9 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
             const value = metadata[k] ?? undefined;
             newMetadata[k] = value;
         }
-        return this._changeCellMetadata(cell, newMetadata, computeUndoRedo);
+        return this._changeCellMetadata(cell, newMetadata, computeUndoRedo, beginSelectionState, undoRedoGroup);
     }
-    _changeCellMetadata(cell, metadata, computeUndoRedo) {
+    _changeCellMetadata(cell, metadata, computeUndoRedo, beginSelectionState, undoRedoGroup) {
         const triggerDirtyChange = this._isCellMetadataChanged(cell.metadata, metadata);
         if (triggerDirtyChange) {
             if (computeUndoRedo) {
@@ -822,9 +821,9 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
                         if (!cell) {
                             return;
                         }
-                        this._changeCellMetadata(cell, newMetadata, false);
+                        this._changeCellMetadata(cell, newMetadata, false, beginSelectionState, undoRedoGroup);
                     }
-                })), undefined, undefined);
+                })), beginSelectionState, undefined, this._alternativeVersionId, undoRedoGroup);
             }
         }
         cell.metadata = metadata;
@@ -852,7 +851,7 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
             endSelectionState: undefined
         });
     }
-    _changeCellLanguage(cell, languageId, computeUndoRedo) {
+    _changeCellLanguage(cell, languageId, computeUndoRedo, beginSelectionState, undoRedoGroup) {
         if (cell.language === languageId) {
             return;
         }
@@ -864,18 +863,18 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
                 constructor() {
                     this.type = 0 ;
                     this.label = 'Update Cell Language';
-                    this.code = 'undoredo.notebooks.updateCellLanguage';
+                    this.code = 'undoredo.textBufferEdit';
                 }
                 get resource() {
                     return that.uri;
                 }
                 undo() {
-                    that._changeCellLanguage(cell, oldLanguage, false);
+                    that._changeCellLanguage(cell, oldLanguage, false, beginSelectionState, undoRedoGroup);
                 }
                 redo() {
-                    that._changeCellLanguage(cell, languageId, false);
+                    that._changeCellLanguage(cell, languageId, false, beginSelectionState, undoRedoGroup);
                 }
-            })(), undefined, undefined);
+            })(), beginSelectionState, undefined, this._alternativeVersionId, undoRedoGroup);
         }
         this._pauseableEmitter.fire({
             rawEvents: [{ kind: NotebookCellsChangeType.ChangeCellLanguage, index: this._cells.indexOf(cell), language: languageId, transient: false }],
@@ -952,13 +951,13 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
             });
         }
     }
-    _moveCellToIdx(index, length, newIdx, synchronous, pushedToUndoStack, beforeSelections, endSelections) {
+    _moveCellToIdx(index, length, newIdx, synchronous, pushedToUndoStack, beforeSelections, endSelections, undoRedoGroup) {
         if (pushedToUndoStack) {
             this._operationManager.pushEditOperation(( new MoveCellEdit(this.uri, index, length, newIdx, {
                 moveCell: (fromIndex, length, toIndex, beforeSelections, endSelections) => {
-                    this._moveCellToIdx(fromIndex, length, toIndex, true, false, beforeSelections, endSelections);
+                    this._moveCellToIdx(fromIndex, length, toIndex, true, false, beforeSelections, endSelections, undoRedoGroup);
                 },
-            }, beforeSelections, endSelections)), beforeSelections, endSelections);
+            }, beforeSelections, endSelections)), beforeSelections, endSelections, this._alternativeVersionId, undoRedoGroup);
         }
         this._assertIndex(index);
         this._assertIndex(newIdx);

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

@@ -1,7 +1,7 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
-import { NotebookWorkingCopyTypeIdentifier, CellUri } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
+import { NotebookWorkingCopyTypeIdentifier, NotebookSetting, CellUri } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { NotebookFileWorkingCopyModelFactory, SimpleNotebookEditorModel } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookEditorModel';
 import { ReferenceCollection, DisposableStore, dispose, combinedDisposable, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { INotebookService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookService';
@@ -54,7 +54,8 @@ let NotebookModelReferenceCollection = class NotebookModelReferenceCollection ex
             workingCopyManager = this._instantiationService.createInstance(FileWorkingCopyManager, workingCopyTypeId, factory, factory);
             this._workingCopyManagers.set(workingCopyTypeId, workingCopyManager);
         }
-        const model = this._instantiationService.createInstance(SimpleNotebookEditorModel, uri, hasAssociatedFilePath, viewType, workingCopyManager);
+        const scratchPad = viewType === 'interactive' && this._configurationService.getValue(NotebookSetting.InteractiveWindowPromptToSave) !== true;
+        const model = this._instantiationService.createInstance(SimpleNotebookEditorModel, uri, hasAssociatedFilePath, viewType, workingCopyManager, scratchPad);
         const result = await model.load({ limits });
         let onDirtyAutoReference;
         this._modelListener.set(result, combinedDisposable(result.onDidSave(() => this._onDidSaveNotebook.fire(result.resource)), result.onDidChangeDirty(() => {

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

@@ -29,7 +29,17 @@ import { IWorkingCopyService } from 'vscode/vscode/vs/workbench/services/working
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import { IDecorationsService } from 'vscode/vscode/vs/workbench/services/decorations/common/decorations';
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
-import { listErrorForeground } from 'vscode/vscode/vs/platform/theme/common/colorRegistry';
+import 'vscode/vscode/vs/platform/theme/common/colorUtils';
+import 'vscode/vscode/vs/platform/theme/common/colors/baseColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/chartsColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/editorColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/inputColors';
+import { listErrorForeground } from 'vscode/vscode/vs/platform/theme/common/colors/listColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/menuColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/minimapColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/miscColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/quickpickColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/searchColors';
 import { IFileDialogService, IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs';
 
 var FileWorkingCopyManager_1;