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

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

@@ -4,10 +4,10 @@ import { registerAction2, Action2, MenuId } from 'vscode/vscode/vs/platform/acti
 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 './diffElementViewModel.js';
-import { NOTEBOOK_DIFF_CELL_PROPERTY, NOTEBOOK_DIFF_CELL_PROPERTY_EXPANDED, NOTEBOOK_DIFF_CELL_INPUT } from './notebookDiffEditorBrowser.js';
-import { NotebookTextDiffEditor } from './notebookDiffEditor.js';
-import { openAsTextIcon, revertIcon, renderOutputIcon, previousChangeIcon, nextChangeIcon } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookIcons';
+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 { 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';
@@ -15,25 +15,38 @@ import { DEFAULT_EDITOR_ASSOCIATION } from 'vscode/vscode/vs/workbench/common/ed
 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 '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.switchToText',
             icon: openAsTextIcon,
-            title: ( localize2(8257, 'Open Text Diff Editor')),
-            precondition: ( (ActiveEditorContext.isEqualTo(NotebookTextDiffEditor.ID))),
+            title: ( localize2(8052, 'Open Text Diff Editor')),
+            precondition: ( (ContextKeyExpr.or(
+                 (ActiveEditorContext.isEqualTo(NotebookTextDiffEditor.ID)),
+                 (ActiveEditorContext.isEqualTo(NotebookMultiTextDiffEditor.ID))
+            ))),
             menu: [{
                     id: MenuId.EditorTitle,
                     group: 'navigation',
-                    when: ( (ActiveEditorContext.isEqualTo(NotebookTextDiffEditor.ID)))
+                    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 && activeEditor instanceof NotebookTextDiffEditor) {
+        if (!activeEditor) {
+            return;
+        }
+        if (activeEditor instanceof NotebookTextDiffEditor || activeEditor instanceof NotebookMultiTextDiffEditor) {
             const diffEditorInput = activeEditor.input;
             await editorService.openEditor({
                 original: { resource: diffEditorInput.original.resource },
@@ -47,11 +60,231 @@ registerAction2(class extends Action2 {
         }
     }
 });
+registerAction2(class extends Action2 {
+    constructor() {
+        super({
+            id: 'notebook.diffEditor.showUnchangedCells',
+            title: ( localize2(8053, 'Show Unchanged Cells')),
+            icon: Codicon.unfold,
+            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))
+                ))),
+                id: MenuId.EditorTitle,
+                order: 22,
+                group: 'navigation',
+            },
+        });
+    }
+    run(accessor, ...args) {
+        const activeEditor = accessor.get(IEditorService).activeEditorPane;
+        if (!activeEditor) {
+            return;
+        }
+        if (activeEditor instanceof NotebookMultiTextDiffEditor) {
+            activeEditor.showUnchanged();
+        }
+    }
+});
+registerAction2(class extends Action2 {
+    constructor() {
+        super({
+            id: 'notebook.diffEditor.hideUnchangedCells',
+            title: ( localize2(8054, 'Hide Unchanged Cells')),
+            icon: Codicon.fold,
+            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))
+                ))),
+                id: MenuId.EditorTitle,
+                order: 22,
+                group: 'navigation',
+            },
+        });
+    }
+    run(accessor, ...args) {
+        const activeEditor = accessor.get(IEditorService).activeEditorPane;
+        if (!activeEditor) {
+            return;
+        }
+        if (activeEditor instanceof NotebookMultiTextDiffEditor) {
+            activeEditor.hideUnchanged();
+        }
+    }
+});
+registerAction2(class GoToFileAction extends Action2 {
+    constructor() {
+        super({
+            id: 'notebook.diffEditor.2.goToCell',
+            title: ( localize2(8055, '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'))
+                ))),
+                id: MenuId.MultiDiffEditorFileToolbar,
+                order: 0,
+                group: 'navigation',
+            },
+        });
+    }
+    async run(accessor, ...args) {
+        const uri = args[0];
+        const editorService = accessor.get(IEditorService);
+        const activeEditorPane = editorService.activeEditorPane;
+        if (!(activeEditorPane instanceof NotebookMultiTextDiffEditor)) {
+            return;
+        }
+        await editorService.openEditor({
+            resource: uri,
+            options: {
+                selectionRevealType: TextEditorSelectionRevealType.CenterIfOutsideViewport,
+            },
+        });
+    }
+});
+const revertInput = ( localize(8056, "Revert Input"));
+registerAction2(class extends Action2 {
+    constructor() {
+        super({
+            id: 'notebook.diffEditor.2.cell.revertInput',
+            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'))
+                ))),
+                id: MenuId.MultiDiffEditorFileToolbar,
+                order: 2,
+                group: 'navigation',
+            },
+        });
+    }
+    async run(accessor, ...args) {
+        const uri = args[0];
+        const editorService = accessor.get(IEditorService);
+        const activeEditorPane = editorService.activeEditorPane;
+        if (!(activeEditorPane instanceof NotebookMultiTextDiffEditor)) {
+            return;
+        }
+        const item = activeEditorPane.getDiffElementViewModel(uri);
+        if (item && item instanceof SideBySideDiffElementViewModel) {
+            const modified = item.modified;
+            const original = item.original;
+            if (!original || !modified) {
+                return;
+            }
+            const bulkEditService = accessor.get(IBulkEditService);
+            await bulkEditService.apply([
+                ( (new ResourceTextEdit(
+                modified.uri,
+                { range: modified.textModel.getFullModelRange(), text: original.textModel.getValue() }
+            ))),
+            ], { quotableLabel: 'Revert Notebook Cell Content Change' });
+        }
+    }
+});
+const revertOutputs = ( localize(8057, "Revert Outputs"));
+registerAction2(class extends Action2 {
+    constructor() {
+        super({
+            id: 'notebook.diffEditor.2.cell.revertOutputs',
+            title: revertOutputs,
+            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'))
+                ))),
+                id: MenuId.MultiDiffEditorFileToolbar,
+                order: 2,
+                group: 'navigation',
+            },
+        });
+    }
+    async run(accessor, ...args) {
+        const uri = args[0];
+        const editorService = accessor.get(IEditorService);
+        const activeEditorPane = editorService.activeEditorPane;
+        if (!(activeEditorPane instanceof NotebookMultiTextDiffEditor)) {
+            return;
+        }
+        const item = activeEditorPane.getDiffElementViewModel(uri);
+        if (item && item instanceof SideBySideDiffElementViewModel) {
+            const original = item.original;
+            const modifiedCellIndex = item.modifiedDocument.cells.findIndex(cell => cell.handle === item.modified.handle);
+            if (modifiedCellIndex === -1) {
+                return;
+            }
+            item.mainDocumentTextModel.applyEdits([{
+                    editType: CellEditType.Output, index: modifiedCellIndex, outputs: original.outputs
+                }], true, undefined, () => undefined, undefined, true);
+        }
+    }
+});
+const revertMetadata = ( localize(8058, "Revert Metadata"));
+registerAction2(class extends Action2 {
+    constructor() {
+        super({
+            id: 'notebook.diffEditor.2.cell.revertMetadata',
+            title: revertMetadata,
+            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'))
+                ))),
+                id: MenuId.MultiDiffEditorFileToolbar,
+                order: 2,
+                group: 'navigation',
+            },
+        });
+    }
+    async run(accessor, ...args) {
+        const uri = args[0];
+        const editorService = accessor.get(IEditorService);
+        const activeEditorPane = editorService.activeEditorPane;
+        if (!(activeEditorPane instanceof NotebookMultiTextDiffEditor)) {
+            return;
+        }
+        const item = activeEditorPane.getDiffElementViewModel(uri);
+        if (item && item instanceof SideBySideDiffElementViewModel) {
+            const original = item.original;
+            const modifiedCellIndex = item.modifiedDocument.cells.findIndex(cell => cell.handle === item.modified.handle);
+            if (modifiedCellIndex === -1) {
+                return;
+            }
+            item.mainDocumentTextModel.applyEdits([{
+                    editType: CellEditType.Metadata, index: modifiedCellIndex, metadata: original.metadata
+                }], true, undefined, () => undefined, undefined, true);
+        }
+    }
+});
 registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.diff.cell.revertMetadata',
