@codingame/monaco-vscode-notebook-service-override 9.0.3 → 10.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-notebook-service-override",
-  "version": "9.0.3",
+  "version": "10.0.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -29,7 +29,7 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@9.0.3",
+    "vscode": "npm:@codingame/monaco-vscode-api@10.0.0",
     "marked": "~14.0.0"
   }
 }

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

@@ -2,7 +2,6 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import './emptyTextEditorHint.css.js';
 import { $ as $$1, getActiveWindow, addDisposableListener, EventType } from 'vscode/vscode/vs/base/browser/dom';
 import { dispose, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
-import { ContentWidgetPositionPreference } from 'vscode/vscode/vs/editor/browser/editorBrowser';
 import { localize } from 'vscode/vscode/vs/nls';
 import { ChangeLanguageAction } from 'vscode/vscode/vs/workbench/browser/parts/editor/editorStatus';
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
@@ -10,8 +9,7 @@ import { PLAINTEXT_LANGUAGE_ID } from 'vscode/vscode/vs/editor/common/languages/
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import { Event } from 'vscode/vscode/vs/base/common/event';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
-import { EditorOption } from 'vscode/vscode/vs/editor/common/config/editorOptions';
-import { registerEditorContribution, EditorContributionInstantiation } from 'vscode/vscode/vs/editor/browser/editorExtensions';
+import { registerEditorContribution } from 'vscode/vscode/vs/editor/browser/editorExtensions';
 import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding.service';
 import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { renderFormattedText } from 'vscode/vscode/vs/base/browser/formattedTextRenderer';
@@ -22,7 +20,6 @@ import { IProductService } from 'vscode/vscode/vs/platform/product/common/produc
 import { KeybindingLabel } from 'vscode/vscode/vs/base/browser/ui/keybindingLabel/keybindingLabel';
 import { OS } from 'vscode/vscode/vs/base/common/platform';
 import { status } from 'vscode/vscode/vs/base/browser/ui/aria/aria';
-import { AccessibilityVerbositySettingId } from 'vscode/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
 import { OUTPUT_MODE_ID, LOG_MODE_ID } from 'vscode/vscode/vs/workbench/services/output/common/output';
 import { SEARCH_RESULT_LANGUAGE_ID } from 'vscode/vscode/vs/workbench/services/search/common/search';
 import { getDefaultHoverDelegate } from 'vscode/vscode/vs/base/browser/ui/hover/hoverDelegateFactory';
@@ -55,7 +52,7 @@ let EmptyTextEditorHintContribution = class EmptyTextEditorHintContribution {
         this.toDispose.push(this.chatAgentService.onDidChangeAgents(() => this.update()));
         this.toDispose.push(this.editor.onDidChangeModelDecorations(() => this.update()));
         this.toDispose.push(this.editor.onDidChangeConfiguration((e) => {
-            if (e.hasChanged(EditorOption.readOnly)) {
+            if (e.hasChanged(94 )) {
                 this.update();
             }
         }));
@@ -83,7 +80,7 @@ let EmptyTextEditorHintContribution = class EmptyTextEditorHintContribution {
         if (configValue === 'hidden') {
             return false;
         }
-        if (this.editor.getOption(EditorOption.readOnly)) {
+        if (this.editor.getOption(94 )) {
             return false;
         }
         const model = this.editor.getModel();
@@ -165,13 +162,13 @@ class EmptyTextEditorHintContentWidget {
         this.ariaLabel = '';
         this.toDispose = ( (new DisposableStore()));
         this.toDispose.add(this.editor.onDidChangeConfiguration((e) => {
-            if (this.domNode && e.hasChanged(EditorOption.fontInfo)) {
+            if (this.domNode && e.hasChanged(52 )) {
                 this.editor.applyFontInfo(this.domNode);
             }
         }));
         const onDidFocusEditorText = Event.debounce(this.editor.onDidFocusEditorText, () => undefined, 500);
         this.toDispose.add(onDidFocusEditorText(() => {
-            if (this.editor.hasTextFocus() && this.isVisible && this.ariaLabel && this.configurationService.getValue(AccessibilityVerbositySettingId.EmptyEditorHint)) {
+            if (this.editor.hasTextFocus() && this.isVisible && this.ariaLabel && this.configurationService.getValue("accessibility.verbosity.emptyEditorHint" )) {
                 status(this.ariaLabel);
             }
         }));
@@ -197,8 +194,8 @@ class EmptyTextEditorHintContentWidget {
             getActions: () => {
                 return [{
                         id: 'workench.action.disableEmptyEditorHint',
-                        label: ( localize(10768, "Disable Empty Editor Hint")),
-                        tooltip: ( localize(10768, "Disable Empty Editor Hint")),
+                        label: ( localize(10857, "Disable Empty Editor Hint")),
+                        tooltip: ( localize(10857, "Disable Empty Editor Hint")),
                         enabled: true,
                         class: undefined,
                         run: () => {
@@ -236,7 +233,7 @@ class EmptyTextEditorHintContentWidget {
         const keybindingHintLabel = keybindingHint?.getLabel();
         if (keybindingHint && keybindingHintLabel) {
             const actionPart = ( localize(
-                10769,
+                10858,
                 'Press {0} to ask {1} to do something. ',
                 keybindingHintLabel,
                 providerName
@@ -267,7 +264,7 @@ class EmptyTextEditorHintContentWidget {
                 this.toDispose.add(addDisposableListener(label.element, EventType.CLICK, handleClick));
             }
             hintElement.appendChild(after);
-            const typeToDismiss = ( localize(10770, 'Start typing to dismiss.'));
+            const typeToDismiss = ( localize(10859, 'Start typing to dismiss.'));
             const textHint2 = $('span', undefined, typeToDismiss);
             textHint2.style.fontStyle = 'italic';
             hintElement.appendChild(textHint2);
@@ -275,7 +272,7 @@ class EmptyTextEditorHintContentWidget {
         }
         else {
             const hintMsg = ( localize(
-                10771,
+                10860,
                 '[[Ask {0} to do something]] or start typing to dismiss.',
                 providerName
             ));
@@ -335,7 +332,7 @@ class EmptyTextEditorHintContentWidget {
             }
         };
         const hintMsg = ( localize(
-            10772,
+            10861,
             '[[Select a language]], or [[fill with template]], or [[open a different editor]] to get started.\nStart typing to dismiss or [[don\'t show]] this again.'
         ));
         const hintElement = renderFormattedText(hintMsg, {
@@ -346,7 +343,7 @@ class EmptyTextEditorHintContentWidget {
         const keybindingsLookup = [ChangeLanguageAction.ID, ApplyFileSnippetAction.Id, 'welcome.showNewFileEntries'];
         const keybindingLabels = ( (keybindingsLookup.map((id) => this.keybindingService.lookupKeybinding(id)?.getLabel() ?? id)));
         const ariaLabel = ( localize(
-            10773,
+            10862,
             'Execute {0} to select a language, execute {1} to fill with template, or execute {2} to open a different editor and get started. Start typing to dismiss.',
             ...keybindingLabels
         ));
@@ -367,9 +364,9 @@ class EmptyTextEditorHintContentWidget {
             const { hintElement, ariaLabel } = !inlineChatProviders.length ? this._getHintDefault() : this._getHintInlineChat(inlineChatProviders);
             this.domNode.append(hintElement);
             this.ariaLabel = ariaLabel.concat(( localize(
-                10774,
+                10863,
                 ' Toggle {0} in settings to disable this hint.',
-                AccessibilityVerbositySettingId.EmptyEditorHint
+                "accessibility.verbosity.emptyEditorHint"
             )));
             this.toDispose.add(addDisposableListener(this.domNode, 'click', () => {
                 this.editor.focus();
@@ -381,7 +378,7 @@ class EmptyTextEditorHintContentWidget {
     getPosition() {
         return {
             position: { lineNumber: 1, column: 1 },
-            preference: [ContentWidgetPositionPreference.EXACT]
+            preference: [0 ]
         };
     }
     dispose() {
@@ -389,6 +386,6 @@ class EmptyTextEditorHintContentWidget {
         dispose(this.toDispose);
     }
 }
-registerEditorContribution(EmptyTextEditorHintContribution.ID, EmptyTextEditorHintContribution, EditorContributionInstantiation.Eager);
+registerEditorContribution(EmptyTextEditorHintContribution.ID, EmptyTextEditorHintContribution, 0 );
 
 export { EmptyTextEditorHintContribution, emptyTextEditorHintSetting };

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

@@ -1,18 +1,17 @@
-import { KeyMod, KeyCode, KeyChord } from 'vscode/vscode/vs/base/common/keyCodes';
+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 { localize2, localize } 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';
-import { KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { ResourceNotebookCellEdit } from 'vscode/vscode/vs/workbench/contrib/bulkEdit/browser/bulkCellEdits';
 import { moveCellRange, copyCellRange, computeCellLinesContents, joinCellsWithSurrounds, joinSelectedCells, changeCellToKind } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/cellOperations';
-import { NotebookCellAction, CellOverflowToolbarGroups, CellToolbarOrder, CELL_TITLE_CELL_GROUP_ID, NotebookMultiCellAction, parseMultiCellExecutionArgs, cellExecutionArgs } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
+import { NotebookCellAction, CELL_TITLE_CELL_GROUP_ID, NotebookMultiCellAction, parseMultiCellExecutionArgs, cellExecutionArgs } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
 import { CellFocusMode, EXPAND_CELL_INPUT_COMMAND_ID, EXPAND_CELL_OUTPUT_COMMAND_ID } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_CELL_EDITABLE, NOTEBOOK_CELL_INPUT_COLLAPSED, NOTEBOOK_OUTPUT_FOCUSED, NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_CELL_TYPE, NOTEBOOK_CELL_LIST_FOCUSED, NOTEBOOK_CELL_OUTPUT_COLLAPSED, NOTEBOOK_CELL_HAS_OUTPUTS } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
 import { moveUpIcon, moveDownIcon, splitCellIcon } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookIcons';
-import { CellEditType, CellKind, NotebookSetting } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
+import { CellKind, NotebookSetting } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
 import { EditorContextKeys } from 'vscode/vscode/vs/editor/common/editorContextKeys';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
@@ -25,17 +24,17 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: MOVE_CELL_UP_COMMAND_ID,
-            title: ( localize2(8026, "Move Cell Up")),
+            title: ( localize2(8086, "Move Cell Up")),
             icon: moveUpIcon,
             keybinding: {
-                primary: KeyMod.Alt | KeyCode.UpArrow,
+                primary: 512  | 16 ,
                 when: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED,  (InputFocusedContext.toNegated())))),
-                weight: KeybindingWeight.WorkbenchContrib
+                weight: 200
             },
             menu: {
                 id: MenuId.NotebookCellTitle,
                 when: ( (ContextKeyExpr.equals('config.notebook.dragAndDropEnabled', false))),
-                group: CellOverflowToolbarGroups.Edit,
+                group: "3_edit" ,
                 order: 14
             }
         });
@@ -48,17 +47,17 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: MOVE_CELL_DOWN_COMMAND_ID,
-            title: ( localize2(8027, "Move Cell Down")),
+            title: ( localize2(8087, "Move Cell Down")),
             icon: moveDownIcon,
             keybinding: {
-                primary: KeyMod.Alt | KeyCode.DownArrow,
+                primary: 512  | 18 ,
                 when: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED,  (InputFocusedContext.toNegated())))),
-                weight: KeybindingWeight.WorkbenchContrib
+                weight: 200
             },
             menu: {
                 id: MenuId.NotebookCellTitle,
                 when: ( (ContextKeyExpr.equals('config.notebook.dragAndDropEnabled', false))),
-                group: CellOverflowToolbarGroups.Edit,
+                group: "3_edit" ,
                 order: 14
             }
         });
@@ -71,11 +70,11 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: COPY_CELL_UP_COMMAND_ID,
-            title: ( localize2(8028, "Copy Cell Up")),
+            title: ( localize2(8088, "Copy Cell Up")),
             keybinding: {
-                primary: KeyMod.Alt | KeyMod.Shift | KeyCode.UpArrow,
+                primary: 512  | 1024  | 16 ,
                 when: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED,  (InputFocusedContext.toNegated())))),
-                weight: KeybindingWeight.WorkbenchContrib
+                weight: 200
             }
         });
     }
@@ -87,16 +86,16 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: COPY_CELL_DOWN_COMMAND_ID,
-            title: ( localize2(8029, "Copy Cell Down")),
+            title: ( localize2(8089, "Copy Cell Down")),
             keybinding: {
-                primary: KeyMod.Alt | KeyMod.Shift | KeyCode.DownArrow,
+                primary: 512  | 1024  | 18 ,
                 when: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED,  (InputFocusedContext.toNegated())))),
-                weight: KeybindingWeight.WorkbenchContrib
+                weight: 200
             },
             menu: {
                 id: MenuId.NotebookCellTitle,
                 when: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_CELL_EDITABLE))),
-                group: CellOverflowToolbarGroups.Edit,
+                group: "3_edit" ,
                 order: 13
             }
         });
@@ -113,7 +112,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: SPLIT_CELL_COMMAND_ID,
-            title: ( localize2(8030, "Split Cell")),
+            title: ( localize2(8090, "Split Cell")),
             menu: {
                 id: MenuId.NotebookCellTitle,
                 when: ( (ContextKeyExpr.and(
@@ -121,7 +120,7 @@ registerAction2(class extends NotebookCellAction {
                     NOTEBOOK_CELL_EDITABLE,
                      (NOTEBOOK_CELL_INPUT_COLLAPSED.toNegated())
                 ))),
-                order: CellToolbarOrder.SplitCell,
+                order: 4 ,
                 group: CELL_TITLE_CELL_GROUP_ID
             },
             icon: splitCellIcon,
@@ -132,8 +131,8 @@ registerAction2(class extends NotebookCellAction {
                     NOTEBOOK_CELL_EDITABLE,
                     EditorContextKeys.editorTextFocus
                 ))),
-                primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.Backslash),
-                weight: KeybindingWeight.WorkbenchContrib
+                primary: KeyChord(2048  | 41 , 2048  | 1024  | 93 ),
+                weight: 200
             },
         });
     }
