@codingame/monaco-vscode-notebook-service-override 2.2.2 → 3.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-notebook-service-override",
-  "version": "2.2.2",
+  "version": "3.0.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,7 +18,7 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@2.2.2",
+    "vscode": "npm:@codingame/monaco-vscode-api@3.0.0",
     "vscode-marked": "npm:marked@=3.0.2"
   },
   "exports": {

package/vscode/src/vs/workbench/contrib/codeEditor/browser/emptyTextEditorHint/emptyTextEditorHint.js

@@ -61,6 +61,11 @@ let EmptyTextEditorHintContribution = class EmptyTextEditorHintContribution {
         this.toDispose.push(this.editor.onDidChangeModelContent(() => this.update()));
         this.toDispose.push(this.inlineChatService.onDidChangeProviders(() => this.update()));
         this.toDispose.push(this.editor.onDidChangeModelDecorations(() => this.update()));
+        this.toDispose.push(this.editor.onDidChangeConfiguration((e) => {
+            if (e.hasChanged(91 )) {
+                this.update();
+            }
+        }));
         this.toDispose.push(this.configurationService.onDidChangeConfiguration(e => {
             if (e.affectsConfiguration(emptyTextEditorHintSetting)) {
                 this.update();
@@ -85,7 +90,7 @@ let EmptyTextEditorHintContribution = class EmptyTextEditorHintContribution {
         if (configValue === 'hidden') {
             return false;
         }
-        if (this.editor.getOption(90 )) {
+        if (this.editor.getOption(91 )) {
             return false;
         }
         const model = this.editor.getModel();

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

@@ -1,7 +1,7 @@
 import { KeyChord } from 'vscode/vscode/vs/base/common/keyCodes';
 import { Mimes } from 'vscode/vscode/vs/base/common/mime';
 import { IBulkEditService, ResourceTextEdit } from 'vscode/vscode/vs/editor/browser/services/bulkEditService';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize2WithPath, localizeWithPath } from 'vscode/vscode/vs/nls';
 import { registerAction2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { InputFocusedContext, InputFocusedContextKey } from 'vscode/vscode/vs/platform/contextkey/common/contextkeys';
@@ -24,14 +24,11 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: MOVE_CELL_UP_COMMAND_ID,
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/notebook/browser/contrib/cellCommands/cellCommands',
-                    'notebookActions.moveCellUp',
-                    "Move Cell Up"
-                )),
-                original: 'Move Cell Up'
-            },
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/notebook/browser/contrib/cellCommands/cellCommands',
+                'notebookActions.moveCellUp',
+                "Move Cell Up"
+            )),
             icon: moveUpIcon,
             keybinding: {
                 primary: 512  | 16 ,
@@ -54,14 +51,11 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: MOVE_CELL_DOWN_COMMAND_ID,
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/notebook/browser/contrib/cellCommands/cellCommands',
-                    'notebookActions.moveCellDown',
-                    "Move Cell Down"
-                )),
-                original: 'Move Cell Down'
-            },
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/notebook/browser/contrib/cellCommands/cellCommands',
+                'notebookActions.moveCellDown',
+                "Move Cell Down"
+            )),
             icon: moveDownIcon,
             keybinding: {
                 primary: 512  | 18 ,
@@ -84,14 +78,11 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: COPY_CELL_UP_COMMAND_ID,
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/notebook/browser/contrib/cellCommands/cellCommands',
-                    'notebookActions.copyCellUp',
-                    "Copy Cell Up"
-                )),
-                original: 'Copy Cell Up'
-            },
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/notebook/browser/contrib/cellCommands/cellCommands',
+                'notebookActions.copyCellUp',
+                "Copy Cell Up"
+            )),
             keybinding: {
                 primary: 512  | 1024  | 16 ,
                 when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ( InputFocusedContext.toNegated()))),
@@ -107,14 +98,11 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: COPY_CELL_DOWN_COMMAND_ID,
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/notebook/browser/contrib/cellCommands/cellCommands',
-                    'notebookActions.copyCellDown',
-                    "Copy Cell Down"
-                )),
-                original: 'Copy Cell Down'
-            },
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/notebook/browser/contrib/cellCommands/cellCommands',
+                'notebookActions.copyCellDown',
+                "Copy Cell Down"
+            )),
             keybinding: {
                 primary: 512  | 1024  | 18 ,
                 when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ( InputFocusedContext.toNegated()))),
