@codingame/monaco-vscode-notebook-service-override 15.0.2 → 16.0.0

package/vscode/src/vs/workbench/contrib/notebook/browser/notebookExtensionPoint.js

@@ -28,7 +28,7 @@ const NotebookPreloadContribution = ( Object.freeze({
     localResourceRoots: 'localResourceRoots',
 }));
 const notebookProviderContribution = {
-    description: ( localize(7954, 'Contributes notebook document provider.')),
+    description: ( localize(8229, 'Contributes notebook document provider.')),
     type: 'array',
     defaultSnippets: [{ body: [{ type: '', displayName: '', 'selector': [{ 'filenamePattern': '' }] }] }],
     items: {
@@ -41,25 +41,25 @@ const notebookProviderContribution = {
         properties: {
             [NotebookEditorContribution.type]: {
                 type: 'string',
-                description: ( localize(7955, 'Type of the notebook.')),
+                description: ( localize(8230, 'Type of the notebook.')),
             },
             [NotebookEditorContribution.displayName]: {
                 type: 'string',
-                description: ( localize(7956, 'Human readable name of the notebook.')),
+                description: ( localize(8231, 'Human readable name of the notebook.')),
             },
             [NotebookEditorContribution.selector]: {
                 type: 'array',
-                description: ( localize(7957, 'Set of globs that the notebook is for.')),
+                description: ( localize(8232, 'Set of globs that the notebook is for.')),
                 items: {
                     type: 'object',
                     properties: {
                         filenamePattern: {
                             type: 'string',
-                            description: ( localize(7958, 'Glob that the notebook is enabled for.')),
+                            description: ( localize(8233, 'Glob that the notebook is enabled for.')),
                         },
                         excludeFileNamePattern: {
                             type: 'string',
-                            description: ( localize(7959, 'Glob that the notebook is disabled for.'))
+                            description: ( localize(8234, 'Glob that the notebook is disabled for.'))
                         }
                     }
                 }
@@ -67,7 +67,7 @@ const notebookProviderContribution = {
             [NotebookEditorContribution.priority]: {
                 type: 'string',
                 markdownDeprecationMessage: ( localize(
-                    7960,
+                    8235,
                     'Controls if the custom editor is enabled automatically when the user opens a file. This may be overridden by users using the `workbench.editorAssociations` setting.'
                 )),
                 enum: [
@@ -76,11 +76,11 @@ const notebookProviderContribution = {
                 ],
                 markdownEnumDescriptions: [
                     ( localize(
-                    7961,
+                    8236,
                     'The editor is automatically used when the user opens a resource, provided that no other default custom editors are registered for that resource.'
                 )),
                     ( localize(
-                    7962,
+                    8237,
                     'The editor is not automatically used when the user opens a resource, but a user can switch to the editor using the `Reopen With` command.'
                 )),
                 ],
@@ -91,7 +91,7 @@ const notebookProviderContribution = {
 };
 const defaultRendererSnippet = ( Object.freeze({ id: '', displayName: '', mimeTypes: [''], entrypoint: '' }));
 const notebookRendererContribution = {
-    description: ( localize(7963, 'Contributes notebook output renderer provider.')),
+    description: ( localize(8238, 'Contributes notebook output renderer provider.')),
     type: 'array',
     defaultSnippets: [{ body: [defaultRendererSnippet] }],
     items: {
@@ -106,18 +106,18 @@ const notebookRendererContribution = {
                 properties: {
                     [NotebookRendererContribution.id]: {
                         type: 'string',
-                        description: ( localize(7964, 'Unique identifier of the notebook output renderer.')),
+                        description: ( localize(8239, 'Unique identifier of the notebook output renderer.')),
                     },
                     [NotebookRendererContribution.displayName]: {
                         type: 'string',
-                        description: ( localize(7965, 'Human readable name of the notebook output renderer.')),
+                        description: ( localize(8240, 'Human readable name of the notebook output renderer.')),
                     },
                     [NotebookRendererContribution.hardDependencies]: {
                         type: 'array',
                         uniqueItems: true,
                         items: { type: 'string' },
                         markdownDescription: ( localize(
-                            7966,
+                            8241,
                             'List of kernel dependencies the renderer requires. If any of the dependencies are present in the `NotebookKernel.preloads`, the renderer can be used.'
                         )),
                     },
@@ -126,7 +126,7 @@ const notebookRendererContribution = {
                         uniqueItems: true,
                         items: { type: 'string' },
                         markdownDescription: ( localize(
-                            7967,
+                            8242,
                             'List of soft kernel dependencies the renderer can make use of. If any of the dependencies are present in the `NotebookKernel.preloads`, the renderer will be preferred over renderers that don\'t interact with the kernel.'
                         )),
                     },
@@ -139,17 +139,17 @@ const notebookRendererContribution = {
                         ],
                         enumDescriptions: [
                             ( localize(
-                            7968,
+                            8243,
                             'Messaging is required. The renderer will only be used when it\'s part of an extension that can be run in an extension host.'
                         )),
                             ( localize(
-                            7969,
+                            8244,
                             'The renderer is better with messaging available, but it\'s not requried.'
                         )),
-                            ( localize(7970, 'The renderer does not require messaging.')),
+                            ( localize(8245, 'The renderer does not require messaging.')),
                         ],
                         description: ( localize(
-                            7971,
+                            8246,
                             'Defines how and if the renderer needs to communicate with an extension host, via `createRendererMessaging`. Renderers with stronger messaging requirements may not work in all environments.'
                         )),
                     },
@@ -165,13 +165,13 @@ const notebookRendererContribution = {
                         properties: {
                             [NotebookRendererContribution.mimeTypes]: {
                                 type: 'array',
-                                description: ( localize(7972, 'Set of globs that the notebook is for.')),
+                                description: ( localize(8247, 'Set of globs that the notebook is for.')),
                                 items: {
                                     type: 'string'
                                 }
                             },
                             [NotebookRendererContribution.entrypoint]: {
-                                description: ( localize(7973, 'File to load in the webview to render the extension.')),
+                                description: ( localize(8248, 'File to load in the webview to render the extension.')),
                                 type: 'string',
                             },
                         }
@@ -182,17 +182,17 @@ const notebookRendererContribution = {
                         ],
                         properties: {
                             [NotebookRendererContribution.entrypoint]: {
-                                description: ( localize(7973, 'File to load in the webview to render the extension.')),
+                                description: ( localize(8248, 'File to load in the webview to render the extension.')),
                                 type: 'object',
                                 required: ['extends', 'path'],
                                 properties: {
                                     extends: {
                                         type: 'string',
-                                        description: ( localize(7974, 'Existing renderer that this one extends.')),
+                                        description: ( localize(8249, 'Existing renderer that this one extends.')),
                                     },
                                     path: {
                                         type: 'string',
-                                        description: ( localize(7973, 'File to load in the webview to render the extension.')),
+                                        description: ( localize(8248, 'File to load in the webview to render the extension.')),
                                     },
                                 }
                             },
@@ -204,7 +204,7 @@ const notebookRendererContribution = {
     }
 };
 const notebookPreloadContribution = {
-    description: ( localize(7975, 'Contributes notebook preloads.')),
+    description: ( localize(8250, 'Contributes notebook preloads.')),
     type: 'array',
     defaultSnippets: [{ body: [{ type: '', entrypoint: '' }] }],
     items: {
@@ -216,17 +216,17 @@ const notebookPreloadContribution = {
         properties: {
             [NotebookPreloadContribution.type]: {
                 type: 'string',
-                description: ( localize(7976, 'Type of the notebook.')),
+                description: ( localize(8251, 'Type of the notebook.')),
             },
             [NotebookPreloadContribution.entrypoint]: {
                 type: 'string',
-                description: ( localize(7977, 'Path to file loaded in the webview.')),
+                description: ( localize(8252, 'Path to file loaded in the webview.')),
             },
             [NotebookPreloadContribution.localResourceRoots]: {
                 type: 'array',
                 items: { type: 'string' },
                 description: ( localize(
-                    7978,
+                    8253,
                     'Paths to additional resources that should be allowed in the webview.'
                 )),
             },
@@ -273,8 +273,8 @@ class NotebooksDataRenderer extends Disposable {
             return { data: { headers: [], rows: [] }, dispose: () => { } };
         }
         const headers = [
-            ( localize(7979, "ID")),
-            ( localize(7980, "Name")),
+            ( localize(8254, "ID")),
+            ( localize(8255, "Name")),
         ];
         const rows = ( contrib
             .sort((a, b) => a.type.localeCompare(b.type))
@@ -307,8 +307,8 @@ class NotebookRenderersDataRenderer extends Disposable {
             return { data: { headers: [], rows: [] }, dispose: () => { } };
         }
         const headers = [
-            ( localize(7981, "Name")),
-            ( localize(7982, "Mimetypes")),
+            ( localize(8256, "Name")),
+            ( localize(8257, "Mimetypes")),
         ];
         const rows = ( contrib
             .sort((a, b) => a.displayName.localeCompare(b.displayName))
@@ -329,7 +329,7 @@ class NotebookRenderersDataRenderer extends Disposable {
 }
 ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: 'notebooks',
-    label: ( localize(7983, "Notebooks")),
+    label: ( localize(8258, "Notebooks")),
     access: {
         canToggle: false
     },
@@ -337,7 +337,7 @@ class NotebookRenderersDataRenderer extends Disposable {
 });
 ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: 'notebookRenderer',
-    label: ( localize(7984, "Notebook Renderers")),
+    label: ( localize(8259, "Notebook Renderers")),
     access: {
         canToggle: false
     },

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

@@ -10,10 +10,10 @@ import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/even
 import { GroupModelChangeKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
-import { MOST_RECENT_REPL_EDITOR, InteractiveWindowOpen } from '@codingame/monaco-vscode-52bb4d5b-ba1a-57fd-9bee-b28824214eac-common/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
+import { MOST_RECENT_REPL_EDITOR, InteractiveWindowOpen } from '@codingame/monaco-vscode-a1eb43d5-da63-5f76-8ad4-acf0d6c3b749-common/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
 import { ServiceCollection } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/serviceCollection';
 import { IEditorProgressService } from '@codingame/monaco-vscode-api/vscode/vs/platform/progress/common/progress.service';
-import { NotebookDiffEditorInput } from '@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/workbench/contrib/notebook/common/notebookDiffEditorInput';
+import { NotebookDiffEditorInput } from '@codingame/monaco-vscode-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common/vscode/vs/workbench/contrib/notebook/common/notebookDiffEditorInput';
 
 let NotebookEditorWidgetService = class NotebookEditorWidgetService {
     constructor(editorGroupService, editorService, contextKeyService, instantiationService) {

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

@@ -27,7 +27,7 @@ let NotebookExecutionService = class NotebookExecutionService {
             return;
         }
         this._logService.debug(`Execution`, `${JSON.stringify(( cellsArr.map(c => c.handle)))}`);
-        const message = ( localize(8013, "Executing a notebook cell will run code from this workspace."));
+        const message = ( localize(8288, "Executing a notebook cell will run code from this workspace."));
         const trust = await this._workspaceTrustRequestService.requestWorkspaceTrust({ message });
         if (!trust) {
             return;

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

@@ -114,7 +114,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.clearNotebookKernelsMRUCache',
-            title: ( localize2(8014, "Clear Notebook Kernels MRU Cache")),
+            title: ( localize2(8289, "Clear Notebook Kernels MRU Cache")),
             category: Categories.Developer,
             f1: true
         });

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

@@ -75,14 +75,14 @@ let NotebookKeymapService = class NotebookKeymapService extends Disposable {
             }
         };
         this.notificationService.prompt(Severity.Info, ( localize(
-            8015,
+            8290,
             "Disable other keymaps ({0}) to avoid conflicts between keybindings?",
             ( distinct(( oldKeymaps.map(k => k.local.manifest.displayName))).map(name => `'${name}'`)).join(', ')
         )), [{
-                label: ( localize(8016, "Yes")),
+                label: ( localize(8291, "Yes")),
                 run: () => onPrompt(true)
             }, {
-                label: ( localize(8017, "No")),
+                label: ( localize(8292, "No")),
                 run: () => onPrompt(false)
             }]);
     }

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

@@ -10,7 +10,7 @@ let NotebookLoggingService = class NotebookLoggingService extends Disposable {
     static { this.ID = 'notebook'; }
     constructor(loggerService) {
         super();
-        this._logger = this._register(loggerService.createLogger(logChannelId, { name: ( localize(8018, "Notebook")), group: windowLogGroup }));
+        this._logger = this._register(loggerService.createLogger(logChannelId, { name: ( localize(8293, "Notebook")), group: windowLogGroup }));
     }
     debug(category, output) {
         this._logger.debug(`[${category}] ${output}`);

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

@@ -3,7 +3,7 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { toAction } from '@codingame/monaco-vscode-api/vscode/vs/base/common/actions';
 import { createErrorWithActions } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errorMessage';
-import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
+import { Event, Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { Iterable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/iterator';
 import { Lazy } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lazy';
 import { Disposable, DisposableStore, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
@@ -20,7 +20,7 @@ import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
 import { Memento } from '@codingame/monaco-vscode-12c5f9eb-72d3-57ca-babd-5bef7aa9de3b-common/vscode/vs/workbench/common/memento';
 import { notebooksExtensionPoint, notebookRendererExtensionPoint, notebookPreloadExtensionPoint } from '../notebookExtensionPoint.js';
-import { NotebookDiffEditorInput } from '@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/workbench/contrib/notebook/common/notebookDiffEditorInput';
+import { NotebookDiffEditorInput } from '@codingame/monaco-vscode-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common/vscode/vs/workbench/contrib/notebook/common/notebookDiffEditorInput';
 import { NotebookTextModel } from '../../common/model/notebookTextModel.js';
 import { NotebookEditorPriority, NotebookSetting, CellUri, NotebookRendererMatch, RENDERER_EQUIVALENT_EXTENSIONS, RENDERER_NOT_AVAILABLE, MimeTypeDisplayOrder, ACCESSIBLE_NOTEBOOK_DISPLAY_ORDER, NOTEBOOK_DISPLAY_ORDER } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { NotebookEditorInput } from '@codingame/monaco-vscode-9b5a5e82-d649-5455-b4bf-ef90d6afd294-common/vscode/vs/workbench/contrib/notebook/common/notebookEditorInput';
@@ -37,7 +37,7 @@ import { IUriIdentityService } from '@codingame/monaco-vscode-api/vscode/vs/plat
 import { INotebookDocumentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/notebook/common/notebookDocumentService.service';
 import { MergeEditorInput } from '@codingame/monaco-vscode-8ccb7637-50ea-5359-97bf-00015d7fe567-common/vscode/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput';
 import { streamToBuffer, VSBuffer, bufferToStream } from '@codingame/monaco-vscode-api/vscode/vs/base/common/buffer';
-import { NotebookMultiDiffEditorInput } from '@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/workbench/contrib/notebook/browser/diff/notebookMultiDiffEditorInput';
+import { NotebookMultiDiffEditorInput } from '@codingame/monaco-vscode-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common/vscode/vs/workbench/contrib/notebook/browser/diff/notebookMultiDiffEditorInput';
 import { CancellationError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
 
 var NotebookProviderInfoStore_1, NotebookService_1;
@@ -141,16 +141,33 @@ let NotebookProviderInfoStore = class NotebookProviderInfoStore extends Disposab
             };
             const notebookEditorOptions = {
                 canHandleDiff: () => !!this._configurationService.getValue(NotebookSetting.textDiffEditorPreview) && !this._accessibilityService.isScreenReaderOptimized(),
-                canSupportResource: (resource) => resource.scheme === Schemas.untitled || resource.scheme === Schemas.vscodeNotebookCell || this._fileService.hasProvider(resource)
+                canSupportResource: (resource) => {
+                    if (resource.scheme === Schemas.vscodeNotebookCellOutput) {
+                        const params = ( new URLSearchParams(resource.query));
+                        return params.get('openIn') === 'notebook';
+                    }
+                    return resource.scheme === Schemas.untitled || resource.scheme === Schemas.vscodeNotebookCell || this._fileService.hasProvider(resource);
+                }
             };
-            const notebookEditorInputFactory = ({ resource, options }) => {
-                const data = CellUri.parse(resource);
+            const notebookEditorInputFactory = async ({ resource, options }) => {
+                let data;
+                if (resource.scheme === Schemas.vscodeNotebookCellOutput) {
+                    const outputUriData = CellUri.parseCellOutputUri(resource);
+                    if (!outputUriData || !outputUriData.notebook || outputUriData.cellHandle === undefined) {
+                        throw ( new Error('Invalid cell output uri'));
+                    }
+                    data = {
+                        notebook: outputUriData.notebook,
+                        handle: outputUriData.cellHandle
+                    };
+                }
+                else {
+                    data = CellUri.parse(resource);
+                }
                 let notebookUri;
                 let cellOptions;
-                let preferredResource = resource;
                 if (data) {
                     notebookUri = this.uriIdentService.asCanonicalUri(data.notebook);
-                    preferredResource = data.notebook;
                     cellOptions = { resource, options };
                 }
                 else {
@@ -159,13 +176,38 @@ let NotebookProviderInfoStore = class NotebookProviderInfoStore extends Disposab
                 if (!cellOptions) {
                     cellOptions = options?.cellOptions;
                 }
-                const notebookOptions = { ...options, cellOptions, viewState: undefined };
-                const editor = NotebookEditorInput.getOrCreate(this._instantiationService, notebookUri, preferredResource, notebookProviderInfo.id);
+                let notebookOptions;
+                if (resource.scheme === Schemas.vscodeNotebookCellOutput) {
+                    if (data?.handle === undefined || !data?.notebook) {
+                        throw ( new Error('Invalid cell handle'));
+                    }
+                    const cellUri = CellUri.generate(data.notebook, data.handle);
+                    cellOptions = { resource: cellUri, options };
+                    const cellIndex = await this._notebookEditorModelResolverService.resolve(notebookUri)
+                        .then(model => model.object.notebook.cells.findIndex(cell => cell.handle === data?.handle))
+                        .then(index => index >= 0 ? index : 0);
+                    const cellIndexesToRanges = [{ start: cellIndex, end: cellIndex + 1 }];
+                    notebookOptions = {
+                        ...options,
+                        cellOptions,
+                        viewState: undefined,
+                        cellSelections: cellIndexesToRanges
+                    };
+                }
+                else {
+                    notebookOptions = {
+                        ...options,
+                        cellOptions,
+                        viewState: undefined,
+                    };
+                }
+                const preferredResourceParam = cellOptions?.resource;
+                const editor = NotebookEditorInput.getOrCreate(this._instantiationService, notebookUri, preferredResourceParam, notebookProviderInfo.id);
                 return { editor, options: notebookOptions };
             };
             const notebookUntitledEditorFactory = async ({ resource, options }) => {
                 const ref = await this._notebookEditorModelResolverService.resolve({ untitledResource: resource }, notebookProviderInfo.id);
-                ref.object.notebook.onWillDispose(() => {
+                Event.once(ref.object.notebook.onWillDispose)(() => {
                     ref.dispose();
                 });
                 return { editor: NotebookEditorInput.getOrCreate(this._instantiationService, ref.object.resource, undefined, notebookProviderInfo.id), options };
@@ -548,7 +590,7 @@ let NotebookService = class NotebookService extends Disposable {
             const knownProvider = this.getViewTypeProvider(viewType);
             const actions = knownProvider ? [
                 toAction({
-                    id: 'workbench.notebook.action.installMissingViewType', label: ( localize(8019, "Install extension for '{0}'", viewType)), run: async () => {
+                    id: 'workbench.notebook.action.installMissingViewType', label: ( localize(8294, "Install extension for '{0}'", viewType)), run: async () => {
                         await this._instantiationService.createInstance(InstallRecommendedExtensionAction, knownProvider).run();
                     }
                 })

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

@@ -1,12 +1,12 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { Disposable, DisposableStore, toDisposable, dispose } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
-import { createWebWorker } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/defaultWorkerFactory';
+import { createWebWorker } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/webWorkerFactory';
 import { CellUri, NotebookCellsChangeType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { INotebookService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
 import { IModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service';
 import { TextModel } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model/textModel';
-import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
+import { Schemas, FileAccess } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
 import { isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 
 let NotebookEditorWorkerServiceImpl = class NotebookEditorWorkerServiceImpl extends Disposable {
@@ -42,6 +42,7 @@ class WorkerManager extends Disposable {
     withWorker() {
         if (!this._editorWorkerClient) {
             this._editorWorkerClient = ( new NotebookWorkerClient(this._notebookService, this._modelService));
+            this._register(this._editorWorkerClient);
         }
         return Promise.resolve(this._editorWorkerClient);
     }
@@ -214,7 +215,7 @@ class NotebookWorkerClient extends Disposable {
     _getOrCreateWorker() {
         if (!this._worker) {
             try {
-                this._worker = this._register(createWebWorker('vs/workbench/contrib/notebook/common/services/notebookSimpleWorker', 'NotebookEditorWorker'));
+                this._worker = this._register(createWebWorker(( FileAccess.asBrowserUri('vs/workbench/contrib/notebook/common/services/notebookWebWorkerMain.js')), 'NotebookEditorWorker'));
             }
             catch (err) {
                 throw (err);

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

@@ -59,6 +59,8 @@ export declare class NotebookTextModel extends Disposable implements INotebookTe
     private static _computeOutputEdit;
     private static _commonPrefix;
     private static _commonSuffix;
+    private newCellsFromLastEdit;
+    private isOnlyEditingMetadataOnNewCells;
     applyEdits(rawEdits: ICellEditOperation[], synchronous: boolean, beginSelectionState: ISelectionState | undefined, endSelectionsComputer: () => ISelectionState | undefined, undoRedoGroup: UndoRedoGroup | undefined, computeUndoRedo: boolean): boolean;
     private _doApplyEdits;
     private _mergeCellEdits;

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

@@ -37,6 +37,7 @@ class StackOperation {
         this.undoRedoGroup = undoRedoGroup;
         this._pauseableEmitter = _pauseableEmitter;
         this._postUndoRedo = _postUndoRedo;
+        this.tag = 'notebookUndoRedoElement';
         this._operations = [];
         this._beginSelectionState = undefined;
         this._resultSelectionState = undefined;
@@ -107,6 +108,7 @@ class NotebookOperationManager {
         this._pauseableEmitter = _pauseableEmitter;
         this._postUndoRedo = _postUndoRedo;
         this._pendingStackOperation = null;
+        this._isAppending = false;
     }
     isUndoStackEmpty() {
         return this._pendingStackOperation === null || this._pendingStackOperation.isEmpty;
@@ -114,8 +116,11 @@ class NotebookOperationManager {
     pushStackElement(alternativeVersionId, selectionState) {
         if (this._pendingStackOperation && !this._pendingStackOperation.isEmpty) {
             this._pendingStackOperation.pushEndState(alternativeVersionId, selectionState);
-            this._undoService.pushElement(this._pendingStackOperation, this._pendingStackOperation.undoRedoGroup);
+            if (!this._isAppending) {
+                this._undoService.pushElement(this._pendingStackOperation, this._pendingStackOperation.undoRedoGroup);
+            }
         }
+        this._isAppending = false;
         this._pendingStackOperation = null;
     }
     _getOrCreateEditStackElement(beginSelectionState, undoRedoGroup, alternativeVersionId) {
@@ -128,6 +133,15 @@ class NotebookOperationManager {
             alternativeVersionId || ''
         ));
     }
+    appendPreviousOperation() {
+        const previous = this._undoService.getLastElement(this._textModel.uri);
+        if (previous && previous.tag === 'notebookUndoRedoElement') {
+            this._pendingStackOperation = previous;
+            this._isAppending = true;
+            return true;
+        }
+        return false;
+    }
     pushEditOperation(element, beginSelectionState, resultSelectionState, alternativeVersionId, undoRedoGroup) {
         const pendingStackOperation = this._getOrCreateEditStackElement(beginSelectionState, undoRedoGroup, alternativeVersionId);
         pendingStackOperation.pushEditOperation(element, beginSelectionState, resultSelectionState, alternativeVersionId);
@@ -188,6 +202,7 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
         this._versionId = 0;
         this._notebookSpecificAlternativeId = 0;
         this._alternativeVersionId = '1';
+        this.newCellsFromLastEdit = ( new Set());
         this.transientOptions = options;
         this.metadata = metadata;
         this._initialize(cells);
@@ -480,9 +495,34 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
         }
         return result;
     }
+    isOnlyEditingMetadataOnNewCells(rawEdits) {
+        for (const edit of rawEdits) {
+            if (edit.editType === CellEditType.PartialInternalMetadata) {
+                continue;
+            }
+            if (edit.editType !== CellEditType.Metadata && edit.editType !== CellEditType.PartialMetadata) {
+                return false;
+            }
+            if (('index' in edit) && !( this.newCellsFromLastEdit.has(this.cells[edit.index].handle))) {
+                return false;
+            }
+            if ('handle' in edit && !( this.newCellsFromLastEdit.has(edit.handle))) {
+                return false;
+            }
+        }
+        return true;
+    }
     applyEdits(rawEdits, synchronous, beginSelectionState, endSelectionsComputer, undoRedoGroup, computeUndoRedo) {
         this._pauseableEmitter.pause();
         this._operationManager.pushStackElement(this._alternativeVersionId, undefined);
+        if (computeUndoRedo && this.isOnlyEditingMetadataOnNewCells(rawEdits)) {
+            if (!this._operationManager.appendPreviousOperation()) {
+                computeUndoRedo = false;
+            }
+        }
+        else if (computeUndoRedo) {
+            this.newCellsFromLastEdit.clear();
+        }
         try {
             this._doApplyEdits(rawEdits, synchronous, computeUndoRedo, beginSelectionState, undoRedoGroup);
             return true;
@@ -697,6 +737,7 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
             const dirtyStateListener = cell.onDidChangeContent((e) => {
                 this._bindCellContentHandler(cell, e);
             });
+            this.newCellsFromLastEdit.add(cell.handle);
             this._cellListeners.set(cell.handle, dirtyStateListener);
             this._register(cell);
             return cell;

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-897bebad-39df-57cb-8a57-36a271d038be-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';
@@ -47,6 +47,14 @@ let NotebookModelReferenceCollection = class NotebookModelReferenceCollection ex
     isDirty(resource) {
         return this._dirtyStates.get(resource) ?? false;
     }
+    isListeningToModel(uri) {
+        for (const key of ( this._modelListener.keys())) {
+            if (( key.resource.toString()) === ( uri.toString())) {
+                return true;
+            }
+        }
+        return false;
+    }
     async createReferencedObject(key, notebookType, hasAssociatedFilePath, limits, isScratchpad, viewType) {
         this.modelsToDispose.delete(key);
         const uri = ( URI.parse(key));
@@ -142,7 +150,7 @@ let NotebookModelResolverServiceImpl = class NotebookModelResolverServiceImpl {
             const candidate = ( URI.from(
                 { scheme: Schemas.untitled, path: `Untitled-${counter}${suffix}`, query: notebookType }
             ));
-            if (!this._notebookService.getNotebookTextModel(candidate)) {
+            if (!this._notebookService.getNotebookTextModel(candidate) && !this._data.isListeningToModel(candidate)) {
                 return candidate;
             }
         }

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

@@ -0,0 +1,15 @@
+import { CellKind } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon";
+type ICell = {
+    internalMetadata?: {
+        internalId?: string;
+    };
+    getValue(): string;
+    getLinesContent(): string[];
+    cellKind: CellKind;
+};
+export declare function matchCellBasedOnSimilarties(modifiedCells: ICell[], originalCells: ICell[]): {
+    modified: number;
+    original: number;
+    percentage: number;
+}[];
+export {};