@@ -162,7 +161,7 @@ registerAction2(class extends NotebookCellAction {
                     { range: textModel.getFullModelRange(), text: newLinesContents[0] }
                 ))),
                     ( (new ResourceNotebookCellEdit(context.notebookEditor.textModel.uri, {
-                        editType: CellEditType.Replace,
+                        editType: 1 ,
                         index: index + 1,
                         count: 0,
                         cells: ( (newLinesContents.slice(1).map(line => ({
@@ -183,16 +182,16 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: JOIN_CELL_ABOVE_COMMAND_ID,
-            title: ( localize2(8031, "Join With Previous Cell")),
+            title: ( localize2(8091, "Join With Previous Cell")),
             keybinding: {
                 when: NOTEBOOK_EDITOR_FOCUSED,
-                primary: KeyMod.WinCtrl | KeyMod.Alt | KeyMod.Shift | KeyCode.KeyJ,
-                weight: KeybindingWeight.WorkbenchContrib
+                primary: 256  | 512  | 1024  | 40 ,
+                weight: 200
             },
             menu: {
                 id: MenuId.NotebookCellTitle,
                 when: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_EDITOR_EDITABLE))),
-                group: CellOverflowToolbarGroups.Edit,
+                group: "3_edit" ,
                 order: 10
             }
         });
@@ -206,16 +205,16 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: JOIN_CELL_BELOW_COMMAND_ID,
-            title: ( localize2(8032, "Join With Next Cell")),
+            title: ( localize2(8092, "Join With Next Cell")),
             keybinding: {
                 when: NOTEBOOK_EDITOR_FOCUSED,
-                primary: KeyMod.WinCtrl | KeyMod.Alt | KeyCode.KeyJ,
-                weight: KeybindingWeight.WorkbenchContrib
+                primary: 256  | 512  | 40 ,
+                weight: 200
             },
             menu: {
                 id: MenuId.NotebookCellTitle,
                 when: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_EDITOR_EDITABLE))),
-                group: CellOverflowToolbarGroups.Edit,
+                group: "3_edit" ,
                 order: 11
             }
         });
