@codingame/monaco-vscode-notebook-service-override 25.1.2 → 26.0.0

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

@@ -10,14 +10,12 @@ import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/
 class NotebookAccessibilityHelp {
     constructor() {
         this.priority = 105;
-        this.name = 'notebook';
+        this.name = "notebook";
         this.when = ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ( IS_COMPOSITE_NOTEBOOK.negate())));
         this.type = AccessibleViewType.Help;
     }
     getProvider(accessor) {
-        const activeEditor = accessor.get(ICodeEditorService).getActiveCodeEditor()
-            || accessor.get(ICodeEditorService).getFocusedCodeEditor()
-            || accessor.get(IEditorService).activeEditorPane;
+        const activeEditor = accessor.get(ICodeEditorService).getActiveCodeEditor() || accessor.get(ICodeEditorService).getFocusedCodeEditor() || accessor.get(IEditorService).activeEditorPane;
         if (!activeEditor) {
             return;
         }
@@ -25,66 +23,51 @@ class NotebookAccessibilityHelp {
     }
 }
 function getAccessibilityHelpText() {
-    return [
-        ( localize(
-        9575,
-        '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(
-        9576,
-        'The Edit Cell command{0} will focus on the cell input.',
-        '<keybinding:notebook.cell.edit>'
-    )),
-        ( localize(
-        9577,
-        '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(
-        9578,
-        'The Focus Output command{0} will set focus in the cell\'s output.',
-        '<keybinding:notebook.cell.focusInOutput>'
-    )),
-        ( localize(
-        9579,
-        'The Focus Next Cell Editor command{0} will set focus in the next cell\'s editor.',
-        '<keybinding:notebook.focusNextEditor>'
-    )),
-        ( localize(
-        9580,
-        'The Focus Previous Cell Editor command{0} will set focus in the previous cell\'s editor.',
-        '<keybinding:notebook.focusPreviousEditor>'
-    )),
-        ( localize(
-        9581,
-        'The up and down arrows will also move focus between cells while focused on the outer cell container.'
-    )),
-        ( localize(
-        9582,
-        'The Execute Cell command{0} executes the cell that currently has focus.',
-        '<keybinding:notebook.cell.executeAndFocusContainer>'
-    )),
-        ( localize(
-        9583,
-        'The Insert Cell Above{0} and Below{1} commands will create new empty code cells.',
-        '<keybinding:notebook.cell.insertCodeCellAbove>',
-        '<keybinding:notebook.cell.insertCodeCellBelow>'
-    )),
-        ( localize(
-        9584,
-        'The Change Cell to Code/Markdown commands are used to switch between cell types.'
-    ))
-    ].join('\n');
+    return [( localize(
+        9895,
+        "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(
+        9896,
+        "The Edit Cell command{0} will focus on the cell input.",
+        "<keybinding:notebook.cell.edit>"
+    )), ( localize(
+        9897,
+        "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(
+        9898,
+        "The Focus Output command{0} will set focus in the cell's output.",
+        "<keybinding:notebook.cell.focusInOutput>"
+    )), ( localize(
+        9899,
+        "The Focus Next Cell Editor command{0} will set focus in the next cell's editor.",
+        "<keybinding:notebook.focusNextEditor>"
+    )), ( localize(
+        9900,
+        "The Focus Previous Cell Editor command{0} will set focus in the previous cell's editor.",
+        "<keybinding:notebook.focusPreviousEditor>"
+    )), ( localize(
+        9901,
+        "The up and down arrows will also move focus between cells while focused on the outer cell container."
+    )), ( localize(
+        9902,
+        "The Execute Cell command{0} executes the cell that currently has focus.",
+        "<keybinding:notebook.cell.executeAndFocusContainer>"
+    )), ( localize(
+        9903,
+        "The Insert Cell Above{0} and Below{1} commands will create new empty code cells.",
+        "<keybinding:notebook.cell.insertCodeCellAbove>",
+        "<keybinding:notebook.cell.insertCodeCellBelow>"
+    )), ( localize(
+        9904,
+        "The Change Cell to Code/Markdown commands are used to switch between cell types."
+    ))].join("\n");
 }
 function getAccessibilityHelpProvider(accessor, editor) {
     const helpText = getAccessibilityHelpText();
-    return ( new AccessibleContentProvider(
-        AccessibleViewProviderId.Notebook,
-        { type: AccessibleViewType.Help },
-        () => helpText,
-        () => editor.focus(),
-        AccessibilityVerbositySettingId.Notebook
-    ));
+    return ( new AccessibleContentProvider(AccessibleViewProviderId.Notebook, {
+        type: AccessibleViewType.Help
+    }, () => helpText, () => editor.focus(), AccessibilityVerbositySettingId.Notebook));
 }
 
 export { NotebookAccessibilityHelp };

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

@@ -11,7 +11,7 @@ import { getAllOutputsText } from '@codingame/monaco-vscode-api/vscode/vs/workbe
 class NotebookAccessibleView {
     constructor() {
         this.priority = 100;
-        this.name = 'notebook';
+        this.name = "notebook";
         this.type = AccessibleViewType.View;
         this.when = ( ContextKeyExpr.and(NOTEBOOK_CELL_LIST_FOCUSED, ( InputFocusedContext.toNegated())));
     }
@@ -34,16 +34,14 @@ function getAccessibleOutputProvider(editorService) {
     if (!outputContent) {
         return;
     }
-    return ( new AccessibleContentProvider(
-        AccessibleViewProviderId.Notebook,
-        { type: AccessibleViewType.View },
-        () => { return outputContent; },
-        () => {
-            notebookEditor?.setFocus(selections[0]);
-            notebookEditor.focus();
-        },
-        AccessibilityVerbositySettingId.Notebook
-    ));
+    return ( new AccessibleContentProvider(AccessibleViewProviderId.Notebook, {
+        type: AccessibleViewType.View
+    }, () => {
+        return outputContent;
+    }, () => {
+        notebookEditor?.setFocus(selections[0]);
+        notebookEditor.focus();
+    }, AccessibilityVerbositySettingId.Notebook));
 }
 
 export { NotebookAccessibleView, getAccessibleOutputProvider };