@codingame/monaco-vscode-notebook-service-override 11.1.2 → 12.0.0

package/vscode/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffActions.js

@@ -1,39 +1,37 @@
+
 import { IBulkEditService, ResourceTextEdit } from 'vscode/vscode/vs/editor/browser/services/bulkEditService';
 import { localize2, localize } from 'vscode/vscode/vs/nls';
 import { registerAction2, Action2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { ActiveEditorContext } from 'vscode/vscode/vs/workbench/common/contextkeys';
-import { SideBySideDiffElementViewModel } from '@codingame/monaco-vscode-chat-notebook-common/vscode/vs/workbench/contrib/notebook/browser/diff/diffElementViewModel';
-import { NOTEBOOK_DIFF_HAS_UNCHANGED_CELLS, NOTEBOOK_DIFF_UNCHANGED_CELLS_HIDDEN, NOTEBOOK_DIFF_ITEM_KIND, NOTEBOOK_DIFF_ITEM_DIFF_STATE, NOTEBOOK_DIFF_METADATA, NOTEBOOK_DIFF_CELL_PROPERTY, NOTEBOOK_DIFF_CELL_PROPERTY_EXPANDED, NOTEBOOK_DIFF_CELL_INPUT, NOTEBOOK_DIFF_CELL_IGNORE_WHITESPACE_KEY } from '@codingame/monaco-vscode-chat-notebook-common/vscode/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditorBrowser';
-import { NotebookTextDiffEditor } from '@codingame/monaco-vscode-chat-notebook-common/vscode/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditor';
-import { openAsTextIcon, revertIcon, renderOutputIcon, toggleWhitespace, previousChangeIcon, nextChangeIcon } from '@codingame/monaco-vscode-chat-interactive-notebook-search-common/vscode/vs/workbench/contrib/notebook/browser/notebookIcons';
+import { SideBySideDiffElementViewModel } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/notebook/browser/diff/diffElementViewModel';
+import { NOTEBOOK_DIFF_HAS_UNCHANGED_CELLS, NOTEBOOK_DIFF_UNCHANGED_CELLS_HIDDEN, NOTEBOOK_DIFF_ITEM_KIND, NOTEBOOK_DIFF_ITEM_DIFF_STATE, NOTEBOOK_DIFF_METADATA, NOTEBOOK_DIFF_CELL_PROPERTY, NOTEBOOK_DIFF_CELL_PROPERTY_EXPANDED, NOTEBOOK_DIFF_CELL_INPUT, NOTEBOOK_DIFF_CELL_IGNORE_WHITESPACE_KEY } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditorBrowser';
+import { NotebookTextDiffEditor } from '@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditor';
+import { openAsTextIcon, revertIcon, renderOutputIcon, toggleWhitespace, previousChangeIcon, nextChangeIcon } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/notebookIcons';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { Extensions } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
 import { DEFAULT_EDITOR_ASSOCIATION } from 'vscode/vscode/vs/workbench/common/editor';
-import { NOTEBOOK_DIFF_EDITOR_ID } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
+import { KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
+import { KeyMod, KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
+import { CellEditType, NOTEBOOK_DIFF_EDITOR_ID } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { ITextResourceConfigurationService } from 'vscode/vscode/vs/editor/common/services/textResourceConfiguration';
-import { NotebookMultiTextDiffEditor } from '@codingame/monaco-vscode-chat-notebook-common/vscode/vs/workbench/contrib/notebook/browser/diff/notebookMultiDiffEditor';
+import { NotebookMultiTextDiffEditor } from '@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/workbench/contrib/notebook/browser/diff/notebookMultiDiffEditor';
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
+import { TextEditorSelectionRevealType } from 'vscode/vscode/vs/platform/editor/common/editor';
 
 registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.diff.openFile',
             icon: Codicon.goToFile,
-            title: ( localize2(8203, 'Open File')),
-            precondition: ( (ContextKeyExpr.or(
-                 (ActiveEditorContext.isEqualTo(NotebookTextDiffEditor.ID)),
-                 (ActiveEditorContext.isEqualTo(NotebookMultiTextDiffEditor.ID))
-            ))),
+            title: ( localize2(7546, 'Open File')),
+            precondition: ( ContextKeyExpr.or(( ActiveEditorContext.isEqualTo(NotebookTextDiffEditor.ID)), ( ActiveEditorContext.isEqualTo(NotebookMultiTextDiffEditor.ID)))),
             menu: [{
                     id: MenuId.EditorTitle,
                     group: 'navigation',
-                    when: ( (ContextKeyExpr.or(
-                         (ActiveEditorContext.isEqualTo(NotebookTextDiffEditor.ID)),
-                         (ActiveEditorContext.isEqualTo(NotebookMultiTextDiffEditor.ID))
-                    ))),
+                    when: ( ContextKeyExpr.or(( ActiveEditorContext.isEqualTo(NotebookTextDiffEditor.ID)), ( ActiveEditorContext.isEqualTo(NotebookMultiTextDiffEditor.ID)))),
                 }]
         });
     }
