@codingame/monaco-vscode-notebook-service-override 11.1.2 → 12.0.0

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

@@ -1,4 +1,5 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { localize } from 'vscode/vscode/vs/nls';
 import { DisposableStore, Disposable, MutableDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
@@ -6,21 +7,22 @@ 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 } 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 '@codingame/monaco-vscode-chat-interactive-notebook-search-common/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
+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 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 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';
 
 let ImplictKernelSelector = class ImplictKernelSelector {
     constructor(notebook, suggested, notebookKernelService, languageFeaturesService, logService) {
-        const disposables = ( (new DisposableStore()));
+        const disposables = ( new DisposableStore());
         this.dispose = disposables.dispose.bind(disposables);
         const selectKernel = () => {
             disposables.clear();
@@ -48,11 +50,11 @@ let ImplictKernelSelector = class ImplictKernelSelector {
         }));
     }
 };
-ImplictKernelSelector = ( (__decorate([
-    ( (__param(2, INotebookKernelService))),
-    ( (__param(3, ILanguageFeaturesService))),
-    ( (__param(4, ILogService)))
-], ImplictKernelSelector)));
+ImplictKernelSelector = ( __decorate([
+    ( __param(2, INotebookKernelService)),
+    ( __param(3, ILanguageFeaturesService)),
+    ( __param(4, ILogService))
+], ImplictKernelSelector));
 let KernelStatus = class KernelStatus extends Disposable {
     constructor(_editorService, _statusbarService, _notebookKernelService, _instantiationService) {
         super();
@@ -60,8 +62,8 @@ let KernelStatus = class KernelStatus extends Disposable {
         this._statusbarService = _statusbarService;
         this._notebookKernelService = _notebookKernelService;
         this._instantiationService = _instantiationService;
-        this._editorDisposables = this._register(( (new DisposableStore())));
-        this._kernelInfoElement = this._register(( (new DisposableStore())));
+        this._editorDisposables = this._register(( new DisposableStore()));
+        this._kernelInfoElement = this._register(( new DisposableStore()));
         this._register(this._editorService.onDidActiveEditorChange(() => this._updateStatusbar()));
         this._updateStatusbar();
     }
@@ -110,38 +112,38 @@ let KernelStatus = class KernelStatus extends Disposable {
             }
             const tooltip = kernel.description ?? kernel.detail ?? kernel.label;
             this._kernelInfoElement.add(this._statusbarService.addEntry({
-                name: ( localize(8167, "Notebook Kernel Info")),
+                name: ( localize(7321, "Notebook Kernel Info")),
                 text: `$(notebook-kernel-select) ${kernel.label}`,
                 ariaLabel: kernel.label,
-                tooltip: isSuggested ? ( localize(8168, "{0} (suggestion)", tooltip)) : tooltip,
+                tooltip: isSuggested ? ( localize(7322, "{0} (suggestion)", tooltip)) : tooltip,
                 command: SELECT_KERNEL_ID,
-            }, SELECT_KERNEL_ID, 1 , 10));
+            }, SELECT_KERNEL_ID, StatusbarAlignment.RIGHT, 10));
             this._kernelInfoElement.add(kernel.onDidChange(() => this._showKernelStatus(notebook)));
         }
         else {
             this._kernelInfoElement.add(this._statusbarService.addEntry({
-                name: ( localize(8169, "Notebook Kernel Selection")),
-                text: ( localize(8170, "Select Kernel")),
-                ariaLabel: ( localize(8170, "Select Kernel")),
+                name: ( localize(7323, "Notebook Kernel Selection")),
+                text: ( localize(7324, "Select Kernel")),
+                ariaLabel: ( localize(7324, "Select Kernel")),
                 command: SELECT_KERNEL_ID,
                 kind: 'prominent'
-            }, SELECT_KERNEL_ID, 1 , 10));
+            }, SELECT_KERNEL_ID, StatusbarAlignment.RIGHT, 10));
         }
     }
 };
