@codingame/monaco-vscode-notebook-service-override 11.1.2 → 12.0.0

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

@@ -0,0 +1 @@
+export {};

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/multicursor/notebookSelectionHighlight.js

@@ -0,0 +1,124 @@
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
+import { Event } from 'vscode/vscode/vs/base/common/event';
+import { Disposable, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
+import { Selection, SelectionDirection } from 'vscode/vscode/vs/editor/common/core/selection';
+import { CursorChangeReason } from 'vscode/vscode/vs/editor/common/cursorEvents';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
+import { registerNotebookContribution } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/notebook/browser/notebookEditorExtensions';
+
+let NotebookSelectionHighlighter = class NotebookSelectionHighlighter extends Disposable {
+    static { this.id = 'notebook.selectionHighlighter'; }
+    constructor(notebookEditor, configurationService) {
+        super();
+        this.notebookEditor = notebookEditor;
+        this.configurationService = configurationService;
+        this.isEnabled = false;
+        this.cellDecorationIds = ( new Map());
+        this.anchorDisposables = ( new DisposableStore());
+        this.isEnabled = this.configurationService.getValue('editor.selectionHighlight');
+        this._register(this.configurationService.onDidChangeConfiguration(e => {
+            if (e.affectsConfiguration('editor.selectionHighlight')) {
+                this.isEnabled = this.configurationService.getValue('editor.selectionHighlight');
+            }
+        }));
+        this._register(this.notebookEditor.onDidChangeActiveCell(async () => {
+            if (!this.isEnabled) {
+                return;
+            }
+            this.anchorCell = this.notebookEditor.activeCellAndCodeEditor;
+            if (!this.anchorCell) {
+                return;
+            }
+            const activeCell = this.notebookEditor.getActiveCell();
+            if (!activeCell) {
+                return;
+            }
+            if (!activeCell.editorAttached) {
+                await Event.toPromise(activeCell.onDidChangeEditorAttachState);
+            }
+            this.clearNotebookSelectionDecorations();
+            this.anchorDisposables.clear();
+            this.anchorDisposables.add(this.anchorCell[1].onDidChangeCursorPosition((e) => {
+                if (e.reason !== CursorChangeReason.Explicit) {
+                    return;
+                }
+                if (!this.anchorCell) {
+                    return;
+                }
+                if (this.notebookEditor.hasModel()) {
+                    this.clearNotebookSelectionDecorations();
+                    this._update(this.notebookEditor);
+                }
+            }));
+            if (this.notebookEditor.getEditorViewState().editorFocused && this.notebookEditor.hasModel()) {
+                this._update(this.notebookEditor);
+            }
+        }));
+    }
+    _update(editor) {
+        if (!this.anchorCell || !this.isEnabled) {
+            return;
+        }
+        const textModel = this.anchorCell[0].textModel;
+        if (!textModel || textModel.isTooLargeForTokenization()) {
+            return;
+        }
+        const s = this.anchorCell[0].getSelections()[0];
+        if (s.startLineNumber !== s.endLineNumber || s.isEmpty()) {
+            return;
+        }
+        const searchText = this.getSearchText(s, textModel);
+        if (!searchText) {
+            return;
+        }
+        const results = editor.textModel.findMatches(searchText, false, true, null);
+        for (const res of results) {
+            const cell = editor.getCellByHandle(res.cell.handle);
+            if (!cell) {
+                continue;
+            }
+            this.updateCellDecorations(cell, res.matches);
+        }
+    }
+    updateCellDecorations(cell, matches) {
+        const selections = ( matches.map(m => {
+            return Selection.fromRange(m.range, SelectionDirection.LTR);
+        }));
+        const newDecorations = [];
+        selections?.map(selection => {
+            const isEmpty = selection.isEmpty();
+            if (!isEmpty) {
+                newDecorations.push({
+                    range: selection,
+                    options: {
+                        description: '',
+                        className: '.nb-selection-highlight',
+                    }
+                });
+            }
+        });
+        const oldDecorations = this.cellDecorationIds.get(cell) ?? [];
+        this.cellDecorationIds.set(cell, cell.deltaModelDecorations(oldDecorations, newDecorations));
+    }
+    clearNotebookSelectionDecorations() {
+        this.cellDecorationIds.forEach((_, cell) => {
+            const cellDecorations = this.cellDecorationIds.get(cell) ?? [];
+            if (cellDecorations) {
+                cell.deltaModelDecorations(cellDecorations, []);
+                this.cellDecorationIds.delete(cell);
+            }
+        });
+    }
+    getSearchText(selection, model) {
+        return model.getValueInRange(selection).replace(/\r\n/g, '\n');
+    }
+    dispose() {
+        super.dispose();
+        this.anchorDisposables.dispose();
+    }
+};
+NotebookSelectionHighlighter = ( __decorate([
+    ( __param(1, IConfigurationService))
+], NotebookSelectionHighlighter));
+registerNotebookContribution(NotebookSelectionHighlighter.id, NotebookSelectionHighlighter);

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

@@ -0,0 +1 @@
+export declare const CENTER_ACTIVE_CELL = "notebook.centerActiveCell";

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/navigation/arrow.js

@@ -1,4 +1,6 @@
+
 import { timeout } from 'vscode/vscode/vs/base/common/async';
+import { KeyCode, KeyMod } from 'vscode/vscode/vs/base/common/keyCodes';
 import { EditorExtensionsRegistry } from 'vscode/vscode/vs/editor/browser/editorExtensions';
 import { EditorContextKeys } from 'vscode/vscode/vs/editor/common/editorContextKeys';
 import { localize } from 'vscode/vscode/vs/nls';
@@ -7,13 +9,14 @@ import { registerAction2, Action2 } from 'vscode/vscode/vs/platform/actions/comm
 import { Extensions } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { InputFocusedContextKey, IsWindowsContext } from 'vscode/vscode/vs/platform/contextkey/common/contextkeys';
+import { KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
-import { InlineChatController } from '@codingame/monaco-vscode-chat-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
-import { CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION } from '@codingame/monaco-vscode-chat-interactive-notebook-search-common/vscode/vs/workbench/contrib/notebook/browser/controller/chat/notebookChatContext';
-import { NotebookCellAction, NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT, findTargetCellEditor, NotebookAction } from '@codingame/monaco-vscode-chat-interactive-notebook-search-common/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
-import { CellEditState } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { InlineChatController } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
+import { CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/controller/chat/notebookChatContext';
+import { NotebookCellAction, NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT, findTargetCellEditor, NotebookAction } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
+import { CellEditState } from '@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { NOTEBOOK_EDITOR_CURSOR_BOUNDARY, CellKind } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
-import { NOTEBOOK_OUTPUT_INPUT_FOCUSED, NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_CELL_TYPE, NOTEBOOK_CELL_MARKDOWN_EDIT_MODE, NOTEBOOK_CURSOR_NAVIGATION_MODE, NOTEBOOK_OUTPUT_FOCUSED, NOTEBOOK_CELL_EDITOR_FOCUSED, IS_COMPOSITE_NOTEBOOK, NOTEBOOK_CELL_HAS_OUTPUTS } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
+import { NOTEBOOK_OUTPUT_INPUT_FOCUSED, NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_CELL_TYPE, NOTEBOOK_CELL_MARKDOWN_EDIT_MODE, NOTEBOOK_CURSOR_NAVIGATION_MODE, NOTEBOOK_OUTPUT_FOCUSED, NOTEBOOK_CELL_EDITOR_FOCUSED, IS_COMPOSITE_NOTEBOOK, NOTEBOOK_CELL_HAS_OUTPUTS } from '@codingame/monaco-vscode-4a36e358-d94d-55e0-86ee-3bcd543d9d3f-common/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
 
 const NOTEBOOK_FOCUS_TOP = 'notebook.focusTop';
 const NOTEBOOK_FOCUS_BOTTOM = 'notebook.focusBottom';
@@ -31,17 +34,17 @@ registerAction2(class extends Action2 {
         super({
             id: 'notebook.cell.nullAction',
             title: ( localize(
-                8135,
+                7363,
                 "Keypresses that should be handled by the focused element in the cell output."
             )),
             keybinding: [{
                     when: NOTEBOOK_OUTPUT_INPUT_FOCUSED,
-                    primary: 18 ,
-                    weight: 200  + 1
+                    primary: KeyCode.DownArrow,
+                    weight: KeybindingWeight.WorkbenchContrib + 1
                 }, {
                     when: NOTEBOOK_OUTPUT_INPUT_FOCUSED,
-                    primary: 16 ,
-                    weight: 200  + 1
+                    primary: KeyCode.UpArrow,
+                    weight: KeybindingWeight.WorkbenchContrib + 1
                 }],
             f1: false
         });
@@ -54,50 +57,29 @@ registerAction2(class FocusNextCellAction extends NotebookCellAction {
     constructor() {
         super({
             id: NOTEBOOK_FOCUS_NEXT_EDITOR,
-            title: ( localize(8136, 'Focus Next Cell Editor')),
+            title: ( localize(7364, 'Focus Next Cell Editor')),
             keybinding: [
                 {
-                    when: ( (ContextKeyExpr.and(
-                        NOTEBOOK_EDITOR_FOCUSED,
-                         (CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate()),
-                         (ContextKeyExpr.equals('config.notebook.navigation.allowNavigateToSurroundingCells', true)),
-                         (ContextKeyExpr.and(
-                             (ContextKeyExpr.has(InputFocusedContextKey)),
-                            EditorContextKeys.editorTextFocus,
-                             (NOTEBOOK_EDITOR_CURSOR_BOUNDARY.notEqualsTo('top')),
-                             (NOTEBOOK_EDITOR_CURSOR_BOUNDARY.notEqualsTo('none'))
-                        )),
-                         (EditorContextKeys.isEmbeddedDiffEditor.negate())
-                    ))),
-                    primary: 18 ,
+                    when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ( CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate()), ( ContextKeyExpr.equals('config.notebook.navigation.allowNavigateToSurroundingCells', true)), ( ContextKeyExpr.and(( ContextKeyExpr.has(InputFocusedContextKey)), EditorContextKeys.editorTextFocus, ( NOTEBOOK_EDITOR_CURSOR_BOUNDARY.notEqualsTo('top')), ( NOTEBOOK_EDITOR_CURSOR_BOUNDARY.notEqualsTo('none')))), ( EditorContextKeys.isEmbeddedDiffEditor.negate()))),
+                    primary: KeyCode.DownArrow,
                     weight: NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT,
                 },
                 {
-                    when: ( (ContextKeyExpr.and(
-                        NOTEBOOK_EDITOR_FOCUSED,
-                         (CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate()),
-                         (ContextKeyExpr.equals('config.notebook.navigation.allowNavigateToSurroundingCells', true)),
-                         (ContextKeyExpr.and(
-                             (NOTEBOOK_CELL_TYPE.isEqualTo('markup')),
-                             (NOTEBOOK_CELL_MARKDOWN_EDIT_MODE.isEqualTo(false)),
-                            NOTEBOOK_CURSOR_NAVIGATION_MODE
-                        )),
-                         (EditorContextKeys.isEmbeddedDiffEditor.negate())
-                    ))),
-                    primary: 18 ,
-                    weight: 200 ,
+                    when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ( CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate()), ( ContextKeyExpr.equals('config.notebook.navigation.allowNavigateToSurroundingCells', true)), ( ContextKeyExpr.and(( NOTEBOOK_CELL_TYPE.isEqualTo('markup')), ( NOTEBOOK_CELL_MARKDOWN_EDIT_MODE.isEqualTo(false)), NOTEBOOK_CURSOR_NAVIGATION_MODE)), ( EditorContextKeys.isEmbeddedDiffEditor.negate()))),
+                    primary: KeyCode.DownArrow,
+                    weight: KeybindingWeight.WorkbenchContrib,
                 },
                 {
-                    when: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_OUTPUT_FOCUSED))),
-                    primary: 2048  | 18 ,
-                    mac: { primary: 256  | 2048  | 18 , },
-                    weight: 200
+                    when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_OUTPUT_FOCUSED)),
+                    primary: KeyMod.CtrlCmd | KeyCode.DownArrow,
+                    mac: { primary: KeyMod.WinCtrl | KeyMod.CtrlCmd | KeyCode.DownArrow, },
+                    weight: KeybindingWeight.WorkbenchContrib
                 },
                 {
-                    when: ( (ContextKeyExpr.and(NOTEBOOK_CELL_EDITOR_FOCUSED, CONTEXT_ACCESSIBILITY_MODE_ENABLED))),
-                    primary: 2048  | 12 ,
-                    mac: { primary: 256  | 11 , },
-                    weight: 200  + 1
+                    when: ( ContextKeyExpr.and(NOTEBOOK_CELL_EDITOR_FOCUSED, CONTEXT_ACCESSIBILITY_MODE_ENABLED)),
+                    primary: KeyMod.CtrlCmd | KeyCode.PageDown,
+                    mac: { primary: KeyMod.WinCtrl | KeyCode.PageUp, },
+                    weight: KeybindingWeight.WorkbenchContrib + 1
                 },
             ]
         });