@@ -140,14 +128,11 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: SPLIT_CELL_COMMAND_ID,
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/notebook/browser/contrib/cellCommands/cellCommands',
-                    'notebookActions.splitCell',
-                    "Split Cell"
-                )),
-                original: 'Split Cell'
-            },
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/notebook/browser/contrib/cellCommands/cellCommands',
+                'notebookActions.splitCell',
+                "Split Cell"
+            )),
             menu: {
                 id: MenuId.NotebookCellTitle,
                 when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_CELL_EDITABLE, ( NOTEBOOK_CELL_INPUT_COLLAPSED.toNegated()))),
@@ -213,14 +198,11 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: JOIN_CELL_ABOVE_COMMAND_ID,
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/notebook/browser/contrib/cellCommands/cellCommands',
-                    'notebookActions.joinCellAbove',
-                    "Join With Previous Cell"
-                )),
-                original: 'Join With Previous Cell'
-            },
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/notebook/browser/contrib/cellCommands/cellCommands',
+                'notebookActions.joinCellAbove',
+                "Join With Previous Cell"
+            )),
             keybinding: {
                 when: NOTEBOOK_EDITOR_FOCUSED,
                 primary: 256  | 512  | 1024  | 40 ,
@@ -243,14 +225,11 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: JOIN_CELL_BELOW_COMMAND_ID,
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/notebook/browser/contrib/cellCommands/cellCommands',
-                    'notebookActions.joinCellBelow',
-                    "Join With Next Cell"
-                )),
-                original: 'Join With Next Cell'
-            },
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/notebook/browser/contrib/cellCommands/cellCommands',
+                'notebookActions.joinCellBelow',
+                "Join With Next Cell"
+            )),
             keybinding: {
                 when: NOTEBOOK_EDITOR_FOCUSED,
                 primary: 256  | 512  | 40 ,
@@ -273,14 +252,11 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: JOIN_SELECTED_CELLS_COMMAND_ID,
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/notebook/browser/contrib/cellCommands/cellCommands',
-                    'notebookActions.joinSelectedCells',
-                    "Join Selected Cells"
-                )),
-                original: 'Join Selected Cells'
-            },
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/notebook/browser/contrib/cellCommands/cellCommands',
+                'notebookActions.joinSelectedCells',
+                "Join Selected Cells"
+            )),
             menu: {
                 id: MenuId.NotebookCellTitle,
                 when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_EDITOR_EDITABLE)),
