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

package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookEditorServiceImpl.d.ts

@@ -0,0 +1,43 @@
+import { CodeWindow } from "vscode/vscode/vs/base/browser/window";
+import { NotebookEditorWidget } from "@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/notebookEditorWidget";
+import { DisposableStore } from "vscode/vscode/vs/base/common/lifecycle";
+import { IEditorGroupsService } from "vscode/vscode/vs/workbench/services/editor/common/editorGroupsService.service";
+import { IInstantiationService, ServicesAccessor } from "vscode/vscode/vs/platform/instantiation/common/instantiation";
+import { NotebookEditorInput } from "@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/common/notebookEditorInput";
+import { IBorrowValue } from "vscode/vscode/vs/workbench/contrib/notebook/browser/services/notebookEditorService";
+import { INotebookEditorService } from "vscode/vscode/vs/workbench/contrib/notebook/browser/services/notebookEditorService.service";
+import { INotebookEditor, INotebookEditorCreationOptions } from "@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
+import { Dimension } from "vscode/vscode/vs/base/browser/dom";
+import { URI } from "vscode/vscode/vs/base/common/uri";
+import { IEditorService } from "vscode/vscode/vs/workbench/services/editor/common/editorService.service";
+import { IContextKeyService } from "vscode/vscode/vs/platform/contextkey/common/contextkey.service";
+import { IEditorProgressService } from "vscode/vscode/vs/platform/progress/common/progress.service";
+export declare class NotebookEditorWidgetService implements INotebookEditorService {
+    private readonly editorGroupService;
+    private readonly instantiationService;
+    readonly _serviceBrand: undefined;
+    private _tokenPool;
+    private readonly _disposables;
+    private readonly _notebookEditors;
+    private readonly groupListener;
+    private readonly _onNotebookEditorAdd;
+    private readonly _onNotebookEditorsRemove;
+    readonly onDidAddNotebookEditor: import("vscode/vscode/vs/base/common/event").Event<INotebookEditor>;
+    readonly onDidRemoveNotebookEditor: import("vscode/vscode/vs/base/common/event").Event<INotebookEditor>;
+    private readonly _mostRecentRepl;
+    private readonly _borrowableEditors;
+    constructor(editorGroupService: IEditorGroupsService, editorService: IEditorService, contextKeyService: IContextKeyService, instantiationService: IInstantiationService);
+    dispose(): void;
+    private _disposeWidget;
+    private _allowWidgetMove;
+    retrieveExistingWidgetFromURI(resource: URI): IBorrowValue<NotebookEditorWidget> | undefined;
+    retrieveAllExistingWidgets(): IBorrowValue<NotebookEditorWidget>[];
+    retrieveWidget(accessor: ServicesAccessor, groupId: number, input: NotebookEditorInput, creationOptions?: INotebookEditorCreationOptions, initialDimension?: Dimension, codeWindow?: CodeWindow): IBorrowValue<NotebookEditorWidget>;
+    protected createWidget(editorGroupContextKeyService: IContextKeyService, widgetDisposeStore: DisposableStore, editorGroupEditorProgressService: IEditorProgressService, creationOptions?: INotebookEditorCreationOptions, codeWindow?: CodeWindow, initialDimension?: Dimension): NotebookEditorWidget;
+    private _createBorrowValue;
+    addNotebookEditor(editor: INotebookEditor): void;
+    removeNotebookEditor(editor: INotebookEditor): void;
+    getNotebookEditor(editorId: string): INotebookEditor | undefined;
+    listNotebookEditors(): readonly INotebookEditor[];
+    updateReplContextKey(uri: string): void;
+}

package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookEditorServiceImpl.js

@@ -1,14 +1,16 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { ResourceMap } from 'vscode/vscode/vs/base/common/map';
-import { getDefaultNotebookCreationOptions, NotebookEditorWidget } from '@codingame/monaco-vscode-chat-interactive-notebook-search-common/vscode/vs/workbench/contrib/notebook/browser/notebookEditorWidget';
+import { getDefaultNotebookCreationOptions, NotebookEditorWidget } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/notebookEditorWidget';
 import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
-import { NotebookEditorInput, isCompositeNotebookEditorInput, isNotebookEditorInput } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookEditorInput';
+import { NotebookEditorInput, isCompositeNotebookEditorInput, isNotebookEditorInput } from '@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/common/notebookEditorInput';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
+import { GroupModelChangeKind } from 'vscode/vscode/vs/workbench/common/editor';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
-import { InteractiveWindowOpen } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
+import { MOST_RECENT_REPL_EDITOR, InteractiveWindowOpen } from '@codingame/monaco-vscode-4a36e358-d94d-55e0-86ee-3bcd543d9d3f-common/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
 import { ServiceCollection } from 'vscode/vscode/vs/platform/instantiation/common/serviceCollection';
 import { IEditorProgressService } from 'vscode/vscode/vs/platform/progress/common/progress.service';
 