@@ -129,44 +111,23 @@ registerAction2(class FocusPreviousCellAction extends NotebookCellAction {
     constructor() {
         super({
             id: NOTEBOOK_FOCUS_PREVIOUS_EDITOR,
-            title: ( localize(8137, 'Focus Previous Cell Editor')),
+            title: ( localize(7365, 'Focus Previous Cell Editor')),
             keybinding: [
                 {
-                    when: ( (ContextKeyExpr.and(
-                        NOTEBOOK_EDITOR_FOCUSED,
-                         (CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate()),
-                         (ContextKeyExpr.equals('config.notebook.navigation.allowNavigateToSurroundingCells', true)),
-                         (ContextKeyExpr.and(
-                             (ContextKeyExpr.has(InputFocusedContextKey)),
-                            EditorContextKeys.editorTextFocus,
-                             (NOTEBOOK_EDITOR_CURSOR_BOUNDARY.notEqualsTo('bottom')),
-                             (NOTEBOOK_EDITOR_CURSOR_BOUNDARY.notEqualsTo('none'))
-                        )),
-                         (EditorContextKeys.isEmbeddedDiffEditor.negate())
-                    ))),
-                    primary: 16 ,
+                    when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ( CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate()), ( ContextKeyExpr.equals('config.notebook.navigation.allowNavigateToSurroundingCells', true)), ( ContextKeyExpr.and(( ContextKeyExpr.has(InputFocusedContextKey)), EditorContextKeys.editorTextFocus, ( NOTEBOOK_EDITOR_CURSOR_BOUNDARY.notEqualsTo('bottom')), ( NOTEBOOK_EDITOR_CURSOR_BOUNDARY.notEqualsTo('none')))), ( EditorContextKeys.isEmbeddedDiffEditor.negate()))),
+                    primary: KeyCode.UpArrow,
                     weight: NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT,
                 },
                 {
-                    when: ( (ContextKeyExpr.and(
-                        NOTEBOOK_EDITOR_FOCUSED,
-                         (CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate()),
-                         (ContextKeyExpr.equals('config.notebook.navigation.allowNavigateToSurroundingCells', true)),
-                         (ContextKeyExpr.and(
-                             (NOTEBOOK_CELL_TYPE.isEqualTo('markup')),
-                             (NOTEBOOK_CELL_MARKDOWN_EDIT_MODE.isEqualTo(false)),
-                            NOTEBOOK_CURSOR_NAVIGATION_MODE
-                        )),
-                         (EditorContextKeys.isEmbeddedDiffEditor.negate())
-                    ))),
-                    primary: 16 ,
-                    weight: 200 ,
+                    when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ( CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate()), ( ContextKeyExpr.equals('config.notebook.navigation.allowNavigateToSurroundingCells', true)), ( ContextKeyExpr.and(( NOTEBOOK_CELL_TYPE.isEqualTo('markup')), ( NOTEBOOK_CELL_MARKDOWN_EDIT_MODE.isEqualTo(false)), NOTEBOOK_CURSOR_NAVIGATION_MODE)), ( EditorContextKeys.isEmbeddedDiffEditor.negate()))),
+                    primary: KeyCode.UpArrow,
+                    weight: KeybindingWeight.WorkbenchContrib,
                 },
                 {
-                    when: ( (ContextKeyExpr.and(NOTEBOOK_CELL_EDITOR_FOCUSED, CONTEXT_ACCESSIBILITY_MODE_ENABLED))),
-                    primary: 2048  | 11 ,
-                    mac: { primary: 256  | 11 , },
-                    weight: 200  + 1
+                    when: ( ContextKeyExpr.and(NOTEBOOK_CELL_EDITOR_FOCUSED, CONTEXT_ACCESSIBILITY_MODE_ENABLED)),
+                    primary: KeyMod.CtrlCmd | KeyCode.PageUp,
+                    mac: { primary: KeyMod.WinCtrl | KeyCode.PageUp, },
+                    weight: KeybindingWeight.WorkbenchContrib + 1
                 },
             ],
         });
