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

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/statusBarProviders.js

@@ -10,11 +10,10 @@ import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
 import { CHANGE_CELL_LANGUAGE, DETECT_CELL_LANGUAGE } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { INotebookCellStatusBarService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCellStatusBarService.service';
-import { CellKind, CellStatusbarAlignment } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
+import { CellKind } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { INotebookKernelService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookKernelService.service';
 import { INotebookService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
 import { ILanguageDetectionService } from 'vscode/vscode/vs/workbench/services/languageDetection/common/languageDetectionWorkerService.service';
-import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 
 let CellStatusBarLanguagePickerProvider = class CellStatusBarLanguagePickerProvider {
     constructor(_notebookService, _languageService) {
@@ -40,7 +39,7 @@ let CellStatusBarLanguagePickerProvider = class CellStatusBarLanguagePickerProvi
             }
             else {
                 const searchTooltip = ( localize(
-                    8008,
+                    8068,
                     "Unknown cell language. Click to search for '{0}' extensions",
                     cell.language
                 ));
@@ -48,7 +47,7 @@ let CellStatusBarLanguagePickerProvider = class CellStatusBarLanguagePickerProvi
                     text: `$(dialog-warning)`,
                     command: { id: 'workbench.extensions.search', arguments: [`@tag:${cell.language}`], title: 'Search Extensions' },
                     tooltip: searchTooltip,
-                    alignment: CellStatusbarAlignment.Right,
+                    alignment: 2 ,
                     priority: -Number.MAX_SAFE_INTEGER + 1
                 });
             }
@@ -56,8 +55,8 @@ let CellStatusBarLanguagePickerProvider = class CellStatusBarLanguagePickerProvi
         statusBarItems.push({
             text: displayLanguage,
             command: CHANGE_CELL_LANGUAGE,
-            tooltip: ( localize(8009, "Select Cell Language Mode")),
-            alignment: CellStatusbarAlignment.Right,
+            tooltip: ( localize(8069, "Select Cell Language Mode")),
+            alignment: 2 ,
             priority: -Number.MAX_SAFE_INTEGER
         });
         return {
@@ -120,7 +119,7 @@ let CellStatusBarLanguageDetectionProvider = class CellStatusBarLanguageDetectio
         const items = [];
         if (cached.guess && currentLanguageId !== cached.guess) {
             const detectedName = this._languageService.getLanguageName(cached.guess) || cached.guess;
-            let tooltip = ( localize(8010, "Accept Detected Language: {0}", detectedName));
+            let tooltip = ( localize(8070, "Accept Detected Language: {0}", detectedName));
             const keybinding = this._keybindingService.lookupKeybinding(DETECT_CELL_LANGUAGE);
             const label = keybinding?.getLabel();
             if (label) {
@@ -130,7 +129,7 @@ let CellStatusBarLanguageDetectionProvider = class CellStatusBarLanguageDetectio
                 text: '$(lightbulb-autofix)',
                 command: DETECT_CELL_LANGUAGE,
                 tooltip,
-                alignment: CellStatusbarAlignment.Right,
+                alignment: 2 ,
                 priority: -Number.MAX_SAFE_INTEGER + 1
             });
         }
@@ -161,4 +160,4 @@ BuiltinCellStatusBarProviders = ( (__decorate([
     ( (__param(0, IInstantiationService))),
     ( (__param(1, INotebookCellStatusBarService)))
 ], BuiltinCellStatusBarProviders)));
-( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(BuiltinCellStatusBarProviders, LifecyclePhase.Restored);
+( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(BuiltinCellStatusBarProviders, 3 );

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

@@ -1,28 +1,26 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { localize, localize2 } from 'vscode/vscode/vs/nls';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
-import { registerWorkbenchContribution2, WorkbenchPhase } from 'vscode/vscode/vs/workbench/common/contributions';
+import { registerWorkbenchContribution2 } from 'vscode/vscode/vs/workbench/common/contributions';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 import { NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_CELL_EDITABLE, NOTEBOOK_OUTPUT_FOCUSED } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
 import { getNotebookEditorFromEditorPane, expandCellRangesWithHiddenCells, cellRangeToViewCells } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { CopyAction, PasteAction, CutAction } from 'vscode/vscode/vs/editor/contrib/clipboard/browser/clipboard';
 import { IClipboardService } from 'vscode/vscode/vs/platform/clipboard/common/clipboardService.service';
 import { cloneNotebookCellTextModel } from 'vscode/vscode/vs/workbench/contrib/notebook/common/model/notebookCellTextModel';
-import { SelectionStateType, CellEditType } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
+import { SelectionStateType } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { INotebookService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
 import { isNative } from 'vscode/vscode/vs/base/common/platform';
 import { registerAction2, MenuId, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
-import { NotebookCellAction, CellOverflowToolbarGroups, NotebookAction, NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT, NOTEBOOK_OUTPUT_WEBVIEW_ACTION_WEIGHT } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
-import { KeyMod, KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
+import { NotebookCellAction, NotebookAction, NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT, NOTEBOOK_OUTPUT_WEBVIEW_ACTION_WEIGHT } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
 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 { UndoCommand, RedoCommand } from 'vscode/vscode/vs/editor/browser/editorExtensions';
 import { Categories } from 'vscode/vscode/vs/platform/action/common/actionCommonCategories';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
 import { showWindowLogActionId } from 'vscode/vscode/vs/workbench/services/log/common/logConstants';
-import { getWindow, getActiveElement, isHTMLElement, isAncestor } from 'vscode/vscode/vs/base/browser/dom';
+import { getWindow, getActiveElement, isHTMLElement, isEditableElement, isAncestor } from 'vscode/vscode/vs/base/browser/dom';
 
 let _logging = false;
 function toggleLogging() {
@@ -110,7 +108,7 @@ function runPasteCells(editor, activeCell, pasteCells) {
         const newFocusIndex = typeof currCellIndex === 'number' ? currCellIndex + 1 : 0;
         textModel.applyEdits([
             {
-                editType: CellEditType.Replace,
+                editType: 1 ,
                 index: newFocusIndex,
                 count: 0,
                 cells: ( (pasteCells.items.map(cell => cloneNotebookCellTextModel(cell))))
@@ -127,7 +125,7 @@ function runPasteCells(editor, activeCell, pasteCells) {
         }
         textModel.applyEdits([
             {
-                editType: CellEditType.Replace,
+                editType: 1 ,
                 index: 0,
                 count: 0,
                 cells: ( (pasteCells.items.map(cell => cloneNotebookCellTextModel(cell))))
@@ -188,7 +186,7 @@ function runCutCells(accessor, editor, targetCell) {
                 selection => (selection.end <= targetCellIndex ? selection : { start: selection.start - 1, end: selection.end - 1 })
             )));
             textModel.applyEdits([
-                { editType: CellEditType.Replace, index: targetCellIndex, count: 1, cells: [] }
+                { editType: 1 , index: targetCellIndex, count: 1, cells: [] }
             ], true, { kind: SelectionStateType.Index, focus: editor.getFocus(), selections: selections }, () => ({ kind: SelectionStateType.Index, focus: newFocus, selections: newSelections }), undefined, true);
             notebookService.setToCopy([targetCell.model], false);
             return true;
@@ -204,7 +202,7 @@ function runCutCells(accessor, editor, targetCell) {
             selection => (selection.end <= focus.start ? selection : { start: selection.start - 1, end: selection.end - 1 })
         )));
         textModel.applyEdits([
-            { editType: CellEditType.Replace, index: focus.start, count: 1, cells: [] }
+            { editType: 1 , index: focus.start, count: 1, cells: [] }
         ], true, { kind: SelectionStateType.Index, focus: editor.getFocus(), selections: selections }, () => ({ kind: SelectionStateType.Index, focus: newFocus, selections: newSelections }), undefined, true);
         notebookService.setToCopy([targetCell.model], false);
         return true;
@@ -216,7 +214,7 @@ function runCutCells(accessor, editor, targetCell) {
     }
     clipboardService.writeText(( (selectedCells.map(cell => cell.getText()))).join('\n'));
     const edits = ( (selectionRanges.map(
-        range => ({ editType: CellEditType.Replace, index: range.start, count: range.end - range.start, cells: [] })
+        range => ({ editType: 1 , index: range.start, count: range.end - range.start, cells: [] })
     )));
     const firstSelectIndex = selectionRanges[0].start;
     const newFocusedCellIndex = firstSelectIndex < textModel.cells.length - 1
@@ -289,7 +287,7 @@ let NotebookClipboardContribution = class NotebookClipboardContribution extends
     runCopyAction(accessor) {
         const loggerService = accessor.get(ILogService);
         const activeElement = getActiveElement();
-        if (isHTMLElement(activeElement) && ['input', 'textarea'].indexOf(activeElement.tagName.toLowerCase()) >= 0) {
+        if (isHTMLElement(activeElement) && isEditableElement(activeElement)) {
             _log(loggerService, '[NotebookEditor] focus is on input or textarea element, bypass');
             return false;
         }
@@ -311,7 +309,7 @@ let NotebookClipboardContribution = class NotebookClipboardContribution extends
     }
     runPasteAction(accessor) {
         const activeElement = getActiveElement();
-        if (activeElement && ['input', 'textarea'].indexOf(activeElement.tagName.toLowerCase()) >= 0) {
+        if (activeElement && isEditableElement(activeElement)) {
             return false;
         }
         const notebookService = accessor.get(INotebookService);
@@ -327,7 +325,7 @@ let NotebookClipboardContribution = class NotebookClipboardContribution extends
     }
     runCutAction(accessor) {
         const activeElement = getActiveElement();
-        if (activeElement && ['input', 'textarea'].indexOf(activeElement.tagName.toLowerCase()) >= 0) {
+        if (activeElement && isEditableElement(activeElement)) {
             return false;
         }
         const { editor } = this._getContext();
@@ -340,7 +338,7 @@ let NotebookClipboardContribution = class NotebookClipboardContribution extends
 NotebookClipboardContribution = ( (__decorate([
     ( (__param(0, IEditorService)))
 ], NotebookClipboardContribution)));
-registerWorkbenchContribution2(NotebookClipboardContribution.ID, NotebookClipboardContribution, WorkbenchPhase.BlockRestore);
+registerWorkbenchContribution2(NotebookClipboardContribution.ID, NotebookClipboardContribution, 2 );
 const COPY_CELL_COMMAND_ID = 'notebook.cell.copy';
 const CUT_CELL_COMMAND_ID = 'notebook.cell.cut';
 const PASTE_CELL_COMMAND_ID = 'notebook.cell.paste';
@@ -349,18 +347,18 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: COPY_CELL_COMMAND_ID,
-            title: ( localize(7961, "Copy Cell")),
+            title: ( localize(8021, "Copy Cell")),
             menu: {
                 id: MenuId.NotebookCellTitle,
                 when: NOTEBOOK_EDITOR_FOCUSED,
-                group: CellOverflowToolbarGroups.Copy,
+                group: "1_copy" ,
                 order: 2,
             },
             keybinding: isNative ? undefined : {
-                primary: KeyMod.CtrlCmd | KeyCode.KeyC,
-                win: { primary: KeyMod.CtrlCmd | KeyCode.KeyC, secondary: [KeyMod.CtrlCmd | KeyCode.Insert] },
+                primary: 2048  | 33 ,
+                win: { primary: 2048  | 33 , secondary: [2048  | 19 ] },
                 when: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ContextKeyExpr.not(InputFocusedContextKey)))),
-                weight: KeybindingWeight.WorkbenchContrib
+                weight: 200
             }
         });
     }
@@ -372,18 +370,18 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: CUT_CELL_COMMAND_ID,
-            title: ( localize(7962, "Cut Cell")),
+            title: ( localize(8022, "Cut Cell")),
             menu: {
                 id: MenuId.NotebookCellTitle,
                 when: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_CELL_EDITABLE))),
-                group: CellOverflowToolbarGroups.Copy,
+                group: "1_copy" ,
                 order: 1,
             },
             keybinding: isNative ? undefined : {
                 when: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ContextKeyExpr.not(InputFocusedContextKey)))),
-                primary: KeyMod.CtrlCmd | KeyCode.KeyX,
-                win: { primary: KeyMod.CtrlCmd | KeyCode.KeyX, secondary: [KeyMod.Shift | KeyCode.Delete] },
-                weight: KeybindingWeight.WorkbenchContrib
+                primary: 2048  | 54 ,
+                win: { primary: 2048  | 54 , secondary: [1024  | 20 ] },
+                weight: 200
             }
         });
     }
