@codingame/monaco-vscode-notebook-service-override 5.2.0 → 6.0.0

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

@@ -6,16 +6,19 @@ import { isEqual, extname } from 'vscode/vscode/vs/base/common/resources';
 import { assertType } from 'vscode/vscode/vs/base/common/types';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { toFormattedString } from 'vscode/vscode/vs/base/common/jsonFormatter';
+import { DefaultEndOfLine } from 'vscode/vscode/vs/editor/common/model';
 import { IModelService } from 'vscode/vscode/vs/editor/common/services/model';
 import { ILanguageService } from 'vscode/vscode/vs/editor/common/languages/language';
 import { ITextModelService } from 'vscode/vscode/vs/editor/common/services/resolverService';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { Extensions as Extensions$2 } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
 import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
+import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { EditorPaneDescriptor } from 'vscode/vscode/vs/workbench/browser/editor';
-import { Extensions as Extensions$1, registerWorkbenchContribution2 } from 'vscode/vscode/vs/workbench/common/contributions';
+import { Extensions as Extensions$1, registerWorkbenchContribution2, WorkbenchPhase } from 'vscode/vscode/vs/workbench/common/contributions';
 import { EditorExtensions } from 'vscode/vscode/vs/workbench/common/editor';
 import { NotebookEditor } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookEditor';
 import { NotebookEditorInput } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookEditorInput';
@@ -41,20 +44,9 @@ import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label.serv
 import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import './services/notebookRendererMessagingServiceImpl.js';
 import 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService';
+import 'vscode/vscode/vs/workbench/services/outline/browser/outline';
 import 'vscode/vscode/vs/editor/contrib/documentSymbols/browser/outlineModel';
-import 'vscode/vscode/vs/base/browser/dom';
-import 'vscode/vscode/vs/base/browser/dompurify/dompurify';
-import 'vscode/vscode/vs/base/browser/browser';
-import 'vscode/vscode/vs/base/common/keyCodes';
-import 'vscode/vscode/vs/base/common/platform';
-import 'vscode/vscode/vs/base/common/themables';
-import 'vscode/vscode/vs/base/common/filters';
-import 'vscode/vscode/vs/base/common/strings';
-import 'vscode/external/vscode-marked/lib/marked.esm.js';
-import 'vscode/vscode/vs/base/common/codicons';
-import 'vscode/vscode/vs/platform/markers/common/markers';
-import 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookIcons';
-import 'vscode/vscode/vs/editor/common/languages';
+import './viewModel/notebookOutlineEntryFactory.js';
 import 'vscode/vscode/vs/base/common/async';
 import 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
 import './controller/insertCellActions.js';
@@ -65,7 +57,7 @@ import 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/editActio
 import 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/cellOutputActions';
 import './controller/apiActions.js';
 import 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/foldingController';
-import './controller/chat/cellChatActions.js';
+import './controller/chat/notebook.chat.contribution.js';
 import './contrib/editorHint/emptyCellEditorHint.js';
 import './contrib/clipboard/notebookClipboard.js';
 import './contrib/find/notebookFind.js';
@@ -82,7 +74,7 @@ import './contrib/cellStatusBar/contributedStatusBarItemController.js';
 import 'vscode/vscode/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/executionStatusBarItemController';
 import './contrib/editorStatusBar/editorStatusBar.js';
 import './contrib/undoRedo/notebookUndoRedo.js';
-import 'vscode/vscode/vs/workbench/contrib/notebook/browser/contrib/cellCommands/cellCommands';
+import './contrib/cellCommands/cellCommands.js';
 import './contrib/viewportWarmup/viewportWarmup.js';
 import './contrib/troubleshoot/layout.js';
 import './contrib/debug/notebookBreakpoints.js';
@@ -90,6 +82,9 @@ import './contrib/debug/notebookCellPausing.js';
 import './contrib/debug/notebookDebugDecorations.js';
 import './contrib/execute/executionEditorProgress.js';
 import './contrib/kernelDetection/notebookKernelDetection.js';
+import './contrib/cellDiagnostics/cellDiagnosticEditorContrib.js';
+import './contrib/cellDiagnostics/cellDiagnosticsActions.js';
+import './contrib/cellDiagnostics/diagnosticCellStatusBarContrib.js';
 import './diff/notebookDiffActions.js';
 import { editorOptionsRegistry } from 'vscode/vscode/vs/editor/common/config/editorOptions';
 import './services/notebookExecutionStateServiceImpl.js';