@@ -195,21 +156,21 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: NOTEBOOK_FOCUS_TOP,
-            title: ( localize(8138, 'Focus First Cell')),
+            title: ( localize(7366, 'Focus First Cell')),
             keybinding: [
                 {
-                    when: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ContextKeyExpr.not(InputFocusedContextKey)))),
-                    primary: 2048  | 14 ,
-                    weight: 200
+                    when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ContextKeyExpr.not(InputFocusedContextKey))),
+                    primary: KeyMod.CtrlCmd | KeyCode.Home,
+                    weight: KeybindingWeight.WorkbenchContrib
                 },
                 {
-                    when: ( (ContextKeyExpr.and(
+                    when: ( ContextKeyExpr.and(
                         NOTEBOOK_EDITOR_FOCUSED,
                         ContextKeyExpr.not(InputFocusedContextKey),
-                         (CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION.isEqualTo(''))
-                    ))),
-                    mac: { primary: 2048  | 16  },
-                    weight: 200
+                        ( CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION.isEqualTo(''))
+                    )),
+                    mac: { primary: KeyMod.CtrlCmd | KeyCode.UpArrow },
+                    weight: KeybindingWeight.WorkbenchContrib
                 }
             ],
         });
@@ -227,22 +188,22 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: NOTEBOOK_FOCUS_BOTTOM,
-            title: ( localize(8139, 'Focus Last Cell')),
+            title: ( localize(7367, 'Focus Last Cell')),
             keybinding: [
                 {
-                    when: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ContextKeyExpr.not(InputFocusedContextKey)))),
-                    primary: 2048  | 13 ,
+                    when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ContextKeyExpr.not(InputFocusedContextKey))),
+                    primary: KeyMod.CtrlCmd | KeyCode.End,
                     mac: undefined,