@@ -395,19 +393,19 @@ registerAction2(class extends NotebookAction {
     constructor() {
         super({
             id: PASTE_CELL_COMMAND_ID,
-            title: ( localize(7963, "Paste Cell")),
+            title: ( localize(8023, "Paste Cell")),
             menu: {
                 id: MenuId.NotebookCellTitle,
                 when: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_EDITOR_EDITABLE))),
-                group: CellOverflowToolbarGroups.Copy,
+                group: "1_copy" ,
                 order: 3,
             },
             keybinding: isNative ? undefined : {
                 when: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ContextKeyExpr.not(InputFocusedContextKey)))),
-                primary: KeyMod.CtrlCmd | KeyCode.KeyV,
-                win: { primary: KeyMod.CtrlCmd | KeyCode.KeyV, secondary: [KeyMod.Shift | KeyCode.Insert] },
-                linux: { primary: KeyMod.CtrlCmd | KeyCode.KeyV, secondary: [KeyMod.Shift | KeyCode.Insert] },
-                weight: KeybindingWeight.EditorContrib
+                primary: 2048  | 52 ,
+                win: { primary: 2048  | 52 , secondary: [1024  | 19 ] },
+                linux: { primary: 2048  | 52 , secondary: [1024  | 19 ] },
+                weight: 100
             }
         });
     }
