@codingame/monaco-vscode-notebook-service-override 14.0.6 → 15.0.1

package/vscode/src/vs/workbench/contrib/notebook/browser/controller/notebookIndentationActions.js

@@ -1,16 +1,17 @@
 
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
-import { IBulkEditService, ResourceTextEdit } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/bulkEditService';
+import { ResourceTextEdit } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/bulkEditService';
+import { IBulkEditService } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/bulkEditService.service';
 import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
-import { ITextModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService';
+import { ITextModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service';
 import { Action2, registerAction2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service';
 import { INotebookEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/services/notebookEditorService.service';
 import { NotebookSetting } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
-import { isNotebookEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookEditorInput';
+import { isNotebookEditorInput } from '@codingame/monaco-vscode-9b5a5e82-d649-5455-b4bf-ef90d6afd294-common/vscode/vs/workbench/contrib/notebook/common/notebookEditorInput';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 
 class NotebookIndentUsingTabs extends Action2 {
@@ -18,7 +19,7 @@ class NotebookIndentUsingTabs extends Action2 {
     constructor() {
         super({
             id: NotebookIndentUsingTabs.ID,
-            title: ( localize(7682, "Indent Using Tabs")),
+            title: ( localize(7783, "Indent Using Tabs")),
             precondition: undefined,
         });
     }
@@ -31,7 +32,7 @@ class NotebookIndentUsingSpaces extends Action2 {
     constructor() {
         super({
             id: NotebookIndentUsingSpaces.ID,
-            title: ( localize(7683, "Indent Using Spaces")),
+            title: ( localize(7784, "Indent Using Spaces")),
             precondition: undefined,
         });
     }
@@ -44,7 +45,7 @@ class NotebookChangeTabDisplaySize extends Action2 {
     constructor() {
         super({
             id: NotebookChangeTabDisplaySize.ID,
-            title: ( localize(7684, "Change Tab Display Size")),
+            title: ( localize(7785, "Change Tab Display Size")),
             precondition: undefined,
         });
     }
@@ -57,7 +58,7 @@ class NotebookIndentationToSpacesAction extends Action2 {
     constructor() {
         super({
             id: NotebookIndentationToSpacesAction.ID,
-            title: ( localize(7685, "Convert Indentation to Spaces")),
+            title: ( localize(7786, "Convert Indentation to Spaces")),
             precondition: undefined,
         });
     }
@@ -70,7 +71,7 @@ class NotebookIndentationToTabsAction extends Action2 {
     constructor() {
         super({
             id: NotebookIndentationToTabsAction.ID,
-            title: ( localize(7686, "Convert Indentation to Tabs")),
+            title: ( localize(7787, "Convert Indentation to Tabs")),
             precondition: undefined,
         });
     }
@@ -102,7 +103,7 @@ function changeNotebookIndentation(accessor, insertSpaces, displaySizeOnly) {
     delete initialConfig['editor.tabSize'];
     delete initialConfig['editor.insertSpaces'];
     setTimeout(() => {
-        quickInputService.pick(picks, { placeHolder: ( localize(7687, "Select Tab Size for Current File")) }).then(pick => {
+        quickInputService.pick(picks, { placeHolder: ( localize(7788, "Select Tab Size for Current File")) }).then(pick => {
             if (pick) {
                 const pickedVal = parseInt(pick.label, 10);
                 if (displaySizeOnly) {
@@ -152,7 +153,7 @@ function convertNotebookIndentation(accessor, tabsToSpaces) {
                 return;
             }
             const edits = getIndentationEditOperations(textEditorModel, modelOpts.tabSize, tabsToSpaces);
-            bulkEditService.apply(edits, { label: ( localize(7688, "Convert Indentation")), code: 'undoredo.convertIndentation', });
+            bulkEditService.apply(edits, { label: ( localize(7789, "Convert Indentation")), code: 'undoredo.convertIndentation', });
         }))).then(() => {
             const initialConfig = configurationService.getValue(NotebookSetting.cellEditorOptionsCustomizations);
             const initialIndentSize = initialConfig['editor.indentSize'];

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

@@ -1,7 +1,7 @@
 import { Action2 } from "@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions";
 import { ServicesAccessor } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
-import { ICellViewModel, INotebookEditor } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
-import { OutlineEntry } from "@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/viewModel/OutlineEntry";
+import { ICellViewModel, INotebookEditor } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
+import { OutlineEntry } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/viewModel/OutlineEntry";
 export type NotebookOutlineEntryArgs = {
     notebookEditor: INotebookEditor;
     outlineEntry: OutlineEntry;

package/vscode/src/vs/workbench/contrib/notebook/browser/controller/sectionActions.js

@@ -3,12 +3,12 @@ import { localize, localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls'
 import { Action2, MenuId, registerAction2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { NotebookOutlineContext } from '../contrib/outline/notebookOutline.js';
-import { FoldingController } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/controller/foldingController';
-import { CellEditState, CellFoldingState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { executeIcon } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/notebookIcons';
+import { FoldingController } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/controller/foldingController';
+import { CellEditState, CellFoldingState } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { executeIcon } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/notebookIcons';
 import { CellKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
-import { OutlineTarget } from '@codingame/monaco-vscode-d4a98668-f793-5361-a9cf-1e6ae6d62ce3-common/vscode/vs/workbench/services/outline/browser/outline';
-import { CELL_TITLE_CELL_GROUP_ID, CellToolbarOrder } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
+import { OutlineTarget } from '@codingame/monaco-vscode-2e69e120-617a-5258-95e0-3b8902f4e014-common/vscode/vs/workbench/services/outline/browser/outline';
+import { CELL_TITLE_CELL_GROUP_ID, CellToolbarOrder } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
 import { executeSectionCondition } from './executeActions.js';
 
 class NotebookRunSingleCellInSection extends Action2 {
@@ -16,10 +16,10 @@ class NotebookRunSingleCellInSection extends Action2 {
         super({
             id: 'notebook.section.runSingleCell',
             title: {
-                ...( localize2(7689, "Run Cell")),
-                mnemonicTitle: ( localize(7690, "&&Run Cell")),
+                ...( localize2(7790, "Run Cell")),
+                mnemonicTitle: ( localize(7791, "&&Run Cell")),
             },
-            shortTitle: ( localize(7689, "Run Cell")),
+            shortTitle: ( localize(7790, "Run Cell")),
             icon: executeIcon,
             menu: [
                 {
@@ -43,10 +43,10 @@ class NotebookRunCellsInSection extends Action2 {
         super({
             id: 'notebook.section.runCells',
             title: {
-                ...( localize2(7691, "Run Cells In Section")),
-                mnemonicTitle: ( localize(7692, "&&Run Cells In Section")),
+                ...( localize2(7792, "Run Cells In Section")),
+                mnemonicTitle: ( localize(7793, "&&Run Cells In Section")),
             },
-            shortTitle: ( localize(7691, "Run Cells In Section")),
+            shortTitle: ( localize(7792, "Run Cells In Section")),
             icon: executeIcon,
             menu: [
                 {
@@ -105,10 +105,10 @@ class NotebookFoldSection extends Action2 {
         super({
             id: 'notebook.section.foldSection',
             title: {
-                ...( localize2(7693, "Fold Section")),
-                mnemonicTitle: ( localize(7694, "&&Fold Section")),
+                ...( localize2(7794, "Fold Section")),
+                mnemonicTitle: ( localize(7795, "&&Fold Section")),
             },
-            shortTitle: ( localize(7693, "Fold Section")),
+            shortTitle: ( localize(7794, "Fold Section")),
             menu: [
                 {
                     id: MenuId.NotebookOutlineActionMenu,
@@ -138,10 +138,10 @@ class NotebookExpandSection extends Action2 {
         super({
             id: 'notebook.section.expandSection',
             title: {
-                ...( localize2(7695, "Expand Section")),
-                mnemonicTitle: ( localize(7696, "&&Expand Section")),
+                ...( localize2(7796, "Expand Section")),
+                mnemonicTitle: ( localize(7797, "&&Expand Section")),
             },
-            shortTitle: ( localize(7695, "Expand Section")),
+            shortTitle: ( localize(7796, "Expand Section")),
             menu: [
                 {
                     id: MenuId.NotebookOutlineActionMenu,

package/vscode/src/vs/workbench/contrib/notebook/browser/controller/variablesActions.js

@@ -3,17 +3,17 @@ import { localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { registerAction2, MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { IViewsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service';
-import { KERNEL_HAS_VARIABLE_PROVIDER } from '@codingame/monaco-vscode-771c2e6d-0284-5ac1-be73-7176085eedc5-common/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
+import { KERNEL_HAS_VARIABLE_PROVIDER } from '@codingame/monaco-vscode-52bb4d5b-ba1a-57fd-9bee-b28824214eac-common/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
 import { NOTEBOOK_VARIABLE_VIEW_ENABLED } from '../contrib/notebookVariables/notebookVariableContextKeys.js';
-import { variablesViewIcon } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/notebookIcons';
-import { NotebookAction } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
+import { variablesViewIcon } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/notebookIcons';
+import { NotebookAction } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
 
 const OPEN_VARIABLES_VIEW_COMMAND_ID = 'notebook.openVariablesView';
 registerAction2(class OpenVariablesViewAction extends NotebookAction {
     constructor() {
         super({
             id: OPEN_VARIABLES_VIEW_COMMAND_ID,
-            title: ( localize2(7697, "Variables")),
+            title: ( localize2(7798, "Variables")),
             icon: variablesViewIcon,
             menu: [
                 {

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

@@ -1,14 +1,15 @@
 
-import { IBulkEditService, ResourceTextEdit } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/bulkEditService';
+import { ResourceTextEdit } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/bulkEditService';
+import { IBulkEditService } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/bulkEditService.service';
 import { localize2, localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { registerAction2, Action2, MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { ActiveEditorContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contextkeys';
-import { SideBySideDiffElementViewModel } from '@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-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-e4d0fd26-1b26-5583-b3f7-582e08d7b389-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 { SideBySideDiffElementViewModel } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-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_IGNORE_WHITESPACE_KEY, NOTEBOOK_DIFF_CELL_INPUT } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditorBrowser';
+import { NotebookTextDiffEditor } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditor';
+import { openAsTextIcon, revertIcon, renderOutputIcon, toggleWhitespace, previousChangeIcon, nextChangeIcon } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/notebookIcons';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
 import { Extensions } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configurationRegistry';
@@ -16,17 +17,19 @@ import { DEFAULT_EDITOR_ASSOCIATION } from '@codingame/monaco-vscode-api/vscode/
 import { KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { KeyMod, KeyCode } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
 import { CellEditType, NOTEBOOK_DIFF_EDITOR_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
-import { ITextResourceConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/textResourceConfiguration';
+import { ITextResourceConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/textResourceConfiguration.service';
 import { NotebookMultiTextDiffEditor } from '@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/workbench/contrib/notebook/browser/diff/notebookMultiDiffEditor';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { TextEditorSelectionRevealType } from '@codingame/monaco-vscode-api/vscode/vs/platform/editor/common/editor';
+import product from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/product';
+import { ctxHasEditorModification, ctxHasRequestInProgress } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorContextKeys';
 
 registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.diff.openFile',
             icon: Codicon.goToFile,
-            title: ( localize2(7709, 'Open File')),
+            title: ( localize2(7810, 'Open File')),
             precondition: ( ContextKeyExpr.or(( ActiveEditorContext.isEqualTo(NotebookTextDiffEditor.ID)), ( ActiveEditorContext.isEqualTo(NotebookMultiTextDiffEditor.ID)))),
             menu: [{
                     id: MenuId.EditorTitle,
@@ -52,7 +55,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.diff.cell.toggleCollapseUnchangedRegions',
-            title: ( localize2(7710, 'Toggle Collapse Unchanged Regions')),
+            title: ( localize2(7811, 'Toggle Collapse Unchanged Regions')),
             icon: Codicon.map,
             toggled: ( ContextKeyExpr.has('config.diffEditor.hideUnchangedRegions.enabled')),
             precondition: ( ActiveEditorContext.isEqualTo(NotebookTextDiffEditor.ID)),
@@ -74,7 +77,7 @@ registerAction2(class extends Action2 {
         super({
             id: 'notebook.diff.switchToText',
             icon: openAsTextIcon,
-            title: ( localize2(7711, 'Open Text Diff Editor')),
+            title: ( localize2(7812, 'Open Text Diff Editor')),
             precondition: ( ContextKeyExpr.or(( ActiveEditorContext.isEqualTo(NotebookTextDiffEditor.ID)), ( ActiveEditorContext.isEqualTo(NotebookMultiTextDiffEditor.ID)))),
             menu: [{
                     id: MenuId.EditorTitle,
@@ -107,7 +110,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.diffEditor.showUnchangedCells',
-            title: ( localize2(7712, 'Show Unchanged Cells')),
+            title: ( localize2(7813, 'Show Unchanged Cells')),
             icon: Codicon.unfold,
             precondition: ( ContextKeyExpr.and(( ActiveEditorContext.isEqualTo(NotebookMultiTextDiffEditor.ID)), ( ContextKeyExpr.has(NOTEBOOK_DIFF_HAS_UNCHANGED_CELLS.key)))),
             menu: {
@@ -132,7 +135,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.diffEditor.hideUnchangedCells',
-            title: ( localize2(7713, 'Hide Unchanged Cells')),
+            title: ( localize2(7814, 'Hide Unchanged Cells')),
             icon: Codicon.fold,
             precondition: ( ContextKeyExpr.and(( ActiveEditorContext.isEqualTo(NotebookMultiTextDiffEditor.ID)), ( ContextKeyExpr.has(NOTEBOOK_DIFF_HAS_UNCHANGED_CELLS.key)))),
             menu: {
@@ -157,7 +160,7 @@ registerAction2(class GoToFileAction extends Action2 {
     constructor() {
         super({
             id: 'notebook.diffEditor.2.goToCell',
-            title: ( localize2(7714, 'Go To Cell')),
+            title: ( localize2(7815, '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')))),
@@ -186,7 +189,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.diff.revertMetadata',
-            title: ( localize(7715, "Revert Notebook Metadata")),
+            title: ( localize(7816, "Revert Notebook Metadata")),
             icon: revertIcon,
             f1: false,
             menu: {
@@ -211,7 +214,7 @@ registerAction2(class extends Action2 {
             }], true, undefined, () => undefined, undefined, true);
     }
 });
-const revertInput = ( localize(7716, "Revert Input"));
+const revertInput = ( localize(7817, "Revert Input"));
 registerAction2(class extends Action2 {
     constructor() {
         super({
@@ -250,7 +253,7 @@ registerAction2(class extends Action2 {
         }
     }
 });
-const revertOutputs = ( localize(7717, "Revert Outputs"));
+const revertOutputs = ( localize(7818, "Revert Outputs"));
 registerAction2(class extends Action2 {
     constructor() {
         super({
@@ -286,7 +289,7 @@ registerAction2(class extends Action2 {
         }
     }
 });
-const revertMetadata = ( localize(7718, "Revert Metadata"));
+const revertMetadata = ( localize(7819, "Revert Metadata"));
 registerAction2(class extends Action2 {
     constructor() {
         super({
@@ -360,7 +363,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.diff.cell.switchOutputRenderingStyleToText',
-            title: ( localize(7719, "Switch Output Rendering")),
+            title: ( localize(7820, "Switch Output Rendering")),
             icon: renderOutputIcon,
             f1: false,
             menu: {
@@ -380,7 +383,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.diff.cell.revertOutputs',
-            title: ( localize(7717, "Revert Outputs")),
+            title: ( localize(7818, "Revert Outputs")),
             icon: revertIcon,
             f1: false,
             menu: {
@@ -412,7 +415,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.toggle.diff.cell.ignoreTrimWhitespace',
-            title: ( localize(7720, "Show Leading/Trailing Whitespace Differences")),
+            title: ( localize(7821, "Show Leading/Trailing Whitespace Differences")),
             icon: toggleWhitespace,
             f1: false,
             menu: {
@@ -500,19 +503,19 @@ class ToggleRenderAction extends Action2 {
 }
 registerAction2(class extends ToggleRenderAction {
     constructor() {
-        super('notebook.diff.showOutputs', ( localize2(7721, '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(7822, '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(7722, '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(7823, '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(7723, "Show Previous Change")),
+            title: ( localize(7824, "Show Previous Change")),
             icon: previousChangeIcon,
             f1: false,
             keybinding: {
@@ -540,7 +543,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.diff.action.next',
-            title: ( localize(7724, "Show Next Change")),
+            title: ( localize(7825, "Show Next Change")),
             icon: nextChangeIcon,
             f1: false,
             keybinding: {
@@ -564,6 +567,28 @@ registerAction2(class extends Action2 {
         editor?.nextChange();
     }
 });
+registerAction2(class extends Action2 {
+    constructor() {
+        super({
+            id: 'notebook.diff.inline.toggle',
+            title: ( localize(7826, "Toggle Inline View")),
+            menu: {
+                id: MenuId.EditorTitle,
+                group: '1_diff',
+                order: 10,
+                when: ( ContextKeyExpr.and(( ActiveEditorContext.isEqualTo(NotebookTextDiffEditor.ID)), ( ContextKeyExpr.equals('config.notebook.diff.experimental.toggleInline', true)), ( ctxHasEditorModification.negate()), ( ctxHasRequestInProgress.negate())))
+            }
+        });
+    }
+    run(accessor) {
+        const editorService = accessor.get(IEditorService);
+        if (editorService.activeEditorPane?.getId() !== NOTEBOOK_DIFF_EDITOR_ID) {
+            return;
+        }
+        const editor = editorService.activeEditorPane.getControl();
+        editor?.toggleInlineView();
+    }
+});
 ( Registry.as(Extensions.Configuration)).registerConfiguration({
     id: 'notebook',
     order: 100,
@@ -572,12 +597,20 @@ registerAction2(class extends Action2 {
         'notebook.diff.ignoreMetadata': {
             type: 'boolean',
             default: false,
-            markdownDescription: ( localize(7725, "Hide Metadata Differences"))
+            markdownDescription: ( localize(7827, "Hide Metadata Differences"))
         },
         'notebook.diff.ignoreOutputs': {
             type: 'boolean',
             default: false,
-            markdownDescription: ( localize(7726, "Hide Outputs Differences"))
+            markdownDescription: ( localize(7828, "Hide Outputs Differences"))
+        },
+        'notebook.diff.experimental.toggleInline': {
+            type: 'boolean',
+            default: typeof product.quality === 'string' && product.quality !== 'stable',
+            markdownDescription: ( localize(
+                7829,
+                "Enable the command to toggle the experimental notebook inline diff editor."
+            ))
         },
     }
 });

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

@@ -2,7 +2,7 @@ import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/l
 import { IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions";
 import { IUndoRedoService } from "@codingame/monaco-vscode-api/vscode/vs/platform/undoRedo/common/undoRedo.service";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
-import { ICodeEditorService } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/codeEditorService";
+import { ICodeEditorService } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/codeEditorService.service";
 export declare class NotebookContribution extends Disposable implements IWorkbenchContribution {
     private readonly codeEditorService;
     static readonly ID = "workbench.contrib.notebook";