@@ -229,11 +228,11 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: JOIN_SELECTED_CELLS_COMMAND_ID,
-            title: ( localize2(8033, "Join Selected Cells")),
+            title: ( localize2(8093, "Join Selected Cells")),
             menu: {
                 id: MenuId.NotebookCellTitle,
                 when: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_EDITOR_EDITABLE))),
-                group: CellOverflowToolbarGroups.Edit,
+                group: "3_edit" ,
                 order: 12
             }
         });
@@ -250,15 +249,15 @@ registerAction2(class ChangeCellToCodeAction extends NotebookMultiCellAction {
     constructor() {
         super({
             id: CHANGE_CELL_TO_CODE_COMMAND_ID,
-            title: ( localize2(8034, "Change Cell to Code")),
+            title: ( localize2(8094, "Change Cell to Code")),
             keybinding: {
                 when: ( (ContextKeyExpr.and(
                     NOTEBOOK_EDITOR_FOCUSED,
                     ContextKeyExpr.not(InputFocusedContextKey),
                      (NOTEBOOK_OUTPUT_FOCUSED.toNegated())
                 ))),
-                primary: KeyCode.KeyY,
-                weight: KeybindingWeight.WorkbenchContrib
+                primary: 55 ,
+                weight: 200
             },
             precondition: ( (ContextKeyExpr.and(
                 NOTEBOOK_IS_ACTIVE_EDITOR,
@@ -272,7 +271,7 @@ registerAction2(class ChangeCellToCodeAction extends NotebookMultiCellAction {
                     NOTEBOOK_CELL_EDITABLE,
                      (NOTEBOOK_CELL_TYPE.isEqualTo('markup'))
                 ))),
-                group: CellOverflowToolbarGroups.Edit,
+                group: "3_edit" ,
             }
         });
     }
@@ -284,15 +283,15 @@ registerAction2(class ChangeCellToMarkdownAction extends NotebookMultiCellAction
     constructor() {
         super({
             id: CHANGE_CELL_TO_MARKDOWN_COMMAND_ID,
-            title: ( localize2(8035, "Change Cell to Markdown")),
+            title: ( localize2(8095, "Change Cell to Markdown")),
             keybinding: {
                 when: ( (ContextKeyExpr.and(
                     NOTEBOOK_EDITOR_FOCUSED,
                     ContextKeyExpr.not(InputFocusedContextKey),
                      (NOTEBOOK_OUTPUT_FOCUSED.toNegated())
                 ))),
-                primary: KeyCode.KeyM,
-                weight: KeybindingWeight.WorkbenchContrib
+                primary: 43 ,
+                weight: 200
             },
             precondition: ( (ContextKeyExpr.and(
                 NOTEBOOK_IS_ACTIVE_EDITOR,
@@ -306,7 +305,7 @@ registerAction2(class ChangeCellToMarkdownAction extends NotebookMultiCellAction
                     NOTEBOOK_CELL_EDITABLE,
                      (NOTEBOOK_CELL_TYPE.isEqualTo('code'))
                 ))),
-                group: CellOverflowToolbarGroups.Edit,
+                group: "3_edit" ,
             }
         });
     }
@@ -326,15 +325,15 @@ registerAction2(class CollapseCellInputAction extends NotebookMultiCellAction {
     constructor() {
         super({
             id: COLLAPSE_CELL_INPUT_COMMAND_ID,
-            title: ( localize2(8036, "Collapse Cell Input")),
+            title: ( localize2(8096, "Collapse Cell Input")),
             keybinding: {
                 when: ( (ContextKeyExpr.and(
                     NOTEBOOK_CELL_LIST_FOCUSED,
                      (NOTEBOOK_CELL_INPUT_COLLAPSED.toNegated()),
                      (InputFocusedContext.toNegated())
                 ))),
-                primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyMod.CtrlCmd | KeyCode.KeyC),
-                weight: KeybindingWeight.WorkbenchContrib
+                primary: KeyChord(2048  | 41 , 2048  | 33 ),
+                weight: 200
             }
         });
     }
@@ -354,11 +353,11 @@ registerAction2(class ExpandCellInputAction extends NotebookMultiCellAction {
     constructor() {
         super({
             id: EXPAND_CELL_INPUT_COMMAND_ID,
-            title: ( localize2(8037, "Expand Cell Input")),
+            title: ( localize2(8097, "Expand Cell Input")),
             keybinding: {
                 when: ( (ContextKeyExpr.and(NOTEBOOK_CELL_LIST_FOCUSED, NOTEBOOK_CELL_INPUT_COLLAPSED))),
-                primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyMod.CtrlCmd | KeyCode.KeyC),
-                weight: KeybindingWeight.WorkbenchContrib
+                primary: KeyChord(2048  | 41 , 2048  | 33 ),
+                weight: 200
             }
         });
     }
@@ -378,7 +377,7 @@ registerAction2(class CollapseCellOutputAction extends NotebookMultiCellAction {
     constructor() {
         super({
             id: COLLAPSE_CELL_OUTPUT_COMMAND_ID,
-            title: ( localize2(8038, "Collapse Cell Output")),
+            title: ( localize2(8098, "Collapse Cell Output")),
             keybinding: {
                 when: ( (ContextKeyExpr.and(
                     NOTEBOOK_CELL_LIST_FOCUSED,
@@ -386,8 +385,8 @@ registerAction2(class CollapseCellOutputAction extends NotebookMultiCellAction {
                      (InputFocusedContext.toNegated()),
                     NOTEBOOK_CELL_HAS_OUTPUTS
                 ))),
-                primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyCode.KeyT),
-                weight: KeybindingWeight.WorkbenchContrib
+                primary: KeyChord(2048  | 41 , 50 ),
+                weight: 200
             }
         });
     }
@@ -404,11 +403,11 @@ registerAction2(class ExpandCellOuputAction extends NotebookMultiCellAction {
     constructor() {
         super({
             id: EXPAND_CELL_OUTPUT_COMMAND_ID,
-            title: ( localize2(8039, "Expand Cell Output")),
+            title: ( localize2(8099, "Expand Cell Output")),
             keybinding: {
                 when: ( (ContextKeyExpr.and(NOTEBOOK_CELL_LIST_FOCUSED, NOTEBOOK_CELL_OUTPUT_COLLAPSED))),
-                primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyCode.KeyT),
-                weight: KeybindingWeight.WorkbenchContrib
+                primary: KeyChord(2048  | 41 , 50 ),
+                weight: 200
             }
         });
     }
@@ -426,9 +425,9 @@ registerAction2(class extends NotebookMultiCellAction {
         super({
             id: TOGGLE_CELL_OUTPUTS_COMMAND_ID,
             precondition: NOTEBOOK_CELL_LIST_FOCUSED,
-            title: ( localize2(8040, "Toggle Outputs")),
+            title: ( localize2(8100, "Toggle Outputs")),
             metadata: {
-                description: ( localize(8040, "Toggle Outputs")),
+                description: ( localize(8100, "Toggle Outputs")),
                 args: cellExecutionArgs
             }
         });
@@ -453,7 +452,7 @@ registerAction2(class CollapseAllCellInputsAction extends NotebookMultiCellActio
     constructor() {
         super({
             id: COLLAPSE_ALL_CELL_INPUTS_COMMAND_ID,
-            title: ( localize2(8041, "Collapse All Cell Inputs")),
+            title: ( localize2(8101, "Collapse All Cell Inputs")),
             f1: true,
         });
     }
@@ -465,7 +464,7 @@ registerAction2(class ExpandAllCellInputsAction extends NotebookMultiCellAction
     constructor() {
         super({
             id: EXPAND_ALL_CELL_INPUTS_COMMAND_ID,
-            title: ( localize2(8042, "Expand All Cell Inputs")),
+            title: ( localize2(8102, "Expand All Cell Inputs")),
             f1: true
         });
     }
@@ -477,7 +476,7 @@ registerAction2(class CollapseAllCellOutputsAction extends NotebookMultiCellActi
     constructor() {
         super({
             id: COLLAPSE_ALL_CELL_OUTPUTS_COMMAND_ID,
-            title: ( localize2(8043, "Collapse All Cell Outputs")),
+            title: ( localize2(8103, "Collapse All Cell Outputs")),
             f1: true,
         });
     }
@@ -489,7 +488,7 @@ registerAction2(class ExpandAllCellOutputsAction extends NotebookMultiCellAction
     constructor() {
         super({
             id: EXPAND_ALL_CELL_OUTPUTS_COMMAND_ID,
-            title: ( localize2(8044, "Expand All Cell Outputs")),
+            title: ( localize2(8104, "Expand All Cell Outputs")),
             f1: true
         });
     }
@@ -501,15 +500,15 @@ registerAction2(class ToggleCellOutputScrolling extends NotebookMultiCellAction
     constructor() {
         super({
             id: TOGGLE_CELL_OUTPUT_SCROLLING,
-            title: ( localize2(8045, "Toggle Scroll Cell Output")),
+            title: ( localize2(8105, "Toggle Scroll Cell Output")),
             keybinding: {
                 when: ( (ContextKeyExpr.and(
                     NOTEBOOK_CELL_LIST_FOCUSED,
                      (InputFocusedContext.toNegated()),
                     NOTEBOOK_CELL_HAS_OUTPUTS
                 ))),
-                primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyCode.KeyY),
-                weight: KeybindingWeight.WorkbenchContrib
+                primary: KeyChord(2048  | 41 , 55 ),
+                weight: 200
             }
         });
     }

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/cellDiagnostics/cellDiagnosticsActions.js

@@ -1,11 +1,9 @@
-import { KeyMod, KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
 import { Range } from 'vscode/vscode/vs/editor/common/core/range';
 import { CodeActionController } from 'vscode/vscode/vs/editor/contrib/codeAction/browser/codeActionController';
 import { CodeActionTriggerSource, CodeActionKind } from 'vscode/vscode/vs/editor/contrib/codeAction/common/types';
 import { localize2, localize } from 'vscode/vscode/vs/nls';
 import { registerAction2 } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
-import { KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { NotebookCellAction, findTargetCellEditor } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
 import { CodeCellViewModel } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/viewModel/codeCellViewModel';
 import { NOTEBOOK_CELL_FOCUSED, NOTEBOOK_CELL_HAS_ERROR_DIAGNOSTICS, NOTEBOOK_CELL_EDITOR_FOCUSED } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
@@ -15,7 +13,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: OPEN_CELL_FAILURE_ACTIONS_COMMAND_ID,
-            title: ( localize2(10776, "Show Cell Failure Actions")),
+            title: ( localize2(10864, "Show Cell Failure Actions")),
             precondition: ( (ContextKeyExpr.and(
                 NOTEBOOK_CELL_FOCUSED,
                 NOTEBOOK_CELL_HAS_ERROR_DIAGNOSTICS,
@@ -28,8 +26,8 @@ registerAction2(class extends NotebookCellAction {
                     NOTEBOOK_CELL_HAS_ERROR_DIAGNOSTICS,
                      (NOTEBOOK_CELL_EDITOR_FOCUSED.toNegated())
                 ))),
-                primary: KeyMod.CtrlCmd | KeyCode.Period,
-                weight: KeybindingWeight.WorkbenchContrib
+                primary: 2048  | 89 ,
+                weight: 200
             }
         });
     }
@@ -47,7 +45,7 @@ registerAction2(class extends NotebookCellAction {
                 const editor = findTargetCellEditor(context, context.cell);
                 if (editor) {
                     const controller = CodeActionController.get(editor);
-                    controller?.manualTriggerAtCurrentPosition(( localize(10777, "No code actions available")), CodeActionTriggerSource.Default, { include: CodeActionKind.QuickFix });
+                    controller?.manualTriggerAtCurrentPosition(( localize(10865, "No code actions available")), CodeActionTriggerSource.Default, { include: CodeActionKind.QuickFix });
                 }
             }
         }

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/cellDiagnostics/diagnosticCellStatusBarContrib.js

@@ -1,10 +1,11 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import 'vscode/vscode/vs/base/common/arrays';
-import 'vscode/vscode/vs/base/common/observableInternal/derived';
+import 'vscode/vscode/vs/base/common/event';
 import { autorun } from 'vscode/vscode/vs/base/common/observableInternal/autorun';
-import 'vscode/vscode/vs/base/common/observableInternal/utils';
+import 'vscode/vscode/vs/base/common/observableInternal/derived';
 import 'vscode/vscode/vs/base/common/cancellation';
+import 'vscode/vscode/vs/base/common/observableInternal/utils';
 import { localize } from 'vscode/vscode/vs/nls';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding.service';
@@ -12,7 +13,6 @@ import { OPEN_CELL_FAILURE_ACTIONS_COMMAND_ID } from './cellDiagnosticsActions.j
 import { NotebookStatusBarController } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/executionStatusBarItemController';
 import { registerNotebookContribution } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookEditorExtensions';
 import { CodeCellViewModel } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/viewModel/codeCellViewModel';
-import { CellStatusbarAlignment } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 
 let DiagnosticCellStatusBarContrib = class DiagnosticCellStatusBarContrib extends Disposable {
     static { this.id = 'workbench.notebook.statusBar.diagtnostic'; }
@@ -40,11 +40,11 @@ let DiagnosticCellStatusBarItem = class DiagnosticCellStatusBarItem extends Disp
         let item;
         if (error?.location) {
             const keybinding = this.keybindingService.lookupKeybinding(OPEN_CELL_FAILURE_ACTIONS_COMMAND_ID)?.getLabel();
-            const tooltip = ( localize(10778, "Quick Actions {0}", `(${keybinding})`));
+            const tooltip = ( localize(10866, "Quick Actions {0}", `(${keybinding})`));
             item = {
                 text: `$(sparkle)`,
                 tooltip,
-                alignment: CellStatusbarAlignment.Left,
+                alignment: 1 ,
                 command: OPEN_CELL_FAILURE_ACTIONS_COMMAND_ID,
                 priority: Number.MAX_SAFE_INTEGER - 1
             };