@@ -43,6 +45,7 @@ let NotebookEditorWidgetService = class NotebookEditorWidgetService {
                     const value = widgets.splice(index, 1)[0];
                     value.token = undefined;
                     this._disposeWidget(value.widget);
+                    value.disposableStore.dispose();
                     value.widget = undefined;
                 });
             }));
@@ -73,18 +76,20 @@ let NotebookEditorWidgetService = class NotebookEditorWidgetService {
                     for (const value of values) {
                         value.token = undefined;
                         this._disposeWidget(value.widget);
+                        value.disposableStore.dispose();
                     }
                 }
             }
         }));
+        this._mostRecentRepl = MOST_RECENT_REPL_EDITOR.bindTo(contextKeyService);
         const interactiveWindowOpen = InteractiveWindowOpen.bindTo(contextKeyService);
         this._disposables.add(editorService.onDidEditorsChange(e => {
-            if (e.event.kind === 5  && !interactiveWindowOpen.get()) {
+            if (e.event.kind === GroupModelChangeKind.EDITOR_OPEN && !interactiveWindowOpen.get()) {
                 if (editorService.editors.find(editor => isCompositeNotebookEditorInput(editor))) {
                     interactiveWindowOpen.set(true);
                 }
             }
-            else if (e.event.kind === 6  && interactiveWindowOpen.get()) {
+            else if (e.event.kind === GroupModelChangeKind.EDITOR_CLOSE && interactiveWindowOpen.get()) {
                 if (!editorService.editors.find(editor => isCompositeNotebookEditorInput(editor))) {
                     interactiveWindowOpen.set(false);
                 }
@@ -99,6 +104,11 @@ let NotebookEditorWidgetService = class NotebookEditorWidgetService {
             listeners.forEach(listener => listener.dispose());
         });
         this.groupListener.clear();
+        this._borrowableEditors.forEach(widgetMap => {
+            widgetMap.forEach(widgets => {
+                widgets.forEach(widget => widget.disposableStore.dispose());
+            });
+        });
     }
     _disposeWidget(widget) {
         widget.onWillHide();
@@ -161,9 +171,10 @@ let NotebookEditorWidgetService = class NotebookEditorWidgetService {
         if (!value) {
             const editorGroupContextKeyService = accessor.get(IContextKeyService);
             const editorGroupEditorProgressService = accessor.get(IEditorProgressService);
-            const widget = this.createWidget(editorGroupContextKeyService, editorGroupEditorProgressService, creationOptions, codeWindow, initialDimension);
+            const widgetDisposeStore = ( new DisposableStore());
+            const widget = this.createWidget(editorGroupContextKeyService, widgetDisposeStore, editorGroupEditorProgressService, creationOptions, codeWindow, initialDimension);
             const token = this._tokenPool++;
-            value = { widget, editorType: input.typeId, token };
+            value = { widget, editorType: input.typeId, token, disposableStore: widgetDisposeStore };
             let map = this._borrowableEditors.get(groupId);
             if (!map) {
                 map = ( new ResourceMap());
@@ -178,11 +189,11 @@ let NotebookEditorWidgetService = class NotebookEditorWidgetService {
         }
         return this._createBorrowValue(value.token, value);
     }
-    createWidget(editorGroupContextKeyService, editorGroupEditorProgressService, creationOptions, codeWindow, initialDimension) {
-        const notebookInstantiationService = this.instantiationService.createChild(( new ServiceCollection(
+    createWidget(editorGroupContextKeyService, widgetDisposeStore, editorGroupEditorProgressService, creationOptions, codeWindow, initialDimension) {
+        const notebookInstantiationService = widgetDisposeStore.add(this.instantiationService.createChild(( new ServiceCollection(
             [IContextKeyService, editorGroupContextKeyService],
             [IEditorProgressService, editorGroupEditorProgressService]
-        )));
+        ))));
         const ctorOptions = creationOptions ?? getDefaultNotebookCreationOptions();
         const widget = notebookInstantiationService.createInstance(NotebookEditorWidget, {
             ...ctorOptions,
@@ -202,10 +213,14 @@ let NotebookEditorWidgetService = class NotebookEditorWidgetService {
         this._onNotebookEditorAdd.fire(editor);
     }
     removeNotebookEditor(editor) {
+        const notebookUri = editor.getViewModel()?.notebookDocument.uri;
         if (( this._notebookEditors.has(editor.getId()))) {
             this._notebookEditors.delete(editor.getId());
             this._onNotebookEditorsRemove.fire(editor);
         }
+        if (this._mostRecentRepl.get() === notebookUri?.toString()) {
+            this._mostRecentRepl.reset();
+        }
     }
     getNotebookEditor(editorId) {
         return this._notebookEditors.get(editorId);
@@ -213,6 +228,9 @@ let NotebookEditorWidgetService = class NotebookEditorWidgetService {
     listNotebookEditors() {
         return ( [...this._notebookEditors].map(e => e[1]));
     }
+    updateReplContextKey(uri) {
+        this._mostRecentRepl.set(uri);
+    }
 };
 NotebookEditorWidgetService = ( __decorate([
     ( __param(0, IEditorGroupsService)),

package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookExecutionServiceImpl.d.ts

@@ -0,0 +1,30 @@
+import { IDisposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { ICommandService } from "vscode/vscode/vs/platform/commands/common/commands.service";
+import { IContextKeyService } from "vscode/vscode/vs/platform/contextkey/common/contextkey.service";
+import { IWorkspaceTrustRequestService } from "vscode/vscode/vs/platform/workspace/common/workspaceTrust.service";
+import { NotebookCellTextModel } from "@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/notebook/common/model/notebookCellTextModel";
+import { INotebookTextModel } from "vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon";
+import { ICellExecutionParticipant } from "vscode/vscode/vs/workbench/contrib/notebook/common/notebookExecutionService";
+import { INotebookExecutionService } from "vscode/vscode/vs/workbench/contrib/notebook/common/notebookExecutionService.service";
+import { INotebookExecutionStateService } from "vscode/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService.service";
+import { INotebookKernelHistoryService } from "vscode/vscode/vs/workbench/contrib/notebook/common/notebookKernelService.service";
+import { INotebookKernelService } from "vscode/vscode/vs/workbench/contrib/notebook/common/notebookKernelService.service";
+import { INotebookLoggingService } from "vscode/vscode/vs/workbench/contrib/notebook/common/notebookLoggingService.service";
+export declare class NotebookExecutionService implements INotebookExecutionService, IDisposable {
+    private readonly _commandService;
+    private readonly _notebookKernelService;
+    private readonly _notebookKernelHistoryService;
+    private readonly _workspaceTrustRequestService;
+    private readonly _logService;
+    private readonly _notebookExecutionStateService;
+    _serviceBrand: undefined;
+    private _activeProxyKernelExecutionToken;
+    constructor(_commandService: ICommandService, _notebookKernelService: INotebookKernelService, _notebookKernelHistoryService: INotebookKernelHistoryService, _workspaceTrustRequestService: IWorkspaceTrustRequestService, _logService: INotebookLoggingService, _notebookExecutionStateService: INotebookExecutionStateService);
+    executeNotebookCells(notebook: INotebookTextModel, cells: Iterable<NotebookCellTextModel>, contextKeyService: IContextKeyService): Promise<void>;
+    cancelNotebookCellHandles(notebook: INotebookTextModel, cells: Iterable<number>): Promise<void>;
+    cancelNotebookCells(notebook: INotebookTextModel, cells: Iterable<NotebookCellTextModel>): Promise<void>;
+    private readonly cellExecutionParticipants;
+    registerExecutionParticipant(participant: ICellExecutionParticipant): IDisposable;
+    private runExecutionParticipants;
+    dispose(): void;
+}

package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookExecutionServiceImpl.js

@@ -1,9 +1,10 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { localize } from 'vscode/vscode/vs/nls';
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
 import { IWorkspaceTrustRequestService } from 'vscode/vscode/vs/platform/workspace/common/workspaceTrust.service';
-import { KernelPickerMRUStrategy } from '@codingame/monaco-vscode-chat-interactive-notebook-search-common/vscode/vs/workbench/contrib/notebook/browser/viewParts/notebookKernelQuickPickStrategy';
+import { KernelPickerMRUStrategy } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/viewParts/notebookKernelQuickPickStrategy';
 import { CellKind, NotebookCellExecutionState } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { INotebookExecutionStateService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService.service';
 import { INotebookKernelService, INotebookKernelHistoryService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookKernelService.service';
@@ -17,7 +18,7 @@ let NotebookExecutionService = class NotebookExecutionService {
         this._workspaceTrustRequestService = _workspaceTrustRequestService;
         this._logService = _logService;
         this._notebookExecutionStateService = _notebookExecutionStateService;
-        this.cellExecutionParticipants = ( (new Set()));
+        this.cellExecutionParticipants = ( new Set());
     }
     async executeNotebookCells(notebook, cells, contextKeyService) {
         const cellsArr = Array.from(cells)
@@ -25,8 +26,8 @@ let NotebookExecutionService = class NotebookExecutionService {
         if (!cellsArr.length) {
             return;
         }
-        this._logService.debug(`Execution`, `${JSON.stringify(( (cellsArr.map(c => c.handle))))}`);
-        const message = ( localize(3293, "Executing a notebook cell will run code from this workspace."));
+        this._logService.debug(`Execution`, `${JSON.stringify(( cellsArr.map(c => c.handle)))}`);
+        const message = ( localize(7742, "Executing a notebook cell will run code from this workspace."));
         const trust = await this._workspaceTrustRequestService.requestWorkspaceTrust({ message });
         if (!trust) {
             return;
@@ -57,13 +58,13 @@ let NotebookExecutionService = class NotebookExecutionService {
         if (validCellExecutions.length > 0) {
             await this.runExecutionParticipants(validCellExecutions);
             this._notebookKernelService.selectKernelForNotebook(kernel, notebook);
-            await kernel.executeNotebookCellsRequest(notebook.uri, ( (validCellExecutions.map(c => c.cellHandle))));
+            await kernel.executeNotebookCellsRequest(notebook.uri, ( validCellExecutions.map(c => c.cellHandle)));
             const unconfirmed = validCellExecutions.filter(exe => exe.state === NotebookCellExecutionState.Unconfirmed);
             if (unconfirmed.length) {
-                this._logService.debug(`Execution`, `Completing unconfirmed executions ${JSON.stringify(( (unconfirmed.map(exe => exe.cellHandle))))}`);
+                this._logService.debug(`Execution`, `Completing unconfirmed executions ${JSON.stringify(( unconfirmed.map(exe => exe.cellHandle)))}`);
                 unconfirmed.forEach(exe => exe.complete({}));
             }
-            this._logService.debug(`Execution`, `Completed executions ${JSON.stringify(( (validCellExecutions.map(exe => exe.cellHandle))))}`);
+            this._logService.debug(`Execution`, `Completed executions ${JSON.stringify(( validCellExecutions.map(exe => exe.cellHandle)))}`);
         }
     }
     async cancelNotebookCellHandles(notebook, cells) {
@@ -91,13 +92,13 @@ let NotebookExecutionService = class NotebookExecutionService {
         this._activeProxyKernelExecutionToken?.dispose(true);
     }
 };
-NotebookExecutionService = ( (__decorate([
-    ( (__param(0, ICommandService))),
-    ( (__param(1, INotebookKernelService))),
-    ( (__param(2, INotebookKernelHistoryService))),
-    ( (__param(3, IWorkspaceTrustRequestService))),
-    ( (__param(4, INotebookLoggingService))),
-    ( (__param(5, INotebookExecutionStateService)))
-], NotebookExecutionService)));
+NotebookExecutionService = ( __decorate([
+    ( __param(0, ICommandService)),
+    ( __param(1, INotebookKernelService)),
+    ( __param(2, INotebookKernelHistoryService)),
+    ( __param(3, IWorkspaceTrustRequestService)),
+    ( __param(4, INotebookLoggingService)),
+    ( __param(5, INotebookExecutionStateService))
+], NotebookExecutionService));
 
 export { NotebookExecutionService };

package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookExecutionStateServiceImpl.d.ts

@@ -0,0 +1,46 @@
+import { Disposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { URI } from "vscode/vscode/vs/base/common/uri";
+import { IAccessibilitySignalService } from "vscode/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService.service";
+import { IInstantiationService } from "vscode/vscode/vs/platform/instantiation/common/instantiation";
+import { ILogService } from "vscode/vscode/vs/platform/log/common/log.service";
+import { ICellExecutionStateChangedEvent, IExecutionStateChangedEvent, INotebookCellExecution, INotebookExecution, INotebookFailStateChangedEvent } from "@codingame/monaco-vscode-22790577-4553-50b6-978d-0acc75c394cc-common/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService";
+import { INotebookExecutionStateService } from "vscode/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService.service";
+import { INotebookService } from "vscode/vscode/vs/workbench/contrib/notebook/common/notebookService.service";
+export declare class NotebookExecutionStateService extends Disposable implements INotebookExecutionStateService {
+    private readonly _instantiationService;
+    private readonly _logService;
+    private readonly _notebookService;
+    private readonly _accessibilitySignalService;
+    _serviceBrand: undefined;
+    private readonly _executions;
+    private readonly _notebookExecutions;
+    private readonly _notebookListeners;
+    private readonly _cellListeners;
+    private readonly _lastFailedCells;
+    private readonly _lastCompletedCellHandles;
+    private readonly _onDidChangeExecution;
+    onDidChangeExecution: import("vscode/vscode/vs/base/common/event").Event<ICellExecutionStateChangedEvent | IExecutionStateChangedEvent>;
+    private readonly _onDidChangeLastRunFailState;
+    onDidChangeLastRunFailState: import("vscode/vscode/vs/base/common/event").Event<INotebookFailStateChangedEvent>;
+    constructor(_instantiationService: IInstantiationService, _logService: ILogService, _notebookService: INotebookService, _accessibilitySignalService: IAccessibilitySignalService);
+    getLastFailedCellForNotebook(notebook: URI): number | undefined;
+    getLastCompletedCellForNotebook(notebook: URI): number | undefined;
+    forceCancelNotebookExecutions(notebookUri: URI): void;
+    getCellExecution(cellUri: URI): INotebookCellExecution | undefined;
+    getExecution(notebook: URI): INotebookExecution | undefined;
+    getCellExecutionsForNotebook(notebook: URI): INotebookCellExecution[];
+    getCellExecutionsByHandleForNotebook(notebook: URI): Map<number, INotebookCellExecution> | undefined;
+    private _onCellExecutionDidChange;
+    private _onCellExecutionDidComplete;
+    private _onExecutionDidChange;
+    private _onExecutionDidComplete;
+    createCellExecution(notebookUri: URI, cellHandle: number): INotebookCellExecution;
+    createExecution(notebookUri: URI): INotebookExecution;
+    private _createNotebookCellExecution;
+    private _createNotebookExecution;
+    private _setLastFailedCell;
+    private _setLastFailedCellVisibility;
+    private _clearLastFailedCell;
+    private _getFailedCellListener;
+    dispose(): void;
+}

package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookExecutionStateServiceImpl.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 { Emitter } from 'vscode/vscode/vs/base/common/event';
 import { Disposable, combinedDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { ResourceMap } from 'vscode/vscode/vs/base/common/map';
@@ -8,10 +9,10 @@ import { AccessibilitySignal } from 'vscode/vscode/vs/platform/accessibilitySign
 import { IAccessibilitySignalService } from 'vscode/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService.service';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
-import { CellUri, NotebookCellExecutionState, NotebookExecutionState } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
+import { CellUri, NotebookCellExecutionState, CellEditType, NotebookExecutionState } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { CellExecutionUpdateType } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookExecutionService';
 import { INotebookExecutionService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookExecutionService.service';
-import { NotebookExecutionType } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService';
+import { NotebookExecutionType } from '@codingame/monaco-vscode-22790577-4553-50b6-978d-0acc75c394cc-common/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService';
 import { INotebookExecutionStateService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService.service';
 import { INotebookKernelService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookKernelService.service';
 import { INotebookService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
@@ -28,6 +29,7 @@ let NotebookExecutionStateService = class NotebookExecutionStateService extends
         this._notebookListeners = ( new ResourceMap());
         this._cellListeners = ( new ResourceMap());
         this._lastFailedCells = ( new ResourceMap());
+        this._lastCompletedCellHandles = ( new ResourceMap());
         this._onDidChangeExecution = this._register(( new Emitter()));
         this.onDidChangeExecution = this._onDidChangeExecution.event;
         this._onDidChangeLastRunFailState = this._register(( new Emitter()));
@@ -37,6 +39,9 @@ let NotebookExecutionStateService = class NotebookExecutionStateService extends
         const failedCell = this._lastFailedCells.get(notebook);
         return failedCell?.visible ? failedCell.cellHandle : undefined;
     }
+    getLastCompletedCellForNotebook(notebook) {
+        return this._lastCompletedCellHandles.get(notebook);
+    }
     forceCancelNotebookExecutions(notebookUri) {
         const notebookCellExecutions = this._executions.get(notebookUri);
         if (notebookCellExecutions) {
@@ -100,6 +105,7 @@ let NotebookExecutionStateService = class NotebookExecutionStateService extends
                 this._accessibilitySignalService.playSignal(AccessibilitySignal.notebookCellFailed);
                 this._setLastFailedCell(notebookUri, cellHandle);
             }
+            this._lastCompletedCellHandles.set(notebookUri, cellHandle);
         }
         this._onDidChangeExecution.fire(( new NotebookCellExecutionEvent(notebookUri, cellHandle)));
     }
@@ -334,7 +340,7 @@ NotebookExecutionListeners = ( __decorate([
 function updateToEdit(update, cellHandle) {
     if (update.editType === CellExecutionUpdateType.Output) {
         return {
-            editType: 2 ,
+            editType: CellEditType.Output,
             handle: update.cellHandle,
             append: update.append,
             outputs: update.outputs,
@@ -342,7 +348,7 @@ function updateToEdit(update, cellHandle) {
     }
     else if (update.editType === CellExecutionUpdateType.OutputItems) {
         return {
-            editType: 7 ,
+            editType: CellEditType.OutputItems,
             items: update.items,
             append: update.append,
             outputId: update.outputId
@@ -357,7 +363,7 @@ function updateToEdit(update, cellHandle) {
             newInternalMetadata.runStartTime = update.runStartTime;
         }
         return {
-            editType: 9 ,
+            editType: CellEditType.PartialInternalMetadata,
             handle: cellHandle,
             internalMetadata: newInternalMetadata
         };
@@ -393,7 +399,7 @@ let CellExecution = class CellExecution extends Disposable {
     }
     initialize() {
         const startExecuteEdit = {
-            editType: 9 ,
+            editType: CellEditType.PartialInternalMetadata,
             handle: this.cellHandle,
             internalMetadata: {
                 executionId: generateUuid(),
@@ -449,7 +455,7 @@ let CellExecution = class CellExecution extends Disposable {
         }
         else {
             const edit = {
-                editType: 9 ,
+                editType: CellEditType.PartialInternalMetadata,
                 handle: this.cellHandle,
                 internalMetadata: {
                     lastRunSuccess: completionData.lastRunSuccess,

package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookKernelHistoryServiceImpl.d.ts

@@ -0,0 +1,25 @@
+import { Disposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { IStorageService } from "vscode/vscode/vs/platform/storage/common/storage.service";
+import { INotebookKernel, INotebookTextModelLike } from "vscode/vscode/vs/workbench/contrib/notebook/common/notebookKernelService";
+import { INotebookKernelHistoryService } from "vscode/vscode/vs/workbench/contrib/notebook/common/notebookKernelService.service";
+import { INotebookKernelService } from "vscode/vscode/vs/workbench/contrib/notebook/common/notebookKernelService.service";
+import { INotebookLoggingService } from "vscode/vscode/vs/workbench/contrib/notebook/common/notebookLoggingService.service";
+export declare class NotebookKernelHistoryService extends Disposable implements INotebookKernelHistoryService {
+    private readonly _storageService;
+    private readonly _notebookKernelService;
+    private readonly _notebookLoggingService;
+    _serviceBrand: undefined;
+    private static STORAGE_KEY;
+    private _mostRecentKernelsMap;
+    constructor(_storageService: IStorageService, _notebookKernelService: INotebookKernelService, _notebookLoggingService: INotebookLoggingService);
+    getKernels(notebook: INotebookTextModelLike): {
+        selected: INotebookKernel | undefined;
+        all: INotebookKernel[];
+    };
+    addMostRecentKernel(kernel: INotebookKernel): void;
+    private _saveState;
+    private _loadState;
+    private _serialize;
+    private _deserialize;
+    _clear(): void;
+}

package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookKernelHistoryServiceImpl.js

@@ -1,9 +1,11 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { Disposable, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
-import { LinkedMap } from 'vscode/vscode/vs/base/common/map';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
+import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { LinkedMap, Touch } from 'vscode/vscode/vs/base/common/map';
 import { localize2 } from 'vscode/vscode/vs/nls';
 import { Categories } from 'vscode/vscode/vs/platform/action/common/actionCommonCategories';
 import { registerAction2, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
+import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { INotebookKernelService, INotebookKernelHistoryService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookKernelService.service';
 import { INotebookLoggingService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookLoggingService.service';
@@ -21,7 +23,7 @@ let NotebookKernelHistoryService = class NotebookKernelHistoryService extends Di
         this._mostRecentKernelsMap = {};
         this._loadState();
         this._register(this._storageService.onWillSaveState(() => this._saveState()));
-        this._register(this._storageService.onDidChangeValue(1 , NotebookKernelHistoryService_1.STORAGE_KEY, this._register(( (new DisposableStore()))))(() => {
+        this._register(this._storageService.onDidChangeValue(StorageScope.WORKSPACE, NotebookKernelHistoryService_1.STORAGE_KEY, this._store)(() => {
             this._loadState();
         }));
     }
@@ -31,8 +33,8 @@ let NotebookKernelHistoryService = class NotebookKernelHistoryService extends Di
         const selectedKernel = allAvailableKernels.selected;
         const suggested = allAvailableKernels.all.length === 1 ? allAvailableKernels.all[0] : undefined;
         this._notebookLoggingService.debug('History', `getMatchingKernels: ${allAvailableKernels.all.length} kernels available for ${notebook.uri.path}. Selected: ${allAvailableKernels.selected?.label}. Suggested: ${suggested?.label}`);
-        const mostRecentKernelIds = this._mostRecentKernelsMap[notebook.notebookType] ? [...( (this._mostRecentKernelsMap[notebook.notebookType].values()))] : [];
-        const all = ( (mostRecentKernelIds.map(kernelId => allKernels.find(kernel => kernel.id === kernelId)))).filter(kernel => !!kernel);
+        const mostRecentKernelIds = this._mostRecentKernelsMap[notebook.notebookType] ? [...( this._mostRecentKernelsMap[notebook.notebookType].values())] : [];
+        const all = ( mostRecentKernelIds.map(kernelId => allKernels.find(kernel => kernel.id === kernelId))).filter(kernel => !!kernel);
         this._notebookLoggingService.debug('History', `mru: ${mostRecentKernelIds.length} kernels in history, ${all.length} registered already.`);
         return {
             selected: selectedKernel ?? suggested,
@@ -42,8 +44,8 @@ let NotebookKernelHistoryService = class NotebookKernelHistoryService extends Di
     addMostRecentKernel(kernel) {
         const key = kernel.id;
         const viewType = kernel.viewType;
-        const recentKeynels = this._mostRecentKernelsMap[viewType] ?? ( (new LinkedMap()));
-        recentKeynels.set(key, key, 1 );
+        const recentKeynels = this._mostRecentKernelsMap[viewType] ?? ( new LinkedMap());
+        recentKeynels.set(key, key, Touch.AsOld);
         if (recentKeynels.size > MAX_KERNELS_IN_HISTORY) {
             const reserved = [...recentKeynels.entries()].slice(0, MAX_KERNELS_IN_HISTORY);
             recentKeynels.fromJSON(reserved);
@@ -57,14 +59,14 @@ let NotebookKernelHistoryService = class NotebookKernelHistoryService extends Di
         }
         if (notEmpty) {
             const serialized = this._serialize();
-            this._storageService.store(NotebookKernelHistoryService_1.STORAGE_KEY, JSON.stringify(serialized), 1 , 0 );
+            this._storageService.store(NotebookKernelHistoryService_1.STORAGE_KEY, JSON.stringify(serialized), StorageScope.WORKSPACE, StorageTarget.USER);
         }
         else {
-            this._storageService.remove(NotebookKernelHistoryService_1.STORAGE_KEY, 1 );
+            this._storageService.remove(NotebookKernelHistoryService_1.STORAGE_KEY, StorageScope.WORKSPACE);
         }
     }
     _loadState() {
-        const serialized = this._storageService.get(NotebookKernelHistoryService_1.STORAGE_KEY, 1 );
+        const serialized = this._storageService.get(NotebookKernelHistoryService_1.STORAGE_KEY, StorageScope.WORKSPACE);
         if (serialized) {
             try {
                 this._deserialize(JSON.parse(serialized));
@@ -81,7 +83,7 @@ let NotebookKernelHistoryService = class NotebookKernelHistoryService extends Di
         const result = Object.create(null);
         for (const [viewType, kernels] of Object.entries(this._mostRecentKernelsMap)) {
             result[viewType] = {
-                entries: [...( (kernels.values()))]
+                entries: [...( kernels.values())]
             };
         }
         return result;
@@ -89,7 +91,7 @@ let NotebookKernelHistoryService = class NotebookKernelHistoryService extends Di
     _deserialize(serialized) {
         this._mostRecentKernelsMap = {};
         for (const [viewType, kernels] of Object.entries(serialized)) {
-            const linkedMap = ( (new LinkedMap()));
+            const linkedMap = ( new LinkedMap());
             const mapValues = [];
             for (const entry of kernels.entries) {
                 mapValues.push([entry, entry]);
@@ -103,16 +105,16 @@ let NotebookKernelHistoryService = class NotebookKernelHistoryService extends Di
         this._saveState();
     }
 };
-NotebookKernelHistoryService = NotebookKernelHistoryService_1 = ( (__decorate([
-    ( (__param(0, IStorageService))),
-    ( (__param(1, INotebookKernelService))),
-    ( (__param(2, INotebookLoggingService)))
-], NotebookKernelHistoryService)));
+NotebookKernelHistoryService = NotebookKernelHistoryService_1 = ( __decorate([
+    ( __param(0, IStorageService)),
+    ( __param(1, INotebookKernelService)),
+    ( __param(2, INotebookLoggingService))
+], NotebookKernelHistoryService));
 registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.clearNotebookKernelsMRUCache',
-            title: ( localize2(3297, "Clear Notebook Kernels MRU Cache")),
+            title: ( localize2(7743, "Clear Notebook Kernels MRU Cache")),
             category: Categories.Developer,
             f1: true
         });

package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookKernelServiceImpl.d.ts

@@ -0,0 +1,57 @@
+import { Event } from "vscode/vscode/vs/base/common/event";
+import { Disposable, IDisposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { INotebookKernelSourceAction, INotebookTextModel } from "vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon";
+import { INotebookKernel, ISelectedNotebooksChangeEvent, INotebookKernelMatchResult, INotebookTextModelLike, ISourceAction, INotebookSourceActionChangeEvent, INotebookKernelDetectionTask, IKernelSourceActionProvider } from "vscode/vscode/vs/workbench/contrib/notebook/common/notebookKernelService";
+import { INotebookKernelService } from "vscode/vscode/vs/workbench/contrib/notebook/common/notebookKernelService.service";
+import { IStorageService } from "vscode/vscode/vs/platform/storage/common/storage.service";
+import { URI } from "vscode/vscode/vs/base/common/uri";
+import { INotebookService } from "vscode/vscode/vs/workbench/contrib/notebook/common/notebookService.service";
+import { IMenuService } from "vscode/vscode/vs/platform/actions/common/actions.service";
+import { IContextKeyService } from "vscode/vscode/vs/platform/contextkey/common/contextkey.service";
+export declare class NotebookKernelService extends Disposable implements INotebookKernelService {
+    private readonly _notebookService;
+    private readonly _storageService;
+    private readonly _menuService;
+    private readonly _contextKeyService;
+    _serviceBrand: undefined;
+    private readonly _kernels;
+    private readonly _notebookBindings;
+    private readonly _onDidChangeNotebookKernelBinding;
+    private readonly _onDidAddKernel;
+    private readonly _onDidRemoveKernel;
+    private readonly _onDidChangeNotebookAffinity;
+    private readonly _onDidChangeSourceActions;
+    private readonly _onDidNotebookVariablesChange;
+    private readonly _kernelSources;
+    private readonly _kernelSourceActionsUpdates;
+    private readonly _kernelDetectionTasks;
+    private readonly _onDidChangeKernelDetectionTasks;
+    private readonly _kernelSourceActionProviders;
+    readonly onDidChangeSelectedNotebooks: Event<ISelectedNotebooksChangeEvent>;
+    readonly onDidAddKernel: Event<INotebookKernel>;
+    readonly onDidRemoveKernel: Event<INotebookKernel>;
+    readonly onDidChangeNotebookAffinity: Event<void>;
+    readonly onDidChangeSourceActions: Event<INotebookSourceActionChangeEvent>;
+    readonly onDidChangeKernelDetectionTasks: Event<string>;
+    readonly onDidNotebookVariablesUpdate: Event<URI>;
+    private static _storageNotebookBinding;
+    constructor(_notebookService: INotebookService, _storageService: IStorageService, _menuService: IMenuService, _contextKeyService: IContextKeyService);
+    dispose(): void;
+    private _persistSoonHandle?;
+    private _persistMementos;
+    private static _score;
+    private _tryAutoBindNotebook;
+    notifyVariablesChange(notebookUri: URI): void;
+    registerKernel(kernel: INotebookKernel): IDisposable;
+    getMatchingKernel(notebook: INotebookTextModelLike): INotebookKernelMatchResult;
+    getSelectedOrSuggestedKernel(notebook: INotebookTextModel): INotebookKernel | undefined;
+    selectKernelForNotebook(kernel: INotebookKernel | undefined, notebook: INotebookTextModelLike): void;
+    preselectKernelForNotebook(kernel: INotebookKernel, notebook: INotebookTextModelLike): void;
+    updateKernelNotebookAffinity(kernel: INotebookKernel, notebook: URI, preference: number | undefined): void;
+    getRunningSourceActions(notebook: INotebookTextModelLike): ISourceAction[];
+    getSourceActions(notebook: INotebookTextModelLike, contextKeyService: IContextKeyService | undefined): ISourceAction[];
+    registerNotebookKernelDetectionTask(task: INotebookKernelDetectionTask): IDisposable;
+    getKernelDetectionTasks(notebook: INotebookTextModelLike): INotebookKernelDetectionTask[];
+    registerKernelSourceActionProvider(viewType: string, provider: IKernelSourceActionProvider): IDisposable;
+    getKernelSourceActions2(notebook: INotebookTextModelLike): Promise<INotebookKernelSourceAction[]>;
+}