@@ -427,10 +425,10 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: PASTE_CELL_ABOVE_COMMAND_ID,
-            title: ( localize(7964, "Paste Cell Above")),
+            title: ( localize(8024, "Paste Cell Above")),
             keybinding: {
                 when: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ContextKeyExpr.not(InputFocusedContextKey)))),
-                primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyV,
+                primary: 2048  | 1024  | 52 ,
                 weight: NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT
             },
         });
@@ -455,7 +453,7 @@ registerAction2(class extends NotebookCellAction {
         const newFocusIndex = currCellIndex;
         textModel.applyEdits([
             {
-                editType: CellEditType.Replace,
+                editType: 1 ,
                 index: currCellIndex,
                 count: 0,
                 cells: ( (pasteCells.items.map(cell => cloneNotebookCellTextModel(cell))))
@@ -471,7 +469,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.toggleNotebookClipboardLog',
-            title: ( localize2(7965, 'Toggle Notebook Clipboard Troubleshooting')),
+            title: ( localize2(8025, 'Toggle Notebook Clipboard Troubleshooting')),
             category: Categories.Developer,
             f1: true
         });
@@ -488,9 +486,9 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: 'notebook.cell.output.selectAll',
-            title: ( localize(7966, "Select All")),
+            title: ( localize(8026, "Select All")),
             keybinding: {
-                primary: KeyMod.CtrlCmd | KeyCode.KeyA,
+                primary: 2048  | 31 ,
                 when: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_OUTPUT_FOCUSED))),
                 weight: NOTEBOOK_OUTPUT_WEBVIEW_ACTION_WEIGHT
             }

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/debug/notebookBreakpoints.js