@@ -301,14 +277,11 @@ registerAction2(class ChangeCellToCodeAction extends NotebookMultiCellAction {
     constructor() {
         super({
             id: CHANGE_CELL_TO_CODE_COMMAND_ID,
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/notebook/browser/contrib/cellCommands/cellCommands',
-                    'notebookActions.changeCellToCode',
-                    "Change Cell to Code"
-                )),
-                original: 'Change Cell to Code'
-            },
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/notebook/browser/contrib/cellCommands/cellCommands',
+                'notebookActions.changeCellToCode',
+                "Change Cell to Code"
+            )),
             keybinding: {
                 when: ( ContextKeyExpr.and(
                     NOTEBOOK_EDITOR_FOCUSED,
@@ -339,14 +312,11 @@ registerAction2(class ChangeCellToMarkdownAction extends NotebookMultiCellAction
     constructor() {
         super({
             id: CHANGE_CELL_TO_MARKDOWN_COMMAND_ID,
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/notebook/browser/contrib/cellCommands/cellCommands',
-                    'notebookActions.changeCellToMarkdown',
-                    "Change Cell to Markdown"
-                )),
-                original: 'Change Cell to Markdown'
-            },
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/notebook/browser/contrib/cellCommands/cellCommands',
+                'notebookActions.changeCellToMarkdown',
+                "Change Cell to Markdown"
+            )),
             keybinding: {
                 when: ( ContextKeyExpr.and(
                     NOTEBOOK_EDITOR_FOCUSED,
@@ -385,14 +355,11 @@ registerAction2(class CollapseCellInputAction extends NotebookMultiCellAction {
     constructor() {
         super({
             id: COLLAPSE_CELL_INPUT_COMMAND_ID,
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/notebook/browser/contrib/cellCommands/cellCommands',
-                    'notebookActions.collapseCellInput',
-                    "Collapse Cell Input"
-                )),
-                original: 'Collapse Cell Input'
-            },
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/notebook/browser/contrib/cellCommands/cellCommands',
+                'notebookActions.collapseCellInput',
+                "Collapse Cell Input"
+            )),
             keybinding: {
                 when: ( ContextKeyExpr.and(NOTEBOOK_CELL_LIST_FOCUSED, ( NOTEBOOK_CELL_INPUT_COLLAPSED.toNegated()), ( InputFocusedContext.toNegated()))),
                 primary: KeyChord(2048  | 41 , 2048  | 33 ),
@@ -416,14 +383,11 @@ registerAction2(class ExpandCellInputAction extends NotebookMultiCellAction {
     constructor() {
         super({
             id: EXPAND_CELL_INPUT_COMMAND_ID,
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/notebook/browser/contrib/cellCommands/cellCommands',
-                    'notebookActions.expandCellInput',
-                    "Expand Cell Input"
-                )),
-                original: 'Expand Cell Input'
-            },
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/notebook/browser/contrib/cellCommands/cellCommands',
+                'notebookActions.expandCellInput',
+                "Expand Cell Input"
+            )),
             keybinding: {
                 when: ( ContextKeyExpr.and(NOTEBOOK_CELL_LIST_FOCUSED, NOTEBOOK_CELL_INPUT_COLLAPSED)),
                 primary: KeyChord(2048  | 41 , 2048  | 33 ),
@@ -447,14 +411,11 @@ registerAction2(class CollapseCellOutputAction extends NotebookMultiCellAction {
     constructor() {
         super({
             id: COLLAPSE_CELL_OUTPUT_COMMAND_ID,
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/notebook/browser/contrib/cellCommands/cellCommands',
-                    'notebookActions.collapseCellOutput',
-                    "Collapse Cell Output"
-                )),
-                original: 'Collapse Cell Output'
-            },
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/notebook/browser/contrib/cellCommands/cellCommands',
+                'notebookActions.collapseCellOutput',
+                "Collapse Cell Output"
+            )),
             keybinding: {
                 when: ( ContextKeyExpr.and(NOTEBOOK_CELL_LIST_FOCUSED, ( NOTEBOOK_CELL_OUTPUT_COLLAPSED.toNegated()), ( InputFocusedContext.toNegated()), NOTEBOOK_CELL_HAS_OUTPUTS)),
                 primary: KeyChord(2048  | 41 , 50 ),
@@ -475,14 +436,11 @@ registerAction2(class ExpandCellOuputAction extends NotebookMultiCellAction {
     constructor() {
         super({
             id: EXPAND_CELL_OUTPUT_COMMAND_ID,
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/notebook/browser/contrib/cellCommands/cellCommands',
-                    'notebookActions.expandCellOutput',
-                    "Expand Cell Output"
-                )),
-                original: 'Expand Cell Output'
-            },
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/notebook/browser/contrib/cellCommands/cellCommands',
+                'notebookActions.expandCellOutput',
+                "Expand Cell Output"
+            )),
             keybinding: {
                 when: ( ContextKeyExpr.and(NOTEBOOK_CELL_LIST_FOCUSED, NOTEBOOK_CELL_OUTPUT_COLLAPSED)),
                 primary: KeyChord(2048  | 41 , 50 ),
@@ -504,14 +462,11 @@ registerAction2(class extends NotebookMultiCellAction {
         super({
             id: TOGGLE_CELL_OUTPUTS_COMMAND_ID,
             precondition: NOTEBOOK_CELL_LIST_FOCUSED,
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/notebook/browser/contrib/cellCommands/cellCommands',
-                    'notebookActions.toggleOutputs',
-                    "Toggle Outputs"
-                )),
-                original: 'Toggle Outputs'
-            },
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/notebook/browser/contrib/cellCommands/cellCommands',
+                'notebookActions.toggleOutputs',
+                "Toggle Outputs"
+            )),
             metadata: {
                 description: ( localizeWithPath(
                     'vs/workbench/contrib/notebook/browser/contrib/cellCommands/cellCommands',
@@ -542,14 +497,11 @@ registerAction2(class CollapseAllCellInputsAction extends NotebookMultiCellActio
     constructor() {
         super({
             id: COLLAPSE_ALL_CELL_INPUTS_COMMAND_ID,
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/notebook/browser/contrib/cellCommands/cellCommands',
-                    'notebookActions.collapseAllCellInput',
-                    "Collapse All Cell Inputs"
-                )),
-                original: 'Collapse All Cell Inputs'
-            },
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/notebook/browser/contrib/cellCommands/cellCommands',
+                'notebookActions.collapseAllCellInput',
+                "Collapse All Cell Inputs"
+            )),
             f1: true,
         });
     }
@@ -561,14 +513,11 @@ registerAction2(class ExpandAllCellInputsAction extends NotebookMultiCellAction
     constructor() {
         super({
             id: EXPAND_ALL_CELL_INPUTS_COMMAND_ID,
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/notebook/browser/contrib/cellCommands/cellCommands',
-                    'notebookActions.expandAllCellInput',
-                    "Expand All Cell Inputs"
-                )),
-                original: 'Expand All Cell Inputs'
-            },
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/notebook/browser/contrib/cellCommands/cellCommands',
+                'notebookActions.expandAllCellInput',
+                "Expand All Cell Inputs"
+            )),
             f1: true
         });
     }
@@ -580,14 +529,11 @@ registerAction2(class CollapseAllCellOutputsAction extends NotebookMultiCellActi
     constructor() {
         super({
             id: COLLAPSE_ALL_CELL_OUTPUTS_COMMAND_ID,
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/notebook/browser/contrib/cellCommands/cellCommands',
-                    'notebookActions.collapseAllCellOutput',
-                    "Collapse All Cell Outputs"
-                )),
-                original: 'Collapse All Cell Outputs'
-            },
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/notebook/browser/contrib/cellCommands/cellCommands',
+                'notebookActions.collapseAllCellOutput',
+                "Collapse All Cell Outputs"
+            )),
             f1: true,
         });
     }
