@codingame/monaco-vscode-notebook-service-override 9.0.2 → 10.0.0

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

@@ -1,16 +1,16 @@
-import { NOTEBOOK_EDITOR_FOCUSED } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
+import { NOTEBOOK_EDITOR_FOCUSED, IS_COMPOSITE_NOTEBOOK } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
 import { localize } from 'vscode/vscode/vs/nls';
-import { AccessibleViewType, AccessibleContentProvider, AccessibleViewProviderId } from 'vscode/vscode/vs/platform/accessibility/browser/accessibleView';
-import { AccessibilityVerbositySettingId } from 'vscode/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
+import { AccessibleContentProvider } from 'vscode/vscode/vs/platform/accessibility/browser/accessibleView';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 import { ICodeEditorService } from 'vscode/vscode/vs/editor/browser/services/codeEditorService';
+import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 
 class NotebookAccessibilityHelp {
     constructor() {
         this.priority = 105;
         this.name = 'notebook';
-        this.when = NOTEBOOK_EDITOR_FOCUSED;
-        this.type = AccessibleViewType.Help;
+        this.when = ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED,  (IS_COMPOSITE_NOTEBOOK.negate()))));
+        this.type = "help" ;
     }
     getProvider(accessor) {
         const activeEditor = accessor.get(ICodeEditorService).getActiveCodeEditor()
@@ -25,51 +25,51 @@ class NotebookAccessibilityHelp {
 function getAccessibilityHelpText() {
     return [
         ( localize(
-            8070,
+            8134,
             'The notebook view is a collection of code and markdown cells. Code cells can be executed and will produce output directly below the cell.'
         )),
         ( localize(
-            8071,
+            8135,
             'The Edit Cell command{0} will focus on the cell input.',
             '<keybinding:notebook.cell.edit>'
         )),
         ( localize(
-            8072,
+            8136,
             'The Quit Edit command{0} will set focus on the cell container. The default (Escape) key may need to be pressed twice first exit the virtual cursor if active.',
             '<keybinding:notebook.cell.quitEdit>'
         )),
         ( localize(
-            8073,
+            8137,
             'The Focus Output command{0} will set focus in the cell\'s output.',
             '<keybinding:notebook.cell.focusInOutput>'
         )),
         ( localize(
-            8074,
+            8138,
             'The Focus Next Cell Editor command{0} will set focus in the next cell\'s editor.',
             '<keybinding:notebook.focusNextEditor>'
         )),
         ( localize(
-            8075,
+            8139,
             'The Focus Previous Cell Editor command{0} will set focus in the previous cell\'s editor.',
             '<keybinding:notebook.focusPreviousEditor>'
         )),
         ( localize(
-            8076,
+            8140,
             'The up and down arrows will also move focus between cells while focused on the outer cell container.'
         )),
         ( localize(
-            8077,
+            8141,
             'The Execute Cell command{0} executes the cell that currently has focus.',
             '<keybinding:notebook.cell.executeAndFocusContainer>'
         )),
         ( localize(
-            8078,
+            8142,
             'The Insert Cell Above{0} and Below{1} commands will create new empty code cells.',
             '<keybinding:notebook.cell.insertCodeCellAbove>',
             '<keybinding:notebook.cell.insertCodeCellBelow>'
         )),
         ( localize(
-            8079,
+            8143,
             'The Change Cell to Code/Markdown commands are used to switch between cell types.'
         ))
     ].join('\n');
@@ -78,13 +78,13 @@ function getAccessibilityHelpProvider(accessor, editor) {
     const helpText = getAccessibilityHelpText();
     return (
          (new AccessibleContentProvider(
-            AccessibleViewProviderId.Notebook,
-            { type: AccessibleViewType.Help },
+            "notebook" ,
+            { type: "help"  },
             () => helpText,
             () => editor.focus(),
-            AccessibilityVerbositySettingId.Notebook
+            "accessibility.verbosity.notebook"
         ))
     );
 }
 
-export { NotebookAccessibilityHelp, getAccessibilityHelpProvider, getAccessibilityHelpText };
+export { NotebookAccessibilityHelp };

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

@@ -1,6 +1,5 @@
-import { AccessibleViewType, AccessibleContentProvider, AccessibleViewProviderId } from 'vscode/vscode/vs/platform/accessibility/browser/accessibleView';
+import { AccessibleContentProvider } from 'vscode/vscode/vs/platform/accessibility/browser/accessibleView';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
-import { AccessibilityVerbositySettingId } from 'vscode/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
 import { getNotebookEditorFromEditorPane } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { NOTEBOOK_OUTPUT_FOCUSED } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
@@ -9,7 +8,7 @@ class NotebookAccessibleView {
     constructor() {
         this.priority = 100;
         this.name = 'notebook';
-        this.type = AccessibleViewType.View;
+        this.type = "view" ;
         this.when = ( ContextKeyExpr.and(NOTEBOOK_OUTPUT_FOCUSED, ( ContextKeyExpr.equals('resourceExtname', '.ipynb'))));
     }
     getProvider(accessor) {
@@ -58,14 +57,14 @@ function getAccessibleOutputProvider(editorService) {
         return;
     }
     return ( new AccessibleContentProvider(
-        AccessibleViewProviderId.Notebook,
-        { type: AccessibleViewType.View },
+        "notebook" ,
+        { type: "view"  },
         () => { return outputContent; },
         () => {
             notebookEditor?.setFocus(selections[0]);
             activePane?.focus();
         },
-        AccessibilityVerbositySettingId.Notebook
+        "accessibility.verbosity.notebook"
     ));
 }
 

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

@@ -27,7 +27,7 @@ const NotebookPreloadContribution = ( (Object.freeze({
     localResourceRoots: 'localResourceRoots',
 })));
 const notebookProviderContribution = {
-    description: ( localize(7632, 'Contributes notebook document provider.')),
+    description: ( localize(7687, 'Contributes notebook document provider.')),
     type: 'array',
     defaultSnippets: [{ body: [{ type: '', displayName: '', 'selector': [{ 'filenamePattern': '' }] }] }],
     items: {
@@ -40,25 +40,25 @@ const notebookProviderContribution = {
         properties: {
             [NotebookEditorContribution.type]: {
                 type: 'string',
-                description: ( localize(7633, 'Type of the notebook.')),
+                description: ( localize(7688, 'Type of the notebook.')),
             },
             [NotebookEditorContribution.displayName]: {
                 type: 'string',
-                description: ( localize(7634, 'Human readable name of the notebook.')),
+                description: ( localize(7689, 'Human readable name of the notebook.')),
             },
             [NotebookEditorContribution.selector]: {
                 type: 'array',
-                description: ( localize(7635, 'Set of globs that the notebook is for.')),
+                description: ( localize(7690, 'Set of globs that the notebook is for.')),
                 items: {
                     type: 'object',
                     properties: {
                         filenamePattern: {
                             type: 'string',
-                            description: ( localize(7636, 'Glob that the notebook is enabled for.')),
+                            description: ( localize(7691, 'Glob that the notebook is enabled for.')),
                         },
                         excludeFileNamePattern: {
                             type: 'string',
-                            description: ( localize(7637, 'Glob that the notebook is disabled for.'))
+                            description: ( localize(7692, 'Glob that the notebook is disabled for.'))
                         }
                     }
                 }
@@ -66,7 +66,7 @@ const notebookProviderContribution = {
             [NotebookEditorContribution.priority]: {
                 type: 'string',
                 markdownDeprecationMessage: ( localize(
-                    7638,
+                    7693,
                     '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: [
@@ -75,11 +75,11 @@ const notebookProviderContribution = {
                 ],
                 markdownEnumDescriptions: [
                     ( localize(
-                        7639,
+                        7694,
                         'The editor is automatically used when the user opens a resource, provided that no other default custom editors are registered for that resource.'
                     )),
                     ( localize(
-                        7640,
+                        7695,
                         '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.'
                     )),
                 ],
@@ -90,7 +90,7 @@ const notebookProviderContribution = {
 };
 const defaultRendererSnippet = ( (Object.freeze({ id: '', displayName: '', mimeTypes: [''], entrypoint: '' })));
 const notebookRendererContribution = {
-    description: ( localize(7641, 'Contributes notebook output renderer provider.')),
+    description: ( localize(7696, 'Contributes notebook output renderer provider.')),
     type: 'array',
     defaultSnippets: [{ body: [defaultRendererSnippet] }],
     items: {
@@ -105,18 +105,18 @@ const notebookRendererContribution = {
                 properties: {
                     [NotebookRendererContribution.id]: {
                         type: 'string',
-                        description: ( localize(7642, 'Unique identifier of the notebook output renderer.')),
+                        description: ( localize(7697, 'Unique identifier of the notebook output renderer.')),
                     },
                     [NotebookRendererContribution.displayName]: {
                         type: 'string',
-                        description: ( localize(7643, 'Human readable name of the notebook output renderer.')),
+                        description: ( localize(7698, 'Human readable name of the notebook output renderer.')),
                     },
                     [NotebookRendererContribution.hardDependencies]: {
                         type: 'array',
                         uniqueItems: true,
                         items: { type: 'string' },
                         markdownDescription: ( localize(
-                            7644,
+                            7699,
                             'List of kernel dependencies the renderer requires. If any of the dependencies are present in the `NotebookKernel.preloads`, the renderer can be used.'
                         )),
                     },
@@ -125,7 +125,7 @@ const notebookRendererContribution = {
                         uniqueItems: true,
                         items: { type: 'string' },
                         markdownDescription: ( localize(
-                            7645,
+                            7700,
                             '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.'
                         )),
                     },
@@ -138,17 +138,17 @@ const notebookRendererContribution = {
                         ],
                         enumDescriptions: [
                             ( localize(
-                                7646,
+                                7701,
                                 '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(
-                                7647,
+                                7702,
                                 'The renderer is better with messaging available, but it\'s not requried.'
                             )),
-                            ( localize(7648, 'The renderer does not require messaging.')),
+                            ( localize(7703, 'The renderer does not require messaging.')),
                         ],
                         description: ( localize(
-                            7649,
+                            7704,
                             '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.'
                         )),
                     },
@@ -164,13 +164,13 @@ const notebookRendererContribution = {
                         properties: {
                             [NotebookRendererContribution.mimeTypes]: {
                                 type: 'array',
-                                description: ( localize(7650, 'Set of globs that the notebook is for.')),
+                                description: ( localize(7705, 'Set of globs that the notebook is for.')),
                                 items: {
                                     type: 'string'
                                 }
                             },
                             [NotebookRendererContribution.entrypoint]: {
-                                description: ( localize(7651, 'File to load in the webview to render the extension.')),
+                                description: ( localize(7706, 'File to load in the webview to render the extension.')),
                                 type: 'string',
                             },
                         }
@@ -181,17 +181,17 @@ const notebookRendererContribution = {
                         ],
                         properties: {
                             [NotebookRendererContribution.entrypoint]: {
-                                description: ( localize(7651, 'File to load in the webview to render the extension.')),
+                                description: ( localize(7706, 'File to load in the webview to render the extension.')),
                                 type: 'object',
                                 required: ['extends', 'path'],
                                 properties: {
                                     extends: {
                                         type: 'string',
-                                        description: ( localize(7652, 'Existing renderer that this one extends.')),
+                                        description: ( localize(7707, 'Existing renderer that this one extends.')),
                                     },
                                     path: {
                                         type: 'string',
-                                        description: ( localize(7651, 'File to load in the webview to render the extension.')),
+                                        description: ( localize(7706, 'File to load in the webview to render the extension.')),
                                     },
                                 }
                             },
@@ -203,7 +203,7 @@ const notebookRendererContribution = {
     }
 };
 const notebookPreloadContribution = {
-    description: ( localize(7653, 'Contributes notebook preloads.')),
+    description: ( localize(7708, 'Contributes notebook preloads.')),
     type: 'array',
     defaultSnippets: [{ body: [{ type: '', entrypoint: '' }] }],
     items: {
@@ -215,17 +215,17 @@ const notebookPreloadContribution = {
         properties: {
             [NotebookPreloadContribution.type]: {
                 type: 'string',
-                description: ( localize(7654, 'Type of the notebook.')),
+                description: ( localize(7709, 'Type of the notebook.')),
             },
             [NotebookPreloadContribution.entrypoint]: {
                 type: 'string',
-                description: ( localize(7655, 'Path to file loaded in the webview.')),
+                description: ( localize(7710, 'Path to file loaded in the webview.')),
             },
             [NotebookPreloadContribution.localResourceRoots]: {
                 type: 'array',
                 items: { type: 'string' },
                 description: ( localize(
-                    7656,
+                    7711,
                     'Paths to additional resources that should be allowed in the webview.'
                 )),
             },
@@ -272,8 +272,8 @@ class NotebooksDataRenderer extends Disposable {
             return { data: { headers: [], rows: [] }, dispose: () => { } };
         }
         const headers = [
-            ( localize(7657, "ID")),
-            ( localize(7658, "Name")),
+            ( localize(7712, "ID")),
+            ( localize(7713, "Name")),
         ];
         const rows = ( (contrib
             .sort((a, b) => a.type.localeCompare(b.type))
@@ -306,8 +306,8 @@ class NotebookRenderersDataRenderer extends Disposable {
             return { data: { headers: [], rows: [] }, dispose: () => { } };
         }
         const headers = [
-            ( localize(7659, "Name")),
-            ( localize(7660, "Mimetypes")),
+            ( localize(7714, "Name")),
+            ( localize(7715, "Mimetypes")),
         ];
         const rows = ( (contrib
             .sort((a, b) => a.displayName.localeCompare(b.displayName))
@@ -328,7 +328,7 @@ class NotebookRenderersDataRenderer extends Disposable {
 }
 ( (Registry.as(Extensions.ExtensionFeaturesRegistry))).registerExtensionFeature({
     id: 'notebooks',
-    label: ( localize(7661, "Notebooks")),
+    label: ( localize(7716, "Notebooks")),
     access: {
         canToggle: false
     },
@@ -336,7 +336,7 @@ class NotebookRenderersDataRenderer extends Disposable {
 });
 ( (Registry.as(Extensions.ExtensionFeaturesRegistry))).registerExtensionFeature({
     id: 'notebookRenderer',
-    label: ( localize(7662, "Notebook Renderers")),
+    label: ( localize(7717, "Notebook Renderers")),
     access: {
         canToggle: false
     },

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

@@ -6,7 +6,6 @@ import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { NotebookEditorInput, isCompositeNotebookEditorInput, isNotebookEditorInput } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookEditorInput';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
-import { GroupModelChangeKind } from 'vscode/vscode/vs/workbench/common/editor';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
 import { InteractiveWindowOpen } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
@@ -80,13 +79,13 @@ let NotebookEditorWidgetService = class NotebookEditorWidgetService {
         }));
         const interactiveWindowOpen = InteractiveWindowOpen.bindTo(contextKeyService);
         this._disposables.add(editorService.onDidEditorsChange(e => {
-            if (e.event.kind === GroupModelChangeKind.EDITOR_OPEN && !interactiveWindowOpen.get()) {
-                if (editorService.editors.find(editor => editor.editorId === 'interactive')) {
+            if (e.event.kind === 5  && !interactiveWindowOpen.get()) {
+                if (editorService.editors.find(editor => isCompositeNotebookEditorInput(editor))) {
                     interactiveWindowOpen.set(true);
                 }
             }
-            else if (e.event.kind === GroupModelChangeKind.EDITOR_CLOSE && interactiveWindowOpen.get()) {
-                if (!editorService.editors.find(editor => editor.editorId === 'interactive')) {
+            else if (e.event.kind === 6  && interactiveWindowOpen.get()) {
+                if (!editorService.editors.find(editor => isCompositeNotebookEditorInput(editor))) {
                     interactiveWindowOpen.set(false);
                 }
             }

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

@@ -26,7 +26,7 @@ let NotebookExecutionService = class NotebookExecutionService {
             return;
         }
         this._logService.debug(`Execution`, `${JSON.stringify(( (cellsArr.map(c => c.handle))))}`);
-        const message = ( localize(3259, "Executing a notebook cell will run code from this workspace."));
+        const message = ( localize(3294, "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/notebookExecutionStateServiceImpl.js

@@ -8,7 +8,7 @@ import { AccessibilitySignal } from 'vscode/vscode/vs/platform/accessibilitySign
 import { IAccessibilitySignalService } from 'vscode/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService.service';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
-import { CellUri, NotebookCellExecutionState, CellEditType, NotebookExecutionState } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
+import { CellUri, NotebookCellExecutionState, NotebookExecutionState } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { CellExecutionUpdateType } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookExecutionService';
 import { INotebookExecutionService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookExecutionService.service';
 import { NotebookExecutionType } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService';
@@ -334,7 +334,7 @@ NotebookExecutionListeners = ( __decorate([
 function updateToEdit(update, cellHandle) {
     if (update.editType === CellExecutionUpdateType.Output) {
         return {
-            editType: CellEditType.Output,
+            editType: 2 ,
             handle: update.cellHandle,
             append: update.append,
             outputs: update.outputs,
@@ -342,7 +342,7 @@ function updateToEdit(update, cellHandle) {
     }
     else if (update.editType === CellExecutionUpdateType.OutputItems) {
         return {
-            editType: CellEditType.OutputItems,
+            editType: 7 ,
             items: update.items,
             append: update.append,
             outputId: update.outputId
@@ -357,7 +357,7 @@ function updateToEdit(update, cellHandle) {
             newInternalMetadata.runStartTime = update.runStartTime;
         }
         return {
-            editType: CellEditType.PartialInternalMetadata,
+            editType: 9 ,
             handle: cellHandle,
             internalMetadata: newInternalMetadata
         };
@@ -393,7 +393,7 @@ let CellExecution = class CellExecution extends Disposable {
     }
     initialize() {
         const startExecuteEdit = {
-            editType: CellEditType.PartialInternalMetadata,
+            editType: 9 ,
             handle: this.cellHandle,
             internalMetadata: {
                 executionId: generateUuid(),
@@ -449,7 +449,7 @@ let CellExecution = class CellExecution extends Disposable {
         }
         else {
             const edit = {
-                editType: CellEditType.PartialInternalMetadata,
+                editType: 9 ,
                 handle: this.cellHandle,
                 internalMetadata: {
                     lastRunSuccess: completionData.lastRunSuccess,

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

@@ -1,10 +1,9 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { Disposable, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
-import { LinkedMap, Touch } from 'vscode/vscode/vs/base/common/map';
+import { LinkedMap } from 'vscode/vscode/vs/base/common/map';
 import { localize2 } from 'vscode/vscode/vs/nls';
 import { Categories } from 'vscode/vscode/vs/platform/action/common/actionCommonCategories';
 import { registerAction2, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
-import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { INotebookKernelService, INotebookKernelHistoryService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookKernelService.service';
 import { INotebookLoggingService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookLoggingService.service';
@@ -22,7 +21,7 @@ let NotebookKernelHistoryService = class NotebookKernelHistoryService extends Di
         this._mostRecentKernelsMap = {};
         this._loadState();
         this._register(this._storageService.onWillSaveState(() => this._saveState()));
-        this._register(this._storageService.onDidChangeValue(StorageScope.WORKSPACE, NotebookKernelHistoryService_1.STORAGE_KEY, this._register(( (new DisposableStore()))))(() => {
+        this._register(this._storageService.onDidChangeValue(1 , NotebookKernelHistoryService_1.STORAGE_KEY, this._register(( (new DisposableStore()))))(() => {
             this._loadState();
         }));
     }
@@ -44,7 +43,7 @@ let NotebookKernelHistoryService = class NotebookKernelHistoryService extends Di
         const key = kernel.id;
         const viewType = kernel.viewType;
         const recentKeynels = this._mostRecentKernelsMap[viewType] ?? ( (new LinkedMap()));
-        recentKeynels.set(key, key, Touch.AsOld);
+        recentKeynels.set(key, key, 1 );
         if (recentKeynels.size > MAX_KERNELS_IN_HISTORY) {
             const reserved = [...recentKeynels.entries()].slice(0, MAX_KERNELS_IN_HISTORY);
             recentKeynels.fromJSON(reserved);
@@ -58,14 +57,14 @@ let NotebookKernelHistoryService = class NotebookKernelHistoryService extends Di
         }
         if (notEmpty) {
             const serialized = this._serialize();
-            this._storageService.store(NotebookKernelHistoryService_1.STORAGE_KEY, JSON.stringify(serialized), StorageScope.WORKSPACE, StorageTarget.USER);
+            this._storageService.store(NotebookKernelHistoryService_1.STORAGE_KEY, JSON.stringify(serialized), 1 , 0 );
         }
         else {
-            this._storageService.remove(NotebookKernelHistoryService_1.STORAGE_KEY, StorageScope.WORKSPACE);
+            this._storageService.remove(NotebookKernelHistoryService_1.STORAGE_KEY, 1 );
         }
     }
     _loadState() {
-        const serialized = this._storageService.get(NotebookKernelHistoryService_1.STORAGE_KEY, StorageScope.WORKSPACE);
+        const serialized = this._storageService.get(NotebookKernelHistoryService_1.STORAGE_KEY, 1 );
         if (serialized) {
             try {
                 this._deserialize(JSON.parse(serialized));
@@ -113,7 +112,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.clearNotebookKernelsMRUCache',
-            title: ( localize2(3263, "Clear Notebook Kernels MRU Cache")),
+            title: ( localize2(3298, "Clear Notebook Kernels MRU Cache")),
             category: Categories.Developer,
             f1: true
         });

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

@@ -2,14 +2,12 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
 import { Disposable, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { ResourceMap, LRUCache } from 'vscode/vscode/vs/base/common/map';
-import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { INotebookService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
 import { MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { IMenuService } from 'vscode/vscode/vs/platform/actions/common/actions.service';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
-import { MarshalledId } from 'vscode/vscode/vs/base/common/marshallingIds';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import { runWhenWindowIdle, getActiveWindow } from 'vscode/vscode/vs/base/browser/dom';
 
@@ -58,7 +56,7 @@ class SourceAction extends Disposable {
         try {
             await this.action.run({
                 uri: this.model.uri,
-                $mid: MarshalledId.NotebookActionContext
+                $mid: 14
             });
         }
         catch (error) {
@@ -106,7 +104,7 @@ let NotebookKernelService = class NotebookKernelService extends Disposable {
             this._kernelSourceActionsUpdates.delete(id);
         }));
         try {
-            const data = JSON.parse(this._storageService.get(NotebookKernelService_1._storageNotebookBinding, StorageScope.WORKSPACE, '[]'));
+            const data = JSON.parse(this._storageService.get(NotebookKernelService_1._storageNotebookBinding, 1 , '[]'));
             this._notebookBindings.fromJSON(data);
         }
         catch {
@@ -127,7 +125,7 @@ let NotebookKernelService = class NotebookKernelService extends Disposable {
     _persistMementos() {
         this._persistSoonHandle?.dispose();
         this._persistSoonHandle = runWhenWindowIdle(getActiveWindow(), () => {
-            this._storageService.store(NotebookKernelService_1._storageNotebookBinding, JSON.stringify(this._notebookBindings), StorageScope.WORKSPACE, StorageTarget.MACHINE);
+            this._storageService.store(NotebookKernelService_1._storageNotebookBinding, JSON.stringify(this._notebookBindings), 1 , 1 );
         }, 100);
     }
     static _score(kernel, notebook) {

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

@@ -7,13 +7,10 @@ import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/c
 import 'vscode/vscode/vs/platform/notification/common/notification';
 import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
 import { getInstalledExtensions } from 'vscode/vscode/vs/workbench/contrib/extensions/common/extensionsUtils';
-import { EnablementState } from 'vscode/vscode/vs/workbench/services/extensionManagement/common/extensionManagement';
 import { IWorkbenchExtensionEnablementService } from 'vscode/vscode/vs/workbench/services/extensionManagement/common/extensionManagement.service';
 import { ILifecycleService } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle.service';
-import { InstallOperation } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement';
 import { IExtensionManagementService } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement.service';
 import { areSameExtensions } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagementUtil';
-import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { Memento } from 'vscode/vscode/vs/workbench/common/memento';
 import { distinct } from 'vscode/vscode/vs/base/common/arrays';
@@ -22,7 +19,7 @@ import Severity$1 from 'vscode/vscode/vs/base/common/severity';
 function onExtensionChanged(accessor) {
     const extensionService = accessor.get(IExtensionManagementService);
     const extensionEnablementService = accessor.get(IWorkbenchExtensionEnablementService);
-    const onDidInstallExtensions = Event.chain(extensionService.onDidInstallExtensions, $ => ( ($.filter(e => ( (e.some(({ operation }) => operation === InstallOperation.Install))))
+    const onDidInstallExtensions = Event.chain(extensionService.onDidInstallExtensions, $ => ( ($.filter(e => ( (e.some(({ operation }) => operation === 2 ))))
         .map(e => ( (e.map(({ identifier }) => identifier)))))));
     return Event.debounce(Event.any(Event.any(onDidInstallExtensions, ( (Event.map(extensionService.onDidUninstallExtension, e => [e.identifier])))), ( (Event.map(
         extensionEnablementService.onEnablementChanged,
@@ -45,7 +42,7 @@ let NotebookKeymapService = class NotebookKeymapService extends Disposable {
         this.extensionEnablementService = extensionEnablementService;
         this.notificationService = notificationService;
         this.notebookKeymapMemento = ( (new Memento('notebookKeymap', storageService)));
-        this.notebookKeymap = this.notebookKeymapMemento.getMemento(StorageScope.PROFILE, StorageTarget.USER);
+        this.notebookKeymap = this.notebookKeymapMemento.getMemento(0 , 0 );
         this._register(lifecycleService.onDidShutdown(() => this.dispose()));
         this._register(this.instantiationService.invokeFunction(onExtensionChanged)((identifiers => {
             Promise.all(( (identifiers.map(identifier => this.checkForOtherKeymaps(identifier)))))
@@ -70,18 +67,18 @@ let NotebookKeymapService = class NotebookKeymapService extends Disposable {
     promptForDisablingOtherKeymaps(newKeymap, oldKeymaps) {
         const onPrompt = (confirmed) => {
             if (confirmed) {
-                this.extensionEnablementService.setEnablement(( (oldKeymaps.map(keymap => keymap.local))), EnablementState.DisabledGlobally);
+                this.extensionEnablementService.setEnablement(( (oldKeymaps.map(keymap => keymap.local))), 7 );
             }
         };
         this.notificationService.prompt(Severity$1.Info, ( localize(
-            3260,
+            3295,
             "Disable other keymaps ({0}) to avoid conflicts between keybindings?",
             ( (distinct(( (oldKeymaps.map(k => k.local.manifest.displayName)))).map(name => `'${name}'`))).join(', ')
         )), [{
-                label: ( localize(3261, "Yes")),
+                label: ( localize(3296, "Yes")),
                 run: () => onPrompt(true)
             }, {
-                label: ( localize(3262, "No")),
+                label: ( localize(3297, "No")),
                 run: () => onPrompt(false)
             }]);
     }

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

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