@@ -10,7 +10,6 @@ import { getNotebookEditorFromEditorPane } from 'vscode/vscode/vs/workbench/cont
 import { NotebookCellsChangeType, CellUri } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { INotebookService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
-import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 
 let NotebookBreakpoints = class NotebookBreakpoints extends Disposable {
     constructor(_debugService, _notebookService, _editorService) {
@@ -104,4 +103,4 @@ NotebookBreakpoints = ( __decorate([
     ( __param(1, INotebookService)),
     ( __param(2, IEditorService))
 ], NotebookBreakpoints));
-( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(NotebookBreakpoints, LifecyclePhase.Restored);
+( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(NotebookBreakpoints, 3 );

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/debug/notebookCellPausing.js

@@ -8,7 +8,6 @@ import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/d
 import { CellUri } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { CellExecutionUpdateType } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookExecutionService';
 import { INotebookExecutionStateService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService.service';
-import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 
 let NotebookCellPausing = class NotebookCellPausing extends Disposable {
     constructor(_debugService, _notebookExecutionStateService) {
@@ -65,4 +64,4 @@ NotebookCellPausing = ( __decorate([
     ( __param(0, IDebugService)),
     ( __param(1, INotebookExecutionStateService))
 ], NotebookCellPausing));
-( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(NotebookCellPausing, LifecyclePhase.Restored);
+( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(NotebookCellPausing, 3 );

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/editorHint/emptyCellEditorHint.js

@@ -1,6 +1,6 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
-import { registerEditorContribution, EditorContributionInstantiation } from 'vscode/vscode/vs/editor/browser/editorExtensions';
+import { registerEditorContribution } from 'vscode/vscode/vs/editor/browser/editorExtensions';
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView.service';
@@ -66,6 +66,6 @@ EmptyCellEditorHintContribution = ( __decorate([
     ( __param(10, IProductService)),
     ( __param(11, IContextMenuService))
 ], EmptyCellEditorHintContribution));
-registerEditorContribution(EmptyCellEditorHintContribution.CONTRIB_ID, EmptyCellEditorHintContribution, EditorContributionInstantiation.Eager);
+registerEditorContribution(EmptyCellEditorHintContribution.CONTRIB_ID, EmptyCellEditorHintContribution, 0 );
 
 export { EmptyCellEditorHintContribution };

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

@@ -6,7 +6,7 @@ import { ILanguageFeaturesService } from 'vscode/vscode/vs/editor/common/service
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
-import { registerWorkbenchContribution2, WorkbenchPhase } from 'vscode/vscode/vs/workbench/common/contributions';
+import { registerWorkbenchContribution2 } from 'vscode/vscode/vs/workbench/common/contributions';
 import { CENTER_ACTIVE_CELL } from '../navigation/arrow.js';
 import { SELECT_KERNEL_ID } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
 import { SELECT_NOTEBOOK_INDENTATION_ID } from '../../controller/editActions.js';
@@ -14,7 +14,6 @@ import { getNotebookEditorFromEditorPane } from 'vscode/vscode/vs/workbench/cont
 import { NotebookCellsChangeType } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { INotebookKernelService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookKernelService.service';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
-import { StatusbarAlignment } from 'vscode/vscode/vs/workbench/services/statusbar/browser/statusbar';
 import { IStatusbarService } from 'vscode/vscode/vs/workbench/services/statusbar/browser/statusbar.service';
 import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { Event } from 'vscode/vscode/vs/base/common/event';
@@ -110,22 +109,22 @@ let KernelStatus = class KernelStatus extends Disposable {
             }
             const tooltip = kernel.description ?? kernel.detail ?? kernel.label;
             this._kernelInfoElement.add(this._statusbarService.addEntry({
-                name: ( localize(8017, "Notebook Kernel Info")),
+                name: ( localize(8077, "Notebook Kernel Info")),
                 text: `$(notebook-kernel-select) ${kernel.label}`,
                 ariaLabel: kernel.label,
-                tooltip: isSuggested ? ( localize(8018, "{0} (suggestion)", tooltip)) : tooltip,
+                tooltip: isSuggested ? ( localize(8078, "{0} (suggestion)", tooltip)) : tooltip,
                 command: SELECT_KERNEL_ID,
-            }, SELECT_KERNEL_ID, StatusbarAlignment.RIGHT, 10));
+            }, SELECT_KERNEL_ID, 1 , 10));
             this._kernelInfoElement.add(kernel.onDidChange(() => this._showKernelStatus(notebook)));
         }
         else {
             this._kernelInfoElement.add(this._statusbarService.addEntry({
-                name: ( localize(8019, "Notebook Kernel Selection")),
-                text: ( localize(8020, "Select Kernel")),
-                ariaLabel: ( localize(8020, "Select Kernel")),
+                name: ( localize(8079, "Notebook Kernel Selection")),
+                text: ( localize(8080, "Select Kernel")),
+                ariaLabel: ( localize(8080, "Select Kernel")),
                 command: SELECT_KERNEL_ID,
                 kind: 'prominent'
-            }, SELECT_KERNEL_ID, StatusbarAlignment.RIGHT, 10));
+            }, SELECT_KERNEL_ID, 1 , 10));
         }
     }
 };
@@ -167,13 +166,13 @@ let ActiveCellStatus = class ActiveCellStatus extends Disposable {
             return;
         }
         const entry = {
-            name: ( localize(8021, "Notebook Editor Selections")),
+            name: ( localize(8081, "Notebook Editor Selections")),
             text: newText,
             ariaLabel: newText,
             command: CENTER_ACTIVE_CELL
         };
         if (!this._accessor.value) {
-            this._accessor.value = this._statusbarService.addEntry(entry, 'notebook.activeCellStatus', StatusbarAlignment.RIGHT, 100);
+            this._accessor.value = this._statusbarService.addEntry(entry, 'notebook.activeCellStatus', 1 , 100);
         }
         else {
             this._accessor.value.update(entry);
@@ -191,8 +190,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(8022, "Cell {0} ({1} selected)", idxFocused, numSelected)) :
-            ( localize(8023, "Cell {0} of {1}", idxFocused, totalCells));
+            ( localize(8082, "Cell {0} ({1} selected)", idxFocused, numSelected)) :
+            ( localize(8083, "Cell {0} of {1}", idxFocused, totalCells));
     }
 };
 ActiveCellStatus = ( (__decorate([
@@ -251,14 +250,14 @@ let NotebookIndentationStatus = class NotebookIndentationStatus extends Disposab
             return;
         }
         const entry = {
-            name: ( localize(8024, "Notebook Indentation")),
+            name: ( localize(8084, "Notebook Indentation")),
             text: newText,
             ariaLabel: newText,
-            tooltip: ( localize(8025, "Select Indentation")),
+            tooltip: ( localize(8085, "Select Indentation")),
             command: SELECT_NOTEBOOK_INDENTATION_ID
         };
         if (!this._accessor.value) {
-            this._accessor.value = this._statusbarService.addEntry(entry, 'notebook.status.indentation', StatusbarAlignment.RIGHT, 100.4);
+            this._accessor.value = this._statusbarService.addEntry(entry, 'notebook.status.indentation', 1 , 100.4);
         }
         else {
             this._accessor.value.update(entry);
@@ -292,6 +291,6 @@ let NotebookEditorStatusContribution = class NotebookEditorStatusContribution ex
 NotebookEditorStatusContribution = ( (__decorate([
     ( (__param(0, IEditorGroupsService)))
 ], NotebookEditorStatusContribution)));
-registerWorkbenchContribution2(NotebookEditorStatusContribution.ID, NotebookEditorStatusContribution, WorkbenchPhase.AfterRestored);
+registerWorkbenchContribution2(NotebookEditorStatusContribution.ID, NotebookEditorStatusContribution, 3 );
 
 export { ActiveCellStatus, KernelStatus, NotebookEditorStatusContribution, NotebookIndentationStatus };

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

@@ -1,15 +1,12 @@
 import './media/notebookFind.css.js';
-import { KeyCode, KeyMod } from 'vscode/vscode/vs/base/common/keyCodes';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import { isEqual } from 'vscode/vscode/vs/base/common/resources';
 import { ICodeEditorService } from 'vscode/vscode/vs/editor/browser/services/codeEditorService';
-import { EditorOption } from 'vscode/vscode/vs/editor/common/config/editorOptions';
 import { EditorContextKeys } from 'vscode/vscode/vs/editor/common/editorContextKeys';
-import { getSelectionSearchString, StartFindAction, FindStartFocusAction, StartFindReplaceAction } from 'vscode/vscode/vs/editor/contrib/find/browser/findController';
+import { getSelectionSearchString, StartFindAction, StartFindReplaceAction } from 'vscode/vscode/vs/editor/contrib/find/browser/findController';
 import { localize2 } from 'vscode/vscode/vs/nls';
 import { registerAction2, Action2 } 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 { NotebookFindContrib } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindWidget';
 import { NotebookMultiCellAction } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
 import { getNotebookEditorFromEditorPane } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
@@ -23,11 +20,11 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.hideFind',
-            title: ( localize2(7967, 'Hide Find in Notebook')),
+            title: ( localize2(8027, 'Hide Find in Notebook')),
             keybinding: {
                 when: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, KEYBINDING_CONTEXT_NOTEBOOK_FIND_WIDGET_FOCUSED))),
-                primary: KeyCode.Escape,
-                weight: KeybindingWeight.WorkbenchContrib
+                primary: 9 ,
+                weight: 200
             }
         });
     }