@@ -599,14 +545,11 @@ registerAction2(class ExpandAllCellOutputsAction extends NotebookMultiCellAction
     constructor() {
         super({
             id: EXPAND_ALL_CELL_OUTPUTS_COMMAND_ID,
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/notebook/browser/contrib/cellCommands/cellCommands',
-                    'notebookActions.expandAllCellOutput',
-                    "Expand All Cell Outputs"
-                )),
-                original: 'Expand All Cell Outputs'
-            },
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/notebook/browser/contrib/cellCommands/cellCommands',
+                'notebookActions.expandAllCellOutput',
+                "Expand All Cell Outputs"
+            )),
             f1: true
         });
     }
@@ -618,14 +561,11 @@ registerAction2(class ToggleCellOutputScrolling extends NotebookMultiCellAction
     constructor() {
         super({
             id: TOGGLE_CELL_OUTPUT_SCROLLING,
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/notebook/browser/contrib/cellCommands/cellCommands',
-                    'notebookActions.toggleScrolling',
-                    "Toggle Scroll Cell Output"
-                )),
-                original: 'Toggle Scroll Cell Output'
-            },
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/notebook/browser/contrib/cellCommands/cellCommands',
+                'notebookActions.toggleScrolling',
+                "Toggle Scroll Cell Output"
+            )),
             keybinding: {
                 when: ( ContextKeyExpr.and(NOTEBOOK_CELL_LIST_FOCUSED, ( InputFocusedContext.toNegated()), NOTEBOOK_CELL_HAS_OUTPUTS)),
                 primary: KeyChord(2048  | 41 , 55 ),

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/clipboard/notebookClipboard.js

@@ -1,11 +1,10 @@
 import { __decorate, __param } from '../../../../../../../../../external/tslib/tslib.es6.js';
 import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
-import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
-import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
+import { registerWorkbenchContribution2 } from 'vscode/vscode/vs/workbench/common/contributions';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
 import { NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_CELL_EDITABLE } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
-import { expandCellRangesWithHiddenCells, cellRangeToViewCells, getNotebookEditorFromEditorPane } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { getNotebookEditorFromEditorPane, expandCellRangesWithHiddenCells, cellRangeToViewCells } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { CopyAction, PasteAction, CutAction } from 'vscode/vscode/vs/editor/contrib/clipboard/browser/clipboard';
 import { IClipboardService } from 'vscode/vscode/vs/platform/clipboard/common/clipboardService';
 import { cloneNotebookCellTextModel } from 'vscode/vscode/vs/workbench/contrib/notebook/common/model/notebookCellTextModel';
@@ -217,6 +216,7 @@ function runCutCells(accessor, editor, targetCell) {
     return true;
 }
 let NotebookClipboardContribution = class NotebookClipboardContribution extends Disposable {
+    static { this.ID = 'workbench.contrib.notebookClipboard'; }
     constructor(_editorService) {
         super();
         this._editorService = _editorService;
@@ -323,8 +323,7 @@ let NotebookClipboardContribution = class NotebookClipboardContribution extends
 NotebookClipboardContribution = ( __decorate([
     ( __param(0, IEditorService))
 ], NotebookClipboardContribution));
-const workbenchContributionsRegistry = ( Registry.as(Extensions.Workbench));
-workbenchContributionsRegistry.registerWorkbenchContribution(NotebookClipboardContribution, 2 );
+registerWorkbenchContribution2(NotebookClipboardContribution.ID, NotebookClipboardContribution, 2 );
 const COPY_CELL_COMMAND_ID = 'notebook.cell.copy';
 const CUT_CELL_COMMAND_ID = 'notebook.cell.cut';
 const PASTE_CELL_COMMAND_ID = 'notebook.cell.paste';

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

@@ -1,14 +1,16 @@
 import { __decorate, __param } from '../../../../../../../../../external/tslib/tslib.es6.js';
+import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { Disposable, DisposableStore, MutableDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import { ILanguageFeaturesService } from 'vscode/vscode/vs/editor/common/services/languageFeatures';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
-import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
+import { Extensions, registerWorkbenchContribution2 } from 'vscode/vscode/vs/workbench/common/contributions';
 import { CENTER_ACTIVE_CELL } from '../navigation/arrow.js';
 import { SELECT_KERNEL_ID } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
+import { SELECT_NOTEBOOK_INDENTATION_ID } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/editActions';
 import { getNotebookEditorFromEditorPane } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { NotebookCellsChangeType } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { INotebookKernelService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookKernelService';
@@ -234,5 +236,85 @@ ActiveCellStatus = ( __decorate([
     ( __param(1, IStatusbarService))
 ], ActiveCellStatus));
 ( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(ActiveCellStatus, 3 );
+let NotebookIndentationStatus = class NotebookIndentationStatus extends Disposable {
+    static { this.ID = 'selectNotebookIndentation'; }
+    constructor(_editorService, _statusbarService, _configurationService) {
+        super();
+        this._editorService = _editorService;
+        this._statusbarService = _statusbarService;
+        this._configurationService = _configurationService;
+        this._itemDisposables = this._register(( new DisposableStore()));
+        this._accessor = this._register(( new MutableDisposable()));
+        this._register(this._editorService.onDidActiveEditorChange(() => this._update()));
+        this._register(this._configurationService.onDidChangeConfiguration(e => {
+            if (e.affectsConfiguration('editor') || e.affectsConfiguration('notebook')) {
+                this._update();
+            }
+        }));
+    }
+    _update() {
+        this._itemDisposables.clear();
+        const activeEditor = getNotebookEditorFromEditorPane(this._editorService.activeEditorPane);
+        if (activeEditor) {
+            this._show(activeEditor);
+            this._itemDisposables.add(activeEditor.onDidChangeSelection(() => {
+                this._accessor.clear();
+                this._show(activeEditor);
+            }));
+        }
+        else {
+            this._accessor.clear();
+        }
+    }
+    _show(editor) {
+        if (!editor.hasModel()) {
+            this._accessor.clear();
+            return;
+        }
+        const cellOptions = editor.getActiveCell()?.textModel?.getOptions();
+        if (!cellOptions) {
+            this._accessor.clear();
+            return;
+        }
+        const cellEditorOverridesRaw = editor.notebookOptions.getDisplayOptions().editorOptionsCustomizations;
+        const indentSize = cellEditorOverridesRaw['editor.indentSize'] ?? cellOptions?.indentSize;
+        const insertSpaces = cellEditorOverridesRaw['editor.insertSpaces'] ?? cellOptions?.tabSize;
+        const tabSize = cellEditorOverridesRaw['editor.tabSize'] ?? cellOptions?.insertSpaces;
+        const width = typeof indentSize === 'number' ? indentSize : tabSize;
+        const message = insertSpaces ? `Spaces: ${width}` : `Tab Size: ${width}`;
+        const newText = message;
+        if (!newText) {
+            this._accessor.clear();
+            return;
+        }
+        const entry = {
+            name: ( localizeWithPath(
+                'vs/workbench/contrib/notebook/browser/contrib/editorStatusBar/editorStatusBar',
+                'notebook.indentation',
+                "Notebook Indentation"
+            )),
+            text: newText,
+            ariaLabel: newText,
+            tooltip: ( localizeWithPath(
+                'vs/workbench/contrib/notebook/browser/contrib/editorStatusBar/editorStatusBar',
+                'selectNotebookIndentation',
+                "Select Indentation"
+            )),
+            command: SELECT_NOTEBOOK_INDENTATION_ID
+        };
+        if (!this._accessor.value) {
+            this._accessor.value = this._statusbarService.addEntry(entry, 'notebook.status.indentation', 1 , 100.4);
+        }
+        else {
+            this._accessor.value.update(entry);
+        }
+    }
+};
+NotebookIndentationStatus = ( __decorate([
+    ( __param(0, IEditorService)),
+    ( __param(1, IStatusbarService)),
+    ( __param(2, IConfigurationService))
+], NotebookIndentationStatus));
+registerWorkbenchContribution2(NotebookIndentationStatus.ID, NotebookIndentationStatus, 3 );
 
-export { ActiveCellStatus, KernelStatus };
+export { ActiveCellStatus, KernelStatus, NotebookIndentationStatus };

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/gettingStarted/notebookGettingStarted.js

@@ -1,17 +1,17 @@
 import { __decorate, __param } from '../../../../../../../../../external/tslib/tslib.es6.js';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize2WithPath } from 'vscode/vscode/vs/nls';
+import { Categories } from 'vscode/vscode/vs/platform/action/common/actionCommonCategories';
 import { registerAction2, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
 import { ContextKeyExpr, IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
-import { Categories } from 'vscode/vscode/vs/platform/action/common/actionCommonCategories';
 import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
 import { Memento } from 'vscode/vscode/vs/workbench/common/memento';
-import { HAS_OPENED_NOTEBOOK } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
 import { NotebookSetting } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
+import { HAS_OPENED_NOTEBOOK } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
 import { NotebookEditorInput } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookEditorInput';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
 
@@ -62,14 +62,11 @@ registerAction2(class NotebookClearNotebookLayoutAction extends Action2 {
     constructor() {
         super({
             id: 'workbench.notebook.layout.gettingStarted',
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/notebook/browser/contrib/gettingStarted/notebookGettingStarted',
-                    'workbench.notebook.layout.gettingStarted.label',
-                    "Reset notebook getting started"
-                )),
-                original: 'Reset notebook getting started'
-            },
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/notebook/browser/contrib/gettingStarted/notebookGettingStarted',
+                'workbench.notebook.layout.gettingStarted.label',
+                "Reset notebook getting started"
+            )),
             f1: true,
             precondition: ( ContextKeyExpr.equals(`config.${NotebookSetting.openGettingStarted}`, true)),
             category: Categories.Developer,