-                    weight: 200
+                    weight: KeybindingWeight.WorkbenchContrib
                 },
                 {
-                    when: ( (ContextKeyExpr.and(
+                    when: ( ContextKeyExpr.and(
                         NOTEBOOK_EDITOR_FOCUSED,
                         ContextKeyExpr.not(InputFocusedContextKey),
-                         (CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION.isEqualTo(''))
-                    ))),
-                    mac: { primary: 2048  | 18  },
-                    weight: 200
+                        ( CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION.isEqualTo(''))
+                    )),
+                    mac: { primary: KeyMod.CtrlCmd | KeyCode.DownArrow },
+                    weight: KeybindingWeight.WorkbenchContrib
                 }
             ],
         });
@@ -264,18 +225,17 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: FOCUS_IN_OUTPUT_COMMAND_ID,
-            title: ( localize(8140, 'Focus In Active Cell Output')),
+            title: ( localize(7368, 'Focus In Active Cell Output')),
             keybinding: [{
-                    primary: 2048  | 1024  | 18 ,
-                    mac: { primary: 256  | 2048  | 18 , },
-                    weight: 200
-                },
-                {
-                    when: ( (ContextKeyExpr.and( (IS_COMPOSITE_NOTEBOOK.negate()), IsWindowsContext))),
-                    primary: 2048  | 18 ,
-                    weight: 200
+                    when: ( ContextKeyExpr.and(( IS_COMPOSITE_NOTEBOOK.negate()), IsWindowsContext)),
+                    primary: KeyMod.CtrlCmd | KeyCode.DownArrow,
+                    weight: KeybindingWeight.WorkbenchContrib
+                }, {
+                    primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.DownArrow,
+                    mac: { primary: KeyMod.WinCtrl | KeyMod.CtrlCmd | KeyCode.DownArrow, },
+                    weight: KeybindingWeight.WorkbenchContrib
                 }],
