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

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

@@ -5,27 +5,78 @@ import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/c
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { ActiveEditorContext } from 'vscode/vscode/vs/workbench/common/contextkeys';
 import { SideBySideDiffElementViewModel } from 'vscode/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_CELL_PROPERTY, NOTEBOOK_DIFF_CELL_PROPERTY_EXPANDED, NOTEBOOK_DIFF_CELL_INPUT, NOTEBOOK_DIFF_CELL_IGNORE_WHITESPACE_KEY } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditorBrowser';
+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 'vscode/vscode/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditorBrowser';
 import { NotebookTextDiffEditor } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditor';
 import { openAsTextIcon, revertIcon, renderOutputIcon, toggleWhitespace, previousChangeIcon, nextChangeIcon } from 'vscode/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 { 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 { 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 'vscode/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(8113, '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))
+                    ))),
+                }]
+        });
+    }
+    async run(accessor) {
+        const editorService = accessor.get(IEditorService);
+        const activeEditor = editorService.activeEditorPane;
+        if (!activeEditor) {
+            return;
+        }
+        if (activeEditor instanceof NotebookTextDiffEditor || activeEditor instanceof NotebookMultiTextDiffEditor) {
+            const diffEditorInput = activeEditor.input;
+            const resource = diffEditorInput.modified.resource;
+            await editorService.openEditor({ resource });
+        }
+    }
+});
+registerAction2(class extends Action2 {
+    constructor() {
+        super({
+            id: 'notebook.diff.cell.toggleCollapseUnchangedRegions',
+            title: ( localize2(8114, 'Toggle Collapse Unchanged Regions')),
+            icon: Codicon.map,
+            toggled: ( (ContextKeyExpr.has('config.diffEditor.hideUnchangedRegions.enabled'))),
+            precondition: ( (ActiveEditorContext.isEqualTo(NotebookTextDiffEditor.ID))),
+            menu: {
+                id: MenuId.EditorTitle,
+                group: 'navigation',
+                when: ( (ActiveEditorContext.isEqualTo(NotebookTextDiffEditor.ID))),
+            },
+        });
+    }
+    run(accessor, ...args) {
+        const configurationService = accessor.get(IConfigurationService);
+        const newValue = !configurationService.getValue('diffEditor.hideUnchangedRegions.enabled');
+        configurationService.updateValue('diffEditor.hideUnchangedRegions.enabled', newValue);
+    }
+});
 registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.diff.switchToText',
             icon: openAsTextIcon,