-            title: ( localize(8258, "Revert Metadata")),
+            title: revertMetadata,
             icon: revertIcon,
             f1: false,
             menu: {
@@ -65,19 +298,27 @@ registerAction2(class extends Action2 {
         if (!context) {
             return;
         }
+        if (!(context.cell instanceof SideBySideDiffElementViewModel)) {
+            return;
+        }
         const original = context.cell.original;
         const modified = context.cell.modified;
-        if (!original || !modified) {
+        const modifiedCellIndex = context.cell.mainDocumentTextModel.cells.indexOf(modified.textModel);
+        if (modifiedCellIndex === -1) {
             return;
         }
-        modified.textModel.metadata = original.metadata;
+        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 });
+        }
+        context.cell.modifiedDocument.applyEdits(rawEdits, true, undefined, () => undefined, undefined, true);
     }
 });
 registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.diff.cell.switchOutputRenderingStyleToText',
-            title: ( localize(8259, "Switch Output Rendering")),
+            title: ( localize(8059, "Switch Output Rendering")),
             icon: renderOutputIcon,
             f1: false,
             menu: {
@@ -97,7 +338,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.diff.cell.revertOutputs',
-            title: ( localize(8260, "Revert Outputs")),
+            title: ( localize(8057, "Revert Outputs")),
             icon: revertIcon,
             f1: false,
             menu: {
@@ -125,16 +366,45 @@ registerAction2(class extends Action2 {
             }], true, undefined, () => undefined, undefined, true);
     }
 });