@@ -46,15 +43,15 @@ registerAction2(class extends NotebookMultiCellAction {
     constructor() {
         super({
             id: 'notebook.find',
-            title: ( localize2(7968, 'Find in Notebook')),
+            title: ( localize2(8028, '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,
-                weight: KeybindingWeight.WorkbenchContrib
+                primary: 36  | 2048 ,
+                weight: 200
             }
         });
     }
@@ -118,13 +115,13 @@ StartFindAction.addImplementation(100, (accessor, codeEditor, args) => {
     const controller = editor.getContribution(NotebookFindContrib.id);
     const searchStringOptions = getSearchStringOptions(codeEditor, {
         forceRevealReplace: false,
-        seedSearchStringFromSelection: codeEditor.getOption(EditorOption.find).seedSearchStringFromSelection !== 'never' ? 'single' : 'none',
-        seedSearchStringFromNonEmptySelection: codeEditor.getOption(EditorOption.find).seedSearchStringFromSelection === 'selection',
-        seedSearchStringFromGlobalClipboard: codeEditor.getOption(EditorOption.find).globalFindClipboard,
-        shouldFocus: FindStartFocusAction.FocusFindInput,
+        seedSearchStringFromSelection: codeEditor.getOption(43 ).seedSearchStringFromSelection !== 'never' ? 'single' : 'none',
+        seedSearchStringFromNonEmptySelection: codeEditor.getOption(43 ).seedSearchStringFromSelection === 'selection',
+        seedSearchStringFromGlobalClipboard: codeEditor.getOption(43 ).globalFindClipboard,
+        shouldFocus: 1 ,
         shouldAnimate: true,
         updateSearchScope: false,
-        loop: codeEditor.getOption(EditorOption.find).loop
+        loop: codeEditor.getOption(43 ).loop
     });
     let options = undefined;
     const uri = codeEditor.getModel().uri;
@@ -152,13 +149,13 @@ StartFindReplaceAction.addImplementation(100, (accessor, codeEditor, args) => {
     const controller = editor.getContribution(NotebookFindContrib.id);
     const searchStringOptions = getSearchStringOptions(codeEditor, {
         forceRevealReplace: false,
-        seedSearchStringFromSelection: codeEditor.getOption(EditorOption.find).seedSearchStringFromSelection !== 'never' ? 'single' : 'none',
-        seedSearchStringFromNonEmptySelection: codeEditor.getOption(EditorOption.find).seedSearchStringFromSelection === 'selection',
-        seedSearchStringFromGlobalClipboard: codeEditor.getOption(EditorOption.find).globalFindClipboard,
-        shouldFocus: FindStartFocusAction.FocusFindInput,
+        seedSearchStringFromSelection: codeEditor.getOption(43 ).seedSearchStringFromSelection !== 'never' ? 'single' : 'none',
+        seedSearchStringFromNonEmptySelection: codeEditor.getOption(43 ).seedSearchStringFromSelection === 'selection',
+        seedSearchStringFromGlobalClipboard: codeEditor.getOption(43 ).globalFindClipboard,
+        shouldFocus: 1 ,
         shouldAnimate: true,
         updateSearchScope: false,
-        loop: codeEditor.getOption(EditorOption.find).loop
+        loop: codeEditor.getOption(43 ).loop
     });
     if (controller) {
         controller.replace(searchStringOptions?.searchString);