@codingame/monaco-vscode-api 9.0.2 → 10.0.0

package/vscode/src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorToolbar.js

@@ -5,7 +5,6 @@ import { ToolBar } from '../../../../../base/browser/ui/toolbar/toolbar.js';
 import { Separator } from '../../../../../base/common/actions.js';
 import { Emitter, Event } from '../../../../../base/common/event.js';
 import { Disposable } from '../../../../../base/common/lifecycle.js';
-import { ScrollbarVisibility } from '../../../../../base/common/scrollable.js';
 import { MenuEntryActionViewItem, SubmenuEntryActionViewItem } from '../../../../../platform/actions/browser/menuEntryActionViewItem.js';
 import { MenuId, MenuItemAction, SubmenuItemAction } from '../../../../../platform/actions/common/actions.js';
 import { IMenuService } from '../../../../../platform/actions/common/actions.service.js';
@@ -20,7 +19,7 @@ import { ActionViewWithLabel, UnifiedSubmenuActionView } from '../view/cellParts
 import { IEditorService } from '../../../../services/editor/common/editorService.service.js';
 import { IWorkbenchAssignmentService } from '../../../../services/assignment/common/assignmentService.service.js';
 import { disposableTimeout } from '../../../../../base/common/async.js';
-import { WorkbenchToolBar, HiddenItemStrategy } from '../../../../../platform/actions/browser/toolbar.js';
+import { WorkbenchToolBar } from '../../../../../platform/actions/browser/toolbar.js';
 import { WorkbenchHoverDelegate } from '../../../../../platform/hover/browser/hover.js';
 var RenderLabel;
 ( (function(RenderLabel) {
@@ -201,8 +200,8 @@ let NotebookEditorWorkbenchToolbar = class NotebookEditorWorkbenchToolbar extend
         this._notebookTopLeftToolbarContainer = document.createElement('div');
         this._notebookTopLeftToolbarContainer.classList.add('notebook-toolbar-left');
         this._leftToolbarScrollable = ( new DomScrollableElement(this._notebookTopLeftToolbarContainer, {
-            vertical: ScrollbarVisibility.Hidden,
-            horizontal: ScrollbarVisibility.Visible,
+            vertical: 2 ,
+            horizontal: 3 ,
             horizontalScrollbarSize: 3,
             useShadows: false,
             scrollYToX: true
@@ -253,7 +252,7 @@ let NotebookEditorWorkbenchToolbar = class NotebookEditorWorkbenchToolbar extend
         const hoverDelegate = this._register(this.instantiationService.createInstance(WorkbenchHoverDelegate, 'element', true, {}));
         hoverDelegate.setInstantHoverTimeLimit(600);
         const leftToolbarOptions = {
-            hiddenItemStrategy: HiddenItemStrategy.RenderInSecondaryGroup,
+            hiddenItemStrategy: 1 ,
             resetMenu: MenuId.NotebookToolbar,
             actionViewItemProvider: (action, options) => {
                 return this._strategy.actionProvider(action, options);

package/vscode/src/vs/workbench/contrib/notebook/browser/viewParts/notebookKernelQuickPickStrategy.js

@@ -5,28 +5,22 @@ import { CancellationToken } from '../../../../../base/common/cancellation.js';
 import { Codicon } from '../../../../../base/common/codicons.js';
 import { Event } from '../../../../../base/common/event.js';
 import { DisposableStore } from '../../../../../base/common/lifecycle.js';
-import { MarshalledId } from '../../../../../base/common/marshallingIds.js';
 import { uppercaseFirstLetter } from '../../../../../base/common/strings.js';
 import { localize } from '../../../../../nls.js';
 import { ICommandService } from '../../../../../platform/commands/common/commands.service.js';
 import { ILabelService } from '../../../../../platform/label/common/label.service.js';
 import { ILogService } from '../../../../../platform/log/common/log.service.js';
 import { IProductService } from '../../../../../platform/product/common/productService.service.js';
-import { ProgressLocation } from '../../../../../platform/progress/common/progress.js';
 import { IQuickInputService } from '../../../../../platform/quickinput/common/quickInput.service.js';
 import { ThemeIcon } from '../../../../../base/common/themables.js';
-import { ViewContainerLocation } from '../../../../common/views.js';
-import { VIEWLET_ID } from '../../../extensions/common/extensions.js';
 import { IExtensionsWorkbenchService } from '../../../extensions/common/extensions.service.js';
 import { JUPYTER_EXTENSION_ID, KERNEL_RECOMMENDATIONS } from '../notebookBrowser.js';
 import { executingStateIcon, selectKernelIcon } from '../notebookIcons.js';
 import { INotebookKernelService, INotebookKernelHistoryService } from '../../common/notebookKernelService.service.js';
 import { IExtensionService } from '../../../../services/extensions/common/extensions.service.js';
-import { IPaneCompositePartService } from '../../../../services/panecomposite/browser/panecomposite.service.js';
 import { URI } from '../../../../../base/common/uri.js';
 import { IOpenerService } from '../../../../../platform/opener/common/opener.service.js';
 import { SELECT_KERNEL_ID } from '../controller/coreActions.js';
-import { EnablementState } from '../../../../services/extensionManagement/common/extensionManagement.js';
 function isKernelPick(item) {
     return 'kernel' in item;
 }
@@ -59,22 +53,21 @@ function toKernelQuickPick(kernel, selected) {
     };
     if (kernel.id === selected?.id) {
         if (!res.description) {
-            res.description = ( localize(7853, "Currently Selected"));
+            res.description = ( localize(7912, "Currently Selected"));
         }
         else {
-            res.description = ( localize(7854, "{0} - Currently Selected", res.description));
+            res.description = ( localize(7913, "{0} - Currently Selected", res.description));
         }
     }
     return res;
 }
 class KernelPickerStrategyBase {
-    constructor(_notebookKernelService, _productService, _quickInputService, _labelService, _logService, _paneCompositePartService, _extensionWorkbenchService, _extensionService, _commandService) {
+    constructor(_notebookKernelService, _productService, _quickInputService, _labelService, _logService, _extensionWorkbenchService, _extensionService, _commandService) {
         this._notebookKernelService = _notebookKernelService;
         this._productService = _productService;
         this._quickInputService = _quickInputService;
         this._labelService = _labelService;
         this._logService = _logService;
-        this._paneCompositePartService = _paneCompositePartService;
         this._extensionWorkbenchService = _extensionWorkbenchService;
         this._extensionService = _extensionService;
         this._commandService = _commandService;
@@ -113,12 +106,12 @@ class KernelPickerStrategyBase {
         quickPick.canSelectMany = false;
         quickPick.placeholder = selected
             ? ( localize(
-            7855,
+            7914,
             "Change kernel for '{0}'",
             this._labelService.getUriLabel(notebook.uri, { relative: true })
         ))
             : ( localize(
-            7856,
+            7915,
             "Select kernel for '{0}'",
             this._labelService.getUriLabel(notebook.uri, { relative: true })
         ));
@@ -190,10 +183,10 @@ class KernelPickerStrategyBase {
             return true;
         }
         if (isSearchMarketplacePick(pick)) {
-            await this._showKernelExtension(this._paneCompositePartService, this._extensionWorkbenchService, this._extensionService, editor.textModel.viewType, []);
+            await this._showKernelExtension(this._extensionWorkbenchService, this._extensionService, editor.textModel.viewType, []);
         }
         else if (isInstallExtensionPick(pick)) {
-            await this._showKernelExtension(this._paneCompositePartService, this._extensionWorkbenchService, this._extensionService, editor.textModel.viewType, pick.extensionIds, this._productService.quality !== 'stable');
+            await this._showKernelExtension(this._extensionWorkbenchService, this._extensionService, editor.textModel.viewType, pick.extensionIds, this._productService.quality !== 'stable');
         }
         else if (isSourcePick(pick)) {
             pick.action.runAction();
@@ -203,12 +196,12 @@ class KernelPickerStrategyBase {
     _selecteKernel(notebook, kernel) {
         this._notebookKernelService.selectKernelForNotebook(kernel, notebook);
     }
-    async _showKernelExtension(paneCompositePartService, extensionWorkbenchService, extensionService, viewType, extIds, isInsiders) {
+    async _showKernelExtension(extensionWorkbenchService, extensionService, viewType, extIds, isInsiders) {
         const extensionsToInstall = [];
         const extensionsToEnable = [];
         for (const extId of extIds) {
             const extension = (await extensionWorkbenchService.getExtensions([{ id: extId }], CancellationToken.None))[0];
-            if (extension.enablementState === EnablementState.DisabledGlobally || extension.enablementState === EnablementState.DisabledWorkspace || extension.enablementState === EnablementState.DisabledByEnvironment) {
+            if (extension.enablementState === 7  || extension.enablementState === 8  || extension.enablementState === 2 ) {
                 extensionsToEnable.push(extension);
             }
             else {
@@ -223,27 +216,25 @@ class KernelPickerStrategyBase {
                     await extensionWorkbenchService.install(extension, {
                         installPreReleaseVersion: isInsiders ?? false,
                         context: { skipWalkthrough: true }
-                    }, ProgressLocation.Notification);
+                    }, 15 );
                 }))), ...( (extensionsToEnable.map(async (extension) => {
                     switch (extension.enablementState) {
-                        case EnablementState.DisabledWorkspace:
-                            await extensionWorkbenchService.setEnablement([extension], EnablementState.EnabledWorkspace);
+                        case 8 :
+                            await extensionWorkbenchService.setEnablement([extension], 10 );
                             return;
-                        case EnablementState.DisabledGlobally:
-                            await extensionWorkbenchService.setEnablement([extension], EnablementState.EnabledGlobally);
+                        case 7 :
+                            await extensionWorkbenchService.setEnablement([extension], 9 );
                             return;
-                        case EnablementState.DisabledByEnvironment:
-                            await extensionWorkbenchService.setEnablement([extension], EnablementState.EnabledByEnvironment);
+                        case 2 :
+                            await extensionWorkbenchService.setEnablement([extension], 3 );
                             return;
                     }
                 })))]);
             await extensionService.activateByEvent(`onNotebook:${viewType}`);
             return;
         }
-        const viewlet = await paneCompositePartService.openPaneComposite(VIEWLET_ID, ViewContainerLocation.Sidebar, true);
-        const view = viewlet?.getViewPaneContainer();
         const pascalCased = ( (viewType.split(/[^a-z0-9]/ig).map(uppercaseFirstLetter))).join('');
-        view?.search(`@tag:notebookKernel${pascalCased}`);
+        await extensionWorkbenchService.openSearch(`@tag:notebookKernel${pascalCased}`);
     }
     async _showInstallKernelExtensionRecommendation(notebookTextModel, quickPick, extensionWorkbenchService, token) {
         quickPick.busy = true;
@@ -262,7 +253,7 @@ class KernelPickerStrategyBase {
         const suggestedExtension = language ? this.getSuggestedKernelFromLanguage(notebookTextModel.viewType, language) : undefined;
         if (suggestedExtension) {
             await extensionWorkbenchService.queryLocal();
-            const extensions = extensionWorkbenchService.installed.filter(e => (e.enablementState === EnablementState.EnabledByEnvironment || e.enablementState === EnablementState.EnabledGlobally || e.enablementState === EnablementState.EnabledWorkspace)
+            const extensions = extensionWorkbenchService.installed.filter(e => ((e.enablementState === 3  || e.enablementState === 9  || e.enablementState === 10) )
                 && suggestedExtension.extensionIds.includes(e.identifier.id));
             if (extensions.length === suggestedExtension.extensionIds.length) {
                 return undefined;
@@ -270,13 +261,13 @@ class KernelPickerStrategyBase {
             quickPickItems.push({
                 id: 'installSuggested',
                 description: suggestedExtension.displayName ?? suggestedExtension.extensionIds.join(', '),
-                label: `$(${Codicon.lightbulb.id}) ` + ( localize(7857, 'Install/Enable suggested extensions')),
+                label: `$(${Codicon.lightbulb.id}) ` + ( localize(7916, 'Install/Enable suggested extensions')),
                 extensionIds: suggestedExtension.extensionIds
             });
         }
         quickPickItems.push({
             id: 'install',
-            label: ( localize(7858, "Browse marketplace for kernel extensions")),
+            label: ( localize(7917, "Browse marketplace for kernel extensions")),
         });
         return quickPickItems;
     }
@@ -300,8 +291,8 @@ class KernelPickerStrategyBase {
     }
 }
 let KernelPickerMRUStrategy = class KernelPickerMRUStrategy extends KernelPickerStrategyBase {
-    constructor(_notebookKernelService, _productService, _quickInputService, _labelService, _logService, _paneCompositePartService, _extensionWorkbenchService, _extensionService, _commandService, _notebookKernelHistoryService, _openerService) {
-        super(_notebookKernelService, _productService, _quickInputService, _labelService, _logService, _paneCompositePartService, _extensionWorkbenchService, _extensionService, _commandService);
+    constructor(_notebookKernelService, _productService, _quickInputService, _labelService, _logService, _extensionWorkbenchService, _extensionService, _commandService, _notebookKernelHistoryService, _openerService) {
+        super(_notebookKernelService, _productService, _quickInputService, _labelService, _logService, _extensionWorkbenchService, _extensionService, _commandService);
         this._notebookKernelHistoryService = _notebookKernelHistoryService;
         this._openerService = _openerService;
     }
@@ -323,7 +314,7 @@ let KernelPickerMRUStrategy = class KernelPickerMRUStrategy extends KernelPicker
         }
         quickPickItems.push({
             id: 'selectAnother',
-            label: ( localize(7859, "Select Another Kernel...")),
+            label: ( localize(7918, "Select Another Kernel...")),
             autoRun: shouldAutoRun
         });
         return quickPickItems;
@@ -357,8 +348,8 @@ let KernelPickerMRUStrategy = class KernelPickerMRUStrategy extends KernelPicker
         const disposables = ( (new DisposableStore()));
         const quickPick = disposables.add(this._quickInputService.createQuickPick({ useSeparators: true }));
         const quickPickItem = await ( (new Promise(resolve => {
-            quickPick.title = kernelListEmpty ? ( localize(7860, "Select Kernel")) : ( localize(7861, "Select Another Kernel"));
-            quickPick.placeholder = ( localize(7862, "Type to choose a kernel source"));
+            quickPick.title = kernelListEmpty ? ( localize(7919, "Select Kernel")) : ( localize(7920, "Select Another Kernel"));
+            quickPick.placeholder = ( localize(7921, "Type to choose a kernel source"));
             quickPick.busy = true;
             quickPick.buttons = [this._quickInputService.backButton];
             quickPick.show();
@@ -437,11 +428,11 @@ let KernelPickerMRUStrategy = class KernelPickerMRUStrategy extends KernelPicker
                 }
             }
             else if (isSearchMarketplacePick(selectedKernelPickItem)) {
-                await this._showKernelExtension(this._paneCompositePartService, this._extensionWorkbenchService, this._extensionService, editor.textModel.viewType, []);
+                await this._showKernelExtension(this._extensionWorkbenchService, this._extensionService, editor.textModel.viewType, []);
                 return true;
             }
             else if (isInstallExtensionPick(selectedKernelPickItem)) {
-                await this._showKernelExtension(this._paneCompositePartService, this._extensionWorkbenchService, this._extensionService, editor.textModel.viewType, selectedKernelPickItem.extensionIds, this._productService.quality !== 'stable');
+                await this._showKernelExtension(this._extensionWorkbenchService, this._extensionService, editor.textModel.viewType, selectedKernelPickItem.extensionIds, this._productService.quality !== 'stable');
                 return this.displaySelectAnotherQuickPick(editor, false);
             }
         }
@@ -477,7 +468,7 @@ let KernelPickerMRUStrategy = class KernelPickerMRUStrategy extends KernelPicker
         quickPickItems.push(...( (validActions.map(action => {
             const buttons = action.documentation ? [{
                     iconClass: ThemeIcon.asClassName(Codicon.info),
-                    tooltip: ( localize(7863, 'Learn More')),
+                    tooltip: ( localize(7922, 'Learn More')),
                 }] : [];
             return {
                 id: typeof action.command === 'string' ? action.command : action.command.id,
@@ -505,7 +496,7 @@ let KernelPickerMRUStrategy = class KernelPickerMRUStrategy extends KernelPicker
         const quickPick = localDisposableStore.add(this._quickInputService.createQuickPick({ useSeparators: true }));
         quickPick.items = quickPickItems;
         quickPick.canSelectMany = false;
-        quickPick.title = ( localize(7864, "Select Kernel from {0}", source));
+        quickPick.title = ( localize(7923, "Select Kernel from {0}", source));
         localDisposableStore.add(quickPick.onDidAccept(async () => {
             if (quickPick.selectedItems && quickPick.selectedItems.length > 0 && isKernelPick(quickPick.selectedItems[0])) {
                 await this._selecteKernel(notebook, quickPick.selectedItems[0].kernel);
@@ -524,7 +515,7 @@ let KernelPickerMRUStrategy = class KernelPickerMRUStrategy extends KernelPicker
         if (typeof command === 'string' || !command.arguments || !Array.isArray(command.arguments) || command.arguments.length === 0) {
             args.unshift({
                 uri: notebook.uri,
-                $mid: MarshalledId.NotebookActionContext
+                $mid: 14
             });
         }
         if (typeof command === 'string') {
@@ -544,11 +535,11 @@ let KernelPickerMRUStrategy = class KernelPickerMRUStrategy extends KernelPicker
                 action.label = info.selected.label;
                 const kernelInfo = info.selected.description ?? info.selected.detail;
                 action.tooltip = kernelInfo
-                    ? ( localize(7865, "Selected Kernel: {0} (Kernel Detection Tasks Running)", kernelInfo))
-                    : ( localize(7866, "Detecting Kernels"));
+                    ? ( localize(7924, "Selected Kernel: {0} (Kernel Detection Tasks Running)", kernelInfo))
+                    : ( localize(7925, "Detecting Kernels"));
             }
             else {
-                action.label = ( localize(7866, "Detecting Kernels"));
+                action.label = ( localize(7925, "Detecting Kernels"));
             }
             return;
         }
@@ -569,7 +560,7 @@ let KernelPickerMRUStrategy = class KernelPickerMRUStrategy extends KernelPicker
             action.tooltip = selected.description ?? selected.detail ?? '';
         }
         else {
-            action.label = ( localize(7860, "Select Kernel"));
+            action.label = ( localize(7919, "Select Kernel"));
             action.class = ThemeIcon.asClassName(selectKernelIcon);
             action.tooltip = '';
         }
@@ -590,11 +581,10 @@ KernelPickerMRUStrategy = ( (__decorate([
     ( (__param(2, IQuickInputService))),
     ( (__param(3, ILabelService))),
     ( (__param(4, ILogService))),
-    ( (__param(5, IPaneCompositePartService))),
-    ( (__param(6, IExtensionsWorkbenchService))),
-    ( (__param(7, IExtensionService))),
-    ( (__param(8, ICommandService))),
-    ( (__param(9, INotebookKernelHistoryService))),
-    ( (__param(10, IOpenerService)))
+    ( (__param(5, IExtensionsWorkbenchService))),
+    ( (__param(6, IExtensionService))),
+    ( (__param(7, ICommandService))),
+    ( (__param(8, INotebookKernelHistoryService))),
+    ( (__param(9, IOpenerService)))
 ], KernelPickerMRUStrategy)));
 export { KernelPickerMRUStrategy };

package/vscode/src/vs/workbench/contrib/notebook/browser/viewParts/notebookKernelView.js

@@ -37,7 +37,7 @@ registerAction2(class extends Action2 {
         super({
             id: SELECT_KERNEL_ID,
             category: NOTEBOOK_ACTIONS_CATEGORY,
-            title: ( localize2(10725, 'Select Notebook Kernel')),
+            title: ( localize2(10809, 'Select Notebook Kernel')),
             icon: selectKernelIcon,
             f1: true,
             precondition: NOTEBOOK_IS_ACTIVE_EDITOR,
@@ -61,7 +61,7 @@ registerAction2(class extends Action2 {
                     order: -10
                 }],
             metadata: {
-                description: ( localize(10726, "Notebook Kernel Args")),
+                description: ( localize(10810, "Notebook Kernel Args")),
                 args: [
                     {
                         name: 'kernelInfo',

package/vscode/src/vs/workbench/contrib/notebook/browser/viewParts/notebookTopCellToolbar.js

@@ -1,7 +1,7 @@
 import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
 import { $, clearNode } from '../../../../../base/browser/dom.js';
 import { Disposable, MutableDisposable, DisposableStore } from '../../../../../base/common/lifecycle.js';
-import { MenuWorkbenchToolBar, HiddenItemStrategy } from '../../../../../platform/actions/browser/toolbar.js';
+import { MenuWorkbenchToolBar } from '../../../../../platform/actions/browser/toolbar.js';
 import { MenuItemAction } from '../../../../../platform/actions/common/actions.js';
 import { IMenuService } from '../../../../../platform/actions/common/actions.service.js';
 import { IContextMenuService } from '../../../../../platform/contextview/browser/contextView.service.js';
@@ -87,7 +87,7 @@ let ListTopCellToolbar = class ListTopCellToolbar extends Disposable {
                 toolbarOptions: {
                     primaryGroup: (g) => /^inline/.test(g),
                 },
-                hiddenItemStrategy: HiddenItemStrategy.Ignore,
+                hiddenItemStrategy: 0 ,
             });
             if (this.notebookEditor.hasModel()) {
                 toolbar.context = {

package/vscode/src/vs/workbench/contrib/notebook/browser/viewParts/notebookViewZones.js

@@ -127,7 +127,7 @@ class NotebookViewZones extends Disposable {
 }
 function safeInvoke1Arg(func, arg1) {
     try {
-        return func(arg1);
+        func(arg1);
     }
     catch (e) {
         onUnexpectedError(e);

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

@@ -3,12 +3,12 @@ import { hash, StringSHA1 } from '../../../../../base/common/hash.js';
 import { Disposable, DisposableStore, dispose } from '../../../../../base/common/lifecycle.js';
 import { generateUuid } from '../../../../../base/common/uuid.js';
 import { Range } from '../../../../../editor/common/core/range.js';
-import { DefaultEndOfLine, EndOfLinePreference } from '../../../../../editor/common/model.js';
 import { PieceTreeTextBuffer } from '../../../../../editor/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.js';
-import { PieceTreeTextBufferBuilder } from '../../../../../editor/common/model/pieceTreeTextBuffer/pieceTreeTextBufferBuilder.js';
+import { createTextBuffer } from '../../../../../editor/common/model/textModel.js';
 import { PLAINTEXT_LANGUAGE_ID } from '../../../../../editor/common/languages/modesRegistry.js';
 import { NotebookCellOutputTextModel } from './notebookCellOutputTextModel.js';
 import { ThrottledDelayer } from '../../../../../base/common/async.js';
+import { toFormattedString } from '../../../../../base/common/jsonFormatter.js';
 class NotebookCellTextModel extends Disposable {
     get outputs() {
         return this._outputs;
@@ -61,12 +61,7 @@ class NotebookCellTextModel extends Disposable {
         if (this._textBuffer) {
             return this._textBuffer;
         }
-        const builder = ( new PieceTreeTextBufferBuilder());
-        builder.acceptChunk(this._source);
-        const bufferFactory = builder.finish(true);
-        const { textBuffer, disposable } = bufferFactory.create(DefaultEndOfLine.LF);
-        this._textBuffer = textBuffer;
-        this._register(disposable);
+        this._textBuffer = this._register(createTextBuffer(this._source, 1 ).textBuffer);
         this._register(this._textBuffer.onDidChangeContent(() => {
             this._hash = null;
             if (!this._textModel) {
@@ -92,13 +87,14 @@ class NotebookCellTextModel extends Disposable {
             this.setRegisteredLanguage(this._languageService, this._textModel.getLanguageId(), this.language);
             this._textModelDisposables.add(this._textModel.onDidChangeLanguage((e) => this.setRegisteredLanguage(this._languageService, e.newLanguage, this.language)));
             this._textModelDisposables.add(this._textModel.onWillDispose(() => this.textModel = undefined));
-            this._textModelDisposables.add(this._textModel.onDidChangeContent(() => {
+            this._textModelDisposables.add(this._textModel.onDidChangeContent((e) => {
                 if (this._textModel) {
                     this._versionId = this._textModel.getVersionId();
                     this._alternativeId = this._textModel.getAlternativeVersionId();
                 }
                 this._textBufferHash = null;
                 this._onDidChangeContent.fire('content');
+                this._onDidChangeContent.fire({ type: 'model', event: e });
             }));
             this._textModel._overwriteVersionId(this._versionId);
             this._textModel._overwriteAlternativeVersionId(this._versionId);
@@ -200,10 +196,10 @@ class NotebookCellTextModel extends Disposable {
         const fullRange = this.getFullModelRange();
         const eol = this.textBuffer.getEOL();
         if (eol === '\n') {
-            return this.textBuffer.getValueInRange(fullRange, EndOfLinePreference.LF);
+            return this.textBuffer.getValueInRange(fullRange, 1 );
         }
         else {
-            return this.textBuffer.getValueInRange(fullRange, EndOfLinePreference.CRLF);
+            return this.textBuffer.getValueInRange(fullRange, 2 );
         }
     }
     getTextBufferHash() {
@@ -233,15 +229,7 @@ class NotebookCellTextModel extends Disposable {
         return this._hash;
     }
     _getPersisentMetadata() {
-        const filteredMetadata = {};
-        const transientCellMetadata = this.transientOptions.transientCellMetadata;
-        const keys = ( new Set([...( Object.keys(this.metadata))]));
-        for (const key of keys) {
-            if (!(transientCellMetadata[key])) {
-                filteredMetadata[key] = this.metadata[key];
-            }
-        }
-        return filteredMetadata;
+        return getFormattedMetadataJSON(this.transientOptions.transientCellMetadata, this.metadata, this.language);
     }
     getTextLength() {
         return this.textBuffer.getLength();
@@ -391,4 +379,27 @@ function computeRunStartTimeAdjustment(oldMetadata, newMetadata) {
         return newMetadata.runStartTimeAdjustment;
     }
 }
-export { NotebookCellTextModel, cloneNotebookCellTextModel };
+function getFormattedMetadataJSON(transientCellMetadata, metadata, language) {
+    let filteredMetadata = {};
+    if (transientCellMetadata) {
+        const keys = ( new Set([...( Object.keys(metadata))]));
+        for (const key of keys) {
+            if (!(transientCellMetadata[key])) {
+                filteredMetadata[key] = metadata[key];
+            }
+        }
+    }
+    else {
+        filteredMetadata = metadata;
+    }
+    const obj = {
+        language,
+        ...filteredMetadata
+    };
+    if (language) {
+        obj.language = language;
+    }
+    const metadataSource = toFormattedString(obj, {});
+    return metadataSource;
+}
+export { NotebookCellTextModel, cloneNotebookCellTextModel, getFormattedMetadataJSON };

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

@@ -0,0 +1,85 @@
+import { toFormattedString } from '../../../../../base/common/jsonFormatter.js';
+import { NotebookMetadataUri, NotebookCellsChangeType } from '../notebookCommon.js';
+import { StringSHA1 } from '../../../../../base/common/hash.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { Emitter } from '../../../../../base/common/event.js';
+import { Range } from '../../../../../editor/common/core/range.js';
+import { createTextBuffer } from '../../../../../editor/common/model/textModel.js';
+function getFormattedNotebookMetadataJSON(transientMetadata, metadata) {
+    let filteredMetadata = {};
+    if (transientMetadata) {
+        const keys = ( new Set([...( Object.keys(metadata))]));
+        for (const key of keys) {
+            if (!(transientMetadata[key])) {
+                filteredMetadata[key] = metadata[key];
+            }
+        }
+    }
+    else {
+        filteredMetadata = metadata;
+    }
+    const metadataSource = toFormattedString(filteredMetadata, {});
+    return metadataSource;
+}
+class NotebookDocumentMetadataTextModel extends Disposable {
+    get metadata() {
+        return this.notebookModel.metadata;
+    }
+    get textBuffer() {
+        if (this._textBuffer) {
+            return this._textBuffer;
+        }
+        const source = getFormattedNotebookMetadataJSON(this.notebookModel.transientOptions.transientDocumentMetadata, this.metadata);
+        this._textBuffer = this._register(createTextBuffer(source, 1 ).textBuffer);
+        this._register(this._textBuffer.onDidChangeContent(() => {
+            this._onDidChange.fire();
+        }));
+        return this._textBuffer;
+    }
+    constructor(notebookModel) {
+        super();
+        this.notebookModel = notebookModel;
+        this._onDidChange = this._register(( new Emitter()));
+        this.onDidChange = this._onDidChange.event;
+        this._textBufferHash = null;
+        this.uri = NotebookMetadataUri.generate(this.notebookModel.uri);
+        this._register(this.notebookModel.onDidChangeContent((e) => {
+            if (( e.rawEvents.some(
+                event => event.kind === NotebookCellsChangeType.ChangeDocumentMetadata || event.kind === NotebookCellsChangeType.ModelChange
+            ))) {
+                this._textBuffer?.dispose();
+                this._textBuffer = undefined;
+                this._textBufferHash = null;
+                this._onDidChange.fire();
+            }
+        }));
+    }
+    getHash() {
+        if (this._textBufferHash !== null) {
+            return this._textBufferHash;
+        }
+        const shaComputer = ( new StringSHA1());
+        const snapshot = this.textBuffer.createSnapshot(false);
+        let text;
+        while ((text = snapshot.read())) {
+            shaComputer.update(text);
+        }
+        this._textBufferHash = shaComputer.digest();
+        return this._textBufferHash;
+    }
+    getValue() {
+        const fullRange = this.getFullModelRange();
+        const eol = this.textBuffer.getEOL();
+        if (eol === '\n') {
+            return this.textBuffer.getValueInRange(fullRange, 1 );
+        }
+        else {
+            return this.textBuffer.getValueInRange(fullRange, 2 );
+        }
+    }
+    getFullModelRange() {
+        const lineCount = this.textBuffer.getLineCount();
+        return ( new Range(1, 1, lineCount, this.textBuffer.getLineLength(lineCount) + 1));
+    }
+}
+export { NotebookDocumentMetadataTextModel, getFormattedNotebookMetadataJSON };

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

@@ -6,7 +6,7 @@ import { Schemas } from '../../../../base/common/network.js';
 import '../../../../base/common/path.js';
 import { isWindows } from '../../../../base/common/platform.js';
 import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
-import { generate, parse } from '../../../services/notebook/common/notebookDocumentService.js';
+import { generateMetadataUri, parseMetadataUri, generate, parse } from '../../../services/notebook/common/notebookDocumentService.js';
 const NOTEBOOK_EDITOR_ID = 'workbench.editor.notebook';
 const NOTEBOOK_DIFF_EDITOR_ID = 'workbench.editor.notebookTextDiffEditor';
 const NOTEBOOK_MULTI_DIFF_EDITOR_ID = 'workbench.editor.notebookMultiTextDiffEditor';
@@ -54,19 +54,6 @@ var NotebookExecutionState;
     NotebookExecutionState[NotebookExecutionState["Pending"] = 2] = "Pending";
     NotebookExecutionState[NotebookExecutionState["Executing"] = 3] = "Executing";
 })(NotebookExecutionState || (NotebookExecutionState = {})));
-var NotebookRendererMatch;
-( (function(NotebookRendererMatch) {
-    NotebookRendererMatch[NotebookRendererMatch["WithHardKernelDependency"] = 0] = "WithHardKernelDependency";
-    NotebookRendererMatch[NotebookRendererMatch["WithOptionalKernelDependency"] = 1] = "WithOptionalKernelDependency";
-    NotebookRendererMatch[NotebookRendererMatch["Pure"] = 2] = "Pure";
-    NotebookRendererMatch[NotebookRendererMatch["Never"] = 3] = "Never";
-})(NotebookRendererMatch || (NotebookRendererMatch = {})));
-var RendererMessagingSpec;
-( (function(RendererMessagingSpec) {
-    RendererMessagingSpec["Always"] = "always";
-    RendererMessagingSpec["Never"] = "never";
-    RendererMessagingSpec["Optional"] = "optional";
-})(RendererMessagingSpec || (RendererMessagingSpec = {})));
 var NotebookCellsChangeType;
 ( (function(NotebookCellsChangeType) {
     NotebookCellsChangeType[NotebookCellsChangeType["ModelChange"] = 1] = "ModelChange";
@@ -87,18 +74,18 @@ var SelectionStateType;
     SelectionStateType[SelectionStateType["Handle"] = 0] = "Handle";
     SelectionStateType[SelectionStateType["Index"] = 1] = "Index";
 })(SelectionStateType || (SelectionStateType = {})));
-var CellEditType;
-( (function(CellEditType) {
-    CellEditType[CellEditType["Replace"] = 1] = "Replace";
-    CellEditType[CellEditType["Output"] = 2] = "Output";
-    CellEditType[CellEditType["Metadata"] = 3] = "Metadata";
-    CellEditType[CellEditType["CellLanguage"] = 4] = "CellLanguage";
-    CellEditType[CellEditType["DocumentMetadata"] = 5] = "DocumentMetadata";
-    CellEditType[CellEditType["Move"] = 6] = "Move";
-    CellEditType[CellEditType["OutputItems"] = 7] = "OutputItems";
-    CellEditType[CellEditType["PartialMetadata"] = 8] = "PartialMetadata";
-    CellEditType[CellEditType["PartialInternalMetadata"] = 9] = "PartialInternalMetadata";
-})(CellEditType || (CellEditType = {})));
+var NotebookMetadataUri;
+( (function(NotebookMetadataUri) {
+    NotebookMetadataUri.scheme = Schemas.vscodeNotebookMetadata;
+    function generate(notebook) {
+        return generateMetadataUri(notebook);
+    }
+    NotebookMetadataUri.generate = generate;
+    function parse(metadata) {
+        return parseMetadataUri(metadata);
+    }
+    NotebookMetadataUri.parse = parse;
+})(NotebookMetadataUri || (NotebookMetadataUri = {})));
 var CellUri;
 ( (function(CellUri) {
     CellUri.scheme = Schemas.vscodeNotebookCell;
@@ -324,20 +311,19 @@ const NotebookSetting = {
     InteractiveWindowPromptToSave: 'interactiveWindow.promptToSaveOnClose',
     cellFailureDiagnostics: 'notebook.cellFailureDiagnostics',
     outputBackupSizeLimit: 'notebook.backup.sizeLimit',
+    multiCursor: 'notebook.multiCursor.enabled',
 };
-var CellStatusbarAlignment;
-( (function(CellStatusbarAlignment) {
-    CellStatusbarAlignment[CellStatusbarAlignment["Left"] = 1] = "Left";
-    CellStatusbarAlignment[CellStatusbarAlignment["Right"] = 2] = "Right";
-})(CellStatusbarAlignment || (CellStatusbarAlignment = {})));
 class NotebookWorkingCopyTypeIdentifier {
     static { this._prefix = 'notebook/'; }
-    static create(viewType) {
-        return `${NotebookWorkingCopyTypeIdentifier._prefix}${viewType}`;
+    static create(notebookType, viewType) {
+        return `${NotebookWorkingCopyTypeIdentifier._prefix}${notebookType}/${viewType ?? notebookType}`;
     }
     static parse(candidate) {
         if (candidate.startsWith(NotebookWorkingCopyTypeIdentifier._prefix)) {
-            return candidate.substring(NotebookWorkingCopyTypeIdentifier._prefix.length);
+            const split = candidate.substring(NotebookWorkingCopyTypeIdentifier._prefix.length).split('/');
+            if (split.length === 2) {
+                return { notebookType: split[0], viewType: split[1] };
+            }
         }
         return undefined;
     }
@@ -410,4 +396,4 @@ function formatStreamText(buffer) {
     }
     return VSBuffer.fromString(fixCarriageReturn(fixBackspace(textDecoder.decode(buffer.buffer))));
 }
-export { ACCESSIBLE_NOTEBOOK_DISPLAY_ORDER, CellEditType, CellKind, CellStatusbarAlignment, CellUri, INTERACTIVE_WINDOW_EDITOR_ID, MOVE_CURSOR_1_LINE_COMMAND, MimeTypeDisplayOrder, NOTEBOOK_DIFF_EDITOR_ID, NOTEBOOK_DISPLAY_ORDER, NOTEBOOK_EDITOR_CURSOR_BOUNDARY, NOTEBOOK_EDITOR_CURSOR_LINE_BOUNDARY, NOTEBOOK_EDITOR_ID, NOTEBOOK_MULTI_DIFF_EDITOR_ID, NotebookCellExecutionState, NotebookCellsChangeType, NotebookEditorPriority, NotebookExecutionState, NotebookFindScopeType, NotebookRendererMatch, NotebookSetting, NotebookWorkingCopyTypeIdentifier, RENDERER_EQUIVALENT_EXTENSIONS, RENDERER_NOT_AVAILABLE, RendererMessagingSpec, SelectionStateType, compressOutputItemStreams, diff, isDocumentExcludePattern, isTextStreamMime };
+export { ACCESSIBLE_NOTEBOOK_DISPLAY_ORDER, CellKind, CellUri, INTERACTIVE_WINDOW_EDITOR_ID, MOVE_CURSOR_1_LINE_COMMAND, MimeTypeDisplayOrder, NOTEBOOK_DIFF_EDITOR_ID, NOTEBOOK_DISPLAY_ORDER, NOTEBOOK_EDITOR_CURSOR_BOUNDARY, NOTEBOOK_EDITOR_CURSOR_LINE_BOUNDARY, NOTEBOOK_EDITOR_ID, NOTEBOOK_MULTI_DIFF_EDITOR_ID, NotebookCellExecutionState, NotebookCellsChangeType, NotebookEditorPriority, NotebookExecutionState, NotebookFindScopeType, NotebookMetadataUri, NotebookSetting, NotebookWorkingCopyTypeIdentifier, RENDERER_EQUIVALENT_EXTENSIONS, RENDERER_NOT_AVAILABLE, SelectionStateType, compressOutputItemStreams, diff, isDocumentExcludePattern, isTextStreamMime };