+registerAction2(class extends Action2 {
+    constructor() {
+        super({
+            id: 'notebook.toggle.diff.cell.ignoreTrimWhitespace',
+            title: ( localize(8060, "Show Leading/Trailing Whitespace Differences")),
+            icon: toggleWhitespace,
+            f1: false,
+            menu: {
+                id: MenuId.NotebookDiffCellInputTitle,
+                when: NOTEBOOK_DIFF_CELL_INPUT,
+                order: 1,
+            },
+            precondition: NOTEBOOK_DIFF_CELL_INPUT,
+            toggled: ( (ContextKeyExpr.equals(NOTEBOOK_DIFF_CELL_IGNORE_WHITESPACE_KEY, false))),
+        });
+    }
+    run(accessor, context) {
+        const cell = context?.cell;
+        if (!cell?.modified) {
+            return;
+        }
+        const uri = cell.modified.uri;
+        const configService = accessor.get(ITextResourceConfigurationService);
+        const key = 'diffEditor.ignoreTrimWhitespace';
+        const val = configService.getValue(uri, key);
+        configService.updateValue(uri, key, !val);
+    }
+});
 registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.diff.cell.revertInput',
-            title: ( localize(8261, "Revert Input")),
+            title: revertInput,
             icon: revertIcon,
             f1: false,
             menu: {
                 id: MenuId.NotebookDiffCellInputTitle,
-                when: NOTEBOOK_DIFF_CELL_INPUT
+                when: NOTEBOOK_DIFF_CELL_INPUT,
+                order: 2
             },
             precondition: NOTEBOOK_DIFF_CELL_INPUT
         });
@@ -188,19 +458,25 @@ class ToggleRenderAction extends Action2 {
 }
 registerAction2(class extends ToggleRenderAction {
     constructor() {
-        super('notebook.diff.showOutputs', ( localize2(8262, 'Show Outputs Differences')), ( (ActiveEditorContext.isEqualTo(NotebookTextDiffEditor.ID))), ( (ContextKeyExpr.notEquals('config.notebook.diff.ignoreOutputs', true))), 2, true, undefined);
+        super('notebook.diff.showOutputs', ( localize2(8061, '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(8263, 'Show Metadata Differences')), ( (ActiveEditorContext.isEqualTo(NotebookTextDiffEditor.ID))), ( (ContextKeyExpr.notEquals('config.notebook.diff.ignoreMetadata', true))), 1, undefined, true);
+        super('notebook.diff.showMetadata', ( localize2(8062, '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(8264, "Show Previous Change")),
+            title: ( localize(8063, "Show Previous Change")),
             icon: previousChangeIcon,
             f1: false,
             keybinding: {
@@ -228,7 +504,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.diff.action.next',
-            title: ( localize(8265, "Show Next Change")),
+            title: ( localize(8064, "Show Next Change")),
             icon: nextChangeIcon,
             f1: false,
             keybinding: {
@@ -260,12 +536,12 @@ registerAction2(class extends Action2 {
         'notebook.diff.ignoreMetadata': {
             type: 'boolean',
             default: false,
-            markdownDescription: ( localize(8266, "Hide Metadata Differences"))
+            markdownDescription: ( localize(8065, "Hide Metadata Differences"))
         },
         'notebook.diff.ignoreOutputs': {
             type: 'boolean',
             default: false,
-            markdownDescription: ( localize(8267, "Hide Outputs Differences"))
+            markdownDescription: ( localize(8066, "Hide Outputs Differences"))
         },
     }
 });