-KernelStatus = ( (__decorate([
-    ( (__param(0, IEditorService))),
-    ( (__param(1, IStatusbarService))),
-    ( (__param(2, INotebookKernelService))),
-    ( (__param(3, IInstantiationService)))
-], KernelStatus)));
+KernelStatus = ( __decorate([
+    ( __param(0, IEditorService)),
+    ( __param(1, IStatusbarService)),
+    ( __param(2, INotebookKernelService)),
+    ( __param(3, IInstantiationService))
+], KernelStatus));
 let ActiveCellStatus = class ActiveCellStatus extends Disposable {
     constructor(_editorService, _statusbarService) {
         super();
         this._editorService = _editorService;
         this._statusbarService = _statusbarService;
-        this._itemDisposables = this._register(( (new DisposableStore())));
-        this._accessor = this._register(( (new MutableDisposable())));
+        this._itemDisposables = this._register(( new DisposableStore()));
+        this._accessor = this._register(( new MutableDisposable()));
         this._register(this._editorService.onDidActiveEditorChange(() => this._update()));
         this._update();
     }
@@ -168,13 +170,13 @@ let ActiveCellStatus = class ActiveCellStatus extends Disposable {
             return;
         }
         const entry = {
-            name: ( localize(8171, "Notebook Editor Selections")),
+            name: ( localize(7325, "Notebook Editor Selections")),
             text: newText,
             ariaLabel: newText,
             command: CENTER_ACTIVE_CELL
         };
         if (!this._accessor.value) {
-            this._accessor.value = this._statusbarService.addEntry(entry, 'notebook.activeCellStatus', 1 , 100);
+            this._accessor.value = this._statusbarService.addEntry(entry, 'notebook.activeCellStatus', StatusbarAlignment.RIGHT, 100);
         }
         else {
             this._accessor.value.update(entry);
@@ -192,14 +194,14 @@ 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(8172, "Cell {0} ({1} selected)", idxFocused, numSelected)) :
-            ( localize(8173, "Cell {0} of {1}", idxFocused, totalCells));
+            ( localize(7326, "Cell {0} ({1} selected)", idxFocused, numSelected)) :
+            ( localize(7327, "Cell {0} of {1}", idxFocused, totalCells));
     }
 };