-            precondition: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_CELL_HAS_OUTPUTS)))
+            precondition: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_CELL_HAS_OUTPUTS))
         });
     }
     async runWithContext(accessor, context) {
@@ -288,13 +248,13 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: FOCUS_OUT_OUTPUT_COMMAND_ID,
-            title: ( localize(8141, 'Focus Out Active Cell Output')),
+            title: ( localize(7369, 'Focus Out Active Cell Output')),
             keybinding: {
-                primary: 2048  | 1024  | 16 ,
-                mac: { primary: 256  | 2048  | 16 , },
-                weight: 200
+                primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.UpArrow,
+                mac: { primary: KeyMod.WinCtrl | KeyMod.CtrlCmd | KeyCode.UpArrow, },
+                weight: KeybindingWeight.WorkbenchContrib
             },
-            precondition: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_OUTPUT_FOCUSED))),
+            precondition: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_OUTPUT_FOCUSED)),
         });
     }
     async runWithContext(accessor, context) {
@@ -307,14 +267,14 @@ registerAction2(class CenterActiveCellAction extends NotebookCellAction {
     constructor() {
         super({
             id: CENTER_ACTIVE_CELL,
-            title: ( localize(8142, "Center Active Cell")),
+            title: ( localize(7370, "Center Active Cell")),
             keybinding: {
                 when: NOTEBOOK_EDITOR_FOCUSED,
-                primary: 2048  | 42 ,
+                primary: KeyMod.CtrlCmd | KeyCode.KeyL,
                 mac: {
-                    primary: 256  | 42 ,
+                    primary: KeyMod.WinCtrl | KeyCode.KeyL,
                 },
-                weight: 200
+                weight: KeybindingWeight.WorkbenchContrib
             },
         });
     }
@@ -326,15 +286,11 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: NOTEBOOK_CURSOR_PAGEUP_COMMAND_ID,
-            title: ( localize(8143, "Cell Cursor Page Up")),
+            title: ( localize(7371, "Cell Cursor Page Up")),
             keybinding: [
                 {
-                    when: ( (ContextKeyExpr.and(
-                        NOTEBOOK_EDITOR_FOCUSED,
-                         (ContextKeyExpr.has(InputFocusedContextKey)),
-                        EditorContextKeys.editorTextFocus
-                    ))),
-                    primary: 11 ,
+                    when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ( ContextKeyExpr.has(InputFocusedContextKey)), EditorContextKeys.editorTextFocus)),
+                    primary: KeyCode.PageUp,
                     weight: NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT
                 }
             ]
@@ -348,16 +304,11 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: NOTEBOOK_CURSOR_PAGEUP_SELECT_COMMAND_ID,
-            title: ( localize(8144, "Cell Cursor Page Up Select")),
+            title: ( localize(7372, "Cell Cursor Page Up Select")),
             keybinding: [
                 {
-                    when: ( (ContextKeyExpr.and(
-                        NOTEBOOK_EDITOR_FOCUSED,
-                         (ContextKeyExpr.has(InputFocusedContextKey)),
-                        EditorContextKeys.editorTextFocus,
-                         (NOTEBOOK_OUTPUT_FOCUSED.negate())
-                    ))),
-                    primary: 1024  | 11 ,
+                    when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ( ContextKeyExpr.has(InputFocusedContextKey)), EditorContextKeys.editorTextFocus, ( NOTEBOOK_OUTPUT_FOCUSED.negate()))),
+                    primary: KeyMod.Shift | KeyCode.PageUp,
                     weight: NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT
                 }
             ]