@@ -54,14 +52,14 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.diff.cell.toggleCollapseUnchangedRegions',
-            title: ( localize2(8204, 'Toggle Collapse Unchanged Regions')),
+            title: ( localize2(7547, 'Toggle Collapse Unchanged Regions')),
             icon: Codicon.map,
-            toggled: ( (ContextKeyExpr.has('config.diffEditor.hideUnchangedRegions.enabled'))),
-            precondition: ( (ActiveEditorContext.isEqualTo(NotebookTextDiffEditor.ID))),
+            toggled: ( ContextKeyExpr.has('config.diffEditor.hideUnchangedRegions.enabled')),
+            precondition: ( ActiveEditorContext.isEqualTo(NotebookTextDiffEditor.ID)),
             menu: {
                 id: MenuId.EditorTitle,
                 group: 'navigation',
-                when: ( (ActiveEditorContext.isEqualTo(NotebookTextDiffEditor.ID))),
+                when: ( ActiveEditorContext.isEqualTo(NotebookTextDiffEditor.ID)),
             },
         });
     }
@@ -76,18 +74,12 @@ registerAction2(class extends Action2 {
         super({
             id: 'notebook.diff.switchToText',
             icon: openAsTextIcon,
-            title: ( localize2(8205, 'Open Text Diff Editor')),
-            precondition: ( (ContextKeyExpr.or(
-                 (ActiveEditorContext.isEqualTo(NotebookTextDiffEditor.ID)),
-                 (ActiveEditorContext.isEqualTo(NotebookMultiTextDiffEditor.ID))
-            ))),
+            title: ( localize2(7548, 'Open Text Diff Editor')),
+            precondition: ( ContextKeyExpr.or(( ActiveEditorContext.isEqualTo(NotebookTextDiffEditor.ID)), ( ActiveEditorContext.isEqualTo(NotebookMultiTextDiffEditor.ID)))),
             menu: [{
                     id: MenuId.EditorTitle,
                     group: 'navigation',
-                    when: ( (ContextKeyExpr.or(
-                         (ActiveEditorContext.isEqualTo(NotebookTextDiffEditor.ID)),
-                         (ActiveEditorContext.isEqualTo(NotebookMultiTextDiffEditor.ID))
-                    ))),
+                    when: ( ContextKeyExpr.or(( ActiveEditorContext.isEqualTo(NotebookTextDiffEditor.ID)), ( ActiveEditorContext.isEqualTo(NotebookMultiTextDiffEditor.ID)))),
                 }]
         });
     }
@@ -115,18 +107,11 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.diffEditor.showUnchangedCells',
-            title: ( localize2(8206, 'Show Unchanged Cells')),
+            title: ( localize2(7549, 'Show Unchanged Cells')),
             icon: Codicon.unfold,
-            precondition: ( (ContextKeyExpr.and(
-                 (ActiveEditorContext.isEqualTo(NotebookMultiTextDiffEditor.ID)),
-                 (ContextKeyExpr.has(NOTEBOOK_DIFF_HAS_UNCHANGED_CELLS.key))
-            ))),
+            precondition: ( ContextKeyExpr.and(( ActiveEditorContext.isEqualTo(NotebookMultiTextDiffEditor.ID)), ( ContextKeyExpr.has(NOTEBOOK_DIFF_HAS_UNCHANGED_CELLS.key)))),
             menu: {
-                when: ( (ContextKeyExpr.and(
-                     (ActiveEditorContext.isEqualTo(NotebookMultiTextDiffEditor.ID)),
-                     (ContextKeyExpr.has(NOTEBOOK_DIFF_HAS_UNCHANGED_CELLS.key)),
-                     (ContextKeyExpr.equals(NOTEBOOK_DIFF_UNCHANGED_CELLS_HIDDEN.key, true))
-                ))),
+                when: ( ContextKeyExpr.and(( ActiveEditorContext.isEqualTo(NotebookMultiTextDiffEditor.ID)), ( ContextKeyExpr.has(NOTEBOOK_DIFF_HAS_UNCHANGED_CELLS.key)), ( ContextKeyExpr.equals(NOTEBOOK_DIFF_UNCHANGED_CELLS_HIDDEN.key, true)))),
                 id: MenuId.EditorTitle,
                 order: 22,
                 group: 'navigation',
@@ -147,18 +132,11 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.diffEditor.hideUnchangedCells',
-            title: ( localize2(8207, 'Hide Unchanged Cells')),
+            title: ( localize2(7550, 'Hide Unchanged Cells')),
             icon: Codicon.fold,
-            precondition: ( (ContextKeyExpr.and(
-                 (ActiveEditorContext.isEqualTo(NotebookMultiTextDiffEditor.ID)),
-                 (ContextKeyExpr.has(NOTEBOOK_DIFF_HAS_UNCHANGED_CELLS.key))
-            ))),
+            precondition: ( ContextKeyExpr.and(( ActiveEditorContext.isEqualTo(NotebookMultiTextDiffEditor.ID)), ( ContextKeyExpr.has(NOTEBOOK_DIFF_HAS_UNCHANGED_CELLS.key)))),
             menu: {
-                when: ( (ContextKeyExpr.and(
-                     (ActiveEditorContext.isEqualTo(NotebookMultiTextDiffEditor.ID)),
-                     (ContextKeyExpr.has(NOTEBOOK_DIFF_HAS_UNCHANGED_CELLS.key)),
-                     (ContextKeyExpr.equals(NOTEBOOK_DIFF_UNCHANGED_CELLS_HIDDEN.key, false))
-                ))),
+                when: ( ContextKeyExpr.and(( ActiveEditorContext.isEqualTo(NotebookMultiTextDiffEditor.ID)), ( ContextKeyExpr.has(NOTEBOOK_DIFF_HAS_UNCHANGED_CELLS.key)), ( ContextKeyExpr.equals(NOTEBOOK_DIFF_UNCHANGED_CELLS_HIDDEN.key, false)))),
                 id: MenuId.EditorTitle,
                 order: 22,
                 group: 'navigation',
@@ -179,14 +157,10 @@ registerAction2(class GoToFileAction extends Action2 {
     constructor() {
         super({
             id: 'notebook.diffEditor.2.goToCell',
-            title: ( localize2(8208, 'Go To Cell')),
+            title: ( localize2(7551, 'Go To Cell')),
             icon: Codicon.goToFile,
             menu: {
-                when: ( (ContextKeyExpr.and(
-                     (ActiveEditorContext.isEqualTo(NotebookMultiTextDiffEditor.ID)),
-                     (ContextKeyExpr.equals(NOTEBOOK_DIFF_ITEM_KIND.key, 'Cell')),
-                     (ContextKeyExpr.notEquals(NOTEBOOK_DIFF_ITEM_DIFF_STATE.key, 'delete'))
-                ))),
+                when: ( ContextKeyExpr.and(( ActiveEditorContext.isEqualTo(NotebookMultiTextDiffEditor.ID)), ( ContextKeyExpr.equals(NOTEBOOK_DIFF_ITEM_KIND.key, 'Cell')), ( ContextKeyExpr.notEquals(NOTEBOOK_DIFF_ITEM_DIFF_STATE.key, 'delete')))),
                 id: MenuId.MultiDiffEditorFileToolbar,
                 order: 0,
                 group: 'navigation',
@@ -203,7 +177,7 @@ registerAction2(class GoToFileAction extends Action2 {
         await editorService.openEditor({
             resource: uri,
             options: {
-                selectionRevealType: 1 ,
+                selectionRevealType: TextEditorSelectionRevealType.CenterIfOutsideViewport,
             },
         });
     }
@@ -212,7 +186,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.diff.revertMetadata',
-            title: ( localize(8209, "Revert Notebook Metadata")),
+            title: ( localize(7552, "Revert Notebook Metadata")),
             icon: revertIcon,
             f1: false,
             menu: {
@@ -232,12 +206,12 @@ registerAction2(class extends Action2 {
             return;
         }
         context.modifiedDocumentTextModel.applyEdits([{
-                editType: 5 ,
+                editType: CellEditType.DocumentMetadata,
                 metadata: context.originalMetadata.metadata,
             }], true, undefined, () => undefined, undefined, true);
     }
 });
-const revertInput = ( localize(8210, "Revert Input"));
+const revertInput = ( localize(7553, "Revert Input"));
 registerAction2(class extends Action2 {
     constructor() {
         super({
@@ -245,11 +219,7 @@ registerAction2(class extends Action2 {
             title: revertInput,
             icon: revertIcon,
             menu: {
-                when: ( (ContextKeyExpr.and(
-                     (ActiveEditorContext.isEqualTo(NotebookMultiTextDiffEditor.ID)),
-                     (ContextKeyExpr.equals(NOTEBOOK_DIFF_ITEM_KIND.key, 'Cell')),
-                     (ContextKeyExpr.equals(NOTEBOOK_DIFF_ITEM_DIFF_STATE.key, 'modified'))
-                ))),
+                when: ( ContextKeyExpr.and(( ActiveEditorContext.isEqualTo(NotebookMultiTextDiffEditor.ID)), ( ContextKeyExpr.equals(NOTEBOOK_DIFF_ITEM_KIND.key, 'Cell')), ( ContextKeyExpr.equals(NOTEBOOK_DIFF_ITEM_DIFF_STATE.key, 'modified')))),
                 id: MenuId.MultiDiffEditorFileToolbar,
                 order: 2,
                 group: 'navigation',
@@ -272,15 +242,15 @@ registerAction2(class extends Action2 {
             }
             const bulkEditService = accessor.get(IBulkEditService);
             await bulkEditService.apply([
-                ( (new ResourceTextEdit(
-                modified.uri,
-                { range: modified.textModel.getFullModelRange(), text: original.textModel.getValue() }
-            ))),
+                ( new ResourceTextEdit(
+                    modified.uri,
+                    { range: modified.textModel.getFullModelRange(), text: original.textModel.getValue() }
+                )),
             ], { quotableLabel: 'Revert Notebook Cell Content Change' });
         }
     }
 });
-const revertOutputs = ( localize(8211, "Revert Outputs"));
+const revertOutputs = ( localize(7554, "Revert Outputs"));
 registerAction2(class extends Action2 {
     constructor() {
         super({
@@ -289,11 +259,7 @@ registerAction2(class extends Action2 {
             icon: revertIcon,
             f1: false,
             menu: {
-                when: ( (ContextKeyExpr.and(
-                     (ActiveEditorContext.isEqualTo(NotebookMultiTextDiffEditor.ID)),
-                     (ContextKeyExpr.equals(NOTEBOOK_DIFF_ITEM_KIND.key, 'Output')),
-                     (ContextKeyExpr.equals(NOTEBOOK_DIFF_ITEM_DIFF_STATE.key, 'modified'))
-                ))),
+                when: ( ContextKeyExpr.and(( ActiveEditorContext.isEqualTo(NotebookMultiTextDiffEditor.ID)), ( ContextKeyExpr.equals(NOTEBOOK_DIFF_ITEM_KIND.key, 'Output')), ( ContextKeyExpr.equals(NOTEBOOK_DIFF_ITEM_DIFF_STATE.key, 'modified')))),
                 id: MenuId.MultiDiffEditorFileToolbar,
                 order: 2,
                 group: 'navigation',
@@ -315,12 +281,12 @@ registerAction2(class extends Action2 {
                 return;
             }
             item.mainDocumentTextModel.applyEdits([{
-                    editType: 2 , index: modifiedCellIndex, outputs: original.outputs
+                    editType: CellEditType.Output, index: modifiedCellIndex, outputs: original.outputs
                 }], true, undefined, () => undefined, undefined, true);
         }
     }
 });
-const revertMetadata = ( localize(8212, "Revert Metadata"));
+const revertMetadata = ( localize(7555, "Revert Metadata"));
 registerAction2(class extends Action2 {
     constructor() {
         super({
@@ -329,11 +295,7 @@ registerAction2(class extends Action2 {
             icon: revertIcon,
             f1: false,
             menu: {
-                when: ( (ContextKeyExpr.and(
-                     (ActiveEditorContext.isEqualTo(NotebookMultiTextDiffEditor.ID)),
-                     (ContextKeyExpr.equals(NOTEBOOK_DIFF_ITEM_KIND.key, 'Metadata')),
-                     (ContextKeyExpr.equals(NOTEBOOK_DIFF_ITEM_DIFF_STATE.key, 'modified'))
-                ))),
+                when: ( ContextKeyExpr.and(( ActiveEditorContext.isEqualTo(NotebookMultiTextDiffEditor.ID)), ( ContextKeyExpr.equals(NOTEBOOK_DIFF_ITEM_KIND.key, 'Metadata')), ( ContextKeyExpr.equals(NOTEBOOK_DIFF_ITEM_DIFF_STATE.key, 'modified')))),
                 id: MenuId.MultiDiffEditorFileToolbar,
                 order: 2,
                 group: 'navigation',
@@ -355,7 +317,7 @@ registerAction2(class extends Action2 {
                 return;
             }
             item.mainDocumentTextModel.applyEdits([{
-                    editType: 3 , index: modifiedCellIndex, metadata: original.metadata
+                    editType: CellEditType.Metadata, index: modifiedCellIndex, metadata: original.metadata
                 }], true, undefined, () => undefined, undefined, true);
         }
     }
@@ -387,9 +349,9 @@ registerAction2(class extends Action2 {
         if (modifiedCellIndex === -1) {
             return;
         }
-        const rawEdits = [{ editType: 3 , index: modifiedCellIndex, metadata: original.metadata }];
+        const rawEdits = [{ editType: CellEditType.Metadata, index: modifiedCellIndex, metadata: original.metadata }];
         if (context.original.language && context.modified.language !== context.original.language) {
-            rawEdits.push({ editType: 4 , index: modifiedCellIndex, language: context.original.language });
+            rawEdits.push({ editType: CellEditType.CellLanguage, index: modifiedCellIndex, language: context.original.language });
         }
         context.modifiedDocument.applyEdits(rawEdits, true, undefined, () => undefined, undefined, true);
     }
@@ -398,7 +360,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.diff.cell.switchOutputRenderingStyleToText',
-            title: ( localize(8213, "Switch Output Rendering")),
+            title: ( localize(7556, "Switch Output Rendering")),
             icon: renderOutputIcon,
             f1: false,
             menu: {
@@ -418,7 +380,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.diff.cell.revertOutputs',
-            title: ( localize(8211, "Revert Outputs")),
+            title: ( localize(7554, "Revert Outputs")),
             icon: revertIcon,
             f1: false,
             menu: {
@@ -442,7 +404,7 @@ registerAction2(class extends Action2 {
             return;
         }
         context.mainDocumentTextModel.applyEdits([{
-                editType: 2 , index: modifiedCellIndex, outputs: original.outputs
+                editType: CellEditType.Output, index: modifiedCellIndex, outputs: original.outputs
             }], true, undefined, () => undefined, undefined, true);
     }
 });
@@ -450,7 +412,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.toggle.diff.cell.ignoreTrimWhitespace',
-            title: ( localize(8214, "Show Leading/Trailing Whitespace Differences")),
+            title: ( localize(7557, "Show Leading/Trailing Whitespace Differences")),
             icon: toggleWhitespace,
             f1: false,
             menu: {
@@ -459,7 +421,7 @@ registerAction2(class extends Action2 {
                 order: 1,
             },
             precondition: NOTEBOOK_DIFF_CELL_INPUT,
-            toggled: ( (ContextKeyExpr.equals(NOTEBOOK_DIFF_CELL_IGNORE_WHITESPACE_KEY, false))),
+            toggled: ( ContextKeyExpr.equals(NOTEBOOK_DIFF_CELL_IGNORE_WHITESPACE_KEY, false)),
         });
     }
     run(accessor, context) {
@@ -500,10 +462,10 @@ registerAction2(class extends Action2 {
         }
         const bulkEditService = accessor.get(IBulkEditService);
         return bulkEditService.apply([
-            ( (new ResourceTextEdit(
-            modified.uri,
-            { range: modified.textModel.getFullModelRange(), text: original.textModel.getValue() }
-        ))),
+            ( new ResourceTextEdit(
+                modified.uri,
+                { range: modified.textModel.getFullModelRange(), text: original.textModel.getValue() }
+            )),
         ], { quotableLabel: 'Revert Notebook Cell Content Change' });
     }
 });
@@ -538,36 +500,30 @@ class ToggleRenderAction extends Action2 {
 }
 registerAction2(class extends ToggleRenderAction {
     constructor() {
-        super('notebook.diff.showOutputs', ( localize2(8215, 'Show Outputs Differences')), ( (ContextKeyExpr.or(
-             (ActiveEditorContext.isEqualTo(NotebookTextDiffEditor.ID)),
-             (ActiveEditorContext.isEqualTo(NotebookMultiTextDiffEditor.ID))
-        ))), ( (ContextKeyExpr.notEquals('config.notebook.diff.ignoreOutputs', true))), 2, true, undefined);
+        super('notebook.diff.showOutputs', ( localize2(7558, 'Show Outputs Differences')), ( ContextKeyExpr.or(( ActiveEditorContext.isEqualTo(NotebookTextDiffEditor.ID)), ( ActiveEditorContext.isEqualTo(NotebookMultiTextDiffEditor.ID)))), ( ContextKeyExpr.notEquals('config.notebook.diff.ignoreOutputs', true)), 2, true, undefined);
     }
 });
 registerAction2(class extends ToggleRenderAction {
     constructor() {
-        super('notebook.diff.showMetadata', ( localize2(8216, 'Show Metadata Differences')), ( (ContextKeyExpr.or(
-             (ActiveEditorContext.isEqualTo(NotebookTextDiffEditor.ID)),
-             (ActiveEditorContext.isEqualTo(NotebookMultiTextDiffEditor.ID))
-        ))), ( (ContextKeyExpr.notEquals('config.notebook.diff.ignoreMetadata', true))), 1, undefined, true);
+        super('notebook.diff.showMetadata', ( localize2(7559, 'Show Metadata Differences')), ( ContextKeyExpr.or(( ActiveEditorContext.isEqualTo(NotebookTextDiffEditor.ID)), ( ActiveEditorContext.isEqualTo(NotebookMultiTextDiffEditor.ID)))), ( ContextKeyExpr.notEquals('config.notebook.diff.ignoreMetadata', true)), 1, undefined, true);
     }
 });
 registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.diff.action.previous',
-            title: ( localize(8217, "Show Previous Change")),
+            title: ( localize(7560, "Show Previous Change")),
             icon: previousChangeIcon,
             f1: false,
             keybinding: {
-                primary: 1024  | 512  | 61 ,
-                weight: 200 ,
-                when: ( (ActiveEditorContext.isEqualTo(NotebookTextDiffEditor.ID)))
+                primary: KeyMod.Shift | KeyMod.Alt | KeyCode.F3,
+                weight: KeybindingWeight.WorkbenchContrib,
+                when: ( ActiveEditorContext.isEqualTo(NotebookTextDiffEditor.ID))
             },
             menu: {
                 id: MenuId.EditorTitle,
                 group: 'navigation',
-                when: ( (ActiveEditorContext.isEqualTo(NotebookTextDiffEditor.ID)))
+                when: ( ActiveEditorContext.isEqualTo(NotebookTextDiffEditor.ID))
             }
         });
     }
@@ -584,18 +540,18 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.diff.action.next',
-            title: ( localize(8218, "Show Next Change")),
+            title: ( localize(7561, "Show Next Change")),
             icon: nextChangeIcon,
             f1: false,
             keybinding: {
-                primary: 512  | 61 ,
-                weight: 200 ,
-                when: ( (ActiveEditorContext.isEqualTo(NotebookTextDiffEditor.ID)))
+                primary: KeyMod.Alt | KeyCode.F3,
+                weight: KeybindingWeight.WorkbenchContrib,
+                when: ( ActiveEditorContext.isEqualTo(NotebookTextDiffEditor.ID))
             },
             menu: {
                 id: MenuId.EditorTitle,
                 group: 'navigation',
-                when: ( (ActiveEditorContext.isEqualTo(NotebookTextDiffEditor.ID)))
+                when: ( ActiveEditorContext.isEqualTo(NotebookTextDiffEditor.ID))
             }
         });
     }
@@ -608,7 +564,7 @@ registerAction2(class extends Action2 {
         editor?.nextChange();
     }
 });
-( (Registry.as(Extensions.Configuration))).registerConfiguration({
+( Registry.as(Extensions.Configuration)).registerConfiguration({
     id: 'notebook',
     order: 100,
     type: 'object',
@@ -616,12 +572,12 @@ registerAction2(class extends Action2 {
         'notebook.diff.ignoreMetadata': {
             type: 'boolean',
             default: false,
-            markdownDescription: ( localize(8219, "Hide Metadata Differences"))
+            markdownDescription: ( localize(7562, "Hide Metadata Differences"))
         },
         'notebook.diff.ignoreOutputs': {
             type: 'boolean',
             default: false,
-            markdownDescription: ( localize(8220, "Hide Outputs Differences"))
+            markdownDescription: ( localize(7563, "Hide Outputs Differences"))
         },
     }
 });

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

@@ -0,0 +1,14 @@
+import { Disposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { IWorkbenchContribution } from "vscode/vscode/vs/workbench/common/contributions";
+import { IUndoRedoService } from "vscode/vscode/vs/platform/undoRedo/common/undoRedo.service";
+import { IConfigurationService } from "vscode/vscode/vs/platform/configuration/common/configuration.service";
+import { ICodeEditorService } from "vscode/vscode/vs/editor/browser/services/codeEditorService";
+export declare class NotebookContribution extends Disposable implements IWorkbenchContribution {
+    private readonly codeEditorService;
+    static readonly ID = "workbench.contrib.notebook";
+    private _uriComparisonKeyComputer?;
+    constructor(undoRedoService: IUndoRedoService, configurationService: IConfigurationService, codeEditorService: ICodeEditorService);
+    private updateCellUndoRedoComparisonKey;
+    private static _getCellUndoRedoComparisonKey;
+    dispose(): void;
+}