@codingame/monaco-vscode-notebook-service-override 5.2.0 → 6.0.0

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

@@ -0,0 +1,58 @@
+import { KeyMod, KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
+import { Range } from 'vscode/vscode/vs/editor/common/core/range';
+import { CodeActionController } from 'vscode/vscode/vs/editor/contrib/codeAction/browser/codeActionController';
+import { CodeActionTriggerSource, CodeActionKind } from 'vscode/vscode/vs/editor/contrib/codeAction/common/types';
+import { localize2WithPath, localizeWithPath } from 'vscode/vscode/vs/nls';
+import { registerAction2 } from 'vscode/vscode/vs/platform/actions/common/actions';
+import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
+import { KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
+import { NotebookCellAction, findTargetCellEditor } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
+import { CodeCellViewModel } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/viewModel/codeCellViewModel';
+import { NOTEBOOK_CELL_FOCUSED, NOTEBOOK_CELL_HAS_ERROR_DIAGNOSTICS, NOTEBOOK_CELL_EDITOR_FOCUSED } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
+
+const _moduleId = "vs/workbench/contrib/notebook/browser/contrib/cellDiagnostics/cellDiagnosticsActions";
+const OPEN_CELL_FAILURE_ACTIONS_COMMAND_ID = 'notebook.cell.openFailureActions';
+registerAction2(class extends NotebookCellAction {
+    constructor() {
+        super({
+            id: OPEN_CELL_FAILURE_ACTIONS_COMMAND_ID,
+            title: ( localize2WithPath(_moduleId, 0, "Show Cell Failure Actions")),
+            precondition: ( (ContextKeyExpr.and(
+                NOTEBOOK_CELL_FOCUSED,
+                NOTEBOOK_CELL_HAS_ERROR_DIAGNOSTICS,
+                 (NOTEBOOK_CELL_EDITOR_FOCUSED.toNegated())
+            ))),
+            f1: true,
+            keybinding: {
+                when: ( (ContextKeyExpr.and(
+                    NOTEBOOK_CELL_FOCUSED,
+                    NOTEBOOK_CELL_HAS_ERROR_DIAGNOSTICS,
+                     (NOTEBOOK_CELL_EDITOR_FOCUSED.toNegated())
+                ))),
+                primary: KeyMod.CtrlCmd | KeyCode.Period,
+                weight: KeybindingWeight.WorkbenchContrib
+            }
+        });
+    }
+    async runWithContext(accessor, context) {
+        if (context.cell instanceof CodeCellViewModel) {
+            const error = context.cell.excecutionError.get();
+            if (error?.location) {
+                const location = Range.lift({
+                    startLineNumber: error.location.startLineNumber + 1,
+                    startColumn: error.location.startColumn + 1,
+                    endLineNumber: error.location.endLineNumber + 1,
+                    endColumn: error.location.endColumn + 1
+                });
+                context.notebookEditor.setCellEditorSelection(context.cell, Range.lift(location));
+                const editor = findTargetCellEditor(context, context.cell);
+                if (editor) {
+                    const controller = CodeActionController.get(editor);
+                    controller?.manualTriggerAtCurrentPosition(( localizeWithPath(_moduleId, 1, "No code actions available")), CodeActionTriggerSource.Default, { include: CodeActionKind.QuickFix });
+                }
+            }
+        }
+    }
+});
+
+export { OPEN_CELL_FAILURE_ACTIONS_COMMAND_ID };

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

@@ -0,0 +1,65 @@
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import 'vscode/vscode/vs/base/common/arrays';
+import 'vscode/vscode/vs/base/common/observableInternal/derived';
+import { autorun } from 'vscode/vscode/vs/base/common/observableInternal/autorun';
+import 'vscode/vscode/vs/base/common/observableInternal/utils';
+import 'vscode/vscode/vs/base/common/cancellation';
+import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding.service';
+import { OPEN_CELL_FAILURE_ACTIONS_COMMAND_ID } from './cellDiagnosticsActions.js';
+import { NotebookStatusBarController } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/executionStatusBarItemController';
+import { registerNotebookContribution } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookEditorExtensions';
+import { CodeCellViewModel } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/viewModel/codeCellViewModel';
+import { CellStatusbarAlignment } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
+
+const _moduleId = "vs/workbench/contrib/notebook/browser/contrib/cellDiagnostics/diagnosticCellStatusBarContrib";
+let DiagnosticCellStatusBarContrib = class DiagnosticCellStatusBarContrib extends Disposable {
+    static { this.id = 'workbench.notebook.statusBar.diagtnostic'; }
+    constructor(notebookEditor, instantiationService) {
+        super();
+        this._register(( (new NotebookStatusBarController(notebookEditor, (vm, cell) => cell instanceof CodeCellViewModel ?
+            instantiationService.createInstance(DiagnosticCellStatusBarItem, vm, cell) :
+            Disposable.None))));
+    }
+};
+DiagnosticCellStatusBarContrib = ( (__decorate([
+    ( (__param(1, IInstantiationService)))
+], DiagnosticCellStatusBarContrib)));
+registerNotebookContribution(DiagnosticCellStatusBarContrib.id, DiagnosticCellStatusBarContrib);
+let DiagnosticCellStatusBarItem = class DiagnosticCellStatusBarItem extends Disposable {
+    constructor(_notebookViewModel, cell, keybindingService) {
+        super();
+        this._notebookViewModel = _notebookViewModel;
+        this.cell = cell;
+        this.keybindingService = keybindingService;
+        this._currentItemIds = [];
+        this._register(autorun((reader) => this.updateSparkleItem(reader.readObservable(cell.excecutionError))));
+    }
+    async updateSparkleItem(error) {
+        let item;
+        if (error?.location) {
+            const keybinding = this.keybindingService.lookupKeybinding(OPEN_CELL_FAILURE_ACTIONS_COMMAND_ID)?.getLabel();
+            const tooltip = ( localizeWithPath(_moduleId, 0, "Quick Actions {0}", `(${keybinding})`));
+            item = {
+                text: `$(sparkle)`,
+                tooltip,
+                alignment: CellStatusbarAlignment.Left,
+                command: OPEN_CELL_FAILURE_ACTIONS_COMMAND_ID,
+                priority: Number.MAX_SAFE_INTEGER - 1
+            };
+        }
+        const items = item ? [item] : [];
+        this._currentItemIds = this._notebookViewModel.deltaCellStatusBarItems(this._currentItemIds, [{ handle: this.cell.handle, items }]);
+    }
+    dispose() {
+        super.dispose();
+        this._notebookViewModel.deltaCellStatusBarItems(this._currentItemIds, [{ handle: this.cell.handle, items: [] }]);
+    }
+};
+DiagnosticCellStatusBarItem = ( (__decorate([
+    ( (__param(2, IKeybindingService)))
+], DiagnosticCellStatusBarItem)));
+
+export { DiagnosticCellStatusBarContrib };

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

@@ -10,10 +10,11 @@ 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 } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
+import { CellKind, CellStatusbarAlignment } 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';
 
 const _moduleId = "vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/statusBarProviders";
 let CellStatusBarLanguagePickerProvider = class CellStatusBarLanguagePickerProvider {
@@ -49,7 +50,7 @@ let CellStatusBarLanguagePickerProvider = class CellStatusBarLanguagePickerProvi
                     text: `$(dialog-warning)`,
                     command: { id: 'workbench.extensions.search', arguments: [`@tag:${cell.language}`], title: 'Search Extensions' },
                     tooltip: searchTooltip,
-                    alignment: 2 ,
+                    alignment: CellStatusbarAlignment.Right,
                     priority: -Number.MAX_SAFE_INTEGER + 1
                 });
             }
