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

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

@@ -24,17 +24,17 @@ import { NotebookEditor } from 'vscode/vscode/vs/workbench/contrib/notebook/brow
 import { NotebookEditorInput } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookEditorInput';
 import { INotebookService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
 import './services/notebookServiceImpl.js';
-import { NotebookSetting, CellUri, CellKind, NotebookWorkingCopyTypeIdentifier } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
+import { NotebookSetting, CellUri, CellKind, NotebookCellsChangeType, NotebookWorkingCopyTypeIdentifier } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 import { IUndoRedoService } from 'vscode/vscode/vs/platform/undoRedo/common/undoRedo.service';
 import { INotebookEditorModelResolverService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookEditorModelResolverService.service';
-import { NotebookDiffEditorInput } from '../common/notebookDiffEditorInput.js';
-import { NotebookTextDiffEditor } from './diff/notebookDiffEditor.js';
+import { NotebookDiffEditorInput } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookDiffEditorInput';
+import { NotebookTextDiffEditor } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditor';
 import './services/notebookWorkerServiceImpl.js';
 import { Event } from 'vscode/vscode/vs/base/common/event';
 import './services/notebookEditorServiceImpl.js';
 import { Extensions } from 'vscode/vscode/vs/platform/jsonschemas/common/jsonContributionRegistry';
-import { getFormattedMetadataJSON, getStreamOutputData } from './diff/diffElementViewModel.js';
+import { getFormattedMetadataJSON, getStreamOutputData, getFormattedOutputJSON } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/diff/diffElementViewModel';
 import '../common/notebookEditorModelResolverServiceImpl.js';
 import './services/notebookKernelServiceImpl.js';
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
@@ -83,6 +83,7 @@ import './contrib/kernelDetection/notebookKernelDetection.js';
 import './contrib/cellDiagnostics/cellDiagnosticEditorContrib.js';
 import './contrib/cellDiagnostics/cellDiagnosticsActions.js';
 import './contrib/cellDiagnostics/diagnosticCellStatusBarContrib.js';
+import './contrib/multicursor/notebookMulticursor.js';
 import './diff/notebookDiffActions.js';
 import { editorOptionsRegistry } from 'vscode/vscode/vs/editor/common/config/editorOptions';
 import './services/notebookExecutionStateServiceImpl.js';
@@ -100,6 +101,8 @@ import { AccessibleViewRegistry } from 'vscode/vscode/vs/platform/accessibility/
 import { NotebookAccessibilityHelp } from './notebookAccessibilityHelp.js';
 import { NotebookAccessibleView } from './notebookAccessibleView.js';
 import { DefaultFormatter } from 'vscode/vscode/vs/workbench/contrib/format/browser/formatActionsMultiple';
+import { NotebookMultiTextDiffEditor } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/diff/notebookMultiDiffEditor';
+import { NotebookMultiDiffEditorInput } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/diff/notebookMultiDiffEditorInput';
 
 var NotebookContribution_1;
 ( (Registry.as(EditorExtensions.EditorPane))).registerEditorPane(EditorPaneDescriptor.create(NotebookEditor, NotebookEditor.ID, 'Notebook Editor'), [
@@ -108,7 +111,13 @@ var NotebookContribution_1;
 ( (Registry.as(EditorExtensions.EditorPane))).registerEditorPane(EditorPaneDescriptor.create(NotebookTextDiffEditor, NotebookTextDiffEditor.ID, 'Notebook Diff Editor'), [
     ( (new SyncDescriptor(NotebookDiffEditorInput)))
 ]);
-class NotebookDiffEditorSerializer {
+( (Registry.as(EditorExtensions.EditorPane))).registerEditorPane(EditorPaneDescriptor.create(NotebookMultiTextDiffEditor, NotebookMultiTextDiffEditor.ID, 'Notebook Diff Editor'), [
+    ( (new SyncDescriptor(NotebookMultiDiffEditorInput)))
+]);
+let NotebookDiffEditorSerializer = class NotebookDiffEditorSerializer {
+    constructor(_configurationService) {
+        this._configurationService = _configurationService;
+    }
     canSerialize() {
         return true;
     }
@@ -132,13 +141,20 @@ class NotebookDiffEditorSerializer {
         if (!data || !URI.isUri(resource) || !URI.isUri(originalResource) || typeof name !== 'string' || typeof viewType !== 'string') {
             return undefined;
         }
-        const input = NotebookDiffEditorInput.create(instantiationService, resource, name, undefined, originalResource, viewType);
-        return input;
+        if (this._configurationService.getValue('notebook.experimental.enableNewDiffEditor')) {
+            return NotebookMultiDiffEditorInput.create(instantiationService, resource, name, undefined, originalResource, viewType);
+        }
+        else {
+            return NotebookDiffEditorInput.create(instantiationService, resource, name, undefined, originalResource, viewType);
+        }
     }
     static canResolveBackup(editorInput, backupResource) {
         return false;
     }
-}
+};
+NotebookDiffEditorSerializer = ( (__decorate([
+    ( (__param(0, IConfigurationService)))
+], NotebookDiffEditorSerializer)));
 class NotebookEditorSerializer {
     canSerialize(input) {
         return input.typeId === NotebookEditorInput.ID;
@@ -328,10 +344,22 @@ let CellInfoContentProvider = class CellInfoContentProvider {
         const ref = await this._notebookModelResolverService.resolve(data.notebook);
         let result = null;
         const mode = this._languageService.createById('json');
+        const disposables = ( (new DisposableStore()));
         for (const cell of ref.object.notebook.cells) {
             if (cell.handle === data.handle) {
+                const cellIndex = ref.object.notebook.cells.indexOf(cell);
                 const metadataSource = getFormattedMetadataJSON(ref.object.notebook, cell.metadata, cell.language);
                 result = this._modelService.createModel(metadataSource, mode, resource);
+                this._disposables.push(disposables.add(ref.object.notebook.onDidChangeContent(e => {
+                    if (result && ( (e.rawEvents.some(
+                        event => (event.kind === NotebookCellsChangeType.ChangeCellMetadata || event.kind === NotebookCellsChangeType.ChangeCellLanguage) && event.index === cellIndex
+                    )))) {
+                        const value = getFormattedMetadataJSON(ref.object.notebook, cell.metadata, cell.language);
+                        if (result.getValue() !== value) {
+                            result.setValue(getFormattedMetadataJSON(ref.object.notebook, cell.metadata, cell.language));
+                        }
+                    }
+                })));
                 break;
             }
         }
@@ -340,6 +368,7 @@ let CellInfoContentProvider = class CellInfoContentProvider {
             return null;
         }
         const once = result.onWillDispose(() => {
+            disposables.dispose();
             once.dispose();
             ref.dispose();
         });
@@ -381,6 +410,33 @@ let CellInfoContentProvider = class CellInfoContentProvider {
         };
         return result;
     }
+    async provideOutputsTextContent(resource) {
+        const existing = this._modelService.getModel(resource);
+        if (existing) {
+            return existing;
+        }
+        const data = CellUri.parseCellPropertyUri(resource, Schemas.vscodeNotebookCellOutput);
+        if (!data) {
+            return null;
+        }
+        const ref = await this._notebookModelResolverService.resolve(data.notebook);
+        const cell = ref.object.notebook.cells.find(cell => cell.handle === data.handle);
+        if (!cell) {
+            ref.dispose();
+            return null;
+        }
+        const mode = this._languageService.createById('json');
+        const model = this._modelService.createModel(getFormattedOutputJSON(cell.outputs || []), mode, resource, true);
+        const cellModelListener = Event.any(cell.onDidChangeOutputs ?? Event.None, cell.onDidChangeOutputItems ?? Event.None)(() => {
+            model.setValue(getFormattedOutputJSON(cell.outputs || []));
+        });
+        const once = model.onWillDispose(() => {
+            once.dispose();
+            cellModelListener.dispose();
+            ref.dispose();
+        });
+        return model;
+    }
     async provideOutputTextContent(resource) {
         const existing = this._modelService.getModel(resource);
         if (existing) {
@@ -388,7 +444,7 @@ let CellInfoContentProvider = class CellInfoContentProvider {
         }
         const data = CellUri.parseCellOutputUri(resource);
         if (!data) {
-            return null;
+            return this.provideOutputsTextContent(resource);
         }
         const ref = await this._notebookModelResolverService.resolve(data.notebook);
         const cell = ref.object.notebook.cells.find(cell => !!cell.outputs.find(op => op.outputId === data.outputId || op.alternativeOutputId === data.outputId));
@@ -589,7 +645,7 @@ for (const editorOption of editorOptionsRegistry) {
 }
 const editorOptionsCustomizationSchema = {
     description: ( localize(
-        3307,
+        3265,
         'Settings for code editors used in notebooks. This can be used to customize most editor.* settings.'
     )),
     default: {},
@@ -604,11 +660,11 @@ const configurationRegistry = ( (Registry.as(Extensions$2.Configuration)));
 configurationRegistry.registerConfiguration({
     id: 'notebook',
     order: 100,
-    title: ( localize(3308, "Notebook")),
+    title: ( localize(3266, "Notebook")),
     type: 'object',
     properties: {
         [NotebookSetting.displayOrder]: {
-            description: ( localize(3309, "Priority list for output mime types")),
+            description: ( localize(3267, "Priority list for output mime types")),
             type: 'array',
             items: {
                 type: 'string'
@@ -617,12 +673,12 @@ configurationRegistry.registerConfiguration({
         },
         [NotebookSetting.cellToolbarLocation]: {
             description: ( localize(
-                3310,
+                3268,
                 "Where the cell toolbar should be shown, or whether it should be hidden."
             )),
             type: 'object',
             additionalProperties: {
-                markdownDescription: ( localize(3311, "Configure the cell toolbar position for for specific file types")),
+                markdownDescription: ( localize(3269, "Configure the cell toolbar position for for specific file types")),
                 type: 'string',
                 enum: ['left', 'right', 'hidden']
             },
@@ -632,14 +688,14 @@ configurationRegistry.registerConfiguration({
             tags: ['notebookLayout']
         },
         [NotebookSetting.showCellStatusBar]: {
-            description: ( localize(3312, "Whether the cell status bar should be shown.")),
+            description: ( localize(3270, "Whether the cell status bar should be shown.")),
             type: 'string',
             enum: ['hidden', 'visible', 'visibleAfterExecute'],
             enumDescriptions: [
-                ( localize(3313, "The cell Status bar is always hidden.")),
-                ( localize(3314, "The cell Status bar is always visible.")),
+                ( localize(3271, "The cell Status bar is always hidden.")),
+                ( localize(3272, "The cell Status bar is always visible.")),
                 ( localize(
-                    3315,
+                    3273,
                     "The cell Status bar is hidden until the cell has executed. Then it becomes visible to show the execution status."
                 ))
             ],
@@ -647,14 +703,14 @@ configurationRegistry.registerConfiguration({
             tags: ['notebookLayout']
         },
         [NotebookSetting.textDiffEditorPreview]: {
-            description: ( localize(3316, "Whether to use the enhanced text diff editor for notebook.")),
+            description: ( localize(3274, "Whether to use the enhanced text diff editor for notebook.")),
             type: 'boolean',
             default: true,
             tags: ['notebookLayout']
         },
         [NotebookSetting.diffOverviewRuler]: {
             description: ( localize(
-                3317,
+                3275,
                 "Whether to render the overview ruler in the diff editor for notebook."
             )),
             type: 'boolean',
@@ -662,21 +718,21 @@ configurationRegistry.registerConfiguration({
             tags: ['notebookLayout']
         },
         [NotebookSetting.cellToolbarVisibility]: {
-            markdownDescription: ( localize(3318, "Whether the cell toolbar should appear on hover or click.")),
+            markdownDescription: ( localize(3276, "Whether the cell toolbar should appear on hover or click.")),
             type: 'string',
             enum: ['hover', 'click'],
             default: 'click',
             tags: ['notebookLayout']
         },
         [NotebookSetting.undoRedoPerCell]: {
-            description: ( localize(3319, "Whether to use separate undo/redo stack for each cell.")),
+            description: ( localize(3277, "Whether to use separate undo/redo stack for each cell.")),
             type: 'boolean',
             default: true,
             tags: ['notebookLayout']
         },
         [NotebookSetting.compactView]: {
             description: ( localize(
-                3320,
+                3278,
                 "Control whether the notebook editor should be rendered in a compact form. For example, when turned on, it will decrease the left margin width."
             )),
             type: 'boolean',
@@ -685,7 +741,7 @@ configurationRegistry.registerConfiguration({
         },
         [NotebookSetting.focusIndicator]: {
             description: ( localize(
-                3321,
+                3279,
                 "Controls where the focus indicator is rendered, either along the cell borders or on the left gutter."
             )),
             type: 'string',
@@ -694,21 +750,21 @@ configurationRegistry.registerConfiguration({
             tags: ['notebookLayout']
         },
         [NotebookSetting.insertToolbarLocation]: {
-            description: ( localize(3322, "Control where the insert cell actions should appear.")),
+            description: ( localize(3280, "Control where the insert cell actions should appear.")),
             type: 'string',
             enum: ['betweenCells', 'notebookToolbar', 'both', 'hidden'],
             enumDescriptions: [
-                ( localize(3323, "A toolbar that appears on hover between cells.")),
-                ( localize(3324, "The toolbar at the top of the notebook editor.")),
-                ( localize(3325, "Both toolbars.")),
-                ( localize(3326, "The insert actions don't appear anywhere.")),
+                ( localize(3281, "A toolbar that appears on hover between cells.")),
+                ( localize(3282, "The toolbar at the top of the notebook editor.")),
+                ( localize(3283, "Both toolbars.")),
+                ( localize(3284, "The insert actions don't appear anywhere.")),
             ],
             default: 'both',
             tags: ['notebookLayout']
         },
         [NotebookSetting.globalToolbar]: {
             description: ( localize(
-                3327,
+                3285,
                 "Control whether to render a global toolbar inside the notebook editor."
             )),
             type: 'boolean',
@@ -717,7 +773,7 @@ configurationRegistry.registerConfiguration({
         },
         [NotebookSetting.stickyScrollEnabled]: {
             description: ( localize(
-                3328,
+                3286,
                 "Experimental. Control whether to render notebook Sticky Scroll headers in the notebook editor."
             )),
             type: 'boolean',
@@ -726,21 +782,21 @@ configurationRegistry.registerConfiguration({
         },
         [NotebookSetting.stickyScrollMode]: {
             description: ( localize(
-                3329,
+                3287,
                 "Control whether nested sticky lines appear to stack flat or indented."
             )),
             type: 'string',
             enum: ['flat', 'indented'],
             enumDescriptions: [
-                ( localize(3330, "Nested sticky lines appear flat.")),
-                ( localize(3331, "Nested sticky lines appear indented.")),
+                ( localize(3288, "Nested sticky lines appear flat.")),
+                ( localize(3289, "Nested sticky lines appear indented.")),
             ],
             default: 'indented',
             tags: ['notebookLayout']
         },
         [NotebookSetting.consolidatedOutputButton]: {
             description: ( localize(
-                3332,
+                3290,
                 "Control whether outputs action should be rendered in the output toolbar."
             )),
             type: 'boolean',
@@ -748,20 +804,20 @@ configurationRegistry.registerConfiguration({
             tags: ['notebookLayout']
         },
         [NotebookSetting.showFoldingControls]: {
-            description: ( localize(3333, "Controls when the Markdown header folding arrow is shown.")),
+            description: ( localize(3291, "Controls when the Markdown header folding arrow is shown.")),
             type: 'string',
             enum: ['always', 'never', 'mouseover'],
             enumDescriptions: [
-                ( localize(3334, "The folding controls are always visible.")),
-                ( localize(3335, "Never show the folding controls and reduce the gutter size.")),
-                ( localize(3336, "The folding controls are visible only on mouseover.")),
+                ( localize(3292, "The folding controls are always visible.")),
+                ( localize(3293, "Never show the folding controls and reduce the gutter size.")),
+                ( localize(3294, "The folding controls are visible only on mouseover.")),
             ],
             default: 'mouseover',
             tags: ['notebookLayout']
         },
         [NotebookSetting.dragAndDropEnabled]: {
             description: ( localize(
-                3337,
+                3295,
                 "Control whether the notebook editor should allow moving cells through drag and drop."
             )),
             type: 'boolean',
@@ -770,7 +826,7 @@ configurationRegistry.registerConfiguration({
         },
         [NotebookSetting.consolidatedRunButton]: {
             description: ( localize(
-                3338,
+                3296,
                 "Control whether extra actions are shown in a dropdown next to the run button."
             )),
             type: 'boolean',
@@ -779,7 +835,7 @@ configurationRegistry.registerConfiguration({
         },
         [NotebookSetting.globalToolbarShowLabel]: {
             description: ( localize(
-                3339,
+                3297,
                 "Control whether the actions on the notebook toolbar should render label or not."
             )),
             type: 'string',
@@ -789,7 +845,7 @@ configurationRegistry.registerConfiguration({
         },
         [NotebookSetting.textOutputLineLimit]: {
             markdownDescription: ( localize(
-                3340,
+                3298,
                 "Controls how many lines of text are displayed in a text output. If {0} is enabled, this setting is used to determine the scroll height of the output.",
                 '`#notebook.output.scrolling#`'
             )),
@@ -800,7 +856,7 @@ configurationRegistry.registerConfiguration({
         },
         [NotebookSetting.LinkifyOutputFilePaths]: {
             description: ( localize(
-                3341,
+                3299,
                 "Control whether to disable filepath links in the output of notebook cells."
             )),
             type: 'boolean',
@@ -808,14 +864,14 @@ configurationRegistry.registerConfiguration({
             tags: ['notebookOutputLayout']
         },
         [NotebookSetting.minimalErrorRendering]: {
-            description: ( localize(3342, "Control whether to render error output in a minimal style.")),
+            description: ( localize(3300, "Control whether to render error output in a minimal style.")),
             type: 'boolean',
             default: false,
             tags: ['notebookOutputLayout']
         },
         [NotebookSetting.markupFontSize]: {
             markdownDescription: ( localize(
-                3343,
+                3301,
                 "Controls the font size in pixels of rendered markup in notebooks. When set to {0}, 120% of {1} is used.",
                 '`0`',
                 '`#editor.fontSize#`'
@@ -826,7 +882,7 @@ configurationRegistry.registerConfiguration({
         },
         [NotebookSetting.markdownLineHeight]: {
             markdownDescription: ( localize(
-                3344,
+                3302,
                 "Controls the line height in pixels of markdown cells in notebooks. When set to {0}, {1} will be used",
                 '`0`',
                 '`normal`'
@@ -838,7 +894,7 @@ configurationRegistry.registerConfiguration({
         [NotebookSetting.cellEditorOptionsCustomizations]: editorOptionsCustomizationSchema,
         [NotebookSetting.interactiveWindowCollapseCodeCells]: {
             markdownDescription: ( localize(
-                3345,
+                3303,
                 "Controls whether code cells in the interactive window are collapsed by default."
             )),
             type: 'string',
@@ -847,7 +903,7 @@ configurationRegistry.registerConfiguration({
         },
         [NotebookSetting.outputLineHeight]: {
             markdownDescription: ( localize(
-                3346,
+                3304,
                 "Line height of the output text within notebook cells.\n - When set to 0, editor line height is used.\n - Values between 0 and 8 will be used as a multiplier with the font size.\n - Values greater than or equal to 8 will be used as effective values."
             )),
             type: 'number',
@@ -856,7 +912,7 @@ configurationRegistry.registerConfiguration({
         },
         [NotebookSetting.outputFontSize]: {
             markdownDescription: ( localize(
-                3347,
+                3305,
                 "Font size for the output text within notebook cells. When set to 0, {0} is used.",
                 '`#editor.fontSize#`'
             )),
@@ -866,7 +922,7 @@ configurationRegistry.registerConfiguration({
         },
         [NotebookSetting.outputFontFamily]: {
             markdownDescription: ( localize(
-                3348,
+                3306,
                 "The font family of the output text within notebook cells. When set to empty, the {0} is used.",
                 '`#editor.fontFamily#`'
             )),
@@ -875,7 +931,7 @@ configurationRegistry.registerConfiguration({
         },
         [NotebookSetting.outputScrolling]: {
             markdownDescription: ( localize(
-                3349,
+                3307,
                 "Initially render notebook outputs in a scrollable region when longer than the limit."
             )),
             type: 'boolean',
@@ -883,14 +939,14 @@ configurationRegistry.registerConfiguration({
             default: typeof product$1.quality === 'string' && product$1.quality !== 'stable'
         },
         [NotebookSetting.outputWordWrap]: {
-            markdownDescription: ( localize(3350, "Controls whether the lines in output should wrap.")),
+            markdownDescription: ( localize(3308, "Controls whether the lines in output should wrap.")),
             type: 'boolean',
             tags: ['notebookLayout', 'notebookOutputLayout'],
             default: false
         },
         [NotebookSetting.defaultFormatter]: {
             description: ( localize(
-                3351,
+                3309,
                 "Defines a default notebook formatter which takes precedence over all other formatter settings. Must be the identifier of an extension contributing a formatter."
             )),
             type: ['string', 'null'],
@@ -901,7 +957,7 @@ configurationRegistry.registerConfiguration({
         },
         [NotebookSetting.formatOnSave]: {
             markdownDescription: ( localize(
-                3352,
+                3310,
                 "Format a notebook on save. A formatter must be available, the file must not be saved after delay, and the editor must not be shutting down."
             )),
             type: 'boolean',
@@ -910,7 +966,7 @@ configurationRegistry.registerConfiguration({
         },
         [NotebookSetting.insertFinalNewline]: {
             markdownDescription: ( localize(
-                3353,
+                3311,
                 "When enabled, insert a final new line into the end of code cells when saving a notebook."
             )),
             type: 'boolean',
@@ -919,7 +975,7 @@ configurationRegistry.registerConfiguration({
         },
         [NotebookSetting.formatOnCellExecution]: {
             markdownDescription: ( localize(
-                3354,
+                3312,
                 "Format a notebook cell upon execution. A formatter must be available."
             )),
             type: 'boolean',
@@ -927,7 +983,7 @@ configurationRegistry.registerConfiguration({
         },
         [NotebookSetting.confirmDeleteRunningCell]: {
             markdownDescription: ( localize(
-                3355,
+                3313,
                 "Control whether a confirmation prompt is required to delete a running cell."
             )),
             type: 'boolean',
@@ -935,7 +991,7 @@ configurationRegistry.registerConfiguration({
         },
         [NotebookSetting.findFilters]: {
             markdownDescription: ( localize(
-                3356,
+                3314,
                 "Customize the Find Widget behavior for searching within notebook cells. When both markup source and markup preview are enabled, the Find Widget will search either the source code or preview based on the current state of the cell."
             )),
             type: 'object',
@@ -967,7 +1023,7 @@ configurationRegistry.registerConfiguration({
         },
         [NotebookSetting.remoteSaving]: {
             markdownDescription: ( localize(
-                3357,
+                3315,
                 "Enables the incremental saving of notebooks between processes and across Remote connections. When enabled, only the changes to the notebook are sent to the extension host, improving performance for large notebooks and slow network connections."
             )),
             type: 'boolean',
@@ -976,27 +1032,22 @@ configurationRegistry.registerConfiguration({
         },
         [NotebookSetting.scrollToRevealCell]: {
             markdownDescription: ( localize(
-                3358,
+                3316,
                 "How far to scroll when revealing the next cell upon running {0}.",
                 'notebook.cell.executeAndSelectBelow'
             )),
             type: 'string',
             enum: ['fullCell', 'firstLine', 'none'],
             markdownEnumDescriptions: [
-                ( localize(3359, 'Scroll to fully reveal the next cell.')),
-                ( localize(3360, 'Scroll to reveal the first line of the next cell.')),
-                ( localize(3361, 'Do not scroll.')),
+                ( localize(3317, 'Scroll to fully reveal the next cell.')),
+                ( localize(3318, 'Scroll to reveal the first line of the next cell.')),
+                ( localize(3319, 'Do not scroll.')),
             ],
             default: 'fullCell'
         },
-        [NotebookSetting.cellChat]: {
-            markdownDescription: ( localize(3362, "Enable experimental floating chat widget in notebooks.")),
-            type: 'boolean',
-            default: false
-        },
         [NotebookSetting.cellGenerate]: {
             markdownDescription: ( localize(
-                3363,
+                3320,
                 "Enable experimental generate action to create code cell with inline chat enabled."
             )),
             type: 'boolean',
@@ -1005,20 +1056,20 @@ configurationRegistry.registerConfiguration({
         },
         [NotebookSetting.notebookVariablesView]: {
             markdownDescription: ( localize(
-                3364,
+                3321,
                 "Enable the experimental notebook variables view within the debug panel."
             )),
             type: 'boolean',
             default: false
         },
         [NotebookSetting.cellFailureDiagnostics]: {
-            markdownDescription: ( localize(3365, "Show available diagnostics for cell failures.")),
+            markdownDescription: ( localize(3322, "Show available diagnostics for cell failures.")),
             type: 'boolean',
             default: true
         },
         [NotebookSetting.outputBackupSizeLimit]: {
             markdownDescription: ( localize(
-                3366,
+                3323,
                 "The limit of notebook output size in kilobytes (KB) where notebook files will no longer be backed up for hot reload. Use 0 for unlimited."
             )),
             type: 'number',

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

@@ -1,4 +1,4 @@
-import { NOTEBOOK_IS_ACTIVE_EDITOR } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
+import { NOTEBOOK_EDITOR_FOCUSED } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
 import { localize } from 'vscode/vscode/vs/nls';
 import { AccessibleViewType, AccessibleContentProvider, AccessibleViewProviderId } from 'vscode/vscode/vs/platform/accessibility/browser/accessibleView';
 import { AccessibilityVerbositySettingId } from 'vscode/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
@@ -9,7 +9,7 @@ class NotebookAccessibilityHelp {
     constructor() {
         this.priority = 105;
         this.name = 'notebook';
-        this.when = NOTEBOOK_IS_ACTIVE_EDITOR;
+        this.when = NOTEBOOK_EDITOR_FOCUSED;
         this.type = AccessibleViewType.Help;
     }
     getProvider(accessor) {
@@ -25,43 +25,51 @@ class NotebookAccessibilityHelp {
 function getAccessibilityHelpText() {
     return [
         ( localize(
-            8271,
+            8070,
             'The notebook view is a collection of code and markdown cells. Code cells can be executed and will produce output directly below the cell.'
         )),
         ( localize(
-            8272,
-            'The Edit Cell command<keybinding:notebook.cell.edit> will focus on the cell input.'
+            8071,
+            'The Edit Cell command{0} will focus on the cell input.',
+            '<keybinding:notebook.cell.edit>'
         )),
         ( localize(
-            8273,
-            'The Quit Edit command<keybinding:notebook.cell.quitEdit> will set focus on the cell container. The default (Escape) key may need to be pressed twice first exit the virtual cursor if active.'
+            8072,
+            'The Quit Edit command{0} will set focus on the cell container. The default (Escape) key may need to be pressed twice first exit the virtual cursor if active.',
+            '<keybinding:notebook.cell.quitEdit>'
         )),
         ( localize(
-            8274,
-            'The Focus Output command<keybinding:notebook.cell.focusInOutput> will set focus in the cell\'s output.'
+            8073,
+            'The Focus Output command{0} will set focus in the cell\'s output.',
+            '<keybinding:notebook.cell.focusInOutput>'
         )),
         ( localize(
-            8275,
-            'The Focus Next Cell Editor command<keybinding:notebook.focusNextEditor> will set focus in the next cell\'s editor.'
+            8074,
+            'The Focus Next Cell Editor command{0} will set focus in the next cell\'s editor.',
+            '<keybinding:notebook.focusNextEditor>'
         )),
         ( localize(
-            8276,
-            'The Focus Previous Cell Editor command<keybinding:notebook.focusPreviousEditor> will set focus in the previous cell\'s editor.'
+            8075,
+            'The Focus Previous Cell Editor command{0} will set focus in the previous cell\'s editor.',
+            '<keybinding:notebook.focusPreviousEditor>'
         )),
         ( localize(
-            8277,
+            8076,
             'The up and down arrows will also move focus between cells while focused on the outer cell container.'
         )),
         ( localize(
-            8278,
-            'The Execute Cell command<keybinding:notebook.cell.executeAndFocusContainer> executes the cell that currently has focus.'
+            8077,
+            'The Execute Cell command{0} executes the cell that currently has focus.',
+            '<keybinding:notebook.cell.executeAndFocusContainer>'
         )),
         ( localize(
-            8279,
-            'The Insert Cell Above/Below commands will create new empty code cells.'
+            8078,
+            'The Insert Cell Above{0} and Below{1} commands will create new empty code cells.',
+            '<keybinding:notebook.cell.insertCodeCellAbove>',
+            '<keybinding:notebook.cell.insertCodeCellBelow>'
         )),
         ( localize(
-            8280,
+            8079,
             'The Change Cell to Code/Markdown commands are used to switch between cell types.'
         ))
     ].join('\n');