@@ -102,12 +97,11 @@ import { ICodeEditorService } from 'vscode/vscode/vs/editor/browser/services/cod
 import './services/notebookKernelHistoryServiceImpl.js';
 import './services/notebookLoggingServiceImpl.js';
 import product$1 from 'vscode/vscode/vs/platform/product/common/product';
-import { NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_OUTPUT_FOCUSED } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
-import { runAccessibilityHelpAction, showAccessibleOutput } from './notebookAccessibility.js';
-import { IAccessibleViewService } from 'vscode/vscode/vs/workbench/contrib/accessibility/browser/accessibleView.service';
-import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
-import { AccessibilityHelpAction, AccessibleViewAction } from 'vscode/vscode/vs/workbench/contrib/accessibility/browser/accessibleViewActions';
 import { NotebookVariables } from './contrib/notebookVariables/notebookVariables.js';
+import { AccessibleViewRegistry } from 'vscode/vscode/vs/platform/accessibility/browser/accessibleViewRegistry';
+import { NotebookAccessibilityHelp } from './notebookAccessibilityHelp.js';
+import { NotebookAccessibleView } from './notebookAccessibleView.js';
+import { DefaultFormatter } from 'vscode/vscode/vs/workbench/contrib/format/browser/formatActionsMultiple';
 
 var NotebookContribution_1;
 const _moduleId = "vs/workbench/contrib/notebook/browser/notebook.contribution";