@@ -371,15 +322,11 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: NOTEBOOK_CURSOR_PAGEDOWN_COMMAND_ID,
-            title: ( localize(8145, "Cell Cursor Page Down")),
+            title: ( localize(7373, "Cell Cursor Page Down")),
             keybinding: [
                 {
-                    when: ( (ContextKeyExpr.and(
-                        NOTEBOOK_EDITOR_FOCUSED,
-                         (ContextKeyExpr.has(InputFocusedContextKey)),
-                        EditorContextKeys.editorTextFocus
-                    ))),
-                    primary: 12 ,
+                    when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ( ContextKeyExpr.has(InputFocusedContextKey)), EditorContextKeys.editorTextFocus)),
+                    primary: KeyCode.PageDown,
                     weight: NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT
                 }
             ]
@@ -393,16 +340,11 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: NOTEBOOK_CURSOR_PAGEDOWN_SELECT_COMMAND_ID,
-            title: ( localize(8146, "Cell Cursor Page Down Select")),
+            title: ( localize(7374, "Cell Cursor Page Down Select")),
             keybinding: [
                 {
-                    when: ( (ContextKeyExpr.and(
-                        NOTEBOOK_EDITOR_FOCUSED,
-                         (ContextKeyExpr.has(InputFocusedContextKey)),
-                        EditorContextKeys.editorTextFocus,
-                         (NOTEBOOK_OUTPUT_FOCUSED.negate())
-                    ))),
-                    primary: 1024  | 12 ,
+                    when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ( ContextKeyExpr.has(InputFocusedContextKey)), EditorContextKeys.editorTextFocus, ( NOTEBOOK_OUTPUT_FOCUSED.negate()))),
+                    primary: KeyMod.Shift | KeyCode.PageDown,
                     weight: NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT
                 }
             ]