@@ -58,7 +59,7 @@ let CellStatusBarLanguagePickerProvider = class CellStatusBarLanguagePickerProvi
             text: displayLanguage,
             command: CHANGE_CELL_LANGUAGE,
             tooltip: ( localizeWithPath(_moduleId, 1, "Select Cell Language Mode")),
-            alignment: 2 ,
+            alignment: CellStatusbarAlignment.Right,
             priority: -Number.MAX_SAFE_INTEGER
         });
         return {
@@ -131,7 +132,7 @@ let CellStatusBarLanguageDetectionProvider = class CellStatusBarLanguageDetectio
                 text: '$(lightbulb-autofix)',
                 command: DETECT_CELL_LANGUAGE,
                 tooltip,
-                alignment: 2 ,
+                alignment: CellStatusbarAlignment.Right,
                 priority: -Number.MAX_SAFE_INTEGER + 1
             });
         }
@@ -162,4 +163,4 @@ BuiltinCellStatusBarProviders = ( (__decorate([
     ( (__param(0, IInstantiationService))),
     ( (__param(1, INotebookCellStatusBarService)))
 ], BuiltinCellStatusBarProviders)));
-( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(BuiltinCellStatusBarProviders, 3 );
+( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(BuiltinCellStatusBarProviders, LifecyclePhase.Restored);

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

@@ -1,26 +1,28 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
-import { registerWorkbenchContribution2 } from 'vscode/vscode/vs/workbench/common/contributions';
+import { registerWorkbenchContribution2, WorkbenchPhase } 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 } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
+import { SelectionStateType, CellEditType } 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, NotebookAction, NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT, NOTEBOOK_OUTPUT_WEBVIEW_ACTION_WEIGHT } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
+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 { 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, isAncestor } from 'vscode/vscode/vs/base/browser/dom';
+import { getWindow, getActiveElement, isHTMLElement, isAncestor } from 'vscode/vscode/vs/base/browser/dom';
 
 const _moduleId = "vs/workbench/contrib/notebook/browser/contrib/clipboard/notebookClipboard";
 let _logging = false;