@@ -262,7 +256,7 @@ let CellContentProvider = class CellContentProvider {
             if (( (cell.uri.toString())) === ( (resource.toString()))) {
                 const bufferFactory = {
                     create: (defaultEOL) => {
-                        const newEOL = (defaultEOL === 2  ? '\r\n' : '\n');
+                        const newEOL = (defaultEOL === DefaultEndOfLine.CRLF ? '\r\n' : '\n');
                         cell.textBuffer.setEOL(newEOL);
                         return { textBuffer: cell.textBuffer, disposable: Disposable.None };
                     },
@@ -566,43 +560,17 @@ NotebookLanguageSelectorScoreRefine = ( (__decorate([
     ( (__param(0, INotebookService))),
     ( (__param(1, ILanguageFeaturesService)))
 ], NotebookLanguageSelectorScoreRefine)));
-class NotebookAccessibilityHelpContribution extends Disposable {
-    constructor() {
-        super();
-        this._register(AccessibilityHelpAction.addImplementation(105, 'notebook', async (accessor) => {
-            const activeEditor = accessor.get(ICodeEditorService).getActiveCodeEditor()
-                || accessor.get(ICodeEditorService).getFocusedCodeEditor()
-                || accessor.get(IEditorService).activeEditorPane;
-            if (activeEditor) {
-                runAccessibilityHelpAction(accessor, activeEditor);
-            }
-        }, NOTEBOOK_IS_ACTIVE_EDITOR));
-    }
-}
-class NotebookAccessibleViewContribution extends Disposable {
-    constructor() {
-        super();
-        this._register(AccessibleViewAction.addImplementation(100, 'notebook', accessor => {
-            const accessibleViewService = accessor.get(IAccessibleViewService);
-            const editorService = accessor.get(IEditorService);
-            return showAccessibleOutput(accessibleViewService, editorService);
-        }, ( (ContextKeyExpr.and(
-            NOTEBOOK_OUTPUT_FOCUSED,
-             (ContextKeyExpr.equals('resourceExtname', '.ipynb'))
-        )))));
-    }
-}
 const workbenchContributionsRegistry = ( (Registry.as(Extensions$1.Workbench)));
-registerWorkbenchContribution2(NotebookContribution.ID, NotebookContribution, 1 );
-registerWorkbenchContribution2(CellContentProvider.ID, CellContentProvider, 1 );
-registerWorkbenchContribution2(CellInfoContentProvider.ID, CellInfoContentProvider, 1 );
-registerWorkbenchContribution2(RegisterSchemasContribution.ID, RegisterSchemasContribution, 1 );
-registerWorkbenchContribution2(NotebookEditorManager.ID, NotebookEditorManager, 2 );
-registerWorkbenchContribution2(NotebookLanguageSelectorScoreRefine.ID, NotebookLanguageSelectorScoreRefine, 2 );
-registerWorkbenchContribution2(SimpleNotebookWorkingCopyEditorHandler.ID, SimpleNotebookWorkingCopyEditorHandler, 2 );
-workbenchContributionsRegistry.registerWorkbenchContribution(NotebookAccessibilityHelpContribution, 4 );
-workbenchContributionsRegistry.registerWorkbenchContribution(NotebookAccessibleViewContribution, 4 );
-workbenchContributionsRegistry.registerWorkbenchContribution(NotebookVariables, 4 );
+registerWorkbenchContribution2(NotebookContribution.ID, NotebookContribution, WorkbenchPhase.BlockStartup);
+registerWorkbenchContribution2(CellContentProvider.ID, CellContentProvider, WorkbenchPhase.BlockStartup);
+registerWorkbenchContribution2(CellInfoContentProvider.ID, CellInfoContentProvider, WorkbenchPhase.BlockStartup);
+registerWorkbenchContribution2(RegisterSchemasContribution.ID, RegisterSchemasContribution, WorkbenchPhase.BlockStartup);
+registerWorkbenchContribution2(NotebookEditorManager.ID, NotebookEditorManager, WorkbenchPhase.BlockRestore);
+registerWorkbenchContribution2(NotebookLanguageSelectorScoreRefine.ID, NotebookLanguageSelectorScoreRefine, WorkbenchPhase.BlockRestore);
+registerWorkbenchContribution2(SimpleNotebookWorkingCopyEditorHandler.ID, SimpleNotebookWorkingCopyEditorHandler, WorkbenchPhase.BlockRestore);
+workbenchContributionsRegistry.registerWorkbenchContribution(NotebookVariables, LifecyclePhase.Eventually);
+AccessibleViewRegistry.register(( (new NotebookAccessibleView())));
+AccessibleViewRegistry.register(( (new NotebookAccessibilityHelp())));
 const schemas = {};
 function isConfigurationPropertySchema(x) {
     return (typeof x.type !== 'undefined' || typeof x.anyOf !== 'undefined');
@@ -887,11 +855,23 @@ configurationRegistry.registerConfiguration({
             default: 0,
             tags: ['notebookLayout']
         },
+        [NotebookSetting.markdownLineHeight]: {
+            markdownDescription: ( localizeWithPath(
+                _moduleId,
+                37,
+                "Controls the line height in pixels of markdown cells in notebooks. When set to {0}, {1} will be used",
+                '`0`',
+                '`normal`'
+            )),
+            type: 'number',
+            default: 0,
+            tags: ['notebookLayout']
+        },
         [NotebookSetting.cellEditorOptionsCustomizations]: editorOptionsCustomizationSchema,
         [NotebookSetting.interactiveWindowCollapseCodeCells]: {
             markdownDescription: ( localizeWithPath(
                 _moduleId,
-                37,
+                38,
                 "Controls whether code cells in the interactive window are collapsed by default."
             )),
             type: 'string',
@@ -901,7 +881,7 @@ configurationRegistry.registerConfiguration({
         [NotebookSetting.outputLineHeight]: {
             markdownDescription: ( localizeWithPath(
                 _moduleId,
-                38,
+                39,
                 "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',
@@ -911,7 +891,7 @@ configurationRegistry.registerConfiguration({
         [NotebookSetting.outputFontSize]: {
             markdownDescription: ( localizeWithPath(
                 _moduleId,
-                39,
+                40,
                 "Font size for the output text within notebook cells. When set to 0, {0} is used.",
                 '`#editor.fontSize#`'
             )),
@@ -922,7 +902,7 @@ configurationRegistry.registerConfiguration({
         [NotebookSetting.outputFontFamily]: {
             markdownDescription: ( localizeWithPath(
                 _moduleId,
-                40,
+                41,
                 "The font family of the output text within notebook cells. When set to empty, the {0} is used.",
                 '`#editor.fontFamily#`'
             )),
@@ -932,7 +912,7 @@ configurationRegistry.registerConfiguration({
         [NotebookSetting.outputScrolling]: {
             markdownDescription: ( localizeWithPath(
                 _moduleId,
-                41,
+                42,
                 "Initially render notebook outputs in a scrollable region when longer than the limit."
             )),
             type: 'boolean',
@@ -940,15 +920,27 @@ configurationRegistry.registerConfiguration({
             default: typeof product$1.quality === 'string' && product$1.quality !== 'stable'
         },
         [NotebookSetting.outputWordWrap]: {
-            markdownDescription: ( localizeWithPath(_moduleId, 42, "Controls whether the lines in output should wrap.")),
+            markdownDescription: ( localizeWithPath(_moduleId, 43, "Controls whether the lines in output should wrap.")),
             type: 'boolean',
             tags: ['notebookLayout', 'notebookOutputLayout'],
             default: false
         },
+        [NotebookSetting.defaultFormatter]: {
+            description: ( localizeWithPath(
+                _moduleId,
+                44,
+                "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'],
+            default: null,
+            enum: DefaultFormatter.extensionIds,
+            enumItemLabels: DefaultFormatter.extensionItemLabels,
+            markdownEnumDescriptions: DefaultFormatter.extensionDescriptions
+        },
         [NotebookSetting.formatOnSave]: {
             markdownDescription: ( localizeWithPath(
                 _moduleId,
-                43,
+                45,
                 "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',
@@ -958,7 +950,7 @@ configurationRegistry.registerConfiguration({
         [NotebookSetting.insertFinalNewline]: {
             markdownDescription: ( localizeWithPath(
                 _moduleId,
-                44,
+                46,
                 "When enabled, insert a final new line into the end of code cells when saving a notebook."
             )),
             type: 'boolean',
@@ -968,20 +960,20 @@ configurationRegistry.registerConfiguration({
         [NotebookSetting.codeActionsOnSave]: {
             markdownDescription: ( localizeWithPath(
                 _moduleId,
-                45,
+                47,
                 'Run a series of Code Actions for a notebook on save. Code Actions must be specified, the file must not be saved after delay, and the editor must not be shutting down. Example: `"notebook.source.organizeImports": "explicit"`'
             )),
             type: 'object',
             additionalProperties: {
                 type: ['string', 'boolean'],
                 enum: ['explicit', 'never', true, false],
-                enumDescriptions: [( localizeWithPath(_moduleId, 46, 'Triggers Code Actions only when explicitly saved.')), ( localizeWithPath(_moduleId, 47, 'Never triggers Code Actions on save.')), ( localizeWithPath(
+                enumDescriptions: [( localizeWithPath(_moduleId, 48, 'Triggers Code Actions only when explicitly saved.')), ( localizeWithPath(_moduleId, 49, 'Never triggers Code Actions on save.')), ( localizeWithPath(
                     _moduleId,
-                    48,
+                    50,
                     'Triggers Code Actions only when explicitly saved. This value will be deprecated in favor of "explicit".'
                 )), ( localizeWithPath(
                     _moduleId,
-                    49,
+                    51,
                     'Triggers Code Actions only when explicitly saved. This value will be deprecated in favor of "never".'
                 ))],
             },
@@ -990,7 +982,7 @@ configurationRegistry.registerConfiguration({
         [NotebookSetting.formatOnCellExecution]: {
             markdownDescription: ( localizeWithPath(
                 _moduleId,
-                50,
+                52,
                 "Format a notebook cell upon execution. A formatter must be available."
             )),
             type: 'boolean',
@@ -999,16 +991,16 @@ configurationRegistry.registerConfiguration({
         [NotebookSetting.confirmDeleteRunningCell]: {
             markdownDescription: ( localizeWithPath(
                 _moduleId,
-                51,
+                53,
                 "Control whether a confirmation prompt is required to delete a running cell."
             )),
             type: 'boolean',
             default: true
         },
-        [NotebookSetting.findScope]: {
+        [NotebookSetting.findFilters]: {
             markdownDescription: ( localizeWithPath(
                 _moduleId,
-                52,
+                54,
                 "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',
@@ -1038,40 +1030,50 @@ configurationRegistry.registerConfiguration({
             },
             tags: ['notebookLayout']
         },
+        [NotebookSetting.findScope]: {
+            markdownDescription: ( localizeWithPath(
+                _moduleId,
+                55,
+                "Enables the user to search within a selection of cells in the notebook. When enabled, the user will see a \"Find in Cell Selection\" icon in the notebook find widget."
+            )),
+            type: 'boolean',
+            default: false,
+        },
         [NotebookSetting.remoteSaving]: {
             markdownDescription: ( localizeWithPath(
                 _moduleId,
-                53,
-                "Enables the incremental saving of notebooks in Remote environment. When enabled, only the changes to the notebook are sent to the extension host, improving performance for large notebooks and slow network connections."
+                56,
+                "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',
-            default: typeof product$1.quality === 'string' && product$1.quality !== 'stable'
+            default: typeof product$1.quality === 'string' && product$1.quality !== 'stable',
+            tags: ['experimental']
         },
         [NotebookSetting.scrollToRevealCell]: {
             markdownDescription: ( localizeWithPath(
                 _moduleId,
-                54,
+                57,
                 "How far to scroll when revealing the next cell upon running {0}.",
                 'notebook.cell.executeAndSelectBelow'
             )),
             type: 'string',
             enum: ['fullCell', 'firstLine', 'none'],
             markdownEnumDescriptions: [
-                ( localizeWithPath(_moduleId, 55, 'Scroll to fully reveal the next cell.')),
-                ( localizeWithPath(_moduleId, 56, 'Scroll to reveal the first line of the next cell.')),
-                ( localizeWithPath(_moduleId, 57, 'Do not scroll.')),
+                ( localizeWithPath(_moduleId, 58, 'Scroll to fully reveal the next cell.')),
+                ( localizeWithPath(_moduleId, 59, 'Scroll to reveal the first line of the next cell.')),
+                ( localizeWithPath(_moduleId, 60, 'Do not scroll.')),
             ],
             default: 'fullCell'
         },
         [NotebookSetting.cellChat]: {
-            markdownDescription: ( localizeWithPath(_moduleId, 58, "Enable experimental floating chat widget in notebooks.")),
+            markdownDescription: ( localizeWithPath(_moduleId, 61, "Enable experimental floating chat widget in notebooks.")),
             type: 'boolean',
             default: false
         },
         [NotebookSetting.cellGenerate]: {
             markdownDescription: ( localizeWithPath(
                 _moduleId,
-                59,
+                62,
                 "Enable experimental generate action to create code cell with inline chat enabled."
             )),
             type: 'boolean',
@@ -1081,21 +1083,21 @@ configurationRegistry.registerConfiguration({
         [NotebookSetting.notebookVariablesView]: {
             markdownDescription: ( localizeWithPath(
                 _moduleId,
-                60,
+                63,
                 "Enable the experimental notebook variables view within the debug panel."
             )),
             type: 'boolean',
             default: false
         },
         [NotebookSetting.cellFailureDiagnostics]: {
-            markdownDescription: ( localizeWithPath(_moduleId, 61, "Show available diagnostics for cell failures.")),
+            markdownDescription: ( localizeWithPath(_moduleId, 64, "Show available diagnostics for cell failures.")),
             type: 'boolean',
             default: true
         },
         [NotebookSetting.outputBackupSizeLimit]: {
             markdownDescription: ( localizeWithPath(
                 _moduleId,
-                62,
+                65,
                 "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

@@ -0,0 +1,94 @@
+import { NOTEBOOK_IS_ACTIVE_EDITOR } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
+import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { AccessibleViewType, AccessibleViewProviderId } from 'vscode/vscode/vs/platform/accessibility/browser/accessibleView';
+import { AccessibilityVerbositySettingId } from 'vscode/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
+import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
+import { ICodeEditorService } from 'vscode/vscode/vs/editor/browser/services/codeEditorService';
+
+const _moduleId = "vs/workbench/contrib/notebook/browser/notebookAccessibilityHelp";
+class NotebookAccessibilityHelp {
+    constructor() {
+        this.priority = 105;
+        this.name = 'notebook';
+        this.when = NOTEBOOK_IS_ACTIVE_EDITOR;
+        this.type = AccessibleViewType.Help;
+    }
+    getProvider(accessor) {
+        const activeEditor = accessor.get(ICodeEditorService).getActiveCodeEditor()
+            || accessor.get(ICodeEditorService).getFocusedCodeEditor()
+            || accessor.get(IEditorService).activeEditorPane;
+        if (activeEditor) {
+            return runAccessibilityHelpAction(accessor, activeEditor);
+        }
+        return;
+    }
+    dispose() { }
+}
+function getAccessibilityHelpText() {
+    return [
+        ( localizeWithPath(
+            _moduleId,
+            0,
+            'The notebook view is a collection of code and markdown cells. Code cells can be executed and will produce output directly below the cell.'
+        )),
+        ( localizeWithPath(
+            _moduleId,
+            1,
+            'The Edit Cell command<keybinding:notebook.cell.edit> will focus on the cell input.'
+        )),
+        ( localizeWithPath(
+            _moduleId,
+            2,
+            '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.'
+        )),
+        ( localizeWithPath(
+            _moduleId,
+            3,
+            'The Focus Output command<keybinding:notebook.cell.focusInOutput> will set focus in the cell\'s output.'
+        )),
+        ( localizeWithPath(
+            _moduleId,
+            4,
+            'The Focus Next Cell Editor command<keybinding:notebook.focusNextEditor> will set focus in the next cell\'s editor.'
+        )),
+        ( localizeWithPath(
+            _moduleId,
+            5,
+            'The Focus Previous Cell Editor command<keybinding:notebook.focusPreviousEditor> will set focus in the previous cell\'s editor.'
+        )),
+        ( localizeWithPath(
+            _moduleId,
+            6,
+            'The up and down arrows will also move focus between cells while focused on the outer cell container.'
+        )),
+        ( localizeWithPath(
+            _moduleId,
+            7,
+            'The Execute Cell command<keybinding:notebook.cell.executeAndFocusContainer> executes the cell that currently has focus.'
+        )),
+        ( localizeWithPath(
+            _moduleId,
+            8,
+            'The Insert Cell Above/Below commands will create new empty code cells'
+        )),
+        ( localizeWithPath(
+            _moduleId,
+            9,
+            'The Change Cell to Code/Markdown commands are used to switch between cell types.'
+        ))
+    ].join('\n\n');
+}
+function runAccessibilityHelpAction(accessor, editor) {
+    const helpText = getAccessibilityHelpText();
+    return {
+        id: AccessibleViewProviderId.Notebook,
+        verbositySettingKey: AccessibilityVerbositySettingId.Notebook,
+        provideContent: () => helpText,
+        onClose: () => {
+            editor.focus();
+        },
+        options: { type: AccessibleViewType.Help }
+    };
+}
+
+export { NotebookAccessibilityHelp, getAccessibilityHelpText, runAccessibilityHelpAction };

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

@@ -0,0 +1,73 @@
+import { AccessibleViewType, AccessibleViewProviderId } from 'vscode/vscode/vs/platform/accessibility/browser/accessibleView';
+import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
+import { AccessibilityVerbositySettingId } from 'vscode/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
+import { getNotebookEditorFromEditorPane } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { NOTEBOOK_OUTPUT_FOCUSED } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
+import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
+
+class NotebookAccessibleView {
+    constructor() {
+        this.priority = 100;
+        this.name = 'notebook';
+        this.type = AccessibleViewType.View;
+        this.when = ( ContextKeyExpr.and(NOTEBOOK_OUTPUT_FOCUSED, ( ContextKeyExpr.equals('resourceExtname', '.ipynb'))));
+    }
+    getProvider(accessor) {
+        const editorService = accessor.get(IEditorService);
+        return showAccessibleOutput(editorService);
+    }
+    dispose() { }
+}
+function showAccessibleOutput(editorService) {
+    const activePane = editorService.activeEditorPane;
+    const notebookEditor = getNotebookEditorFromEditorPane(activePane);
+    const notebookViewModel = notebookEditor?.getViewModel();
+    const selections = notebookViewModel?.getSelections();
+    const notebookDocument = notebookViewModel?.notebookDocument;
+    if (!selections || !notebookDocument || !notebookEditor?.textModel) {
+        return;
+    }
+    const viewCell = notebookViewModel.viewCells[selections[0].start];
+    let outputContent = '';
+    const decoder = ( new TextDecoder());
+    for (let i = 0; i < viewCell.outputsViewModels.length; i++) {
+        const outputViewModel = viewCell.outputsViewModels[i];
+        const outputTextModel = viewCell.model.outputs[i];
+        const [mimeTypes, pick] = outputViewModel.resolveMimeTypes(notebookEditor.textModel, undefined);
+        const mimeType = mimeTypes[pick].mimeType;
+        let buffer = outputTextModel.outputs.find(output => output.mime === mimeType);
+        if (!buffer || mimeType.startsWith('image')) {
+            buffer = outputTextModel.outputs.find(output => !output.mime.startsWith('image'));
+        }
+        let text = `${mimeType}`;
+        if (buffer) {
+            const charLimit = 100_000;
+            text = decoder.decode(buffer.data.slice(0, charLimit).buffer);
+            if (buffer.data.byteLength > charLimit) {
+                text = text + '...(truncated)';
+            }
+            if (mimeType.endsWith('error')) {
+                text = text.replace(/\\u001b\[[0-9;]*m/gi, '').replaceAll('\\n', '\n');
+            }
+        }
+        const index = viewCell.outputsViewModels.length > 1
+            ? `Cell output ${i + 1} of ${viewCell.outputsViewModels.length}\n`
+            : '';
+        outputContent = outputContent.concat(`${index}${text}\n`);
+    }
+    if (!outputContent) {
+        return;
+    }
+    return {
+        id: AccessibleViewProviderId.Notebook,
+        verbositySettingKey: AccessibilityVerbositySettingId.Notebook,
+        provideContent() { return outputContent; },
+        onClose() {
+            notebookEditor?.setFocus(selections[0]);
+            activePane?.focus();
+        },
+        options: { type: AccessibleViewType.View }
+    };
+}
+
+export { NotebookAccessibleView, showAccessibleOutput };

package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookEditorServiceImpl.js

@@ -6,6 +6,7 @@ import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { NotebookEditorInput, isCompositeNotebookEditorInput } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookEditorInput';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
+import { GroupModelChangeKind } from 'vscode/vscode/vs/workbench/common/editor';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
 import { InteractiveWindowOpen } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
@@ -73,12 +74,12 @@ let NotebookEditorWidgetService = class NotebookEditorWidgetService {
         }));
         const interactiveWindowOpen = InteractiveWindowOpen.bindTo(contextKeyService);
         this._disposables.add(editorService.onDidEditorsChange(e => {
-            if (e.event.kind === 4  && !interactiveWindowOpen.get()) {
+            if (e.event.kind === GroupModelChangeKind.EDITOR_OPEN && !interactiveWindowOpen.get()) {
                 if (editorService.editors.find(editor => editor.editorId === 'interactive')) {
                     interactiveWindowOpen.set(true);
                 }
             }
-            else if (e.event.kind === 5  && interactiveWindowOpen.get()) {
+            else if (e.event.kind === GroupModelChangeKind.EDITOR_CLOSE && interactiveWindowOpen.get()) {
                 if (!editorService.editors.find(editor => editor.editorId === 'interactive')) {
                     interactiveWindowOpen.set(false);
                 }

package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookExecutionStateServiceImpl.js

@@ -8,7 +8,7 @@ import { AccessibilitySignal } from 'vscode/vscode/vs/platform/accessibilitySign
 import { IAccessibilitySignalService } from 'vscode/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService.service';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
-import { CellUri, NotebookCellExecutionState, NotebookExecutionState } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
+import { CellUri, NotebookCellExecutionState, CellEditType, NotebookExecutionState } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { CellExecutionUpdateType } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookExecutionService';
 import { INotebookExecutionService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookExecutionService.service';
 import { NotebookExecutionType } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService';
@@ -334,7 +334,7 @@ NotebookExecutionListeners = ( __decorate([
 function updateToEdit(update, cellHandle) {
     if (update.editType === CellExecutionUpdateType.Output) {
         return {
-            editType: 2 ,
+            editType: CellEditType.Output,
             handle: update.cellHandle,
             append: update.append,
             outputs: update.outputs,
@@ -342,7 +342,7 @@ function updateToEdit(update, cellHandle) {
     }
     else if (update.editType === CellExecutionUpdateType.OutputItems) {
         return {
-            editType: 7 ,
+            editType: CellEditType.OutputItems,
             items: update.items,
             append: update.append,
             outputId: update.outputId
@@ -357,7 +357,7 @@ function updateToEdit(update, cellHandle) {
             newInternalMetadata.runStartTime = update.runStartTime;
         }
         return {
-            editType: 9 ,
+            editType: CellEditType.PartialInternalMetadata,
             handle: cellHandle,
             internalMetadata: newInternalMetadata
         };
@@ -393,7 +393,7 @@ let CellExecution = class CellExecution extends Disposable {
     }
     initialize() {
         const startExecuteEdit = {
-            editType: 9 ,
+            editType: CellEditType.PartialInternalMetadata,
             handle: this.cellHandle,
             internalMetadata: {
                 executionId: generateUuid(),
@@ -449,7 +449,7 @@ let CellExecution = class CellExecution extends Disposable {
         }
         else {
             const edit = {
-                editType: 9 ,
+                editType: CellEditType.PartialInternalMetadata,
                 handle: this.cellHandle,
                 internalMetadata: {
                     lastRunSuccess: completionData.lastRunSuccess,