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

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/format/formatting.js

@@ -1,6 +1,7 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { localize2WithPath, localizeWithPath } from 'vscode/vscode/vs/nls';
 import { CancellationToken } from 'vscode/vscode/vs/base/common/cancellation';
+import { KeyMod, KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
 import { DisposableStore, Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { registerEditorAction, EditorAction } from 'vscode/vscode/vs/editor/browser/editorExtensions';
 import { IBulkEditService, ResourceTextEdit } from 'vscode/vscode/vs/editor/browser/services/bulkEditService';
@@ -8,10 +9,11 @@ import { EditorContextKeys } from 'vscode/vscode/vs/editor/common/editorContextK
 import { IEditorWorkerService } from 'vscode/vscode/vs/editor/common/services/editorWorker';
 import { ILanguageFeaturesService } from 'vscode/vscode/vs/editor/common/services/languageFeatures';
 import { ITextModelService } from 'vscode/vscode/vs/editor/common/services/resolverService';
-import { getDocumentFormattingEditsUntilResult, formatDocumentWithSelectedProvider } from 'vscode/vscode/vs/editor/contrib/format/browser/format';
+import { getDocumentFormattingEditsWithSelectedProvider, FormattingMode, formatDocumentWithSelectedProvider } from 'vscode/vscode/vs/editor/contrib/format/browser/format';
 import { registerAction2, Action2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+import { KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { Progress } from 'vscode/vscode/vs/platform/progress/common/progress';
 import { NOTEBOOK_ACTIONS_CATEGORY } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
 import { getNotebookEditorFromEditorPane } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
@@ -20,9 +22,11 @@ import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/commo
 import { INotebookExecutionService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookExecutionService.service';
 import { NotebookSetting } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
+import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
 import { INotebookService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
+import { CodeActionParticipantUtils } from '../saveParticipants/saveParticipants.js';
 
 const _moduleId = "vs/workbench/contrib/notebook/browser/contrib/format/formatting";
 registerAction2(class extends Action2 {
@@ -34,9 +38,9 @@ registerAction2(class extends Action2 {
             precondition: ( (ContextKeyExpr.and(NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_EDITOR_EDITABLE))),
             keybinding: {
                 when: ( (EditorContextKeys.editorTextFocus.toNegated())),
-                primary: 1024  | 512  | 36 ,
-                linux: { primary: 2048  | 1024  | 39  },
-                weight: 200
+                primary: KeyMod.Shift | KeyMod.Alt | KeyCode.KeyF,
+                linux: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyI },
+                weight: KeybindingWeight.WorkbenchContrib
             },
             f1: true,
             menu: {
@@ -56,28 +60,32 @@ registerAction2(class extends Action2 {
         const editorWorkerService = accessor.get(IEditorWorkerService);
         const languageFeaturesService = accessor.get(ILanguageFeaturesService);
         const bulkEditService = accessor.get(IBulkEditService);
+        const instantiationService = accessor.get(IInstantiationService);
         const editor = getNotebookEditorFromEditorPane(editorService.activeEditorPane);
         if (!editor || !editor.hasModel()) {
             return;
         }
         const notebook = editor.textModel;
+        const formatApplied = await instantiationService.invokeFunction(CodeActionParticipantUtils.checkAndRunFormatCodeAction, notebook, Progress.None, CancellationToken.None);
         const disposable = ( (new DisposableStore()));
         try {
-            const allCellEdits = await Promise.all(( (notebook.cells.map(async (cell) => {
-                const ref = await textModelService.createModelReference(cell.uri);
-                disposable.add(ref);
-                const model = ref.object.textEditorModel;
-                const formatEdits = await getDocumentFormattingEditsUntilResult(editorWorkerService, languageFeaturesService, model, model.getOptions(), CancellationToken.None);
-                const edits = [];
-                if (formatEdits) {
-                    for (const edit of formatEdits) {
-                        edits.push(( (new ResourceTextEdit(model.uri, edit, model.getVersionId()))));
+            if (!formatApplied) {
+                const allCellEdits = await Promise.all(( (notebook.cells.map(async (cell) => {
+                    const ref = await textModelService.createModelReference(cell.uri);
+                    disposable.add(ref);
+                    const model = ref.object.textEditorModel;
+                    const formatEdits = await getDocumentFormattingEditsWithSelectedProvider(editorWorkerService, languageFeaturesService, model, FormattingMode.Explicit, CancellationToken.None);
+                    const edits = [];
+                    if (formatEdits) {
+                        for (const edit of formatEdits) {
+                            edits.push(( (new ResourceTextEdit(model.uri, edit, model.getVersionId()))));
+                        }
+                        return edits;
                     }
-                    return edits;
-                }
-                return [];
-            }))));
-            await bulkEditService.apply( allCellEdits.flat(), { label: ( localizeWithPath(_moduleId, 1, "Format Notebook")), code: 'undoredo.formatNotebook', });
+                    return [];
+                }))));
+                await bulkEditService.apply( allCellEdits.flat(), { label: ( localizeWithPath(_moduleId, 1, "Format Notebook")), code: 'undoredo.formatNotebook', });
+            }
         }
         finally {
             disposable.dispose();
@@ -99,9 +107,9 @@ registerEditorAction(class FormatCellAction extends EditorAction {
             ))),
             kbOpts: {
                 kbExpr: ( (ContextKeyExpr.and(EditorContextKeys.editorTextFocus))),
-                primary: 1024  | 512  | 36 ,
-                linux: { primary: 2048  | 1024  | 39  },
-                weight: 100
+                primary: KeyMod.Shift | KeyMod.Alt | KeyCode.KeyF,
+                linux: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyI },
+                weight: KeybindingWeight.EditorContrib
             },
             contextMenuOpts: {
                 group: '1_modification',
@@ -112,7 +120,7 @@ registerEditorAction(class FormatCellAction extends EditorAction {
     async run(accessor, editor) {
         if (editor.hasModel()) {
             const instaService = accessor.get(IInstantiationService);
-            await instaService.invokeFunction(formatDocumentWithSelectedProvider, editor, 1 , Progress.None, CancellationToken.None, true);
+            await instaService.invokeFunction(formatDocumentWithSelectedProvider, editor, FormattingMode.Explicit, Progress.None, CancellationToken.None, true);
         }
     }
 });
@@ -150,7 +158,7 @@ let FormatOnCellExecutionParticipant = class FormatOnCellExecutionParticipant {
                 const ref = await this.textModelService.createModelReference(activeCell.uri);
                 disposable.add(ref);
                 const model = ref.object.textEditorModel;
-                const formatEdits = await getDocumentFormattingEditsUntilResult(this.editorWorkerService, this.languageFeaturesService, model, model.getOptions(), CancellationToken.None);
+                const formatEdits = await getDocumentFormattingEditsWithSelectedProvider(this.editorWorkerService, this.languageFeaturesService, model, FormattingMode.Silent, CancellationToken.None);
                 const edits = [];
                 if (formatEdits) {
                     edits.push(...( (formatEdits.map(
@@ -191,6 +199,6 @@ CellExecutionParticipantsContribution = ( (__decorate([
     ( (__param(1, INotebookExecutionService)))
 ], CellExecutionParticipantsContribution)));
 const workbenchContributionsRegistry = ( (Registry.as(Extensions.Workbench)));
-workbenchContributionsRegistry.registerWorkbenchContribution(CellExecutionParticipantsContribution, 3 );
+workbenchContributionsRegistry.registerWorkbenchContribution(CellExecutionParticipantsContribution, LifecyclePhase.Restored);
 
 export { CellExecutionParticipantsContribution };

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

@@ -8,6 +8,7 @@ import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/c
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
+import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
 import { Memento } from 'vscode/vscode/vs/workbench/common/memento';
@@ -15,6 +16,7 @@ import { NotebookSetting } from 'vscode/vscode/vs/workbench/contrib/notebook/com
 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.service';
+import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 
 const _moduleId = "vs/workbench/contrib/notebook/browser/contrib/gettingStarted/notebookGettingStarted";
 const hasOpenedNotebookKey = 'hasOpenedNotebook';
@@ -24,7 +26,7 @@ let NotebookGettingStarted = class NotebookGettingStarted extends Disposable {
         super();
         const hasOpenedNotebook = HAS_OPENED_NOTEBOOK.bindTo(_contextKeyService);
         const memento = ( (new Memento('notebookGettingStarted2', _storageService)));
-        const storedValue = memento.getMemento(0 , 0 );
+        const storedValue = memento.getMemento(StorageScope.PROFILE, StorageTarget.USER);
         if (storedValue[hasOpenedNotebookKey]) {
             hasOpenedNotebook.set(true);
         }
@@ -59,7 +61,7 @@ NotebookGettingStarted = ( (__decorate([
     ( (__param(3, ICommandService))),
     ( (__param(4, IConfigurationService)))
 ], NotebookGettingStarted)));
-( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(NotebookGettingStarted, 3 );
+( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(NotebookGettingStarted, LifecyclePhase.Restored);
 registerAction2(class NotebookClearNotebookLayoutAction extends Action2 {
     constructor() {
         super({
@@ -73,7 +75,7 @@ registerAction2(class NotebookClearNotebookLayoutAction extends Action2 {
     run(accessor) {
         const storageService = accessor.get(IStorageService);
         const memento = ( (new Memento('notebookGettingStarted', storageService)));
-        const storedValue = memento.getMemento(0 , 0 );
+        const storedValue = memento.getMemento(StorageScope.PROFILE, StorageTarget.USER);
         storedValue[hasOpenedNotebookKey] = undefined;
         memento.saveMemento();
     }

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/kernelDetection/notebookKernelDetection.js

@@ -5,6 +5,7 @@ import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
 import { INotebookKernelService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookKernelService.service';
 import { INotebookLoggingService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookLoggingService.service';
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
+import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 
 let NotebookKernelDetection = class NotebookKernelDetection extends Disposable {
     constructor(_notebookKernelService, _extensionService, _notebookLoggingService) {
@@ -79,4 +80,4 @@ NotebookKernelDetection = ( __decorate([
     ( __param(1, IExtensionService)),
     ( __param(2, INotebookLoggingService))
 ], NotebookKernelDetection));
-( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(NotebookKernelDetection, 3 );
+( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(NotebookKernelDetection, LifecyclePhase.Restored);

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/marker/markerProvider.js

@@ -1,5 +1,5 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { registerWorkbenchContribution2 } from 'vscode/vscode/vs/workbench/common/contributions';
+import { registerWorkbenchContribution2, WorkbenchPhase } from 'vscode/vscode/vs/workbench/common/contributions';
 import { MarkerList, IMarkerNavigationService } from 'vscode/vscode/vs/editor/contrib/gotoError/browser/markerNavigationService';
 import { CellUri } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { MarkerSeverity } from 'vscode/vscode/vs/platform/markers/common/markers';
@@ -98,5 +98,5 @@ NotebookMarkerDecorationContribution.__decorator = ( __decorate([
 NotebookMarkerDecorationContribution = ( __decorate([
     ( __param(1, IMarkerService))
 ], NotebookMarkerDecorationContribution));
-registerWorkbenchContribution2(MarkerListProvider.ID, MarkerListProvider, 2 );
+registerWorkbenchContribution2(MarkerListProvider.ID, MarkerListProvider, WorkbenchPhase.BlockRestore);
 registerNotebookContribution(NotebookMarkerDecorationContribution.id, NotebookMarkerDecorationContribution);

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

@@ -1,4 +1,5 @@
 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 { localizeWithPath } from 'vscode/vscode/vs/nls';
@@ -7,6 +8,7 @@ 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 } 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 'vscode/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
 import { CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/chat/notebookChatContext';
@@ -38,12 +40,12 @@ registerAction2(class extends Action2 {
             )),
             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
         });
@@ -71,7 +73,7 @@ registerAction2(class FocusNextCellAction extends NotebookCellAction {
                         )),
                          (EditorContextKeys.isEmbeddedDiffEditor.negate())
                     ))),
-                    primary: 18 ,
+                    primary: KeyCode.DownArrow,
                     weight: NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT,
                 },
                 {
@@ -86,20 +88,20 @@ registerAction2(class FocusNextCellAction extends NotebookCellAction {
                         )),
                          (EditorContextKeys.isEmbeddedDiffEditor.negate())
                     ))),
-                    primary: 18 ,
-                    weight: 200 ,
+                    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
+                    primary: KeyMod.CtrlCmd | KeyCode.DownArrow,
+                    mac: { primary: KeyMod.WinCtrl | KeyMod.CtrlCmd | KeyCode.DownArrow, },
+                    weight: KeybindingWeight.WorkbenchContrib
                 },
                 {
                     when: NOTEBOOK_EDITOR_FOCUSED,
-                    primary: 2048  | 512  | 12 ,
-                    mac: { primary: 2048  | 512  | 12 , },
-                    weight: 200
+                    primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.PageDown,
+                    mac: { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.PageDown, },
+                    weight: KeybindingWeight.WorkbenchContrib
                 },
             ]
         });
@@ -146,7 +148,7 @@ registerAction2(class FocusPreviousCellAction extends NotebookCellAction {
                         )),
                          (EditorContextKeys.isEmbeddedDiffEditor.negate())
                     ))),
-                    primary: 16 ,
+                    primary: KeyCode.UpArrow,
                     weight: NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT,
                 },
                 {
@@ -161,14 +163,14 @@ registerAction2(class FocusPreviousCellAction extends NotebookCellAction {
                         )),
                          (EditorContextKeys.isEmbeddedDiffEditor.negate())
                     ))),
-                    primary: 16 ,
-                    weight: 200 ,
+                    primary: KeyCode.UpArrow,
+                    weight: KeybindingWeight.WorkbenchContrib,
                 },
                 {
                     when: NOTEBOOK_EDITOR_FOCUSED,
-                    primary: 2048  | 512  | 11 ,
-                    mac: { primary: 2048  | 512  | 11  },
-                    weight: 200
+                    primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.PageUp,
+                    mac: { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.PageUp },
+                    weight: KeybindingWeight.WorkbenchContrib
                 },
             ],
         });
@@ -201,8 +203,8 @@ registerAction2(class extends NotebookAction {
             keybinding: [
                 {
                     when: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ContextKeyExpr.not(InputFocusedContextKey)))),
-                    primary: 2048  | 14 ,
-                    weight: 200
+                    primary: KeyMod.CtrlCmd | KeyCode.Home,
+                    weight: KeybindingWeight.WorkbenchContrib
                 },
                 {
                     when: ( (ContextKeyExpr.and(
@@ -210,8 +212,8 @@ registerAction2(class extends NotebookAction {
                         ContextKeyExpr.not(InputFocusedContextKey),
                          (CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION.isEqualTo(''))
                     ))),
-                    mac: { primary: 2048  | 16  },
-                    weight: 200
+                    mac: { primary: KeyMod.CtrlCmd | KeyCode.UpArrow },
+                    weight: KeybindingWeight.WorkbenchContrib
                 }
             ],
         });
@@ -233,9 +235,9 @@ registerAction2(class extends NotebookAction {
             keybinding: [
                 {
                     when: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ContextKeyExpr.not(InputFocusedContextKey)))),
-                    primary: 2048  | 13 ,
+                    primary: KeyMod.CtrlCmd | KeyCode.End,
                     mac: undefined,
-                    weight: 200
+                    weight: KeybindingWeight.WorkbenchContrib
                 },
                 {
                     when: ( (ContextKeyExpr.and(
@@ -243,8 +245,8 @@ registerAction2(class extends NotebookAction {
                         ContextKeyExpr.not(InputFocusedContextKey),
                          (CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION.isEqualTo(''))
                     ))),
-                    mac: { primary: 2048  | 18  },
-                    weight: 200
+                    mac: { primary: KeyMod.CtrlCmd | KeyCode.DownArrow },
+                    weight: KeybindingWeight.WorkbenchContrib
                 }
             ],
         });
@@ -269,9 +271,9 @@ registerAction2(class extends NotebookCellAction {
             title: ( localizeWithPath(_moduleId, 5, 'Focus In Active Cell Output')),
             keybinding: {
                 when: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_CELL_HAS_OUTPUTS))),
-                primary: 2048  | 18 ,
-                mac: { primary: 256  | 2048  | 18 , },
-                weight: 200
+                primary: KeyMod.CtrlCmd | KeyCode.DownArrow,
+                mac: { primary: KeyMod.WinCtrl | KeyMod.CtrlCmd | KeyCode.DownArrow, },
+                weight: KeybindingWeight.WorkbenchContrib
             },
         });
     }
@@ -288,9 +290,9 @@ registerAction2(class extends NotebookCellAction {
             title: ( localizeWithPath(_moduleId, 6, 'Focus Out Active Cell Output')),
             keybinding: {
                 when: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_OUTPUT_FOCUSED))),
-                primary: 2048  | 16 ,
-                mac: { primary: 256  | 2048  | 16 , },
-                weight: 200
+                primary: KeyMod.CtrlCmd | KeyCode.UpArrow,
+                mac: { primary: KeyMod.WinCtrl | KeyMod.CtrlCmd | KeyCode.UpArrow, },
+                weight: KeybindingWeight.WorkbenchContrib
             },
         });
     }
@@ -307,11 +309,11 @@ registerAction2(class CenterActiveCellAction extends NotebookCellAction {
             title: ( localizeWithPath(_moduleId, 7, "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
             },
         });
     }
@@ -331,7 +333,7 @@ registerAction2(class extends NotebookCellAction {
                          (ContextKeyExpr.has(InputFocusedContextKey)),
                         EditorContextKeys.editorTextFocus
                     ))),
-                    primary: 11 ,
+                    primary: KeyCode.PageUp,
                     weight: NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT
                 }
             ]
@@ -354,7 +356,7 @@ registerAction2(class extends NotebookCellAction {
                         EditorContextKeys.editorTextFocus,
                          (NOTEBOOK_OUTPUT_FOCUSED.negate())
                     ))),
-                    primary: 1024  | 11 ,
+                    primary: KeyMod.Shift | KeyCode.PageUp,
                     weight: NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT
                 }
             ]
@@ -376,7 +378,7 @@ registerAction2(class extends NotebookCellAction {
                          (ContextKeyExpr.has(InputFocusedContextKey)),
                         EditorContextKeys.editorTextFocus
                     ))),
-                    primary: 12 ,
+                    primary: KeyCode.PageDown,
                     weight: NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT
                 }
             ]
@@ -399,7 +401,7 @@ registerAction2(class extends NotebookCellAction {
                         EditorContextKeys.editorTextFocus,
                          (NOTEBOOK_OUTPUT_FOCUSED.negate())
                     ))),
-                    primary: 1024  | 12 ,
+                    primary: KeyMod.Shift | KeyCode.PageDown,
                     weight: NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT
                 }
             ]