@codingame/monaco-vscode-notebook-service-override 2.2.2 → 3.0.0

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/marker/markerProvider.js

@@ -1,6 +1,5 @@
 import { __decorate, __param } from '../../../../../../../../../external/tslib/tslib.es6.js';
-import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
-import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
+import { registerWorkbenchContribution2 } from 'vscode/vscode/vs/workbench/common/contributions';
 import { MarkerList, IMarkerNavigationService } from 'vscode/vscode/vs/editor/contrib/gotoError/browser/markerNavigationService';
 import { CellUri } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { MarkerSeverity, IMarkerService } from 'vscode/vscode/vs/platform/markers/common/markers';
@@ -13,6 +12,7 @@ import { editorErrorForeground, editorWarningForeground } from 'vscode/vscode/vs
 import { isEqual } from 'vscode/vscode/vs/base/common/resources';
 
 let MarkerListProvider = class MarkerListProvider {
+    static { this.ID = 'workbench.contrib.markerListProvider'; }
     constructor(_markerService, markerNavigation, _configService) {
         this._markerService = _markerService;
         this._configService = _configService;
@@ -87,7 +87,5 @@ NotebookMarkerDecorationContribution.__decorator = ( __decorate([
 NotebookMarkerDecorationContribution = ( __decorate([
     ( __param(1, IMarkerService))
 ], NotebookMarkerDecorationContribution));
-( Registry
-    .as(Extensions.Workbench))
-    .registerWorkbenchContribution(MarkerListProvider, 2 );
+registerWorkbenchContribution2(MarkerListProvider.ID, MarkerListProvider, 2 );
 registerNotebookContribution(NotebookMarkerDecorationContribution.id, NotebookMarkerDecorationContribution);

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/navigation/arrow.js

@@ -9,6 +9,7 @@ import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/cont
 import { InputFocusedContextKey } from 'vscode/vscode/vs/platform/contextkey/common/contextkeys';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { InlineChatController } from 'vscode/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
+import { CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION } from '../../controller/chat/notebookChatContext.js';
 import { NotebookCellAction, NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT, findTargetCellEditor, NotebookAction } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
 import { CellEditState } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { NOTEBOOK_EDITOR_CURSOR_BOUNDARY, CellKind } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
@@ -141,12 +142,22 @@ registerAction2(class extends NotebookAction {
                 'focusFirstCell',
                 'Focus First Cell'
             )),
-            keybinding: {
-                when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ContextKeyExpr.not(InputFocusedContextKey))),
-                primary: 2048  | 14 ,
-                mac: { primary: 2048  | 16  },
-                weight: 200
-            },
+            keybinding: [
+                {
+                    when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ContextKeyExpr.not(InputFocusedContextKey))),
+                    primary: 2048  | 14 ,
+                    weight: 200
+                },
+                {
+                    when: ( ContextKeyExpr.and(
+                        NOTEBOOK_EDITOR_FOCUSED,
+                        ContextKeyExpr.not(InputFocusedContextKey),
+                        ( CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION.isEqualTo(''))
+                    )),
+                    mac: { primary: 2048  | 16  },
+                    weight: 200
+                }
+            ],
         });
     }
     async runWithContext(accessor, context) {
@@ -167,12 +178,23 @@ registerAction2(class extends NotebookAction {
                 'focusLastCell',
                 'Focus Last Cell'
             )),
-            keybinding: {
-                when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ContextKeyExpr.not(InputFocusedContextKey))),
-                primary: 2048  | 13 ,
-                mac: { primary: 2048  | 18  },
-                weight: 200
-            },
+            keybinding: [
+                {
+                    when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ContextKeyExpr.not(InputFocusedContextKey))),
+                    primary: 2048  | 13 ,
+                    mac: undefined,
+                    weight: 200
+                },
+                {
+                    when: ( ContextKeyExpr.and(
+                        NOTEBOOK_EDITOR_FOCUSED,
+                        ContextKeyExpr.not(InputFocusedContextKey),
+                        ( CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION.isEqualTo(''))
+                    )),
+                    mac: { primary: 2048  | 18  },
+                    weight: 200
+                }
+            ],
         });
     }
     async runWithContext(accessor, context) {

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariableContextKeys.js

@@ -0,0 +1,5 @@
+import { RawContextKey } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
+
+const NOTEBOOK_VARIABLE_VIEW_ENABLED = ( new RawContextKey('notebookVariableViewEnabled', false));
+
+export { NOTEBOOK_VARIABLE_VIEW_ENABLED };

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

@@ -1,36 +1,66 @@
 import { __decorate, __param } from '../../../../../../../../../external/tslib/tslib.es6.js';
-import { localize2WithPath } from 'vscode/vscode/vs/nls';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { localize2WithPath } from 'vscode/vscode/vs/nls';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
+import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
+import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { Extensions } from 'vscode/vscode/vs/workbench/common/views';
 import { VIEWLET_ID } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
-import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
-import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
+import { NOTEBOOK_VARIABLE_VIEW_ENABLED } from './notebookVariableContextKeys.js';
 import { NotebookVariablesView } from './notebookVariablesView.js';
-import { NOTEBOOK_KERNEL } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
+import { getNotebookEditorFromEditorPane } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { variablesViewIcon } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookIcons';
-import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
-import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
-import { INotebookExecutionStateService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService';
 import { NotebookSetting } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
+import { INotebookExecutionStateService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService';
+import { INotebookKernelService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookKernelService';
+import { INotebookService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookService';
+import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
 
 let NotebookVariables = class NotebookVariables extends Disposable {
-    constructor(editorService, configurationService, notebookExecutionStateService) {
+    constructor(contextKeyService, configurationService, editorService, notebookExecutionStateService, notebookKernelService, notebookDocumentService) {
         super();
+        this.configurationService = configurationService;
         this.editorService = editorService;
         this.notebookExecutionStateService = notebookExecutionStateService;
+        this.notebookKernelService = notebookKernelService;
+        this.notebookDocumentService = notebookDocumentService;
         this.listeners = [];
-        this.listeners.push(this.editorService.onDidEditorsChange(() => this.handleInitEvent(configurationService)));
-        this.listeners.push(this.notebookExecutionStateService.onDidChangeExecution(() => this.handleInitEvent(configurationService)));
+        this.initialized = false;
+        this.viewEnabled = NOTEBOOK_VARIABLE_VIEW_ENABLED.bindTo(contextKeyService);
+        this.listeners.push(this.editorService.onDidActiveEditorChange(() => this.handleInitEvent()));
+        this.listeners.push(this.notebookExecutionStateService.onDidChangeExecution((e) => this.handleInitEvent(e.notebook)));
+        this.configListener = configurationService.onDidChangeConfiguration((e) => this.handleConfigChange(e));
+    }
+    handleConfigChange(e) {
+        if (e.affectsConfiguration(NotebookSetting.notebookVariablesView)) {
+            if (!this.configurationService.getValue(NotebookSetting.notebookVariablesView)) {
+                this.viewEnabled.set(false);
+            }
+            else if (this.initialized) {
+                this.viewEnabled.set(true);
+            }
+            else {
+                this.handleInitEvent();
+            }
+        }
     }
-    handleInitEvent(configurationService) {
-        if (configurationService.getValue(NotebookSetting.notebookVariablesView)
-            && this.editorService.activeEditorPane?.getId() === 'workbench.editor.notebook') {
-            if (this.initializeView()) {
+    handleInitEvent(notebook) {
+        if (this.configurationService.getValue(NotebookSetting.notebookVariablesView)
+            && (!!notebook || this.editorService.activeEditorPane?.getId() === 'workbench.editor.notebook')) {
+            if (this.hasVariableProvider(notebook) && !this.initialized && this.initializeView()) {
+                this.viewEnabled.set(true);
+                this.initialized = true;
                 this.listeners.forEach(listener => listener.dispose());
             }
         }
     }
+    hasVariableProvider(notebookUri) {
+        const notebook = notebookUri ?
+            this.notebookDocumentService.getNotebookTextModel(notebookUri) :
+            getNotebookEditorFromEditorPane(this.editorService.activeEditorPane)?.getViewModel()?.notebookDocument;
+        return notebook && this.notebookKernelService.getMatchingKernel(notebook).selected?.hasVariableProvider;
+    }
     initializeView() {
         const debugViewContainer = ( Registry.as('workbench.registry.view.containers')).get(VIEWLET_ID);
         if (debugViewContainer) {
@@ -42,18 +72,26 @@ let NotebookVariables = class NotebookVariables extends Disposable {
                 "Notebook Variables"
             )),
                 containerIcon: variablesViewIcon, ctorDescriptor: ( new SyncDescriptor(NotebookVariablesView)),
-                order: 50, weight: 5, canToggleVisibility: true, canMoveView: true, collapsed: true, when: ( ContextKeyExpr.notEquals(NOTEBOOK_KERNEL.key, '')),
+                order: 50, weight: 5, canToggleVisibility: true, canMoveView: true, collapsed: true, when: NOTEBOOK_VARIABLE_VIEW_ENABLED,
             };
             viewsRegistry.registerViews([viewDescriptor], debugViewContainer);
             return true;
         }
         return false;
     }
+    dispose() {
+        super.dispose();
+        this.listeners.forEach(listener => listener.dispose());
+        this.configListener.dispose();
+    }
 };
 NotebookVariables = ( __decorate([
-    ( __param(0, IEditorService)),
+    ( __param(0, IContextKeyService)),
     ( __param(1, IConfigurationService)),
-    ( __param(2, INotebookExecutionStateService))
+    ( __param(2, IEditorService)),
+    ( __param(3, INotebookExecutionStateService)),
+    ( __param(4, INotebookKernelService)),
+    ( __param(5, INotebookService))
 ], NotebookVariables));
 
 export { NotebookVariables };

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariablesView.js

@@ -1,6 +1,8 @@
 import { __decorate, __param } from '../../../../../../../../../external/tslib/tslib.es6.js';
 import { RunOnceScheduler } from 'vscode/vscode/vs/base/common/async';
 import { localize2WithPath } from 'vscode/vscode/vs/nls';
+import { createAndFillInContextMenuActions } from 'vscode/vscode/vs/platform/actions/browser/menuEntryActionViewItem';
+import { MenuId, IMenuService } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
@@ -14,6 +16,7 @@ import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/te
 import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService';
 import { ViewPane } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPane';
 import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views';
+import { CONTEXT_VARIABLE_NAME, CONTEXT_VARIABLE_VALUE, CONTEXT_VARIABLE_TYPE, CONTEXT_VARIABLE_LANGUAGE, CONTEXT_VARIABLE_EXTENSIONID } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
 import { NotebookVariableDataSource } from './notebookVariablesDataSource.js';
 import { NotebookVariablesDelegate, NotebookVariableRenderer, NotebookVariableAccessibilityProvider } from './notebookVariablesTree.js';
 import { getNotebookEditorFromEditorPane } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
@@ -28,13 +31,14 @@ let NotebookVariablesView = class NotebookVariablesView extends ViewPane {
         'notebook.notebookVariables',
         "Notebook Variables"
     )); }
-    constructor(options, editorService, notebookKernelService, notebookExecutionStateService, keybindingService, contextMenuService, contextKeyService, configurationService, instantiationService, viewDescriptorService, openerService, quickInputService, commandService, themeService, telemetryService) {
+    constructor(options, editorService, notebookKernelService, notebookExecutionStateService, keybindingService, contextMenuService, contextKeyService, configurationService, instantiationService, viewDescriptorService, openerService, quickInputService, commandService, themeService, telemetryService, menuService) {
         super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService);
         this.editorService = editorService;
         this.notebookKernelService = notebookKernelService;
         this.notebookExecutionStateService = notebookExecutionStateService;
         this.quickInputService = quickInputService;
         this.commandService = commandService;
+        this.menuService = menuService;
         this._register(this.editorService.onDidActiveEditorChange(this.handleActiveEditorChange.bind(this)));
         this._register(this.notebookKernelService.onDidNotebookVariablesUpdate(this.handleVariablesChanged.bind(this)));
         this._register(this.notebookExecutionStateService.onDidChangeExecution(this.handleExecutionStateChange.bind(this)));
@@ -44,6 +48,7 @@ let NotebookVariablesView = class NotebookVariablesView extends ViewPane {
     }
     renderBody(container) {
         super.renderBody(container);
+        this.element.classList.add('debug-pane');
         this.tree = this.instantiationService.createInstance(WorkbenchAsyncDataTree, 'notebookVariablesTree', container, ( new NotebookVariablesDelegate()), [( new NotebookVariableRenderer())], this.dataSource, {
             accessibilityProvider: ( new NotebookVariableAccessibilityProvider()),
             identityProvider: { getId: (e) => e.id },
@@ -52,6 +57,36 @@ let NotebookVariablesView = class NotebookVariablesView extends ViewPane {
         if (this.activeNotebook) {
             this.tree.setInput({ kind: 'root', notebook: this.activeNotebook });
         }
+        this._register(this.tree.onContextMenu(e => this.onContextMenu(e)));
+    }
+    onContextMenu(e) {
+        if (!e.element) {
+            return;
+        }
+        const element = e.element;
+        const arg = {
+            source: ( element.notebook.uri.toString()),
+            value: element.value,
+            type: element.type,
+            expression: element.expression,
+            language: element.language,
+            extensionId: element.extensionId
+        };
+        const actions = [];
+        const overlayedContext = this.contextKeyService.createOverlay([
+            [CONTEXT_VARIABLE_NAME.key, element.name],
+            [CONTEXT_VARIABLE_VALUE.key, element.value],
+            [CONTEXT_VARIABLE_TYPE.key, element.type],
+            [CONTEXT_VARIABLE_LANGUAGE.key, element.language],
+            [CONTEXT_VARIABLE_EXTENSIONID.key, element.extensionId]
+        ]);
+        const menu = this.menuService.createMenu(MenuId.NotebookVariablesContext, overlayedContext);
+        createAndFillInContextMenuActions(menu, { arg, shouldForwardArgs: true }, actions);
+        menu.dispose();
+        this.contextMenuService.showContextMenu({
+            getAnchor: () => e.anchor,
+            getActions: () => actions
+        });
     }
     layoutBody(height, width) {
         super.layoutBody(height, width);
@@ -60,7 +95,7 @@ let NotebookVariablesView = class NotebookVariablesView extends ViewPane {
     setActiveNotebook() {
         const current = this.activeNotebook;
         const activeEditorPane = this.editorService.activeEditorPane;
-        if (activeEditorPane && activeEditorPane.getId() === 'workbench.editor.notebook') {
+        if (activeEditorPane?.getId() === 'workbench.editor.notebook' || activeEditorPane?.getId() === 'workbench.editor.interactive') {
             const notebookDocument = getNotebookEditorFromEditorPane(activeEditorPane)?.getViewModel()?.notebookDocument;
             this.activeNotebook = notebookDocument;
         }
@@ -106,7 +141,8 @@ NotebookVariablesView = ( __decorate([
     ( __param(11, IQuickInputService)),
     ( __param(12, ICommandService)),
     ( __param(13, IThemeService)),
-    ( __param(14, ITelemetryService))
+    ( __param(14, ITelemetryService)),
+    ( __param(15, IMenuService))
 ], NotebookVariablesView));
 
 export { NotebookVariablesView };

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/profile/notebookProfile.js

@@ -1,12 +1,7 @@
-import { __decorate, __param } from '../../../../../../../../../external/tslib/tslib.es6.js';
-import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
-import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { registerAction2, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
 import { NotebookSetting } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
-import { IWorkbenchAssignmentService } from 'vscode/vscode/vs/workbench/services/assignment/common/assignmentService';
-import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
 
 var NotebookProfileType;
 ( (function(NotebookProfileType) {
@@ -78,40 +73,5 @@ function isSetProfileArgs(args) {
         setProfileArgs.profile === NotebookProfileType.default ||
         setProfileArgs.profile === NotebookProfileType.jupyter;
 }
-let NotebookProfileContribution = class NotebookProfileContribution extends Disposable {
-    constructor(configService, experimentService) {
-        super();
-        this.experimentService = experimentService;
-        if (this.experimentService) {
-            this.experimentService.getTreatment('notebookprofile').then(treatment => {
-                if (treatment === undefined) {
-                    return;
-                }
-                else {
-                    const focusIndicator = configService.getValue(NotebookSetting.focusIndicator);
-                    const insertToolbarPosition = configService.getValue(NotebookSetting.insertToolbarLocation);
-                    const globalToolbar = configService.getValue(NotebookSetting.globalToolbar);
-                    const compactView = configService.getValue(NotebookSetting.compactView);
-                    const showCellStatusBar = configService.getValue(NotebookSetting.showCellStatusBar);
-                    const consolidatedRunButton = configService.getValue(NotebookSetting.consolidatedRunButton);
-                    if (focusIndicator === 'border'
-                        && insertToolbarPosition === 'both'
-                        && globalToolbar === false
-                        && compactView === true
-                        && showCellStatusBar === 'visible'
-                        && consolidatedRunButton === true) {
-                        applyProfile(configService, profiles[treatment] ?? profiles[NotebookProfileType.default]);
-                    }
-                }
-            });
-        }
-    }
-};
-NotebookProfileContribution = ( __decorate([
-    ( __param(0, IConfigurationService)),
-    ( __param(1, IWorkbenchAssignmentService))
-], NotebookProfileContribution));
-const workbenchContributionsRegistry = ( Registry.as(Extensions.Workbench));
-workbenchContributionsRegistry.registerWorkbenchContribution(NotebookProfileContribution, 2 );
 
-export { NotebookProfileContribution, NotebookProfileType };
+export { NotebookProfileType };

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/troubleshoot/layout.js

@@ -1,7 +1,7 @@
 import { Disposable, DisposableStore, dispose } from 'vscode/vscode/vs/base/common/lifecycle';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
-import { registerAction2, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
+import { localize2WithPath } 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 { getNotebookEditorFromEditorPane } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { registerNotebookContribution } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookEditorExtensions';
 import { INotebookService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookService';
@@ -93,14 +93,11 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.toggleLayoutTroubleshoot',
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/notebook/browser/contrib/troubleshoot/layout',
-                    'workbench.notebook.toggleLayoutTroubleshoot',
-                    "Toggle Layout Troubleshoot"
-                )),
-                original: 'Toggle Notebook Layout Troubleshoot'
-            },
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/notebook/browser/contrib/troubleshoot/layout',
+                'workbench.notebook.toggleLayoutTroubleshoot',
+                "Toggle Layout Troubleshoot"
+            )),
             category: Categories.Developer,
             f1: true
         });
@@ -119,14 +116,11 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.inspectLayout',
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/notebook/browser/contrib/troubleshoot/layout',
-                    'workbench.notebook.inspectLayout',
-                    "Inspect Notebook Layout"
-                )),
-                original: 'Inspect Notebook Layout'
-            },
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/notebook/browser/contrib/troubleshoot/layout',
+                'workbench.notebook.inspectLayout',
+                "Inspect Notebook Layout"
+            )),
             category: Categories.Developer,
             f1: true
         });
@@ -147,14 +141,11 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.clearNotebookEdtitorTypeCache',
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/notebook/browser/contrib/troubleshoot/layout',
-                    'workbench.notebook.clearNotebookEdtitorTypeCache',
-                    "Clear Notebook Editor Type Cache"
-                )),
-                original: 'Clear Notebook Editor Cache'
-            },
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/notebook/browser/contrib/troubleshoot/layout',
+                'workbench.notebook.clearNotebookEdtitorTypeCache',
+                "Clear Notebook Editor Type Cache"
+            )),
             category: Categories.Developer,
             f1: true
         });

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/undoRedo/notebookUndoRedo.js