-            title: ( localize2(8052, 'Open Text Diff Editor')),
+            title: ( localize2(8115, 'Open Text Diff Editor')),
             precondition: ( (ContextKeyExpr.or(
                  (ActiveEditorContext.isEqualTo(NotebookTextDiffEditor.ID)),
                  (ActiveEditorContext.isEqualTo(NotebookMultiTextDiffEditor.ID))
@@ -64,7 +115,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.diffEditor.showUnchangedCells',
-            title: ( localize2(8053, 'Show Unchanged Cells')),
+            title: ( localize2(8116, 'Show Unchanged Cells')),
             icon: Codicon.unfold,
             precondition: ( (ContextKeyExpr.and(
                  (ActiveEditorContext.isEqualTo(NotebookMultiTextDiffEditor.ID)),
@@ -96,7 +147,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.diffEditor.hideUnchangedCells',
-            title: ( localize2(8054, 'Hide Unchanged Cells')),
+            title: ( localize2(8117, 'Hide Unchanged Cells')),
             icon: Codicon.fold,
             precondition: ( (ContextKeyExpr.and(
                  (ActiveEditorContext.isEqualTo(NotebookMultiTextDiffEditor.ID)),
@@ -128,7 +179,7 @@ registerAction2(class GoToFileAction extends Action2 {
     constructor() {
         super({
             id: 'notebook.diffEditor.2.goToCell',
-            title: ( localize2(8055, 'Go To Cell')),
+            title: ( localize2(8118, 'Go To Cell')),
             icon: Codicon.goToFile,
             menu: {
                 when: ( (ContextKeyExpr.and(
@@ -152,12 +203,41 @@ registerAction2(class GoToFileAction extends Action2 {
         await editorService.openEditor({
             resource: uri,
             options: {
-                selectionRevealType: TextEditorSelectionRevealType.CenterIfOutsideViewport,
+                selectionRevealType: 1 ,
             },
         });
     }
 });
-const revertInput = ( localize(8056, "Revert Input"));
+registerAction2(class extends Action2 {
+    constructor() {
+        super({
+            id: 'notebook.diff.revertMetadata',
+            title: ( localize(8119, "Revert Notebook Metadata")),
+            icon: revertIcon,
+            f1: false,
+            menu: {
+                id: MenuId.NotebookDiffDocumentMetadata,
+                when: NOTEBOOK_DIFF_METADATA,
+            },
+            precondition: NOTEBOOK_DIFF_METADATA
+        });
+    }
+    run(accessor, context) {
+        if (!context) {
+            return;
+        }
+        const editorService = accessor.get(IEditorService);
+        const activeEditorPane = editorService.activeEditorPane;
+        if (!(activeEditorPane instanceof NotebookTextDiffEditor)) {
+            return;
+        }
+        context.modifiedDocumentTextModel.applyEdits([{
+                editType: 5 ,
+                metadata: context.originalMetadata.metadata,
+            }], true, undefined, () => undefined, undefined, true);
+    }
+});
+const revertInput = ( localize(8120, "Revert Input"));
 registerAction2(class extends Action2 {
     constructor() {
         super({
@@ -200,7 +280,7 @@ registerAction2(class extends Action2 {
         }
     }
 });
-const revertOutputs = ( localize(8057, "Revert Outputs"));
+const revertOutputs = ( localize(8121, "Revert Outputs"));
 registerAction2(class extends Action2 {
     constructor() {
         super({
@@ -235,12 +315,12 @@ registerAction2(class extends Action2 {
                 return;
             }
             item.mainDocumentTextModel.applyEdits([{
-                    editType: CellEditType.Output, index: modifiedCellIndex, outputs: original.outputs
+                    editType: 2 , index: modifiedCellIndex, outputs: original.outputs
                 }], true, undefined, () => undefined, undefined, true);
         }
     }
 });
-const revertMetadata = ( localize(8058, "Revert Metadata"));
+const revertMetadata = ( localize(8122, "Revert Metadata"));
 registerAction2(class extends Action2 {
     constructor() {
         super({
@@ -275,7 +355,7 @@ registerAction2(class extends Action2 {
                 return;
             }
             item.mainDocumentTextModel.applyEdits([{
-                    editType: CellEditType.Metadata, index: modifiedCellIndex, metadata: original.metadata
+                    editType: 3 , index: modifiedCellIndex, metadata: original.metadata
                 }], true, undefined, () => undefined, undefined, true);
         }
     }
@@ -298,27 +378,27 @@ registerAction2(class extends Action2 {
         if (!context) {
             return;
         }
-        if (!(context.cell instanceof SideBySideDiffElementViewModel)) {
+        if (!(context instanceof SideBySideDiffElementViewModel)) {
             return;
         }
-        const original = context.cell.original;
-        const modified = context.cell.modified;
-        const modifiedCellIndex = context.cell.mainDocumentTextModel.cells.indexOf(modified.textModel);
+        const original = context.original;
+        const modified = context.modified;
+        const modifiedCellIndex = context.mainDocumentTextModel.cells.indexOf(modified.textModel);
         if (modifiedCellIndex === -1) {
             return;
         }
-        const rawEdits = [{ editType: CellEditType.Metadata, index: modifiedCellIndex, metadata: original.metadata }];
-        if (context.cell.original.language && context.cell.modified.language !== context.cell.original.language) {
-            rawEdits.push({ editType: CellEditType.CellLanguage, index: modifiedCellIndex, language: context.cell.original.language });
+        const rawEdits = [{ editType: 3 , 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 });
         }
-        context.cell.modifiedDocument.applyEdits(rawEdits, true, undefined, () => undefined, undefined, true);
+        context.modifiedDocument.applyEdits(rawEdits, true, undefined, () => undefined, undefined, true);
     }
 });
 registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.diff.cell.switchOutputRenderingStyleToText',
-            title: ( localize(8059, "Switch Output Rendering")),
+            title: ( localize(8123, "Switch Output Rendering")),
             icon: renderOutputIcon,
             f1: false,
             menu: {
@@ -331,14 +411,14 @@ registerAction2(class extends Action2 {
         if (!context) {
             return;
         }
-        context.cell.renderOutput = !context.cell.renderOutput;
+        context.renderOutput = !context.renderOutput;
     }
 });
 registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.diff.cell.revertOutputs',
-            title: ( localize(8057, "Revert Outputs")),
+            title: ( localize(8121, "Revert Outputs")),
             icon: revertIcon,
             f1: false,
             menu: {
@@ -352,17 +432,17 @@ registerAction2(class extends Action2 {
         if (!context) {
             return;
         }
-        if (!(context.cell instanceof SideBySideDiffElementViewModel)) {
+        if (!(context instanceof SideBySideDiffElementViewModel)) {
             return;
         }
-        const original = context.cell.original;
-        const modified = context.cell.modified;
-        const modifiedCellIndex = context.cell.mainDocumentTextModel.cells.indexOf(modified.textModel);
+        const original = context.original;
+        const modified = context.modified;
+        const modifiedCellIndex = context.mainDocumentTextModel.cells.indexOf(modified.textModel);
         if (modifiedCellIndex === -1) {
             return;
         }
-        context.cell.mainDocumentTextModel.applyEdits([{
-                editType: CellEditType.Output, index: modifiedCellIndex, outputs: original.outputs
+        context.mainDocumentTextModel.applyEdits([{
+                editType: 2 , index: modifiedCellIndex, outputs: original.outputs
             }], true, undefined, () => undefined, undefined, true);
     }
 });
@@ -370,7 +450,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.toggle.diff.cell.ignoreTrimWhitespace',
-            title: ( localize(8060, "Show Leading/Trailing Whitespace Differences")),
+            title: ( localize(8124, "Show Leading/Trailing Whitespace Differences")),
             icon: toggleWhitespace,
             f1: false,
             menu: {
@@ -383,7 +463,7 @@ registerAction2(class extends Action2 {
         });
     }
     run(accessor, context) {
-        const cell = context?.cell;
+        const cell = context;
         if (!cell?.modified) {
             return;
         }
@@ -413,8 +493,8 @@ registerAction2(class extends Action2 {
         if (!context) {
             return;
         }
-        const original = context.cell.original;
-        const modified = context.cell.modified;
+        const original = context.original;
+        const modified = context.modified;
         if (!original || !modified) {
             return;
         }
@@ -458,7 +538,7 @@ class ToggleRenderAction extends Action2 {
 }
 registerAction2(class extends ToggleRenderAction {
     constructor() {
-        super('notebook.diff.showOutputs', ( localize2(8061, 'Show Outputs Differences')), ( (ContextKeyExpr.or(
+        super('notebook.diff.showOutputs', ( localize2(8125, 'Show Outputs Differences')), ( (ContextKeyExpr.or(
              (ActiveEditorContext.isEqualTo(NotebookTextDiffEditor.ID)),
              (ActiveEditorContext.isEqualTo(NotebookMultiTextDiffEditor.ID))
         ))), ( (ContextKeyExpr.notEquals('config.notebook.diff.ignoreOutputs', true))), 2, true, undefined);
@@ -466,7 +546,7 @@ registerAction2(class extends ToggleRenderAction {
 });
 registerAction2(class extends ToggleRenderAction {
     constructor() {
-        super('notebook.diff.showMetadata', ( localize2(8062, 'Show Metadata Differences')), ( (ContextKeyExpr.or(
+        super('notebook.diff.showMetadata', ( localize2(8126, 'Show Metadata Differences')), ( (ContextKeyExpr.or(
              (ActiveEditorContext.isEqualTo(NotebookTextDiffEditor.ID)),
              (ActiveEditorContext.isEqualTo(NotebookMultiTextDiffEditor.ID))
         ))), ( (ContextKeyExpr.notEquals('config.notebook.diff.ignoreMetadata', true))), 1, undefined, true);
@@ -476,12 +556,12 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.diff.action.previous',
-            title: ( localize(8063, "Show Previous Change")),
+            title: ( localize(8127, "Show Previous Change")),
             icon: previousChangeIcon,
             f1: false,
             keybinding: {
-                primary: KeyMod.Shift | KeyMod.Alt | KeyCode.F3,
-                weight: KeybindingWeight.WorkbenchContrib,
+                primary: 1024  | 512  | 61 ,
+                weight: 200 ,
                 when: ( (ActiveEditorContext.isEqualTo(NotebookTextDiffEditor.ID)))
             },
             menu: {
@@ -504,12 +584,12 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.diff.action.next',
-            title: ( localize(8064, "Show Next Change")),
+            title: ( localize(8128, "Show Next Change")),
             icon: nextChangeIcon,
             f1: false,
             keybinding: {
-                primary: KeyMod.Alt | KeyCode.F3,
-                weight: KeybindingWeight.WorkbenchContrib,
+                primary: 512  | 61 ,
+                weight: 200 ,
                 when: ( (ActiveEditorContext.isEqualTo(NotebookTextDiffEditor.ID)))
             },
             menu: {
@@ -536,12 +616,12 @@ registerAction2(class extends Action2 {
         'notebook.diff.ignoreMetadata': {
             type: 'boolean',
             default: false,
-            markdownDescription: ( localize(8065, "Hide Metadata Differences"))
+            markdownDescription: ( localize(8129, "Hide Metadata Differences"))
         },
         'notebook.diff.ignoreOutputs': {
             type: 'boolean',
             default: false,
-            markdownDescription: ( localize(8066, "Hide Outputs Differences"))
+            markdownDescription: ( localize(8130, "Hide Outputs Differences"))
         },
     }
 });