@@ -109,7 +111,7 @@ function runPasteCells(editor, activeCell, pasteCells) {
         const newFocusIndex = typeof currCellIndex === 'number' ? currCellIndex + 1 : 0;
         textModel.applyEdits([
             {
-                editType: 1 ,
+                editType: CellEditType.Replace,
                 index: newFocusIndex,
                 count: 0,
                 cells: ( (pasteCells.items.map(cell => cloneNotebookCellTextModel(cell))))
@@ -126,7 +128,7 @@ function runPasteCells(editor, activeCell, pasteCells) {
         }
         textModel.applyEdits([
             {
-                editType: 1 ,
+                editType: CellEditType.Replace,
                 index: 0,
                 count: 0,
                 cells: ( (pasteCells.items.map(cell => cloneNotebookCellTextModel(cell))))
@@ -187,7 +189,7 @@ function runCutCells(accessor, editor, targetCell) {
                 selection => (selection.end <= targetCellIndex ? selection : { start: selection.start - 1, end: selection.end - 1 })
             )));
             textModel.applyEdits([
-                { editType: 1 , index: targetCellIndex, count: 1, cells: [] }
+                { editType: CellEditType.Replace, 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;
@@ -203,7 +205,7 @@ function runCutCells(accessor, editor, targetCell) {
             selection => (selection.end <= focus.start ? selection : { start: selection.start - 1, end: selection.end - 1 })
         )));
         textModel.applyEdits([
-            { editType: 1 , index: focus.start, count: 1, cells: [] }
+            { editType: CellEditType.Replace, 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;
@@ -215,7 +217,7 @@ function runCutCells(accessor, editor, targetCell) {
     }
     clipboardService.writeText(( (selectedCells.map(cell => cell.getText()))).join('\n'));
     const edits = ( (selectionRanges.map(
-        range => ({ editType: 1 , index: range.start, count: range.end - range.start, cells: [] })
+        range => ({ editType: CellEditType.Replace, index: range.start, count: range.end - range.start, cells: [] })
     )));
     const firstSelectIndex = selectionRanges[0].start;
     const newFocusedCellIndex = firstSelectIndex < textModel.cells.length - 1
@@ -288,7 +290,7 @@ let NotebookClipboardContribution = class NotebookClipboardContribution extends
     runCopyAction(accessor) {
         const loggerService = accessor.get(ILogService);
         const activeElement = getActiveElement();
-        if (activeElement instanceof HTMLElement && ['input', 'textarea'].indexOf(activeElement.tagName.toLowerCase()) >= 0) {
+        if (isHTMLElement(activeElement) && ['input', 'textarea'].indexOf(activeElement.tagName.toLowerCase()) >= 0) {
             _log(loggerService, '[NotebookEditor] focus is on input or textarea element, bypass');
             return false;
         }
@@ -339,7 +341,7 @@ let NotebookClipboardContribution = class NotebookClipboardContribution extends
 NotebookClipboardContribution = ( (__decorate([
     ( (__param(0, IEditorService)))
 ], NotebookClipboardContribution)));
-registerWorkbenchContribution2(NotebookClipboardContribution.ID, NotebookClipboardContribution, 2 );
+registerWorkbenchContribution2(NotebookClipboardContribution.ID, NotebookClipboardContribution, WorkbenchPhase.BlockRestore);
 const COPY_CELL_COMMAND_ID = 'notebook.cell.copy';
 const CUT_CELL_COMMAND_ID = 'notebook.cell.cut';
 const PASTE_CELL_COMMAND_ID = 'notebook.cell.paste';
@@ -352,14 +354,14 @@ registerAction2(class extends NotebookCellAction {
             menu: {
                 id: MenuId.NotebookCellTitle,
                 when: NOTEBOOK_EDITOR_FOCUSED,
-                group: "1_copy" ,
+                group: CellOverflowToolbarGroups.Copy,
                 order: 2,
             },
             keybinding: isNative ? undefined : {
-                primary: 2048  | 33 ,
-                win: { primary: 2048  | 33 , secondary: [2048  | 19 ] },
+                primary: KeyMod.CtrlCmd | KeyCode.KeyC,
+                win: { primary: KeyMod.CtrlCmd | KeyCode.KeyC, secondary: [KeyMod.CtrlCmd | KeyCode.Insert] },
                 when: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ContextKeyExpr.not(InputFocusedContextKey)))),
-                weight: 200
+                weight: KeybindingWeight.WorkbenchContrib
             }
         });
     }
@@ -375,14 +377,14 @@ registerAction2(class extends NotebookCellAction {
             menu: {
                 id: MenuId.NotebookCellTitle,
                 when: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_CELL_EDITABLE))),
-                group: "1_copy" ,
+                group: CellOverflowToolbarGroups.Copy,
                 order: 1,
             },
             keybinding: isNative ? undefined : {
                 when: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ContextKeyExpr.not(InputFocusedContextKey)))),
-                primary: 2048  | 54 ,
-                win: { primary: 2048  | 54 , secondary: [1024  | 20 ] },
-                weight: 200
+                primary: KeyMod.CtrlCmd | KeyCode.KeyX,
+                win: { primary: KeyMod.CtrlCmd | KeyCode.KeyX, secondary: [KeyMod.Shift | KeyCode.Delete] },
+                weight: KeybindingWeight.WorkbenchContrib
             }
         });
     }