@@ -1,13 +1,13 @@
 import { __decorate, __param } from '../../../../../../../../../external/tslib/tslib.es6.js';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
-import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
-import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
+import { registerWorkbenchContribution2 } from 'vscode/vscode/vs/workbench/common/contributions';
 import { CellKind } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
 import { getNotebookEditorFromEditorPane, CellEditState } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { UndoCommand, RedoCommand } from 'vscode/vscode/vs/editor/browser/editorExtensions';
 
 let NotebookUndoRedoContribution = class NotebookUndoRedoContribution extends Disposable {
+    static { this.ID = 'workbench.contrib.notebookUndoRedo'; }
     constructor(_editorService) {
         super();
         this._editorService = _editorService;
@@ -53,5 +53,4 @@ let NotebookUndoRedoContribution = class NotebookUndoRedoContribution extends Di
 NotebookUndoRedoContribution = ( __decorate([
     ( __param(0, IEditorService))
 ], NotebookUndoRedoContribution));
-const workbenchContributionsRegistry = ( Registry.as(Extensions.Workbench));
-workbenchContributionsRegistry.registerWorkbenchContribution(NotebookUndoRedoContribution, 2 );
+registerWorkbenchContribution2(NotebookUndoRedoContribution.ID, NotebookUndoRedoContribution, 2 );