@codingame/monaco-vscode-notebook-service-override 22.1.8 → 23.0.0

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

@@ -11,7 +11,7 @@ import { registerWorkbenchContribution2, WorkbenchPhase } from '@codingame/monac
 import { CENTER_ACTIVE_CELL } from '../navigation/arrow.js';
 import { SELECT_KERNEL_ID } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
 import { SELECT_NOTEBOOK_INDENTATION_ID } from '../../controller/editActions.js';
-import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-670aae94-7f88-54d7-90ea-6fcbef423557-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-9d2c06d1-1f89-51a5-9964-aa01fe50c198-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { NotebookCellsChangeType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { INotebookKernelService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookKernelService.service';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
@@ -112,19 +112,19 @@ let KernelStatus = class KernelStatus extends Disposable {
             }
             const tooltip = kernel.description ?? kernel.detail ?? kernel.label;
             this._kernelInfoElement.add(this._statusbarService.addEntry({
-                name: ( localize(8821, "Notebook Kernel Info")),
+                name: ( localize(9080, "Notebook Kernel Info")),
                 text: `$(notebook-kernel-select) ${kernel.label}`,
                 ariaLabel: kernel.label,
-                tooltip: isSuggested ? ( localize(8822, "{0} (suggestion)", tooltip)) : tooltip,
+                tooltip: isSuggested ? ( localize(9081, "{0} (suggestion)", tooltip)) : tooltip,
                 command: SELECT_KERNEL_ID,
             }, SELECT_KERNEL_ID, StatusbarAlignment.RIGHT, 10));
             this._kernelInfoElement.add(kernel.onDidChange(() => this._showKernelStatus(notebook)));
         }
         else {
             this._kernelInfoElement.add(this._statusbarService.addEntry({
-                name: ( localize(8823, "Notebook Kernel Selection")),
-                text: ( localize(8824, "Select Kernel")),
-                ariaLabel: ( localize(8824, "Select Kernel")),
+                name: ( localize(9082, "Notebook Kernel Selection")),
+                text: ( localize(9083, "Select Kernel")),
+                ariaLabel: ( localize(9083, "Select Kernel")),
                 command: SELECT_KERNEL_ID,
                 kind: 'prominent'
             }, SELECT_KERNEL_ID, StatusbarAlignment.RIGHT, 10));
@@ -170,7 +170,7 @@ let ActiveCellStatus = class ActiveCellStatus extends Disposable {
             return;
         }
         const entry = {
-            name: ( localize(8825, "Notebook Editor Selections")),
+            name: ( localize(9084, "Notebook Editor Selections")),
             text: newText,
             ariaLabel: newText,
             command: CENTER_ACTIVE_CELL
@@ -194,8 +194,8 @@ let ActiveCellStatus = class ActiveCellStatus extends Disposable {
         const numSelected = editor.getSelections().reduce((prev, range) => prev + (range.end - range.start), 0);
         const totalCells = editor.getLength();
         return numSelected > 1 ?
-            ( localize(8826, "Cell {0} ({1} selected)", idxFocused, numSelected)) :
-            ( localize(8827, "Cell {0} of {1}", idxFocused, totalCells));
+            ( localize(9085, "Cell {0} ({1} selected)", idxFocused, numSelected)) :
+            ( localize(9086, "Cell {0} of {1}", idxFocused, totalCells));
     }
 };
 ActiveCellStatus = ( __decorate([
@@ -255,10 +255,10 @@ let NotebookIndentationStatus = class NotebookIndentationStatus extends Disposab
             return;
         }
         const entry = {
-            name: ( localize(8828, "Notebook Indentation")),
+            name: ( localize(9087, "Notebook Indentation")),
             text: newText,
             ariaLabel: newText,
-            tooltip: ( localize(8829, "Select Indentation")),
+            tooltip: ( localize(9088, "Select Indentation")),
             command: SELECT_NOTEBOOK_INDENTATION_ID
         };
         if (!this._accessor.value) {

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

@@ -1,5 +1,5 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
-import { INotebookEditor, INotebookEditorContribution } from "@codingame/monaco-vscode-670aae94-7f88-54d7-90ea-6fcbef423557-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
+import { INotebookEditor, INotebookEditorContribution } from "@codingame/monaco-vscode-9d2c06d1-1f89-51a5-9964-aa01fe50c198-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
 import { INotebookExecutionStateService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService.service";
 import { IUserActivityService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/userActivity/common/userActivityService.service";
 export declare class ExecutionEditorProgressController extends Disposable implements INotebookEditorContribution {

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFind.js

@@ -7,18 +7,19 @@ import { isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/reso
 import { ICodeEditorService } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/codeEditorService.service';
 import { EditorOption } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/config/editorOptions';
 import { EditorContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/editorContextKeys';
-import { getSelectionSearchString, StartFindAction, StartFindReplaceAction } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/find/browser/findController';
+import { getSelectionSearchString, StartFindAction, StartFindReplaceAction, NextMatchFindAction, PreviousMatchFindAction } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/find/browser/findController';
 import { localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { registerAction2, Action2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
-import { NotebookFindContrib } from '@codingame/monaco-vscode-a793b3ee-7ba9-5176-a019-30ec806fdd95-common/vscode/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindWidget';
+import { NotebookFindContrib } from '@codingame/monaco-vscode-fc28fb90-97de-5e74-89a9-4cfe44128227-common/vscode/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindWidget';
 import { NotebookMultiCellAction } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
-import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-670aae94-7f88-54d7-90ea-6fcbef423557-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-9d2c06d1-1f89-51a5-9964-aa01fe50c198-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { registerNotebookContribution } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/notebookEditorExtensions';
 import { NotebookFindScopeType, CellUri } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
-import { NOTEBOOK_EDITOR_FOCUSED, KEYBINDING_CONTEXT_NOTEBOOK_FIND_WIDGET_FOCUSED, NOTEBOOK_IS_ACTIVE_EDITOR, INTERACTIVE_WINDOW_IS_ACTIVE_EDITOR } from '@codingame/monaco-vscode-eda30bac-0984-5b42-9362-c68996b85232-common/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
+import { NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_IS_ACTIVE_EDITOR, INTERACTIVE_WINDOW_IS_ACTIVE_EDITOR } from '@codingame/monaco-vscode-eda30bac-0984-5b42-9362-c68996b85232-common/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
+import { CONTEXT_FIND_WIDGET_VISIBLE } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/find/browser/findModel';
 
 registerCss(notebookFind);
 registerNotebookContribution(NotebookFindContrib.id, NotebookFindContrib);
@@ -26,11 +27,11 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.hideFind',
-            title: ( localize2(8830, 'Hide Find in Notebook')),
+            title: ( localize2(9089, 'Hide Find in Notebook')),
             keybinding: {
-                when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, KEYBINDING_CONTEXT_NOTEBOOK_FIND_WIDGET_FOCUSED)),
+                when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, CONTEXT_FIND_WIDGET_VISIBLE)),
                 primary: KeyCode.Escape,
-                weight: KeybindingWeight.WorkbenchContrib
+                weight: KeybindingWeight.EditorContrib + 5
             }
         });
     }
@@ -49,7 +50,7 @@ registerAction2(class extends NotebookMultiCellAction {
     constructor() {
         super({
             id: 'notebook.find',
-            title: ( localize2(8831, 'Find in Notebook')),
+            title: ( localize2(9090, 'Find in Notebook')),
             keybinding: {
                 when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ( ContextKeyExpr.or(NOTEBOOK_IS_ACTIVE_EDITOR, INTERACTIVE_WINDOW_IS_ACTIVE_EDITOR)), ( EditorContextKeys.focus.toNegated()))),
                 primary: KeyCode.KeyF | KeyMod.CtrlCmd,
@@ -97,9 +98,7 @@ function getSearchStringOptions(editor, opts) {
     }
     return undefined;
 }
-StartFindAction.addImplementation(100, (accessor, codeEditor, args) => {
-    const editorService = accessor.get(IEditorService);
-    const editor = getNotebookEditorFromEditorPane(editorService.activeEditorPane);
+function isNotebookEditorValidForSearch(accessor, editor, codeEditor) {
     if (!editor) {
         return false;
     }
@@ -109,12 +108,22 @@ StartFindAction.addImplementation(100, (accessor, codeEditor, args) => {
     if (!editor.hasEditorFocus() && !editor.hasWebviewFocus()) {
         const codeEditorService = accessor.get(ICodeEditorService);
         const textEditor = codeEditorService.getFocusedCodeEditor() || codeEditorService.getActiveCodeEditor();
-        if (editor.hasModel() && textEditor && textEditor.hasModel() && notebookContainsTextModel(editor.textModel.uri, textEditor.getModel())) ;
+        if (editor.hasModel() && textEditor && textEditor.hasModel() && notebookContainsTextModel(editor.textModel.uri, textEditor.getModel())) {
+            return true;
+        }
         else {
             return false;
         }
     }
-    const controller = editor.getContribution(NotebookFindContrib.id);
+    return true;
+}
+function openFindWidget(controller, editor, codeEditor, focusWidget = true) {
+    if (!editor || !codeEditor || !controller) {
+        return false;
+    }
+    if (!codeEditor.hasModel()) {
+        return false;
+    }
     const searchStringOptions = getSearchStringOptions(codeEditor, {
         seedSearchStringFromSelection: codeEditor.getOption(EditorOption.find).seedSearchStringFromSelection !== 'never' ? 'single' : 'none',
         seedSearchStringFromNonEmptySelection: codeEditor.getOption(EditorOption.find).seedSearchStringFromSelection === 'selection',
@@ -130,11 +139,53 @@ StartFindAction.addImplementation(100, (accessor, codeEditor, args) => {
         if (cell) {
             options = {
                 searchStringSeededFrom: { cell, range: searchStringOptions.selection },
+                focus: focusWidget
             };
         }
     }
+    else {
+        options = { focus: focusWidget };
+    }
     controller.show(searchStringOptions?.searchString, options);
     return true;
+}
+function findWidgetAction(accessor, codeEditor, next) {
+    const editorService = accessor.get(IEditorService);
+    const editor = getNotebookEditorFromEditorPane(editorService.activeEditorPane);
+    if (!isNotebookEditorValidForSearch(accessor, editor, codeEditor)) {
+        return false;
+    }
+    const controller = editor?.getContribution(NotebookFindContrib.id);
+    if (!controller) {
+        return false;
+    }
+    if (controller.isVisible()) {
+        next ? controller.findNext() : controller.findPrevious();
+        return true;
+    }
+    else {
+        return openFindWidget(controller, editor, codeEditor, false);
+    }
+}
+async function runFind(accessor, next) {
+    const editorService = accessor.get(IEditorService);
+    const editor = getNotebookEditorFromEditorPane(editorService.activeEditorPane);
+    if (!editor) {
+        return;
+    }
+    const controller = editor.getContribution(NotebookFindContrib.id);
+    if (controller && controller.isVisible()) {
+        next ? controller.findNext() : controller.findPrevious();
+    }
+}
+StartFindAction.addImplementation(100, (accessor, codeEditor, args) => {
+    const editorService = accessor.get(IEditorService);
+    const editor = getNotebookEditorFromEditorPane(editorService.activeEditorPane);
+    if (!isNotebookEditorValidForSearch(accessor, editor, codeEditor)) {
+        return false;
+    }
+    const controller = editor?.getContribution(NotebookFindContrib.id);
+    return openFindWidget(controller, editor, codeEditor, true);
 });
 StartFindReplaceAction.addImplementation(100, (accessor, codeEditor, args) => {
     const editorService = accessor.get(IEditorService);
@@ -159,3 +210,43 @@ StartFindReplaceAction.addImplementation(100, (accessor, codeEditor, args) => {
     }
     return false;
 });
+NextMatchFindAction.addImplementation(100, (accessor, codeEditor, args) => {
+    return findWidgetAction(accessor, codeEditor, true);
+});
+PreviousMatchFindAction.addImplementation(100, (accessor, codeEditor, args) => {
+    return findWidgetAction(accessor, codeEditor, false);
+});
+registerAction2(class extends Action2 {
+    constructor() {
+        super({
+            id: 'notebook.findNext.fromWidget',
+            title: ( localize2(9091, 'Find Next')),
+            keybinding: {
+                when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, CONTEXT_FIND_WIDGET_VISIBLE)),
+                primary: KeyCode.F3,
+                mac: { primary: KeyMod.CtrlCmd | KeyCode.KeyG, secondary: [KeyCode.F3] },
+                weight: KeybindingWeight.WorkbenchContrib + 1
+            }
+        });
+    }
+    async run(accessor) {
+        return runFind(accessor, true);
+    }
+});
+registerAction2(class extends Action2 {
+    constructor() {
+        super({
+            id: 'notebook.findPrevious.fromWidget',
+            title: ( localize2(9092, 'Find Previous')),
+            keybinding: {
+                when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, CONTEXT_FIND_WIDGET_VISIBLE)),
+                primary: KeyMod.Shift | KeyCode.F3,
+                mac: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyG, secondary: [KeyMod.Shift | KeyCode.F3] },
+                weight: KeybindingWeight.WorkbenchContrib + 1
+            }
+        });
+    }
+    async run(accessor) {
+        return runFind(accessor, false);
+    }
+});

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

@@ -18,7 +18,7 @@ import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { Progress } from '@codingame/monaco-vscode-api/vscode/vs/platform/progress/common/progress';
 import { NOTEBOOK_ACTIONS_CATEGORY } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
-import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-670aae94-7f88-54d7-90ea-6fcbef423557-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-9d2c06d1-1f89-51a5-9964-aa01fe50c198-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_EDITOR_EDITABLE } from '@codingame/monaco-vscode-eda30bac-0984-5b42-9362-c68996b85232-common/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { INotebookExecutionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookExecutionService.service';
@@ -34,7 +34,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.format',
-            title: ( localize2(8852, 'Format Notebook')),
+            title: ( localize2(9113, 'Format Notebook')),
             category: NOTEBOOK_ACTIONS_CATEGORY,
             precondition: ( ContextKeyExpr.and(NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_EDITOR_EDITABLE)),
             keybinding: {
@@ -85,7 +85,7 @@ registerAction2(class extends Action2 {
                     }
                     return [];
                 })));
-                await bulkEditService.apply( allCellEdits.flat(), { label: ( localize(8853, "Format Notebook")), code: 'undoredo.formatNotebook', });
+                await bulkEditService.apply( allCellEdits.flat(), { label: ( localize(9114, "Format Notebook")), code: 'undoredo.formatNotebook', });
             }
         }
         finally {
@@ -97,7 +97,7 @@ registerEditorAction(class FormatCellAction extends EditorAction {
     constructor() {
         super({
             id: 'notebook.formatCell',
-            label: ( localize2(8854, "Format Cell")),
+            label: ( localize2(9115, "Format Cell")),
             precondition: ( ContextKeyExpr.and(
                 NOTEBOOK_IS_ACTIVE_EDITOR,
                 NOTEBOOK_EDITOR_EDITABLE,
@@ -166,7 +166,7 @@ let FormatOnCellExecutionParticipant = class FormatOnCellExecutionParticipant {
                 }
                 return [];
             })));
-            await this.bulkEditService.apply( allCellEdits.flat(), { label: ( localize(8855, "Format Cells")), code: 'undoredo.notebooks.onWillExecuteFormat', });
+            await this.bulkEditService.apply( allCellEdits.flat(), { label: ( localize(9116, "Format Cells")), code: 'undoredo.notebooks.onWillExecuteFormat', });
         }
         finally {
             disposable.dispose();

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

@@ -15,7 +15,7 @@ import { Extensions } from '@codingame/monaco-vscode-api/vscode/vs/workbench/com
 import { Memento } from '@codingame/monaco-vscode-60014c9d-b815-501d-83a9-4b08725c2ec2-common/vscode/vs/workbench/common/memento';
 import { NotebookSetting } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { HAS_OPENED_NOTEBOOK } from '@codingame/monaco-vscode-eda30bac-0984-5b42-9362-c68996b85232-common/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
-import { NotebookEditorInput } from '@codingame/monaco-vscode-670aae94-7f88-54d7-90ea-6fcbef423557-common/vscode/vs/workbench/contrib/notebook/common/notebookEditorInput';
+import { NotebookEditorInput } from '@codingame/monaco-vscode-9d2c06d1-1f89-51a5-9964-aa01fe50c198-common/vscode/vs/workbench/contrib/notebook/common/notebookEditorInput';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { LifecyclePhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 
@@ -66,7 +66,7 @@ registerAction2(class NotebookClearNotebookLayoutAction extends Action2 {
     constructor() {
         super({
             id: 'workbench.notebook.layout.gettingStarted',
-            title: ( localize2(8856, "Reset notebook getting started")),
+            title: ( localize2(9117, "Reset notebook getting started")),
             f1: true,
             precondition: ( ContextKeyExpr.equals(`config.${NotebookSetting.openGettingStarted}`, true)),
             category: Categories.Developer,

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/layout/layoutActions.js

@@ -10,7 +10,7 @@ class ToggleCellToolbarPositionAction extends Action2 {
     constructor() {
         super({
             id: TOGGLE_CELL_TOOLBAR_POSITION,
-            title: ( localize2(8857, 'Toggle Cell Toolbar Position')),
+            title: ( localize2(9118, 'Toggle Cell Toolbar Position')),
             menu: [{
                     id: MenuId.NotebookCellTitle,
                     group: 'View',

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

@@ -8,7 +8,7 @@ import { MarkerSeverity } from '@codingame/monaco-vscode-api/vscode/vs/platform/
 import { IMarkerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/markers/common/markers.service';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
-import { NotebookOverviewRulerLane } from '@codingame/monaco-vscode-670aae94-7f88-54d7-90ea-6fcbef423557-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { NotebookOverviewRulerLane } from '@codingame/monaco-vscode-9d2c06d1-1f89-51a5-9964-aa01fe50c198-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { registerNotebookContribution } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/notebookEditorExtensions';
 import { throttle } from '@codingame/monaco-vscode-api/vscode/vs/base/common/decorators';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colorUtils';

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

@@ -7,7 +7,7 @@ import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/pl
 import { RawContextKey } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey";
 import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
 import { IUndoRedoService } from "@codingame/monaco-vscode-api/vscode/vs/platform/undoRedo/common/undoRedo.service";
-import { CellFindMatchWithIndex, ICellViewModel, INotebookEditor, INotebookEditorContribution } from "@codingame/monaco-vscode-670aae94-7f88-54d7-90ea-6fcbef423557-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
+import { CellFindMatchWithIndex, ICellViewModel, INotebookEditor, INotebookEditorContribution } from "@codingame/monaco-vscode-9d2c06d1-1f89-51a5-9964-aa01fe50c198-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
 export declare enum NotebookMultiCursorState {
     Idle = 0,
     Selecting = 1,

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

@@ -34,10 +34,10 @@ import { registerWorkbenchContribution2, WorkbenchPhase } from '@codingame/monac
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_CELL_EDITOR_FOCUSED, KEYBINDING_CONTEXT_NOTEBOOK_FIND_WIDGET_FOCUSED } from '@codingame/monaco-vscode-eda30bac-0984-5b42-9362-c68996b85232-common/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
 import { NotebookAction } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
-import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-670aae94-7f88-54d7-90ea-6fcbef423557-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-9d2c06d1-1f89-51a5-9964-aa01fe50c198-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { registerNotebookContribution } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/notebookEditorExtensions';
 import { CellEditorOptions } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/view/cellParts/cellEditorOptions';
-import { NotebookFindContrib } from '@codingame/monaco-vscode-a793b3ee-7ba9-5176-a019-30ec806fdd95-common/vscode/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindWidget';
+import { NotebookFindContrib } from '@codingame/monaco-vscode-fc28fb90-97de-5e74-89a9-4cfe44128227-common/vscode/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindWidget';
 import { NotebookCellTextModel } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/common/model/notebookCellTextModel';
 
 const NOTEBOOK_ADD_FIND_MATCH_TO_SELECTION_ID = 'notebook.addFindMatchToSelection';
@@ -783,7 +783,7 @@ class NotebookSelectAllFindMatches extends NotebookAction {
     constructor() {
         super({
             id: NOTEBOOK_SELECT_ALL_FIND_MATCHES_ID,
-            title: ( localize(8858, "Select All Occurrences of Find Match")),
+            title: ( localize(9119, "Select All Occurrences of Find Match")),
             precondition: ( ContextKeyExpr.and(( ContextKeyExpr.equals('config.notebook.multiCursor.enabled', true)))),
             keybinding: {
                 when: ( ContextKeyExpr.or(( ContextKeyExpr.and(( ContextKeyExpr.equals('config.notebook.multiCursor.enabled', true)), NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_CELL_EDITOR_FOCUSED)), ( ContextKeyExpr.and(( ContextKeyExpr.equals('config.notebook.multiCursor.enabled', true)), KEYBINDING_CONTEXT_NOTEBOOK_FIND_WIDGET_FOCUSED)))),
@@ -816,7 +816,7 @@ class NotebookAddMatchToMultiSelectionAction extends NotebookAction {
     constructor() {
         super({
             id: NOTEBOOK_ADD_FIND_MATCH_TO_SELECTION_ID,
-            title: ( localize(8859, "Add Selection to Next Find Match")),
+            title: ( localize(9120, "Add Selection to Next Find Match")),
             precondition: ( ContextKeyExpr.and(( ContextKeyExpr.equals('config.notebook.multiCursor.enabled', true)), NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_CELL_EDITOR_FOCUSED)),
             keybinding: {
                 when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('config.notebook.multiCursor.enabled', true)), NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_CELL_EDITOR_FOCUSED)),
@@ -842,7 +842,7 @@ class NotebookExitMultiSelectionAction extends NotebookAction {
     constructor() {
         super({
             id: 'noteMultiCursor.exit',
-            title: ( localize(8860, "Exit Multi Cursor Mode")),
+            title: ( localize(9121, "Exit Multi Cursor Mode")),
             precondition: ( ContextKeyExpr.and(( ContextKeyExpr.equals('config.notebook.multiCursor.enabled', true)), NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_MULTI_CURSOR_CONTEXT.IsNotebookMultiCursor)),
             keybinding: {
                 when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('config.notebook.multiCursor.enabled', true)), NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_MULTI_CURSOR_CONTEXT.IsNotebookMultiCursor)),
@@ -865,7 +865,7 @@ class NotebookDeleteLeftMultiSelectionAction extends NotebookAction {
     constructor() {
         super({
             id: 'noteMultiCursor.deleteLeft',
-            title: ( localize(8861, "Delete Left")),
+            title: ( localize(9122, "Delete Left")),
             precondition: ( ContextKeyExpr.and(( ContextKeyExpr.equals('config.notebook.multiCursor.enabled', true)), NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_MULTI_CURSOR_CONTEXT.IsNotebookMultiCursor, ( ContextKeyExpr.or(( NOTEBOOK_MULTI_CURSOR_CONTEXT.NotebookMultiSelectCursorState.isEqualTo(NotebookMultiCursorState.Selecting)), ( NOTEBOOK_MULTI_CURSOR_CONTEXT.NotebookMultiSelectCursorState.isEqualTo(NotebookMultiCursorState.Editing)))))),
             keybinding: {
                 when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('config.notebook.multiCursor.enabled', true)), NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_MULTI_CURSOR_CONTEXT.IsNotebookMultiCursor, ( ContextKeyExpr.or(( NOTEBOOK_MULTI_CURSOR_CONTEXT.NotebookMultiSelectCursorState.isEqualTo(NotebookMultiCursorState.Selecting)), ( NOTEBOOK_MULTI_CURSOR_CONTEXT.NotebookMultiSelectCursorState.isEqualTo(NotebookMultiCursorState.Editing)))))),
@@ -888,7 +888,7 @@ class NotebookDeleteRightMultiSelectionAction extends NotebookAction {
     constructor() {
         super({
             id: 'noteMultiCursor.deleteRight',
-            title: ( localize(8862, "Delete Right")),
+            title: ( localize(9123, "Delete Right")),
             precondition: ( ContextKeyExpr.and(( ContextKeyExpr.equals('config.notebook.multiCursor.enabled', true)), NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_MULTI_CURSOR_CONTEXT.IsNotebookMultiCursor, ( ContextKeyExpr.or(( NOTEBOOK_MULTI_CURSOR_CONTEXT.NotebookMultiSelectCursorState.isEqualTo(NotebookMultiCursorState.Selecting)), ( NOTEBOOK_MULTI_CURSOR_CONTEXT.NotebookMultiSelectCursorState.isEqualTo(NotebookMultiCursorState.Editing)))))),
             keybinding: {
                 when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('config.notebook.multiCursor.enabled', true)), NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_MULTI_CURSOR_CONTEXT.IsNotebookMultiCursor, ( ContextKeyExpr.or(( NOTEBOOK_MULTI_CURSOR_CONTEXT.NotebookMultiSelectCursorState.isEqualTo(NotebookMultiCursorState.Selecting)), ( NOTEBOOK_MULTI_CURSOR_CONTEXT.NotebookMultiSelectCursorState.isEqualTo(NotebookMultiCursorState.Editing)))))),

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

@@ -3,7 +3,7 @@ import { timeout } from '@codingame/monaco-vscode-api/vscode/vs/base/common/asyn
 import { KeyCode, KeyMod } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
 import { EditorExtensionsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorExtensions';
 import { EditorContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/editorContextKeys';
-import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { localize, localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { CONTEXT_ACCESSIBILITY_MODE_ENABLED } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/common/accessibility';
 import { registerAction2, Action2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { Extensions } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configurationRegistry';
@@ -12,11 +12,10 @@ import { InputFocusedContextKey, IsWindowsContext } from '@codingame/monaco-vsco
 import { KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
 import { InlineChatController } from '@codingame/monaco-vscode-a793b3ee-7ba9-5176-a019-30ec806fdd95-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-670aae94-7f88-54d7-90ea-6fcbef423557-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { CellEditState } from '@codingame/monaco-vscode-9d2c06d1-1f89-51a5-9964-aa01fe50c198-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { NOTEBOOK_EDITOR_CURSOR_BOUNDARY, NOTEBOOK_EDITOR_CURSOR_LINE_BOUNDARY, CellKind } from '@codingame/monaco-vscode-api/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, NOTEBOOK_CELL_HAS_OUTPUTS, IS_COMPOSITE_NOTEBOOK } from '@codingame/monaco-vscode-eda30bac-0984-5b42-9362-c68996b85232-common/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, NOTEBOOK_OR_COMPOSITE_IS_ACTIVE_EDITOR, IS_COMPOSITE_NOTEBOOK, NOTEBOOK_CELL_HAS_OUTPUTS } from '@codingame/monaco-vscode-eda30bac-0984-5b42-9362-c68996b85232-common/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
 
 const NOTEBOOK_FOCUS_TOP = 'notebook.focusTop';
 const NOTEBOOK_FOCUS_BOTTOM = 'notebook.focusBottom';
@@ -34,7 +33,7 @@ registerAction2(class extends Action2 {
         super({
             id: 'notebook.cell.nullAction',
             title: ( localize(
-                8863,
+                9124,
                 "Keypresses that should be handled by the focused element in the cell output."
             )),
             keybinding: [{
@@ -57,7 +56,7 @@ registerAction2(class FocusNextCellAction extends NotebookCellAction {
     constructor() {
         super({
             id: NOTEBOOK_FOCUS_NEXT_EDITOR,
-            title: ( localize(8864, 'Focus Next Cell Editor')),
+            title: ( localize(9125, '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')), ( ContextKeyExpr.or(( NOTEBOOK_EDITOR_CURSOR_LINE_BOUNDARY.isEqualTo('end')), ( NOTEBOOK_EDITOR_CURSOR_LINE_BOUNDARY.isEqualTo('both')))))), ( EditorContextKeys.isEmbeddedDiffEditor.negate()))),
@@ -111,7 +110,7 @@ registerAction2(class FocusPreviousCellAction extends NotebookCellAction {
     constructor() {
         super({
             id: NOTEBOOK_FOCUS_PREVIOUS_EDITOR,
-            title: ( localize(8865, 'Focus Previous Cell Editor')),
+            title: ( localize(9126, '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')), ( ContextKeyExpr.or(( NOTEBOOK_EDITOR_CURSOR_LINE_BOUNDARY.isEqualTo('start')), ( NOTEBOOK_EDITOR_CURSOR_LINE_BOUNDARY.isEqualTo('both')))))), ( EditorContextKeys.isEmbeddedDiffEditor.negate()))),
@@ -156,7 +155,7 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: NOTEBOOK_FOCUS_TOP,
-            title: ( localize(8866, 'Focus First Cell')),
+            title: ( localize(9127, 'Focus First Cell')),
             keybinding: [
                 {
                     when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ContextKeyExpr.not(InputFocusedContextKey))),
@@ -164,11 +163,7 @@ registerAction2(class extends NotebookAction {
                     weight: KeybindingWeight.WorkbenchContrib
                 },
                 {
-                    when: ( ContextKeyExpr.and(
-                        NOTEBOOK_EDITOR_FOCUSED,
-                        ContextKeyExpr.not(InputFocusedContextKey),
-                        ( CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION.isEqualTo(''))
-                    )),
+                    when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ContextKeyExpr.not(InputFocusedContextKey))),
                     mac: { primary: KeyMod.CtrlCmd | KeyCode.UpArrow },
                     weight: KeybindingWeight.WorkbenchContrib
                 }
@@ -188,7 +183,7 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: NOTEBOOK_FOCUS_BOTTOM,
-            title: ( localize(8867, 'Focus Last Cell')),
+            title: ( localize(9128, 'Focus Last Cell')),
             keybinding: [
                 {
                     when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ContextKeyExpr.not(InputFocusedContextKey))),
@@ -197,11 +192,7 @@ registerAction2(class extends NotebookAction {
                     weight: KeybindingWeight.WorkbenchContrib
                 },
                 {
-                    when: ( ContextKeyExpr.and(
-                        NOTEBOOK_EDITOR_FOCUSED,
-                        ContextKeyExpr.not(InputFocusedContextKey),
-                        ( CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION.isEqualTo(''))
-                    )),
+                    when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ContextKeyExpr.not(InputFocusedContextKey))),
                     mac: { primary: KeyMod.CtrlCmd | KeyCode.DownArrow },
                     weight: KeybindingWeight.WorkbenchContrib
                 }
@@ -225,9 +216,10 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: FOCUS_IN_OUTPUT_COMMAND_ID,
-            title: ( localize(8868, 'Focus In Active Cell Output')),
+            title: ( localize2(9129, 'Focus In Active Cell Output')),
+            f1: true,
             keybinding: [{
-                    when: ( ContextKeyExpr.and(( IS_COMPOSITE_NOTEBOOK.negate()), IsWindowsContext)),
+                    when: ( ContextKeyExpr.and(( IS_COMPOSITE_NOTEBOOK.negate()), IsWindowsContext, NOTEBOOK_CELL_HAS_OUTPUTS)),
                     primary: KeyMod.CtrlCmd | KeyCode.DownArrow,
                     weight: KeybindingWeight.WorkbenchContrib
                 }, {
@@ -235,7 +227,7 @@ registerAction2(class extends NotebookCellAction {
                     mac: { primary: KeyMod.WinCtrl | KeyMod.CtrlCmd | KeyCode.DownArrow, },
                     weight: KeybindingWeight.WorkbenchContrib
                 }],
-            precondition: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_CELL_HAS_OUTPUTS))
+            precondition: NOTEBOOK_OR_COMPOSITE_IS_ACTIVE_EDITOR
         });
     }
     async runWithContext(accessor, context) {
@@ -248,7 +240,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: FOCUS_OUT_OUTPUT_COMMAND_ID,
-            title: ( localize(8869, 'Focus Out Active Cell Output')),
+            title: ( localize(9130, 'Focus Out Active Cell Output')),
             keybinding: {
                 primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.UpArrow,
                 mac: { primary: KeyMod.WinCtrl | KeyMod.CtrlCmd | KeyCode.UpArrow, },
@@ -267,7 +259,7 @@ registerAction2(class CenterActiveCellAction extends NotebookCellAction {
     constructor() {
         super({
             id: CENTER_ACTIVE_CELL,
-            title: ( localize(8870, "Center Active Cell")),
+            title: ( localize(9131, "Center Active Cell")),
             keybinding: {
                 when: NOTEBOOK_EDITOR_FOCUSED,
                 primary: KeyMod.CtrlCmd | KeyCode.KeyL,
@@ -286,7 +278,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: NOTEBOOK_CURSOR_PAGEUP_COMMAND_ID,
-            title: ( localize(8871, "Cell Cursor Page Up")),
+            title: ( localize(9132, "Cell Cursor Page Up")),
             keybinding: [
                 {
                     when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ( ContextKeyExpr.has(InputFocusedContextKey)), EditorContextKeys.editorTextFocus)),
@@ -304,7 +296,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: NOTEBOOK_CURSOR_PAGEUP_SELECT_COMMAND_ID,
-            title: ( localize(8872, "Cell Cursor Page Up Select")),
+            title: ( localize(9133, "Cell Cursor Page Up Select")),
             keybinding: [
                 {
                     when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ( ContextKeyExpr.has(InputFocusedContextKey)), EditorContextKeys.editorTextFocus, ( NOTEBOOK_OUTPUT_FOCUSED.negate()))),
@@ -322,7 +314,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: NOTEBOOK_CURSOR_PAGEDOWN_COMMAND_ID,
-            title: ( localize(8873, "Cell Cursor Page Down")),
+            title: ( localize(9134, "Cell Cursor Page Down")),
             keybinding: [
                 {
                     when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ( ContextKeyExpr.has(InputFocusedContextKey)), EditorContextKeys.editorTextFocus)),
@@ -340,7 +332,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: NOTEBOOK_CURSOR_PAGEDOWN_SELECT_COMMAND_ID,
-            title: ( localize(8874, "Cell Cursor Page Down Select")),
+            title: ( localize(9135, "Cell Cursor Page Down Select")),
             keybinding: [
                 {
                     when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ( ContextKeyExpr.has(InputFocusedContextKey)), EditorContextKeys.editorTextFocus, ( NOTEBOOK_OUTPUT_FOCUSED.negate()))),
@@ -369,7 +361,7 @@ function getPageSize(context) {
             type: 'boolean',
             default: true,
             markdownDescription: ( localize(
-                8875,
+                9136,
                 "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/notebookInlineVariables.d.ts

@@ -4,7 +4,7 @@ import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/pl
 import { IDebugService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/debug/common/debug.service";
 import { INotebookExecutionStateService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService.service";
 import { INotebookKernelService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookKernelService.service";
-import { INotebookEditor, INotebookEditorContribution } from "@codingame/monaco-vscode-670aae94-7f88-54d7-90ea-6fcbef423557-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
+import { INotebookEditor, INotebookEditorContribution } from "@codingame/monaco-vscode-9d2c06d1-1f89-51a5-9964-aa01fe50c198-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
 export declare class NotebookInlineVariablesController extends Disposable implements INotebookEditorContribution {
     private readonly notebookEditor;
     private readonly notebookKernelService;

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

@@ -507,7 +507,7 @@ registerAction2(class ClearNotebookInlineValues extends NotebookAction {
     constructor() {
         super({
             id: 'notebook.clearAllInlineValues',
-            title: ( localize(8876, 'Clear All Inline Values')),
+            title: ( localize(9137, 'Clear All Inline Values')),
         });
     }
     runWithContext(accessor, context) {