@@ -398,15 +400,15 @@ registerAction2(class extends NotebookAction {
             menu: {
                 id: MenuId.NotebookCellTitle,
                 when: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_EDITOR_EDITABLE))),
-                group: "1_copy" ,
+                group: CellOverflowToolbarGroups.Copy,
                 order: 3,
             },
             keybinding: isNative ? undefined : {
                 when: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ContextKeyExpr.not(InputFocusedContextKey)))),
-                primary: 2048  | 52 ,
-                win: { primary: 2048  | 52 , secondary: [1024  | 19 ] },
-                linux: { primary: 2048  | 52 , secondary: [1024  | 19 ] },
-                weight: 100
+                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
             }
         });
     }
@@ -429,7 +431,7 @@ registerAction2(class extends NotebookCellAction {
             title: ( localizeWithPath(_moduleId, 3, "Paste Cell Above")),
             keybinding: {
                 when: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ContextKeyExpr.not(InputFocusedContextKey)))),
-                primary: 2048  | 1024  | 52 ,
+                primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyV,
                 weight: NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT
             },
         });
@@ -454,7 +456,7 @@ registerAction2(class extends NotebookCellAction {
         const newFocusIndex = currCellIndex;
         textModel.applyEdits([
             {
-                editType: 1 ,
+                editType: CellEditType.Replace,
                 index: currCellIndex,
                 count: 0,
                 cells: ( (pasteCells.items.map(cell => cloneNotebookCellTextModel(cell))))
@@ -489,7 +491,7 @@ registerAction2(class extends NotebookCellAction {
             id: 'notebook.cell.output.selectAll',
             title: ( localizeWithPath(_moduleId, 5, "Select All")),
             keybinding: {
-                primary: 2048  | 31 ,
+                primary: KeyMod.CtrlCmd | KeyCode.KeyA,
                 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,6 +10,7 @@ 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) {
@@ -103,4 +104,4 @@ NotebookBreakpoints = ( __decorate([
     ( __param(1, INotebookService)),
     ( __param(2, IEditorService))
 ], NotebookBreakpoints));
-( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(NotebookBreakpoints, 3 );
+( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(NotebookBreakpoints, LifecyclePhase.Restored);

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

@@ -8,6 +8,7 @@ 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) {
@@ -64,4 +65,4 @@ NotebookCellPausing = ( __decorate([
     ( __param(0, IDebugService)),
     ( __param(1, INotebookExecutionStateService))
 ], NotebookCellPausing));
-( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(NotebookCellPausing, 3 );
+( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(NotebookCellPausing, LifecyclePhase.Restored);

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

@@ -1,23 +1,23 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
-import { registerEditorContribution } from 'vscode/vscode/vs/editor/browser/editorExtensions';
+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 { 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';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
+import { IChatAgentService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
 import { EmptyTextEditorHintContribution } from '../../../../codeEditor/browser/emptyTextEditorHint/emptyTextEditorHint.js';
 import { IInlineChatSessionService } from 'vscode/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatSessionService.service';
-import { IInlineChatService } from 'vscode/vscode/vs/workbench/contrib/inlineChat/common/inlineChat.service';
 import { getNotebookEditorFromEditorPane } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 
 let EmptyCellEditorHintContribution = class EmptyCellEditorHintContribution extends EmptyTextEditorHintContribution {
     static { this.CONTRIB_ID = 'notebook.editor.contrib.emptyCellEditorHint'; }
-    constructor(editor, _editorService, editorGroupsService, commandService, configurationService, hoverService, keybindingService, inlineChatSessionService, inlineChatService, telemetryService, productService) {
-        super(editor, editorGroupsService, commandService, configurationService, hoverService, keybindingService, inlineChatSessionService, inlineChatService, telemetryService, productService);
+    constructor(editor, _editorService, editorGroupsService, commandService, configurationService, hoverService, keybindingService, inlineChatSessionService, chatAgentService, telemetryService, productService) {
+        super(editor, editorGroupsService, commandService, configurationService, hoverService, keybindingService, inlineChatSessionService, chatAgentService, telemetryService, productService);
         this._editorService = _editorService;
         const activeEditor = getNotebookEditorFromEditorPane(this._editorService.activeEditorPane);
         if (!activeEditor) {
@@ -60,10 +60,10 @@ EmptyCellEditorHintContribution = ( __decorate([
     ( __param(5, IHoverService)),
     ( __param(6, IKeybindingService)),
     ( __param(7, IInlineChatSessionService)),
-    ( __param(8, IInlineChatService)),
+    ( __param(8, IChatAgentService)),
     ( __param(9, ITelemetryService)),
     ( __param(10, IProductService))
 ], EmptyCellEditorHintContribution));
-registerEditorContribution(EmptyCellEditorHintContribution.CONTRIB_ID, EmptyCellEditorHintContribution, 0 );
+registerEditorContribution(EmptyCellEditorHintContribution.CONTRIB_ID, EmptyCellEditorHintContribution, EditorContributionInstantiation.Eager);
 
 export { EmptyCellEditorHintContribution };

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

@@ -7,7 +7,7 @@ import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/c
 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 } from 'vscode/vscode/vs/workbench/common/contributions';
+import { Extensions, 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,6 +15,8 @@ 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';
 
 const _moduleId = "vs/workbench/contrib/notebook/browser/contrib/editorStatusBar/editorStatusBar";
@@ -114,7 +116,7 @@ let KernelStatus = class KernelStatus extends Disposable {
                 ariaLabel: kernel.label,
                 tooltip: isSuggested ? ( localizeWithPath(_moduleId, 1, "{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 {
@@ -124,7 +126,7 @@ let KernelStatus = class KernelStatus extends Disposable {
                 ariaLabel: ( localizeWithPath(_moduleId, 3, "Select Kernel")),
                 command: SELECT_KERNEL_ID,
                 kind: 'prominent'
-            }, SELECT_KERNEL_ID, 1 , 10));
+            }, SELECT_KERNEL_ID, StatusbarAlignment.RIGHT, 10));
         }
     }
 };
@@ -134,7 +136,7 @@ KernelStatus = ( (__decorate([
     ( (__param(2, INotebookKernelService))),
     ( (__param(3, IInstantiationService)))
 ], KernelStatus)));
-( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(KernelStatus, 3 );
+( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(KernelStatus, LifecyclePhase.Restored);
 let ActiveCellStatus = class ActiveCellStatus extends Disposable {
     constructor(_editorService, _statusbarService) {
         super();
@@ -173,7 +175,7 @@ let ActiveCellStatus = class ActiveCellStatus extends Disposable {
             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);
@@ -199,7 +201,7 @@ ActiveCellStatus = ( (__decorate([
     ( (__param(0, IEditorService))),
     ( (__param(1, IStatusbarService)))
 ], ActiveCellStatus)));
-( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(ActiveCellStatus, 3 );
+( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(ActiveCellStatus, LifecyclePhase.Restored);
 let NotebookIndentationStatus = class NotebookIndentationStatus extends Disposable {
     static { this.ID = 'selectNotebookIndentation'; }
     constructor(_editorService, _statusbarService, _configurationService) {
@@ -259,7 +261,7 @@ let NotebookIndentationStatus = class NotebookIndentationStatus extends Disposab
             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);
@@ -271,6 +273,6 @@ NotebookIndentationStatus = ( (__decorate([
     ( (__param(1, IStatusbarService))),
     ( (__param(2, IConfigurationService)))
 ], NotebookIndentationStatus)));
-registerWorkbenchContribution2(NotebookIndentationStatus.ID, NotebookIndentationStatus, 3 );
+registerWorkbenchContribution2(NotebookIndentationStatus.ID, NotebookIndentationStatus, WorkbenchPhase.AfterRestored);
 
 export { ActiveCellStatus, KernelStatus, NotebookIndentationStatus };

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 { 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 { localize2WithPath } 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 { 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 { 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);
@@ -23,8 +27,8 @@ registerAction2(class extends Action2 {
             title: ( localize2WithPath(_moduleId, 0, 'Hide Find in Notebook')),
             keybinding: {
                 when: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, KEYBINDING_CONTEXT_NOTEBOOK_FIND_WIDGET_FOCUSED))),
-                primary: 9 ,
-                weight: 200
+                primary: KeyCode.Escape,
+                weight: KeybindingWeight.WorkbenchContrib
             }
         });
     }
@@ -39,7 +43,7 @@ registerAction2(class extends Action2 {
         editor.focus();
     }
 });
-registerAction2(class extends Action2 {
+registerAction2(class extends NotebookMultiCellAction {
     constructor() {
         super({
             id: 'notebook.find',
@@ -50,19 +54,24 @@ registerAction2(class extends Action2 {
                      (ContextKeyExpr.or(NOTEBOOK_IS_ACTIVE_EDITOR, INTERACTIVE_WINDOW_IS_ACTIVE_EDITOR)),
                      (EditorContextKeys.focus.toNegated())
                 ))),
-                primary: 36  | 2048 ,
-                weight: 200
+                primary: KeyCode.KeyF | KeyMod.CtrlCmd,
+                weight: KeybindingWeight.WorkbenchContrib
             }
         });
     }
-    async run(accessor) {
+    async runWithContext(accessor, context) {
         const editorService = accessor.get(IEditorService);
         const editor = getNotebookEditorFromEditorPane(editorService.activeEditorPane);
         if (!editor) {
             return;
         }
         const controller = editor.getContribution(NotebookFindContrib.id);
-        controller.show();
+        if (context.selectedCells.length > 1) {
+            controller.show(undefined, { searchInRanges: true, selectedRanges: editor.getSelections() });
+        }
+        else {
+            controller.show(undefined, { searchInRanges: false, selectedRanges: [] });
+        }
     }
 });
 function notebookContainsTextModel(uri, textModel) {
@@ -115,13 +124,13 @@ StartFindAction.addImplementation(100, (accessor, codeEditor, args) => {
     const controller = editor.getContribution(NotebookFindContrib.id);
     const searchStringOptions = getSearchStringOptions(codeEditor, {
         forceRevealReplace: false,
-        seedSearchStringFromSelection: codeEditor.getOption(41 ).seedSearchStringFromSelection !== 'never' ? 'single' : 'none',
-        seedSearchStringFromNonEmptySelection: codeEditor.getOption(41 ).seedSearchStringFromSelection === 'selection',
-        seedSearchStringFromGlobalClipboard: codeEditor.getOption(41 ).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(41 ).loop
+        loop: codeEditor.getOption(EditorOption.find).loop
     });
     let options = undefined;
     const uri = codeEditor.getModel().uri;
@@ -149,13 +158,13 @@ StartFindReplaceAction.addImplementation(100, (accessor, codeEditor, args) => {
     const controller = editor.getContribution(NotebookFindContrib.id);
     const searchStringOptions = getSearchStringOptions(codeEditor, {
         forceRevealReplace: false,
-        seedSearchStringFromSelection: codeEditor.getOption(41 ).seedSearchStringFromSelection !== 'never' ? 'single' : 'none',
-        seedSearchStringFromNonEmptySelection: codeEditor.getOption(41 ).seedSearchStringFromSelection === 'selection',
-        seedSearchStringFromGlobalClipboard: codeEditor.getOption(41 ).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(41 ).loop
+        loop: codeEditor.getOption(EditorOption.find).loop
     });
     if (controller) {
         controller.replace(searchStringOptions?.searchString);