@@ -418,7 +360,7 @@ function getPageSize(context) {
     const lineHeight = layoutInfo?.fontInfo.lineHeight || 17;
     return Math.max(1, Math.floor((layoutInfo?.height || 0) / lineHeight) - 2);
 }
-( (Registry.as(Extensions.Configuration))).registerConfiguration({
+( Registry.as(Extensions.Configuration)).registerConfiguration({
     id: 'notebook',
     order: 100,
     type: 'object',
@@ -427,7 +369,7 @@ function getPageSize(context) {
             type: 'boolean',
             default: true,
             markdownDescription: ( localize(
-                8147,
+                7375,
                 "When enabled cursor can navigate to the next/previous cell when the current cursor in the cell editor is at the first/last line."
             ))
         }

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

@@ -0,0 +1,2 @@
+import { RawContextKey } from "vscode/vscode/vs/platform/contextkey/common/contextkey";
+export declare const NOTEBOOK_VARIABLE_VIEW_ENABLED: RawContextKey<boolean>;

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariableContextKeys.js

@@ -1,3 +1,4 @@
+
 import { RawContextKey } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 
 const NOTEBOOK_VARIABLE_VIEW_ENABLED = ( new RawContextKey('notebookVariableViewEnabled', false));

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

@@ -0,0 +1,27 @@
+import { Disposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { IConfigurationService } from "vscode/vscode/vs/platform/configuration/common/configuration.service";
+import { IContextKeyService } from "vscode/vscode/vs/platform/contextkey/common/contextkey.service";
+import { IWorkbenchContribution } from "vscode/vscode/vs/workbench/common/contributions";
+import { IViewDescriptorService } from "vscode/vscode/vs/workbench/common/views.service";
+import { INotebookExecutionStateService } from "vscode/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService.service";
+import { INotebookKernelService } from "vscode/vscode/vs/workbench/contrib/notebook/common/notebookKernelService.service";
+import { INotebookService } from "vscode/vscode/vs/workbench/contrib/notebook/common/notebookService.service";
+import { IEditorService } from "vscode/vscode/vs/workbench/services/editor/common/editorService.service";
+export declare class NotebookVariables extends Disposable implements IWorkbenchContribution {
+    private readonly configurationService;
+    private readonly editorService;
+    private readonly notebookExecutionStateService;
+    private readonly notebookKernelService;
+    private readonly notebookDocumentService;
+    private readonly viewDescriptorService;
+    private listeners;
+    private configListener;
+    private initialized;
+    private viewEnabled;
+    constructor(contextKeyService: IContextKeyService, configurationService: IConfigurationService, editorService: IEditorService, notebookExecutionStateService: INotebookExecutionStateService, notebookKernelService: INotebookKernelService, notebookDocumentService: INotebookService, viewDescriptorService: IViewDescriptorService);
+    private handleConfigChange;
+    private handleInitEvent;
+    private hasVariableProvider;
+    private initializeView;
+    dispose(): void;
+}

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

@@ -1,4 +1,5 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { localize2 } from 'vscode/vscode/vs/nls';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
@@ -10,8 +11,8 @@ import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views.
 import { VIEWLET_ID } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
 import { NOTEBOOK_VARIABLE_VIEW_ENABLED } from './notebookVariableContextKeys.js';
 import { NotebookVariablesView } from './notebookVariablesView.js';
-import { getNotebookEditorFromEditorPane } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { variablesViewIcon } from '@codingame/monaco-vscode-chat-interactive-notebook-search-common/vscode/vs/workbench/contrib/notebook/browser/notebookIcons';
+import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { variablesViewIcon } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/notebookIcons';
 import { NotebookSetting } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { INotebookExecutionStateService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService.service';
 import { INotebookKernelService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookKernelService.service';
@@ -60,10 +61,10 @@ let NotebookVariables = class NotebookVariables extends Disposable {
     initializeView() {
         const debugViewContainer = this.viewDescriptorService.getViewContainerById(VIEWLET_ID);
         if (debugViewContainer) {
-            const viewsRegistry = ( (Registry.as(Extensions.ViewsRegistry)));
+            const viewsRegistry = ( Registry.as(Extensions.ViewsRegistry));
             const viewDescriptor = {
-                id: 'workbench.notebook.variables', name: ( localize2(8223, "Notebook Variables")),
-                containerIcon: variablesViewIcon, ctorDescriptor: ( (new SyncDescriptor(NotebookVariablesView))),
+                id: 'workbench.notebook.variables', name: ( localize2(7378, "Notebook Variables")),
+                containerIcon: variablesViewIcon, ctorDescriptor: ( new SyncDescriptor(NotebookVariablesView)),
                 order: 50, weight: 5, canToggleVisibility: true, canMoveView: true, collapsed: false, when: NOTEBOOK_VARIABLE_VIEW_ENABLED
             };
             viewsRegistry.registerViews([viewDescriptor], debugViewContainer);
@@ -77,14 +78,14 @@ let NotebookVariables = class NotebookVariables extends Disposable {
         this.configListener.dispose();
     }
 };
-NotebookVariables = ( (__decorate([
-    ( (__param(0, IContextKeyService))),
-    ( (__param(1, IConfigurationService))),
-    ( (__param(2, IEditorService))),
-    ( (__param(3, INotebookExecutionStateService))),
-    ( (__param(4, INotebookKernelService))),
-    ( (__param(5, INotebookService))),
-    ( (__param(6, IViewDescriptorService)))
-], NotebookVariables)));
+NotebookVariables = ( __decorate([
+    ( __param(0, IContextKeyService)),
+    ( __param(1, IConfigurationService)),
+    ( __param(2, IEditorService)),
+    ( __param(3, INotebookExecutionStateService)),
+    ( __param(4, INotebookKernelService)),
+    ( __param(5, INotebookService)),
+    ( __param(6, IViewDescriptorService))
+], NotebookVariables));
 
 export { NotebookVariables };