@codingame/monaco-vscode-notebook-service-override 22.1.8 → 23.0.0

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

@@ -10,6 +10,7 @@ import { IUndoRedoService } from "@codingame/monaco-vscode-api/vscode/vs/platfor
 import { ILanguageDetectionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/languageDetection/common/languageDetectionWorkerService.service";
 import { ICellDto2, ICellEditOperation, INotebookSnapshotOptions, INotebookTextModel, ISelectionState, NotebookCellDefaultCollapseConfig, NotebookData, NotebookDocumentMetadata, NotebookTextModelChangedEvent, NotebookTextModelWillAddRemoveEvent, TransientOptions } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon";
 import { INotebookExecutionStateService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService.service";
+import { INotebookLoggingService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookLoggingService.service";
 import { NotebookCellTextModel } from "@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/common/model/notebookCellTextModel";
 export declare class NotebookTextModel extends Disposable implements INotebookTextModel {
     readonly viewType: string;
@@ -19,6 +20,7 @@ export declare class NotebookTextModel extends Disposable implements INotebookTe
     private readonly _languageService;
     private readonly _languageDetectionService;
     private readonly _notebookExecutionStateService;
+    private readonly _notebookLoggingService;
     private _isDisposed;
     private readonly _onWillDispose;
     private readonly _onWillAddRemoveCells;
@@ -48,7 +50,7 @@ export declare class NotebookTextModel extends Disposable implements INotebookTe
     get versionId(): number;
     get alternativeVersionId(): string;
     get notebookType(): string;
-    constructor(viewType: string, uri: URI, cells: ICellDto2[], metadata: NotebookDocumentMetadata, options: TransientOptions, _undoService: IUndoRedoService, _modelService: IModelService, _languageService: ILanguageService, _languageDetectionService: ILanguageDetectionService, _notebookExecutionStateService: INotebookExecutionStateService);
+    constructor(viewType: string, uri: URI, cells: ICellDto2[], metadata: NotebookDocumentMetadata, options: TransientOptions, _undoService: IUndoRedoService, _modelService: IModelService, _languageService: ILanguageService, _languageDetectionService: ILanguageDetectionService, _notebookExecutionStateService: INotebookExecutionStateService, _notebookLoggingService: INotebookLoggingService);
     setCellCollapseDefault(collapseConfig: NotebookCellDefaultCollapseConfig | undefined): void;
     _initialize(cells: ICellDto2[], triggerDirty?: boolean): void;
     private _bindCellContentHandler;
@@ -70,7 +72,6 @@ export declare class NotebookTextModel extends Disposable implements INotebookTe
     applyEdits(rawEdits: ICellEditOperation[], synchronous: boolean, beginSelectionState: ISelectionState | undefined, endSelectionsComputer: () => ISelectionState | undefined, undoRedoGroup: UndoRedoGroup | undefined, computeUndoRedo: boolean): boolean;
     private _doApplyEdits;
     private _mergeCellEdits;
-    private _getDefaultCollapseState;
     private _replaceCells;
     private _increaseVersionId;
     private _overwriteAlternativeVersionId;

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

@@ -17,9 +17,10 @@ import { IModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/com
 import { UndoRedoElementType } from '@codingame/monaco-vscode-api/vscode/vs/platform/undoRedo/common/undoRedo';
 import { IUndoRedoService } from '@codingame/monaco-vscode-api/vscode/vs/platform/undoRedo/common/undoRedo.service';
 import { ILanguageDetectionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/languageDetection/common/languageDetectionWorkerService.service';
-import { SnapshotContext } from '@codingame/monaco-vscode-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common/vscode/vs/workbench/services/workingCopy/common/fileWorkingCopy';
-import { CellUri, NotebookCellsChangeType, NotebookCellExecutionState, CellEditType, CellKind, diff } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
+import { SnapshotContext } from '@codingame/monaco-vscode-6f931a91-88ea-5232-897f-a17ec3929ba5-common/vscode/vs/workbench/services/workingCopy/common/fileWorkingCopy';
+import { CellUri, NotebookCellsChangeType, NotebookCellExecutionState, CellEditType, diff } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { INotebookExecutionStateService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService.service';
+import { INotebookLoggingService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookLoggingService.service';
 import { SpliceCellsEdit, CellMetadataEdit, MoveCellEdit } from './cellEdit.js';
 import { NotebookCellOutputTextModel } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/common/model/notebookCellOutputTextModel';
 import { NotebookCellTextModel } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/common/model/notebookCellTextModel';
@@ -178,7 +179,7 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
     get notebookType() {
         return this.viewType;
     }
-    constructor(viewType, uri, cells, metadata, options, _undoService, _modelService, _languageService, _languageDetectionService, _notebookExecutionStateService) {
+    constructor(viewType, uri, cells, metadata, options, _undoService, _modelService, _languageService, _languageDetectionService, _notebookExecutionStateService, _notebookLoggingService) {
         super();
         this.viewType = viewType;
         this.uri = uri;
@@ -187,6 +188,7 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
         this._languageService = _languageService;
         this._languageDetectionService = _languageDetectionService;
         this._notebookExecutionStateService = _notebookExecutionStateService;
+        this._notebookLoggingService = _notebookLoggingService;
         this._isDisposed = false;
         this._onWillDispose = this._register(( new Emitter()));
         this._onWillAddRemoveCells = this._register(( new Emitter()));
@@ -221,7 +223,7 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
             }
         };
         this._register(_modelService.onModelAdded(e => maybeUpdateCellTextModel(e)));
-        this._pauseableEmitter = ( new NotebookEventEmitter({
+        this._pauseableEmitter = this._register(( new NotebookEventEmitter({
             merge: (events) => {
                 const first = events[0];
                 const rawEvents = first.rawEvents;
@@ -236,7 +238,7 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
                 }
                 return { rawEvents, versionId, endSelectionState, synchronous };
             }
-        }));
+        })));
         this._register(this._pauseableEmitter.event(e => {
             if (e.rawEvents.length) {
                 this._onDidChangeContent.fire(e);
@@ -251,6 +253,7 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
                 this._overwriteAlternativeVersionId(alternativeVersionId);
             }
         ));
+        this._notebookLoggingService.trace('notebookTextModel', `Initialized notebook text model for ${( uri.toString())}`);
     }
     setCellCollapseDefault(collapseConfig) {
         this._defaultCollapseConfig = collapseConfig;
@@ -262,22 +265,16 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
         const mainCells = ( cells.map(cell => {
             const cellHandle = this._cellhandlePool++;
             const cellUri = CellUri.generate(this.uri, cellHandle);
-            const collapseState = this._getDefaultCollapseState(cell);
             return ( new NotebookCellTextModel(
                 cellUri,
                 cellHandle,
-                cell.source,
-                cell.language,
-                cell.mime,
-                cell.cellKind,
-                cell.outputs,
-                cell.metadata,
-                cell.internalMetadata,
-                collapseState,
+                cell,
                 this.transientOptions,
                 this._languageService,
                 this._modelService.getCreationOptions(cell.language, cellUri, false).defaultEOL,
-                this._languageDetectionService
+                this._defaultCollapseConfig,
+                this._languageDetectionService,
+                this._notebookLoggingService
             ));
         }));
         for (let i = 0; i < mainCells.length; i++) {
@@ -514,6 +511,7 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
         return true;
     }
     applyEdits(rawEdits, synchronous, beginSelectionState, endSelectionsComputer, undoRedoGroup, computeUndoRedo) {
+        this._notebookLoggingService.trace('textModelEdits', `Begin applying ${rawEdits.length} raw edits`);
         this._pauseableEmitter.pause();
         try {
             this._operationManager.pushStackElement(this._alternativeVersionId, undefined);
@@ -529,12 +527,17 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
                 this._doApplyEdits(rawEdits, synchronous, computeUndoRedo, beginSelectionState, undoRedoGroup);
                 return true;
             }
+            catch (err) {
+                this._notebookLoggingService.error('textModelEdits', `Error while applying edits: ${err}`);
+                throw err;
+            }
             finally {
                 if (!this._pauseableEmitter.isEmpty) {
                     const endSelections = endSelectionsComputer();
                     this._increaseVersionId(this._operationManager.isUndoStackEmpty() && !this._pauseableEmitter.isDirtyEvent());
                     this._operationManager.pushStackElement(this._alternativeVersionId, endSelections);
                     this._pauseableEmitter.fire({ rawEvents: [], versionId: this.versionId, synchronous: synchronous, endSelectionState: endSelections });
+                    this._notebookLoggingService.trace('textModelEdits', `End applying ${rawEdits.length} raw edits`);
                 }
             }
         }
@@ -562,7 +565,7 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
                 }
             }
             else if (edit.editType !== CellEditType.DocumentMetadata) {
-                throw ( new Error('Invalid cell edit'));
+                throw ( new Error('Invalid cell edit: ' + JSON.stringify(edit)));
             }
             return {
                 edit,
@@ -695,10 +698,6 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
         });
         return mergedEdits;
     }
-    _getDefaultCollapseState(cellDto) {
-        const defaultConfig = cellDto.cellKind === CellKind.Code ? this._defaultCollapseConfig?.codeCell : this._defaultCollapseConfig?.markupCell;
-        return cellDto.collapseState ?? (defaultConfig ?? undefined);
-    }
     _replaceCells(index, count, cellDtos, synchronous, computeUndoRedo, beginSelectionState, undoRedoGroup) {
         if (count === 0 && cellDtos.length === 0) {
             return;
@@ -716,22 +715,19 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
         const cells = ( cellDtos.map(cellDto => {
             const cellHandle = this._cellhandlePool++;
             const cellUri = CellUri.generate(this.uri, cellHandle);
-            const collapseState = this._getDefaultCollapseState(cellDto);
+            if (!cellDto.outputs) {
+                cellDto.outputs = [];
+            }
             const cell = ( new NotebookCellTextModel(
                 cellUri,
                 cellHandle,
-                cellDto.source,
-                cellDto.language,
-                cellDto.mime,
-                cellDto.cellKind,
-                cellDto.outputs || [],
-                cellDto.metadata,
-                cellDto.internalMetadata,
-                collapseState,
+                cellDto,
                 this.transientOptions,
                 this._languageService,
                 this._modelService.getCreationOptions(cellDto.language, cellUri, false).defaultEOL,
-                this._languageDetectionService
+                this._defaultCollapseConfig,
+                this._languageDetectionService,
+                this._notebookLoggingService
             ));
             const textModel = this._modelService.getModel(cellUri);
             if (textModel && textModel instanceof TextModel) {
@@ -1165,7 +1161,8 @@ NotebookTextModel = NotebookTextModel_1 = ( __decorate([
     ( __param(6, IModelService)),
     ( __param(7, ILanguageService)),
     ( __param(8, ILanguageDetectionService)),
-    ( __param(9, INotebookExecutionStateService))
+    ( __param(9, INotebookExecutionStateService)),
+    ( __param(10, INotebookLoggingService))
 ], NotebookTextModel));
 class OutputSequence {
     constructor(outputs) {

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

@@ -3,7 +3,7 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { NotebookWorkingCopyTypeIdentifier, NotebookSetting, CellUri } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
-import { NotebookFileWorkingCopyModelFactory, SimpleNotebookEditorModel } from '@codingame/monaco-vscode-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common/vscode/vs/workbench/contrib/notebook/common/notebookEditorModel';
+import { NotebookFileWorkingCopyModelFactory, SimpleNotebookEditorModel } from '@codingame/monaco-vscode-6f931a91-88ea-5232-897f-a17ec3929ba5-common/vscode/vs/workbench/contrib/notebook/common/notebookEditorModel';
 import { ReferenceCollection, DisposableStore, dispose, combinedDisposable, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { INotebookService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
 import { Emitter, AsyncEmitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';

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

@@ -33,7 +33,7 @@ class NotebookOutputRendererInfo {
         }
         this.displayName = descriptor.displayName;
         this.mimeTypes = descriptor.mimeTypes;
-        this.mimeTypeGlobs = ( this.mimeTypes.map(pattern => parse(pattern)));
+        this.mimeTypeGlobs = ( this.mimeTypes.map(pattern => parse(pattern, { ignoreCase: true })));
         this.hardDependencies = ( new DependencyList(descriptor.dependencies ?? Iterable.empty()));
         this.optionalDependencies = ( new DependencyList(descriptor.optionalDependencies ?? Iterable.empty()));
         this.messaging = descriptor.requiresMessaging ?? RendererMessagingSpec.Never;

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

@@ -1,5 +1,5 @@
 
-import { match, isRelativePattern } from '@codingame/monaco-vscode-api/vscode/vs/base/common/glob';
+import { isRelativePattern, match } from '@codingame/monaco-vscode-api/vscode/vs/base/common/glob';
 import { basename } from '@codingame/monaco-vscode-api/vscode/vs/base/common/path';
 import { isDocumentExcludePattern } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 
@@ -41,13 +41,8 @@ class NotebookProviderInfo {
         return this.selectors?.some(selector => NotebookProviderInfo.selectorMatches(selector, resource));
     }
     static selectorMatches(selector, resource) {
-        if (typeof selector === 'string') {
-            if (match(selector.toLowerCase(), basename(resource.fsPath).toLowerCase())) {
-                return true;
-            }
-        }
-        if (isRelativePattern(selector)) {
-            if (match(selector, basename(resource.fsPath).toLowerCase())) {
+        if (typeof selector === 'string' || isRelativePattern(selector)) {
+            if (match(selector, basename(resource.fsPath), { ignoreCase: true })) {
                 return true;
             }
         }
@@ -56,9 +51,9 @@ class NotebookProviderInfo {
         }
         const filenamePattern = selector.include;
         const excludeFilenamePattern = selector.exclude;
-        if (match(filenamePattern, basename(resource.fsPath).toLowerCase())) {
+        if (match(filenamePattern, basename(resource.fsPath), { ignoreCase: true })) {
             if (excludeFilenamePattern) {
-                if (match(excludeFilenamePattern, basename(resource.fsPath).toLowerCase())) {
+                if (match(excludeFilenamePattern, basename(resource.fsPath), { ignoreCase: true })) {
                     return false;
                 }
             }

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

@@ -33,7 +33,7 @@ declare class MirrorNotebookDocument {
     _spliceNotebookCells(splices: NotebookCellTextModelSplice<IMainCellDto>[]): void;
 }
 export declare class NotebookWorker implements IWebWorkerServerRequestHandler, IDisposable {
-    _requestHandlerBrand: any;
+    _requestHandlerBrand: void;
     private _models;
     constructor();
     dispose(): void;

package/vscode/src/vs/workbench/contrib/notebook/common/services/notebookWebWorker.js

@@ -141,6 +141,7 @@ class CellSequence {
 }
 class NotebookWorker {
     constructor() {
+        this._requestHandlerBrand = undefined;
         this._models = Object.create(null);
     }
     dispose() {
@@ -178,7 +179,7 @@ class NotebookWorker {
             };
         }
         const cellMapping = computeDiff(originalModel, modifiedModel, { cellsDiff: { changes: originalDiff.changes, quitEarly: false }}).cellDiffInfo;
-        if (cellMapping.every(c => c.type === 'modified')) {
+        if (cellMapping.every(c => c.type === 'modified' || c.type === 'unchanged')) {
             return {
                 metadataChanged,
                 cellsDiff: originalDiff

package/vscode/src/vs/workbench/contrib/replNotebook/browser/repl.contribution.d.ts

@@ -0,0 +1,15 @@
+import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
+import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
+import { IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions";
+import { IEditorResolverService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorResolverService.service";
+import { INotebookEditorModelResolverService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookEditorModelResolverService.service";
+import { INotebookService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service";
+export declare class ReplDocumentContribution extends Disposable implements IWorkbenchContribution {
+    private readonly notebookEditorModelResolverService;
+    private readonly instantiationService;
+    private readonly configurationService;
+    static readonly ID = "workbench.contrib.replDocument";
+    private readonly editorInputCache;
+    constructor(notebookService: INotebookService, editorResolverService: IEditorResolverService, notebookEditorModelResolverService: INotebookEditorModelResolverService, instantiationService: IInstantiationService, configurationService: IConfigurationService);
+}