-ActiveCellStatus = ( (__decorate([
-    ( (__param(0, IEditorService))),
-    ( (__param(1, IStatusbarService)))
-], ActiveCellStatus)));
+ActiveCellStatus = ( __decorate([
+    ( __param(0, IEditorService)),
+    ( __param(1, IStatusbarService))
+], ActiveCellStatus));
 let NotebookIndentationStatus = class NotebookIndentationStatus extends Disposable {
     static { this.ID = 'selectNotebookIndentation'; }
     constructor(_editorService, _statusbarService, _configurationService) {
@@ -207,8 +209,8 @@ let NotebookIndentationStatus = class NotebookIndentationStatus extends Disposab
         this._editorService = _editorService;
         this._statusbarService = _statusbarService;
         this._configurationService = _configurationService;
-        this._itemDisposables = this._register(( (new DisposableStore())));
-        this._accessor = this._register(( (new MutableDisposable())));
+        this._itemDisposables = this._register(( new DisposableStore()));
+        this._accessor = this._register(( new MutableDisposable()));
         this._register(this._editorService.onDidActiveEditorChange(() => this._update()));
         this._register(this._configurationService.onDidChangeConfiguration(e => {
             if (e.affectsConfiguration('editor') || e.affectsConfiguration('notebook')) {
@@ -253,25 +255,25 @@ let NotebookIndentationStatus = class NotebookIndentationStatus extends Disposab
             return;
         }
         const entry = {
-            name: ( localize(8174, "Notebook Indentation")),
+            name: ( localize(7328, "Notebook Indentation")),
             text: newText,
             ariaLabel: newText,
-            tooltip: ( localize(8175, "Select Indentation")),
+            tooltip: ( localize(7329, "Select Indentation")),
             command: SELECT_NOTEBOOK_INDENTATION_ID
         };
         if (!this._accessor.value) {
-            this._accessor.value = this._statusbarService.addEntry(entry, 'notebook.status.indentation', 1 , 100.4);
+            this._accessor.value = this._statusbarService.addEntry(entry, 'notebook.status.indentation', StatusbarAlignment.RIGHT, 100.4);
         }
         else {
             this._accessor.value.update(entry);
         }
     }
 };
-NotebookIndentationStatus = ( (__decorate([
-    ( (__param(0, IEditorService))),
-    ( (__param(1, IStatusbarService))),
-    ( (__param(2, IConfigurationService)))
-], NotebookIndentationStatus)));
+NotebookIndentationStatus = ( __decorate([
+    ( __param(0, IEditorService)),
+    ( __param(1, IStatusbarService)),
+    ( __param(2, IConfigurationService))
+], NotebookIndentationStatus));
 let NotebookEditorStatusContribution = class NotebookEditorStatusContribution extends Disposable {
     static { this.ID = 'notebook.contrib.editorStatus'; }
     constructor(editorGroupService) {
@@ -283,7 +285,7 @@ let NotebookEditorStatusContribution = class NotebookEditorStatusContribution ex
         this._register(editorGroupService.onDidCreateAuxiliaryEditorPart(part => this.createNotebookStatus(part)));
     }
     createNotebookStatus(part) {
-        const disposables = ( (new DisposableStore()));
+        const disposables = ( new DisposableStore());
         Event.once(part.onWillDispose)(() => disposables.dispose());
         const scopedInstantiationService = this.editorGroupService.getScopedInstantiationService(part);
         disposables.add(scopedInstantiationService.createInstance(KernelStatus));
@@ -291,7 +293,7 @@ let NotebookEditorStatusContribution = class NotebookEditorStatusContribution ex
         disposables.add(scopedInstantiationService.createInstance(NotebookIndentationStatus));
     }
 };
-NotebookEditorStatusContribution = ( (__decorate([
-    ( (__param(0, IEditorGroupsService)))
-], NotebookEditorStatusContribution)));
-registerWorkbenchContribution2(NotebookEditorStatusContribution.ID, NotebookEditorStatusContribution, 3 );
+NotebookEditorStatusContribution = ( __decorate([
+    ( __param(0, IEditorGroupsService))
+], NotebookEditorStatusContribution));
+registerWorkbenchContribution2(NotebookEditorStatusContribution.ID, NotebookEditorStatusContribution, WorkbenchPhase.AfterRestored);

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

@@ -0,0 +1,13 @@
+import { Disposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { INotebookEditor, INotebookEditorContribution } from "@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
+import { INotebookExecutionStateService } from "vscode/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService.service";
+import { IUserActivityService } from "vscode/vscode/vs/workbench/services/userActivity/common/userActivityService.service";
+export declare class ExecutionEditorProgressController extends Disposable implements INotebookEditorContribution {
+    private readonly _notebookEditor;
+    private readonly _notebookExecutionStateService;
+    private readonly _userActivity;
+    static id: string;
+    private readonly _activityMutex;
+    constructor(_notebookEditor: INotebookEditor, _notebookExecutionStateService: INotebookExecutionStateService, _userActivity: IUserActivityService);
+    private _update;
+}

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

@@ -1,7 +1,8 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { throttle } from 'vscode/vscode/vs/base/common/decorators';
 import { Disposable, MutableDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
-import { registerNotebookContribution } from '@codingame/monaco-vscode-chat-interactive-notebook-search-common/vscode/vs/workbench/contrib/notebook/browser/notebookEditorExtensions';
+import { registerNotebookContribution } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/notebook/browser/notebookEditorExtensions';
 import { NotebookCellExecutionState } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { INotebookExecutionStateService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService.service';
 import { IUserActivityService } from 'vscode/vscode/vs/workbench/services/userActivity/common/userActivityService.service';

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

@@ -1,4 +1,4 @@
-import n from 'vscode/external/rollup-plugin-styles/dist/runtime/inject-css.js';
+import n from 'vscode/external/rollup-plugin-styles/dist/runtime/inject-css';
 
 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,{});

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

@@ -0,0 +1 @@
+

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

@@ -1,18 +1,22 @@
+
 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, StartFindReplaceAction } from 'vscode/vscode/vs/editor/contrib/find/browser/findController';
+import { getSelectionSearchString, StartFindAction, FindStartFocusAction, 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 { NotebookFindContrib } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindWidget';
-import { NotebookMultiCellAction } from '@codingame/monaco-vscode-chat-interactive-notebook-search-common/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
-import { getNotebookEditorFromEditorPane } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { registerNotebookContribution } from '@codingame/monaco-vscode-chat-interactive-notebook-search-common/vscode/vs/workbench/contrib/notebook/browser/notebookEditorExtensions';
+import { KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
+import { NotebookFindContrib } from '@codingame/monaco-vscode-1ae7d696-d960-5ac6-97a3-9fe7c8c3a793-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-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { registerNotebookContribution } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/notebook/browser/notebookEditorExtensions';
 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 { NOTEBOOK_EDITOR_FOCUSED, KEYBINDING_CONTEXT_NOTEBOOK_FIND_WIDGET_FOCUSED, NOTEBOOK_IS_ACTIVE_EDITOR, INTERACTIVE_WINDOW_IS_ACTIVE_EDITOR } from '@codingame/monaco-vscode-4a36e358-d94d-55e0-86ee-3bcd543d9d3f-common/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 
 registerNotebookContribution(NotebookFindContrib.id, NotebookFindContrib);
@@ -20,11 +24,11 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.hideFind',
-            title: ( localize2(8117, 'Hide Find in Notebook')),
+            title: ( localize2(7330, 'Hide Find in Notebook')),
             keybinding: {
-                when: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, KEYBINDING_CONTEXT_NOTEBOOK_FIND_WIDGET_FOCUSED))),
-                primary: 9 ,
-                weight: 200
+                when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, KEYBINDING_CONTEXT_NOTEBOOK_FIND_WIDGET_FOCUSED)),
+                primary: KeyCode.Escape,
+                weight: KeybindingWeight.WorkbenchContrib
             }
         });
     }
