@codingame/monaco-vscode-notebook-service-override 6.0.2 → 7.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-notebook-service-override",
-  "version": "6.0.2",
+  "version": "7.0.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -29,6 +29,6 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@6.0.2"
+    "vscode": "npm:@codingame/monaco-vscode-api@7.0.0"
   }
 }

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

@@ -1,6 +1,6 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import './emptyTextEditorHint.css.js';
-import { $ as $$1, addDisposableListener, EventType } from 'vscode/vscode/vs/base/browser/dom';
+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 { localizeWithPath } from 'vscode/vscode/vs/nls';
@@ -23,36 +23,21 @@ import { KeybindingLabel } from 'vscode/vscode/vs/base/browser/ui/keybindingLabe
 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 { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
-import { Extensions } from 'vscode/vscode/vs/workbench/common/configuration';
 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';
 import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
 import { ChatAgentLocation } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents';
 import { IChatAgentService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
+import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView.service';
+import { StandardMouseEvent } from 'vscode/vscode/vs/base/browser/mouseEvent';
 
 const _moduleId = "vs/workbench/contrib/codeEditor/browser/emptyTextEditorHint/emptyTextEditorHint";
 const $ = $$1;
-( (Registry.as(Extensions.ConfigurationMigration)))
-    .registerConfigurationMigrations([{
-        key: 'workbench.editor.untitled.hint',
-        migrateFn: (value, _accessor) => ([
-            [emptyTextEditorHintSetting, { value }],
-            ['workbench.editor.untitled.hint', { value: undefined }]
-        ])
-    },
-    {
-        key: 'accessibility.verbosity.untitledHint',
-        migrateFn: (value, _accessor) => ([
-            [AccessibilityVerbositySettingId.EmptyEditorHint, { value }],
-            ['accessibility.verbosity.untitledHint', { value: undefined }]
-        ])
-    }]);
 const emptyTextEditorHintSetting = 'workbench.editor.empty.hint';
 let EmptyTextEditorHintContribution = class EmptyTextEditorHintContribution {
     static { this.ID = 'editor.contrib.emptyTextEditorHint'; }
-    constructor(editor, editorGroupsService, commandService, configurationService, hoverService, keybindingService, inlineChatSessionService, chatAgentService, telemetryService, productService) {
+    constructor(editor, editorGroupsService, commandService, configurationService, hoverService, keybindingService, inlineChatSessionService, chatAgentService, telemetryService, productService, contextMenuService) {
         this.editor = editor;
         this.editorGroupsService = editorGroupsService;
         this.commandService = commandService;
@@ -63,6 +48,7 @@ let EmptyTextEditorHintContribution = class EmptyTextEditorHintContribution {
         this.chatAgentService = chatAgentService;
         this.telemetryService = telemetryService;
         this.productService = productService;
+        this.contextMenuService = contextMenuService;
         this.toDispose = [];
         this.toDispose.push(this.editor.onDidChangeModel(() => this.update()));
         this.toDispose.push(this.editor.onDidChangeModelLanguage(() => this.update()));
@@ -120,7 +106,7 @@ let EmptyTextEditorHintContribution = class EmptyTextEditorHintContribution {
             return false;
         }
         const hasEditorAgents = Boolean(this.chatAgentService.getDefaultAgent(ChatAgentLocation.Editor));
-        const shouldRenderDefaultHint = model?.uri.scheme === Schemas.untitled && languageId === PLAINTEXT_LANGUAGE_ID && hasEditorAgents;
+        const shouldRenderDefaultHint = model?.uri.scheme === Schemas.untitled && languageId === PLAINTEXT_LANGUAGE_ID;
         return hasEditorAgents || shouldRenderDefaultHint;
     }
     update() {
@@ -136,7 +122,8 @@ let EmptyTextEditorHintContribution = class EmptyTextEditorHintContribution {
                 this.keybindingService,
                 this.chatAgentService,
                 this.telemetryService,
-                this.productService
+                this.productService,
+                this.contextMenuService
             )));
         }
         else if (!shouldRenderHint && this.textHintContentWidget) {
@@ -158,11 +145,12 @@ EmptyTextEditorHintContribution = ( (__decorate([
     ( (__param(6, IInlineChatSessionService))),
     ( (__param(7, IChatAgentService))),
     ( (__param(8, ITelemetryService))),
-    ( (__param(9, IProductService)))
+    ( (__param(9, IProductService))),
+    ( (__param(10, IContextMenuService)))
 ], EmptyTextEditorHintContribution)));
 class EmptyTextEditorHintContentWidget {
     static { this.ID = 'editor.widget.emptyHint'; }
-    constructor(editor, options, editorGroupsService, commandService, configurationService, hoverService, keybindingService, chatAgentService, telemetryService, productService) {
+    constructor(editor, options, editorGroupsService, commandService, configurationService, hoverService, keybindingService, chatAgentService, telemetryService, productService, contextMenuService) {
         this.editor = editor;
         this.options = options;
         this.editorGroupsService = editorGroupsService;
@@ -173,6 +161,7 @@ class EmptyTextEditorHintContentWidget {
         this.chatAgentService = chatAgentService;
         this.telemetryService = telemetryService;
         this.productService = productService;
+        this.contextMenuService = contextMenuService;
         this.isVisible = false;
         this.ariaLabel = '';
         this.toDispose = ( (new DisposableStore()));
@@ -192,6 +181,35 @@ class EmptyTextEditorHintContentWidget {
     getId() {
         return EmptyTextEditorHintContentWidget.ID;
     }
+    _disableHint(e) {
+        const disableHint = () => {
+            this.configurationService.updateValue(emptyTextEditorHintSetting, 'hidden');
+            this.dispose();
+            this.editor.focus();
+        };
+        if (!e) {
+            disableHint();
+            return;
+        }
+        this.contextMenuService.showContextMenu({
+            getAnchor: () => { return (
+                 (new StandardMouseEvent(getActiveWindow(), e))
+            ); },
+            getActions: () => {
+                return [{
+                        id: 'workench.action.disableEmptyEditorHint',
+                        label: ( localizeWithPath(_moduleId, 0, "Disable Empty Editor Hint")),
+                        tooltip: ( localizeWithPath(_moduleId, 0, "Disable Empty Editor Hint")),
+                        enabled: true,
+                        class: undefined,
+                        run: () => {
+                            disableHint();
+                        }
+                    }
+                ];
+            }
+        });
+    }
     _getHintInlineChat(providers) {
         const providerName = (providers.length === 1 ? providers[0].fullName : undefined) ?? this.productService.nameShort;
         const inlineChatId = 'inlineChat.start';
@@ -220,7 +238,7 @@ class EmptyTextEditorHintContentWidget {
         if (keybindingHint && keybindingHintLabel) {
             const actionPart = ( localizeWithPath(
                 _moduleId,
-                0,
+                1,
                 'Press {0} to ask {1} to do something. ',
                 keybindingHintLabel,
                 providerName
@@ -230,6 +248,7 @@ class EmptyTextEditorHintContentWidget {
                     const hintPart = $('a', undefined, fragment);
                     hintPart.style.fontStyle = 'italic';
                     hintPart.style.cursor = 'pointer';
+                    this.toDispose.add(addDisposableListener(hintPart, EventType.CONTEXT_MENU, (e) => this._disableHint(e)));
                     this.toDispose.add(addDisposableListener(hintPart, EventType.CLICK, handleClick));
                     return hintPart;
                 }
@@ -246,10 +265,11 @@ class EmptyTextEditorHintContentWidget {
             label.element.style.display = 'inline';
             if (this.options.clickable) {
                 label.element.style.cursor = 'pointer';
+                this.toDispose.add(addDisposableListener(label.element, EventType.CONTEXT_MENU, (e) => this._disableHint(e)));
                 this.toDispose.add(addDisposableListener(label.element, EventType.CLICK, handleClick));
             }
             hintElement.appendChild(after);
-            const typeToDismiss = ( localizeWithPath(_moduleId, 1, 'Start typing to dismiss.'));
+            const typeToDismiss = ( localizeWithPath(_moduleId, 2, 'Start typing to dismiss.'));
             const textHint2 = $('span', undefined, typeToDismiss);
             textHint2.style.fontStyle = 'italic';
             hintElement.appendChild(textHint2);
@@ -258,14 +278,14 @@ class EmptyTextEditorHintContentWidget {
         else {
             const hintMsg = ( localizeWithPath(
                 _moduleId,
-                2,
+                3,
                 '[[Ask {0} to do something]] or start typing to dismiss.',
                 providerName
             ));
             const rendered = renderFormattedText(hintMsg, { actionHandler: hintHandler });
             hintElement.appendChild(rendered);
         }
-        return { ariaLabel, hintHandler, hintElement };
+        return { ariaLabel, hintElement };
     }
     _getHintDefault() {
         const hintHandler = {
@@ -282,7 +302,7 @@ class EmptyTextEditorHintContentWidget {
                         chooseEditorOnClickOrTap(event.browserEvent);
                         break;
                     case '3':
-                        dontShowOnClickOrTap();
+                        this._disableHint();
                         break;
                 }
             }
@@ -317,14 +337,9 @@ class EmptyTextEditorHintContentWidget {
                 this.editorGroupsService.activeGroup.closeEditor(activeEditorInput, { preserveFocus: true });
             }
         };
-        const dontShowOnClickOrTap = () => {
-            this.configurationService.updateValue(emptyTextEditorHintSetting, 'hidden');
-            this.dispose();
-            this.editor.focus();
-        };
         const hintMsg = ( localizeWithPath(
             _moduleId,
-            3,
+            4,
             '[[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, {
@@ -336,7 +351,7 @@ class EmptyTextEditorHintContentWidget {
         const keybindingLabels = ( (keybindingsLookup.map((id) => this.keybindingService.lookupKeybinding(id)?.getLabel() ?? id)));
         const ariaLabel = ( localizeWithPath(
             _moduleId,
-            4,
+            5,
             '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
         ));
@@ -344,7 +359,7 @@ class EmptyTextEditorHintContentWidget {
             anchor.style.cursor = 'pointer';
             const id = keybindingsLookup.shift();
             const title = id && this.keybindingService.lookupKeybinding(id)?.getLabel();
-            hintHandler.disposables.add(this.hoverService.setupUpdatableHover(getDefaultHoverDelegate('mouse'), anchor, title ?? ''));
+            hintHandler.disposables.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), anchor, title ?? ''));
         }
         return { hintElement, ariaLabel };
     }
@@ -358,7 +373,7 @@ class EmptyTextEditorHintContentWidget {
             this.domNode.append(hintElement);
             this.ariaLabel = ariaLabel.concat(( localizeWithPath(
                 _moduleId,
-                5,
+                6,
                 ' Toggle {0} in settings to disable this hint.',
                 AccessibilityVerbositySettingId.EmptyEditorHint
             )));

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

@@ -3,6 +3,7 @@ import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import { registerEditorContribution, EditorContributionInstantiation } 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';
 import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
 import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding.service';
 import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService.service';
@@ -16,8 +17,8 @@ import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/commo
 
 let EmptyCellEditorHintContribution = class EmptyCellEditorHintContribution extends EmptyTextEditorHintContribution {
     static { this.CONTRIB_ID = 'notebook.editor.contrib.emptyCellEditorHint'; }
-    constructor(editor, _editorService, editorGroupsService, commandService, configurationService, hoverService, keybindingService, inlineChatSessionService, chatAgentService, telemetryService, productService) {
-        super(editor, editorGroupsService, commandService, configurationService, hoverService, keybindingService, inlineChatSessionService, chatAgentService, telemetryService, productService);
+    constructor(editor, _editorService, editorGroupsService, commandService, configurationService, hoverService, keybindingService, inlineChatSessionService, chatAgentService, telemetryService, productService, contextMenuService) {
+        super(editor, editorGroupsService, commandService, configurationService, hoverService, keybindingService, inlineChatSessionService, chatAgentService, telemetryService, productService, contextMenuService);
         this._editorService = _editorService;
         const activeEditor = getNotebookEditorFromEditorPane(this._editorService.activeEditorPane);
         if (!activeEditor) {
@@ -62,7 +63,8 @@ EmptyCellEditorHintContribution = ( __decorate([
     ( __param(7, IInlineChatSessionService)),
     ( __param(8, IChatAgentService)),
     ( __param(9, ITelemetryService)),
-    ( __param(10, IProductService))
+    ( __param(10, IProductService)),
+    ( __param(11, IContextMenuService))
 ], EmptyCellEditorHintContribution));
 registerEditorContribution(EmptyCellEditorHintContribution.CONTRIB_ID, EmptyCellEditorHintContribution, EditorContributionInstantiation.Eager);
 

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

@@ -6,8 +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 { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
-import { Extensions, registerWorkbenchContribution2, WorkbenchPhase } from 'vscode/vscode/vs/workbench/common/contributions';
+import { registerWorkbenchContribution2, WorkbenchPhase } 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 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/editActions';
@@ -15,9 +14,10 @@ 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 { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 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 { ServiceCollection } from 'vscode/vscode/vs/platform/instantiation/common/serviceCollection';
 
 const _moduleId = "vs/workbench/contrib/notebook/browser/contrib/editorStatusBar/editorStatusBar";
 let ImplictKernelSelector = class ImplictKernelSelector {
@@ -136,7 +136,6 @@ KernelStatus = ( (__decorate([
     ( (__param(2, INotebookKernelService))),
     ( (__param(3, IInstantiationService)))
 ], KernelStatus)));
-( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(KernelStatus, LifecyclePhase.Restored);
 let ActiveCellStatus = class ActiveCellStatus extends Disposable {
     constructor(_editorService, _statusbarService) {
         super();
@@ -201,7 +200,6 @@ ActiveCellStatus = ( (__decorate([
     ( (__param(0, IEditorService))),
     ( (__param(1, IStatusbarService)))
 ], ActiveCellStatus)));
-( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(ActiveCellStatus, LifecyclePhase.Restored);
 let NotebookIndentationStatus = class NotebookIndentationStatus extends Disposable {
     static { this.ID = 'selectNotebookIndentation'; }
     constructor(_editorService, _statusbarService, _configurationService) {
@@ -273,6 +271,26 @@ NotebookIndentationStatus = ( (__decorate([
     ( (__param(1, IStatusbarService))),
     ( (__param(2, IConfigurationService)))
 ], NotebookIndentationStatus)));
-registerWorkbenchContribution2(NotebookIndentationStatus.ID, NotebookIndentationStatus, WorkbenchPhase.AfterRestored);
+let NotebookEditorStatusContribution = class NotebookEditorStatusContribution extends Disposable {
+    static { this.ID = 'notebook.contrib.editorStatus'; }
+    constructor(instantiationService, editorGroupService, editorService) {
+        super();
+        const mainInstantiationService = instantiationService.createChild(( (new ServiceCollection([IEditorService, editorService.createScoped('main', this._store)]))));
+        this._register(mainInstantiationService.createInstance(KernelStatus));
+        this._register(mainInstantiationService.createInstance(ActiveCellStatus));
+        this._register(mainInstantiationService.createInstance(NotebookIndentationStatus));
+        this._register(editorGroupService.onDidCreateAuxiliaryEditorPart(({ part, instantiationService, disposables }) => {
+            disposables.add(instantiationService.createInstance(KernelStatus));
+            disposables.add(instantiationService.createInstance(ActiveCellStatus));
+            disposables.add(instantiationService.createInstance(NotebookIndentationStatus));
+        }));
+    }
+};
+NotebookEditorStatusContribution = ( (__decorate([
+    ( (__param(0, IInstantiationService))),
+    ( (__param(1, IEditorGroupsService))),
+    ( (__param(2, IEditorService)))
+], NotebookEditorStatusContribution)));
+registerWorkbenchContribution2(NotebookEditorStatusContribution.ID, NotebookEditorStatusContribution, WorkbenchPhase.AfterRestored);
 
-export { ActiveCellStatus, KernelStatus, NotebookIndentationStatus };
+export { ActiveCellStatus, KernelStatus, NotebookEditorStatusContribution, NotebookIndentationStatus };

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

@@ -1,6 +1,6 @@
 import n from 'vscode/external/rollup-plugin-styles/dist/runtime/inject-css.js';
 
-var css = ".monaco-workbench .notebookOverlay.notebook-editor.find-hide-transition,.monaco-workbench .notebookOverlay.notebook-editor.find-show-transition{overflow-y:hidden}.monaco-workbench .notebookOverlay.notebook-editor .simple-fr-find-part-wrapper .matchesCount{box-sizing:border-box;overflow:hidden;padding:0 2px;text-align:center;text-overflow:ellipsis;white-space:nowrap}";
+var css = ".monaco-workbench .notebookOverlay.notebook-editor.find-hide-transition,.monaco-workbench .notebookOverlay.notebook-editor.find-show-transition{overflow-y:hidden}.monaco-workbench .notebookOverlay.notebook-editor .simple-fr-find-part-wrapper .matchesCount{box-sizing:border-box;overflow:hidden;padding:0 2px;text-align:center;text-overflow:ellipsis;white-space:nowrap}.monaco-workbench .nb-findScope{background-color:var(--vscode-editor-findRangeHighlightBackground)}";
 n(css,{});
 
 export { css, css as default };

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

@@ -3,6 +3,7 @@ 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 { localize2WithPath } from 'vscode/vscode/vs/nls';
@@ -10,13 +11,12 @@ import { registerAction2, Action2 } from 'vscode/vscode/vs/platform/actions/comm
 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';
 import { registerNotebookContribution } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookEditorExtensions';
-import { CellUri } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
+import { NotebookFindScopeType, CellUri } from 'vscode/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 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
-import { EditorOption } from 'vscode/vscode/vs/editor/common/config/editorOptions';
-import { NotebookMultiCellAction } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
 
 const _moduleId = "vs/workbench/contrib/notebook/browser/contrib/find/notebookFind";
 registerNotebookContribution(NotebookFindContrib.id, NotebookFindContrib);
@@ -66,12 +66,7 @@ registerAction2(class extends NotebookMultiCellAction {
             return;
         }
         const controller = editor.getContribution(NotebookFindContrib.id);
-        if (context.selectedCells.length > 1) {
-            controller.show(undefined, { searchInRanges: true, selectedRanges: editor.getSelections() });
-        }
-        else {
-            controller.show(undefined, { searchInRanges: false, selectedRanges: [] });
-        }
+        controller.show(undefined, { findScope: { findScopeType: NotebookFindScopeType.None } });
     }
 });
 function notebookContainsTextModel(uri, textModel) {

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

@@ -15,7 +15,7 @@ import { CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION } from 'vscode/vscode/vs/workben
 import { NotebookCellAction, NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT, findTargetCellEditor, NotebookAction } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
 import { CellEditState } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { NOTEBOOK_EDITOR_CURSOR_BOUNDARY, CellKind } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
-import { NOTEBOOK_OUTPUT_INPUT_FOCUSED, NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_CELL_TYPE, NOTEBOOK_CELL_MARKDOWN_EDIT_MODE, NOTEBOOK_CURSOR_NAVIGATION_MODE, NOTEBOOK_OUTPUT_FOCUSED, NOTEBOOK_CELL_HAS_OUTPUTS } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
+import { NOTEBOOK_OUTPUT_INPUT_FOCUSED, NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_CELL_TYPE, NOTEBOOK_CELL_MARKDOWN_EDIT_MODE, NOTEBOOK_CURSOR_NAVIGATION_MODE, NOTEBOOK_OUTPUT_FOCUSED, NOTEBOOK_CELL_EDITOR_FOCUSED, NOTEBOOK_CELL_HAS_OUTPUTS } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
 
 const _moduleId = "vs/workbench/contrib/notebook/browser/contrib/navigation/arrow";
 const NOTEBOOK_FOCUS_TOP = 'notebook.focusTop';
@@ -98,10 +98,10 @@ registerAction2(class FocusNextCellAction extends NotebookCellAction {
                     weight: KeybindingWeight.WorkbenchContrib
                 },
                 {
-                    when: NOTEBOOK_EDITOR_FOCUSED,
-                    primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.PageDown,
-                    mac: { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.PageDown, },
-                    weight: KeybindingWeight.WorkbenchContrib
+                    when: ( (ContextKeyExpr.and(NOTEBOOK_CELL_EDITOR_FOCUSED, CONTEXT_ACCESSIBILITY_MODE_ENABLED))),
+                    primary: KeyMod.CtrlCmd | KeyCode.PageDown,
+                    mac: { primary: KeyMod.WinCtrl | KeyCode.PageUp, },
+                    weight: KeybindingWeight.WorkbenchContrib + 1
                 },
             ]
         });
@@ -167,10 +167,10 @@ registerAction2(class FocusPreviousCellAction extends NotebookCellAction {
                     weight: KeybindingWeight.WorkbenchContrib,
                 },
                 {
-                    when: NOTEBOOK_EDITOR_FOCUSED,
-                    primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.PageUp,
-                    mac: { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.PageUp },
-                    weight: KeybindingWeight.WorkbenchContrib
+                    when: ( (ContextKeyExpr.and(NOTEBOOK_CELL_EDITOR_FOCUSED, CONTEXT_ACCESSIBILITY_MODE_ENABLED))),
+                    primary: KeyMod.CtrlCmd | KeyCode.PageUp,
+                    mac: { primary: KeyMod.WinCtrl | KeyCode.PageUp, },
+                    weight: KeybindingWeight.WorkbenchContrib + 1
                 },
             ],
         });