@@ -43,15 +47,11 @@ registerAction2(class extends NotebookMultiCellAction {
     constructor() {
         super({
             id: 'notebook.find',
-            title: ( localize2(8118, 'Find in Notebook')),
+            title: ( localize2(7331, '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: 36  | 2048 ,
-                weight: 200
+                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
             }
         });
     }
@@ -115,13 +115,13 @@ StartFindAction.addImplementation(100, (accessor, codeEditor, args) => {
     const controller = editor.getContribution(NotebookFindContrib.id);
     const searchStringOptions = getSearchStringOptions(codeEditor, {
         forceRevealReplace: false,
-        seedSearchStringFromSelection: codeEditor.getOption(43 ).seedSearchStringFromSelection !== 'never' ? 'single' : 'none',
-        seedSearchStringFromNonEmptySelection: codeEditor.getOption(43 ).seedSearchStringFromSelection === 'selection',
-        seedSearchStringFromGlobalClipboard: codeEditor.getOption(43 ).globalFindClipboard,
-        shouldFocus: 1 ,
+        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,
         shouldAnimate: true,
         updateSearchScope: false,
-        loop: codeEditor.getOption(43 ).loop
+        loop: codeEditor.getOption(EditorOption.find).loop
     });
     let options = undefined;
     const uri = codeEditor.getModel().uri;
@@ -149,13 +149,13 @@ StartFindReplaceAction.addImplementation(100, (accessor, codeEditor, args) => {
     const controller = editor.getContribution(NotebookFindContrib.id);
     const searchStringOptions = getSearchStringOptions(codeEditor, {
         forceRevealReplace: false,
-        seedSearchStringFromSelection: codeEditor.getOption(43 ).seedSearchStringFromSelection !== 'never' ? 'single' : 'none',
-        seedSearchStringFromNonEmptySelection: codeEditor.getOption(43 ).seedSearchStringFromSelection === 'selection',
-        seedSearchStringFromGlobalClipboard: codeEditor.getOption(43 ).globalFindClipboard,
-        shouldFocus: 1 ,
+        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,
         shouldAnimate: true,
         updateSearchScope: false,
-        loop: codeEditor.getOption(43 ).loop
+        loop: codeEditor.getOption(EditorOption.find).loop
     });
     if (controller) {
         controller.replace(searchStringOptions?.searchString);

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

@@ -0,0 +1,10 @@
+import { Disposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { IInstantiationService } from "vscode/vscode/vs/platform/instantiation/common/instantiation";
+import { INotebookExecutionService } from "vscode/vscode/vs/workbench/contrib/notebook/common/notebookExecutionService.service";
+import { IWorkbenchContribution } from "vscode/vscode/vs/workbench/common/contributions";
+export declare class CellExecutionParticipantsContribution extends Disposable implements IWorkbenchContribution {
+    private readonly instantiationService;
+    private readonly notebookExecutionService;
+    constructor(instantiationService: IInstantiationService, notebookExecutionService: INotebookExecutionService);
+    private registerKernelExecutionParticipants;
+}

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

@@ -1,6 +1,8 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { localize2, localize } from 'vscode/vscode/vs/nls';
 import { CancellationToken } from 'vscode/vscode/vs/base/common/cancellation';
+import { KeyMod, KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
 import { DisposableStore, Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { registerEditorAction, EditorAction } from 'vscode/vscode/vs/editor/browser/editorExtensions';
 import { IBulkEditService, ResourceTextEdit } from 'vscode/vscode/vs/editor/browser/services/bulkEditService';
@@ -8,18 +10,20 @@ import { EditorContextKeys } from 'vscode/vscode/vs/editor/common/editorContextK
 import { IEditorWorkerService } from 'vscode/vscode/vs/editor/common/services/editorWorker';
 import { ILanguageFeaturesService } from 'vscode/vscode/vs/editor/common/services/languageFeatures';
 import { ITextModelService } from 'vscode/vscode/vs/editor/common/services/resolverService';
-import { getDocumentFormattingEditsWithSelectedProvider, formatDocumentWithSelectedProvider } from 'vscode/vscode/vs/editor/contrib/format/browser/format';
+import { getDocumentFormattingEditsWithSelectedProvider, FormattingMode, formatDocumentWithSelectedProvider } from 'vscode/vscode/vs/editor/contrib/format/browser/format';
 import { registerAction2, Action2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+import { KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { Progress } from 'vscode/vscode/vs/platform/progress/common/progress';
-import { NOTEBOOK_ACTIONS_CATEGORY } from '@codingame/monaco-vscode-chat-interactive-notebook-search-common/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
-import { getNotebookEditorFromEditorPane } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_EDITOR_EDITABLE } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
+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-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_EDITOR_EDITABLE } from '@codingame/monaco-vscode-4a36e358-d94d-55e0-86ee-3bcd543d9d3f-common/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 import { INotebookExecutionService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookExecutionService.service';
 import { NotebookSetting } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
+import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
 import { INotebookService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
@@ -29,22 +33,22 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.format',
-            title: ( localize2(8119, 'Format Notebook')),
+            title: ( localize2(7352, 'Format Notebook')),
             category: NOTEBOOK_ACTIONS_CATEGORY,
-            precondition: ( (ContextKeyExpr.and(NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_EDITOR_EDITABLE))),
+            precondition: ( ContextKeyExpr.and(NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_EDITOR_EDITABLE)),
             keybinding: {
-                when: ( (EditorContextKeys.editorTextFocus.toNegated())),
-                primary: 1024  | 512  | 36 ,
-                linux: { primary: 2048  | 1024  | 39  },
-                weight: 200
+                when: ( EditorContextKeys.editorTextFocus.toNegated()),
+                primary: KeyMod.Shift | KeyMod.Alt | KeyCode.KeyF,
+                linux: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyI },
+                weight: KeybindingWeight.WorkbenchContrib
             },
             f1: true,
             menu: {
                 id: MenuId.EditorContext,
-                when: ( (ContextKeyExpr.and(
+                when: ( ContextKeyExpr.and(
                     EditorContextKeys.inCompositeEditor,
                     EditorContextKeys.hasDocumentFormattingProvider
-                ))),
+                )),
                 group: '1_modification',
                 order: 1.3
             }
@@ -63,24 +67,24 @@ registerAction2(class extends Action2 {
         }
         const notebook = editor.textModel;
         const formatApplied = await instantiationService.invokeFunction(CodeActionParticipantUtils.checkAndRunFormatCodeAction, notebook, Progress.None, CancellationToken.None);
-        const disposable = ( (new DisposableStore()));
+        const disposable = ( new DisposableStore());
         try {
             if (!formatApplied) {
-                const allCellEdits = await Promise.all(( (notebook.cells.map(async (cell) => {
+                const allCellEdits = await Promise.all(( notebook.cells.map(async (cell) => {
                     const ref = await textModelService.createModelReference(cell.uri);
                     disposable.add(ref);
                     const model = ref.object.textEditorModel;
-                    const formatEdits = await getDocumentFormattingEditsWithSelectedProvider(editorWorkerService, languageFeaturesService, model, 1 , CancellationToken.None);
+                    const formatEdits = await getDocumentFormattingEditsWithSelectedProvider(editorWorkerService, languageFeaturesService, model, FormattingMode.Explicit, CancellationToken.None);
                     const edits = [];
                     if (formatEdits) {
                         for (const edit of formatEdits) {
-                            edits.push(( (new ResourceTextEdit(model.uri, edit, model.getVersionId()))));
+                            edits.push(( new ResourceTextEdit(model.uri, edit, model.getVersionId())));
                         }
                         return edits;
                     }
                     return [];
-                }))));
-                await bulkEditService.apply( allCellEdits.flat(), { label: ( localize(8120, "Format Notebook")), code: 'undoredo.formatNotebook', });
+                })));
+                await bulkEditService.apply( allCellEdits.flat(), { label: ( localize(7353, "Format Notebook")), code: 'undoredo.formatNotebook', });
             }
         }
         finally {
@@ -92,20 +96,19 @@ registerEditorAction(class FormatCellAction extends EditorAction {
     constructor() {
         super({
             id: 'notebook.formatCell',
-            label: ( localize(8121, "Format Cell")),
-            alias: 'Format Cell',
-            precondition: ( (ContextKeyExpr.and(
+            label: ( localize2(7354, "Format Cell")),
+            precondition: ( ContextKeyExpr.and(
                 NOTEBOOK_IS_ACTIVE_EDITOR,
                 NOTEBOOK_EDITOR_EDITABLE,
                 EditorContextKeys.inCompositeEditor,
                 EditorContextKeys.writable,
                 EditorContextKeys.hasDocumentFormattingProvider
-            ))),
+            )),
             kbOpts: {
-                kbExpr: ( (ContextKeyExpr.and(EditorContextKeys.editorTextFocus))),
-                primary: 1024  | 512  | 36 ,
-                linux: { primary: 2048  | 1024  | 39  },
-                weight: 100
+                kbExpr: ( ContextKeyExpr.and(EditorContextKeys.editorTextFocus)),
+                primary: KeyMod.Shift | KeyMod.Alt | KeyCode.KeyF,
+                linux: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyI },
+                weight: KeybindingWeight.EditorContrib
             },
             contextMenuOpts: {
                 group: '1_modification',
@@ -116,7 +119,7 @@ registerEditorAction(class FormatCellAction extends EditorAction {
     async run(accessor, editor) {
         if (editor.hasModel()) {
             const instaService = accessor.get(IInstantiationService);
-            await instaService.invokeFunction(formatDocumentWithSelectedProvider, editor, 1 , Progress.None, CancellationToken.None, true);
+            await instaService.invokeFunction(formatDocumentWithSelectedProvider, editor, FormattingMode.Explicit, Progress.None, CancellationToken.None, true);
         }
     }
 });
@@ -134,9 +137,9 @@ let FormatOnCellExecutionParticipant = class FormatOnCellExecutionParticipant {
         if (!enabled) {
             return;
         }
-        const disposable = ( (new DisposableStore()));
+        const disposable = ( new DisposableStore());
         try {
-            const allCellEdits = await Promise.all(( (executions.map(async (cellExecution) => {
+            const allCellEdits = await Promise.all(( executions.map(async (cellExecution) => {
                 const nbModel = this._notebookService.getNotebookTextModel(cellExecution.notebook);
                 if (!nbModel) {
                     return [];
@@ -154,31 +157,29 @@ let FormatOnCellExecutionParticipant = class FormatOnCellExecutionParticipant {
                 const ref = await this.textModelService.createModelReference(activeCell.uri);
                 disposable.add(ref);
                 const model = ref.object.textEditorModel;
-                const formatEdits = await getDocumentFormattingEditsWithSelectedProvider(this.editorWorkerService, this.languageFeaturesService, model, 2 , CancellationToken.None);
+                const formatEdits = await getDocumentFormattingEditsWithSelectedProvider(this.editorWorkerService, this.languageFeaturesService, model, FormattingMode.Silent, CancellationToken.None);
                 const edits = [];
                 if (formatEdits) {
-                    edits.push(...( (formatEdits.map(
-                        edit => ( (new ResourceTextEdit(model.uri, edit, model.getVersionId())))
-                    ))));
+                    edits.push(...( formatEdits.map(edit => ( new ResourceTextEdit(model.uri, edit, model.getVersionId())))));
                     return edits;
                 }
                 return [];
-            }))));
-            await this.bulkEditService.apply( allCellEdits.flat(), { label: ( localize(8122, "Format Cells")), code: 'undoredo.notebooks.onWillExecuteFormat', });
+            })));
+            await this.bulkEditService.apply( allCellEdits.flat(), { label: ( localize(7355, "Format Cells")), code: 'undoredo.notebooks.onWillExecuteFormat', });
         }
         finally {
             disposable.dispose();
         }
     }
 };
-FormatOnCellExecutionParticipant = ( (__decorate([
-    ( (__param(0, IBulkEditService))),
-    ( (__param(1, ILanguageFeaturesService))),
-    ( (__param(2, ITextModelService))),
-    ( (__param(3, IEditorWorkerService))),
-    ( (__param(4, IConfigurationService))),
-    ( (__param(5, INotebookService)))
-], FormatOnCellExecutionParticipant)));
+FormatOnCellExecutionParticipant = ( __decorate([
+    ( __param(0, IBulkEditService)),
+    ( __param(1, ILanguageFeaturesService)),
+    ( __param(2, ITextModelService)),
+    ( __param(3, IEditorWorkerService)),
+    ( __param(4, IConfigurationService)),
+    ( __param(5, INotebookService))
+], FormatOnCellExecutionParticipant));
 let CellExecutionParticipantsContribution = class CellExecutionParticipantsContribution extends Disposable {
     constructor(instantiationService, notebookExecutionService) {
         super();
@@ -190,11 +191,11 @@ let CellExecutionParticipantsContribution = class CellExecutionParticipantsContr
         this._register(this.notebookExecutionService.registerExecutionParticipant(this.instantiationService.createInstance(FormatOnCellExecutionParticipant)));
     }
 };
-CellExecutionParticipantsContribution = ( (__decorate([
-    ( (__param(0, IInstantiationService))),
-    ( (__param(1, INotebookExecutionService)))
-], CellExecutionParticipantsContribution)));
-const workbenchContributionsRegistry = ( (Registry.as(Extensions.Workbench)));
-workbenchContributionsRegistry.registerWorkbenchContribution(CellExecutionParticipantsContribution, 3 );
+CellExecutionParticipantsContribution = ( __decorate([
+    ( __param(0, IInstantiationService)),
+    ( __param(1, INotebookExecutionService))
+], CellExecutionParticipantsContribution));
+const workbenchContributionsRegistry = ( Registry.as(Extensions.Workbench));
+workbenchContributionsRegistry.registerWorkbenchContribution(CellExecutionParticipantsContribution, LifecyclePhase.Restored);
 
 export { CellExecutionParticipantsContribution };

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

@@ -0,0 +1,10 @@
+import { Disposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { ICommandService } from "vscode/vscode/vs/platform/commands/common/commands.service";
+import { IConfigurationService } from "vscode/vscode/vs/platform/configuration/common/configuration.service";
+import { IContextKeyService } from "vscode/vscode/vs/platform/contextkey/common/contextkey.service";
+import { IStorageService } from "vscode/vscode/vs/platform/storage/common/storage.service";
+import { IWorkbenchContribution } from "vscode/vscode/vs/workbench/common/contributions";
+import { IEditorService } from "vscode/vscode/vs/workbench/services/editor/common/editorService.service";
+export declare class NotebookGettingStarted extends Disposable implements IWorkbenchContribution {
+    constructor(_editorService: IEditorService, _storageService: IStorageService, _contextKeyService: IContextKeyService, _commandService: ICommandService, _configurationService: IConfigurationService);
+}