@codingame/monaco-vscode-notebook-service-override 14.0.6 → 15.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-notebook-service-override",
-  "version": "14.0.6",
+  "version": "15.0.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - notebook service-override",
   "keywords": [],
@@ -15,34 +15,31 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-0b087f42-a5a3-5eb9-9bfd-1eebc1bba163-common": "14.0.6",
-    "@codingame/monaco-vscode-0cd5242b-7b61-5f66-ac25-ffa40baf8e8f-common": "14.0.6",
-    "@codingame/monaco-vscode-168b98e5-dc20-5807-b1f9-798f1f92b37f-common": "14.0.6",
-    "@codingame/monaco-vscode-1ae7d696-d960-5ac6-97a3-9fe7c8c3a793-common": "14.0.6",
-    "@codingame/monaco-vscode-3a00040f-b81b-50bc-88da-35f611c0bd1e-common": "14.0.6",
-    "@codingame/monaco-vscode-407531d3-fdae-5387-8c41-49ba0e9574b5-common": "14.0.6",
-    "@codingame/monaco-vscode-4e719823-8b6e-554d-b01a-5670b53fbb19-common": "14.0.6",
-    "@codingame/monaco-vscode-65619f8f-0eab-5d8b-855a-43b6353fe527-common": "14.0.6",
-    "@codingame/monaco-vscode-695440c8-a687-5594-b476-bbc7b36bafe9-common": "14.0.6",
-    "@codingame/monaco-vscode-6f9bc782-77e0-5716-93bd-b05210c768c5-common": "14.0.6",
-    "@codingame/monaco-vscode-771c2e6d-0284-5ac1-be73-7176085eedc5-common": "14.0.6",
-    "@codingame/monaco-vscode-88aa9a78-75f5-5aaa-89e9-bbdd580b3b5c-common": "14.0.6",
-    "@codingame/monaco-vscode-8ccb7637-50ea-5359-97bf-00015d7fe567-common": "14.0.6",
-    "@codingame/monaco-vscode-91789cdf-e3cb-5a04-aaeb-6f7df7d3d231-common": "14.0.6",
-    "@codingame/monaco-vscode-99f24462-c56d-5407-83fb-2ea9dd33cc8c-common": "14.0.6",
-    "@codingame/monaco-vscode-9e30237f-37af-5bbd-8bc1-5c4f2c0714b3-common": "14.0.6",
-    "@codingame/monaco-vscode-9ee79c1a-3f03-568b-8eac-b02513a98b68-common": "14.0.6",
-    "@codingame/monaco-vscode-af5ccfda-af82-504b-b365-92b4e654e5c5-common": "14.0.6",
-    "@codingame/monaco-vscode-api": "14.0.6",
-    "@codingame/monaco-vscode-b1e8558d-1726-5299-bc75-e43ee6d1a124-common": "14.0.6",
-    "@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common": "14.0.6",
-    "@codingame/monaco-vscode-ce8c4b18-4e75-55dd-9656-517347af9de7-common": "14.0.6",
-    "@codingame/monaco-vscode-d0fb86d3-2a47-594e-955b-9a24631a7124-common": "14.0.6",
-    "@codingame/monaco-vscode-d4a98668-f793-5361-a9cf-1e6ae6d62ce3-common": "14.0.6",
-    "@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common": "14.0.6",
-    "@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common": "14.0.6",
-    "@codingame/monaco-vscode-ecf3436d-6064-5fbd-a760-37a211ce79c7-common": "14.0.6",
-    "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common": "14.0.6",
+    "@codingame/monaco-vscode-0b087f42-a5a3-5eb9-9bfd-1eebc1bba163-common": "15.0.0",
+    "@codingame/monaco-vscode-0cd5242b-7b61-5f66-ac25-ffa40baf8e8f-common": "15.0.0",
+    "@codingame/monaco-vscode-12c5f9eb-72d3-57ca-babd-5bef7aa9de3b-common": "15.0.0",
+    "@codingame/monaco-vscode-1ae7d696-d960-5ac6-97a3-9fe7c8c3a793-common": "15.0.0",
+    "@codingame/monaco-vscode-1bb39316-6fbf-572e-ab6a-818a2496c14f-common": "15.0.0",
+    "@codingame/monaco-vscode-29bc1406-2925-5b8f-b25e-d04a7772d896-common": "15.0.0",
+    "@codingame/monaco-vscode-2e69e120-617a-5258-95e0-3b8902f4e014-common": "15.0.0",
+    "@codingame/monaco-vscode-3a00040f-b81b-50bc-88da-35f611c0bd1e-common": "15.0.0",
+    "@codingame/monaco-vscode-4e719823-8b6e-554d-b01a-5670b53fbb19-common": "15.0.0",
+    "@codingame/monaco-vscode-52bb4d5b-ba1a-57fd-9bee-b28824214eac-common": "15.0.0",
+    "@codingame/monaco-vscode-65619f8f-0eab-5d8b-855a-43b6353fe527-common": "15.0.0",
+    "@codingame/monaco-vscode-695440c8-a687-5594-b476-bbc7b36bafe9-common": "15.0.0",
+    "@codingame/monaco-vscode-6f9bc782-77e0-5716-93bd-b05210c768c5-common": "15.0.0",
+    "@codingame/monaco-vscode-805e9c2f-56b6-5a43-8b5b-d2dc2d3805fc-common": "15.0.0",
+    "@codingame/monaco-vscode-86d65fc6-30f9-5dca-9501-e249de688591-common": "15.0.0",
+    "@codingame/monaco-vscode-88aa9a78-75f5-5aaa-89e9-bbdd580b3b5c-common": "15.0.0",
+    "@codingame/monaco-vscode-8ccb7637-50ea-5359-97bf-00015d7fe567-common": "15.0.0",
+    "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common": "15.0.0",
+    "@codingame/monaco-vscode-9b5a5e82-d649-5455-b4bf-ef90d6afd294-common": "15.0.0",
+    "@codingame/monaco-vscode-a3f28a41-ba19-5a7e-8f5a-d6c1403b507d-common": "15.0.0",
+    "@codingame/monaco-vscode-a4c2011e-8775-52bd-abf0-4a3c07a9696b-common": "15.0.0",
+    "@codingame/monaco-vscode-api": "15.0.0",
+    "@codingame/monaco-vscode-b1e8558d-1726-5299-bc75-e43ee6d1a124-common": "15.0.0",
+    "@codingame/monaco-vscode-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common": "15.0.0",
+    "@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common": "15.0.0",
     "marked": "14.0.0"
   },
   "main": "index.js",

package/vscode/src/vs/editor/contrib/gotoError/browser/markerNavigationService.d.ts

@@ -0,0 +1,34 @@
+import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
+import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
+import { Position } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/core/position";
+import { ITextModel } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/model";
+import { IMarker } from "@codingame/monaco-vscode-api/vscode/vs/platform/markers/common/markers";
+import { IMarkerService } from "@codingame/monaco-vscode-api/vscode/vs/platform/markers/common/markers.service";
+import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
+export declare class MarkerCoordinate {
+    readonly marker: IMarker;
+    readonly index: number;
+    readonly total: number;
+    constructor(marker: IMarker, index: number, total: number);
+}
+export declare class MarkerList {
+    private readonly _markerService;
+    private readonly _configService;
+    private readonly _onDidChange;
+    readonly onDidChange: Event<void>;
+    private readonly _resourceFilter?;
+    private readonly _dispoables;
+    private _markers;
+    private _nextIdx;
+    constructor(resourceFilter: URI | ((uri: URI) => boolean) | undefined, _markerService: IMarkerService, _configService: IConfigurationService);
+    dispose(): void;
+    matches(uri: URI | undefined): boolean;
+    get selected(): MarkerCoordinate | undefined;
+    private _initIdx;
+    resetIndex(): void;
+    move(fwd: boolean, model: ITextModel, position: Position): boolean;
+    find(uri: URI, position: Position): MarkerCoordinate | undefined;
+}
+export interface IMarkerListProvider {
+    getMarkerList(resource: URI | undefined): MarkerList | undefined;
+}

package/vscode/src/vs/editor/contrib/gotoError/browser/markerNavigationService.js

@@ -0,0 +1,216 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { equals, binarySearch2 } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
+import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
+import { DisposableStore, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { LinkedList } from '@codingame/monaco-vscode-api/vscode/vs/base/common/linkedList';
+import { compare } from '@codingame/monaco-vscode-api/vscode/vs/base/common/strings';
+import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
+import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
+import { registerSingleton, InstantiationType } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
+import { MarkerSeverity } from '@codingame/monaco-vscode-api/vscode/vs/platform/markers/common/markers';
+import { IMarkerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/markers/common/markers.service';
+import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
+import { isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
+import { IMarkerNavigationService } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/gotoError/browser/markerNavigationService.service';
+
+class MarkerCoordinate {
+    constructor(marker, index, total) {
+        this.marker = marker;
+        this.index = index;
+        this.total = total;
+    }
+}
+let MarkerList = class MarkerList {
+    constructor(resourceFilter, _markerService, _configService) {
+        this._markerService = _markerService;
+        this._configService = _configService;
+        this._onDidChange = ( new Emitter());
+        this.onDidChange = this._onDidChange.event;
+        this._dispoables = ( new DisposableStore());
+        this._markers = [];
+        this._nextIdx = -1;
+        if (URI.isUri(resourceFilter)) {
+            this._resourceFilter = uri => ( uri.toString()) === ( resourceFilter.toString());
+        }
+        else if (resourceFilter) {
+            this._resourceFilter = resourceFilter;
+        }
+        const compareOrder = this._configService.getValue('problems.sortOrder');
+        const compareMarker = (a, b) => {
+            let res = compare(( a.resource.toString()), ( b.resource.toString()));
+            if (res === 0) {
+                if (compareOrder === 'position') {
+                    res = Range.compareRangesUsingStarts(a, b) || MarkerSeverity.compare(a.severity, b.severity);
+                }
+                else {
+                    res = MarkerSeverity.compare(a.severity, b.severity) || Range.compareRangesUsingStarts(a, b);
+                }
+            }
+            return res;
+        };
+        const updateMarker = () => {
+            let newMarkers = this._markerService.read({
+                resource: URI.isUri(resourceFilter) ? resourceFilter : undefined,
+                severities: MarkerSeverity.Error | MarkerSeverity.Warning | MarkerSeverity.Info
+            });
+            if (typeof resourceFilter === 'function') {
+                newMarkers = newMarkers.filter(m => this._resourceFilter(m.resource));
+            }
+            newMarkers.sort(compareMarker);
+            if (equals(newMarkers, this._markers, (a, b) => ( a.resource.toString()) === ( b.resource.toString())
+                && a.startLineNumber === b.startLineNumber
+                && a.startColumn === b.startColumn
+                && a.endLineNumber === b.endLineNumber
+                && a.endColumn === b.endColumn
+                && a.severity === b.severity
+                && a.message === b.message)) {
+                return false;
+            }
+            this._markers = newMarkers;
+            return true;
+        };
+        updateMarker();
+        this._dispoables.add(_markerService.onMarkerChanged(uris => {
+            if (!this._resourceFilter || ( uris.some(uri => this._resourceFilter(uri)))) {
+                if (updateMarker()) {
+                    this._nextIdx = -1;
+                    this._onDidChange.fire();
+                }
+            }
+        }));
+    }
+    dispose() {
+        this._dispoables.dispose();
+        this._onDidChange.dispose();
+    }
+    matches(uri) {
+        if (!this._resourceFilter && !uri) {
+            return true;
+        }
+        if (!this._resourceFilter || !uri) {
+            return false;
+        }
+        return this._resourceFilter(uri);
+    }
+    get selected() {
+        const marker = this._markers[this._nextIdx];
+        return marker && ( new MarkerCoordinate(marker, this._nextIdx + 1, this._markers.length));
+    }
+    _initIdx(model, position, fwd) {
+        let idx = this._markers.findIndex(marker => isEqual(marker.resource, model.uri));
+        if (idx < 0) {
+            idx = binarySearch2(this._markers.length, idx => compare(( this._markers[idx].resource.toString()), ( model.uri.toString())));
+            if (idx < 0) {
+                idx = ~idx;
+            }
+            if (fwd) {
+                this._nextIdx = idx;
+            }
+            else {
+                this._nextIdx = (this._markers.length + idx - 1) % this._markers.length;
+            }
+        }
+        else {
+            let found = false;
+            let wentPast = false;
+            for (let i = idx; i < this._markers.length; i++) {
+                let range = Range.lift(this._markers[i]);
+                if (range.isEmpty()) {
+                    const word = model.getWordAtPosition(range.getStartPosition());
+                    if (word) {
+                        range = ( new Range(
+                            range.startLineNumber,
+                            word.startColumn,
+                            range.startLineNumber,
+                            word.endColumn
+                        ));
+                    }
+                }
+                if (position && (range.containsPosition(position) || position.isBeforeOrEqual(range.getStartPosition()))) {
+                    this._nextIdx = i;
+                    found = true;
+                    wentPast = !range.containsPosition(position);
+                    break;
+                }
+                if (( this._markers[i].resource.toString()) !== ( model.uri.toString())) {
+                    break;
+                }
+            }
+            if (!found) {
+                this._nextIdx = fwd ? 0 : this._markers.length - 1;
+            }
+            else if (wentPast && !fwd) {
+                this._nextIdx -= 1;
+            }
+        }
+        if (this._nextIdx < 0) {
+            this._nextIdx = this._markers.length - 1;
+        }
+    }
+    resetIndex() {
+        this._nextIdx = -1;
+    }
+    move(fwd, model, position) {
+        if (this._markers.length === 0) {
+            return false;
+        }
+        const oldIdx = this._nextIdx;
+        if (this._nextIdx === -1) {
+            this._initIdx(model, position, fwd);
+        }
+        else if (fwd) {
+            this._nextIdx = (this._nextIdx + 1) % this._markers.length;
+        }
+        else if (!fwd) {
+            this._nextIdx = (this._nextIdx - 1 + this._markers.length) % this._markers.length;
+        }
+        if (oldIdx !== this._nextIdx) {
+            return true;
+        }
+        return false;
+    }
+    find(uri, position) {
+        let idx = this._markers.findIndex(marker => ( marker.resource.toString()) === ( uri.toString()));
+        if (idx < 0) {
+            return undefined;
+        }
+        for (; idx < this._markers.length; idx++) {
+            if (Range.containsPosition(this._markers[idx], position)) {
+                return ( new MarkerCoordinate(this._markers[idx], idx + 1, this._markers.length));
+            }
+        }
+        return undefined;
+    }
+};
+MarkerList = ( __decorate([
+    ( __param(1, IMarkerService)),
+    ( __param(2, IConfigurationService))
+], MarkerList));
+let MarkerNavigationService = class MarkerNavigationService {
+    constructor(_markerService, _configService) {
+        this._markerService = _markerService;
+        this._configService = _configService;
+        this._provider = ( new LinkedList());
+    }
+    registerProvider(provider) {
+        const remove = this._provider.unshift(provider);
+        return toDisposable(() => remove());
+    }
+    getMarkerList(resource) {
+        for (const provider of this._provider) {
+            const result = provider.getMarkerList(resource);
+            if (result) {
+                return result;
+            }
+        }
+        return ( new MarkerList(resource, this._markerService, this._configService));
+    }
+};
+MarkerNavigationService = ( __decorate([
+    ( __param(0, IMarkerService)),
+    ( __param(1, IConfigurationService))
+], MarkerNavigationService));
+registerSingleton(IMarkerNavigationService, MarkerNavigationService, InstantiationType.Delayed);
+
+export { MarkerCoordinate, MarkerList };

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

@@ -196,8 +196,8 @@ class EmptyTextEditorHintContentWidget {
             getActions: () => {
                 return [{
                         id: 'workench.action.disableEmptyEditorHint',
-                        label: ( localize(4819, "Disable Empty Editor Hint")),
-                        tooltip: ( localize(4819, "Disable Empty Editor Hint")),
+                        label: ( localize(4904, "Disable Empty Editor Hint")),
+                        tooltip: ( localize(4904, "Disable Empty Editor Hint")),
                         enabled: true,
                         class: undefined,
                         run: () => {
@@ -235,7 +235,7 @@ class EmptyTextEditorHintContentWidget {
         const keybindingHintLabel = keybindingHint?.getLabel();
         if (keybindingHint && keybindingHintLabel) {
             const actionPart = ( localize(
-                4820,
+                4905,
                 'Press {0} to ask {1} to do something. ',
                 keybindingHintLabel,
                 providerName
@@ -266,7 +266,7 @@ class EmptyTextEditorHintContentWidget {
                 this.toDispose.add(addDisposableListener(label.element, EventType.CLICK, handleClick));
             }
             hintElement.appendChild(after);
-            const typeToDismiss = ( localize(4821, 'Start typing to dismiss.'));
+            const typeToDismiss = ( localize(4906, 'Start typing to dismiss.'));
             const textHint2 = $('span', undefined, typeToDismiss);
             textHint2.style.fontStyle = 'italic';
             hintElement.appendChild(textHint2);
@@ -274,7 +274,7 @@ class EmptyTextEditorHintContentWidget {
         }
         else {
             const hintMsg = ( localize(
-                4822,
+                4907,
                 '[[Ask {0} to do something]] or start typing to dismiss.',
                 providerName
             ));
@@ -334,7 +334,7 @@ class EmptyTextEditorHintContentWidget {
             }
         };
         const hintMsg = ( localize(
-            4823,
+            4908,
             '[[Select a language]], or [[fill with template]], or [[open a different editor]] to get started.\nStart typing to dismiss or [[don\'t show]] this again.'
         ));
         const hintElement = renderFormattedText(hintMsg, {
@@ -345,7 +345,7 @@ class EmptyTextEditorHintContentWidget {
         const keybindingsLookup = [ChangeLanguageAction.ID, ApplyFileSnippetAction.Id, 'welcome.showNewFileEntries'];
         const keybindingLabels = ( keybindingsLookup.map((id) => this.keybindingService.lookupKeybinding(id)?.getLabel() ?? id));
         const ariaLabel = ( localize(
-            4824,
+            4909,
             'Execute {0} to select a language, execute {1} to fill with template, or execute {2} to open a different editor and get started. Start typing to dismiss.',
             ...keybindingLabels
         ));
@@ -366,7 +366,7 @@ class EmptyTextEditorHintContentWidget {
             const { hintElement, ariaLabel } = !inlineChatProviders.length ? this._getHintDefault() : this._getHintInlineChat(inlineChatProviders);
             this.domNode.append(hintElement);
             this.ariaLabel = ariaLabel.concat(( localize(
-                4825,
+                4910,
                 ' Toggle {0} in settings to disable this hint.',
                 AccessibilityVerbositySettingId.EmptyEditorHint
             )));

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

@@ -1,18 +1,19 @@
 
 import { KeyMod, KeyCode, KeyChord } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
 import { Mimes } from '@codingame/monaco-vscode-api/vscode/vs/base/common/mime';
-import { IBulkEditService, ResourceTextEdit } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/bulkEditService';
+import { ResourceTextEdit } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/bulkEditService';
+import { IBulkEditService } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/bulkEditService.service';
 import { localize2, localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { registerAction2, MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { InputFocusedContext, InputFocusedContextKey } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkeys';
 import { KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
-import { ResourceNotebookCellEdit } from '@codingame/monaco-vscode-af5ccfda-af82-504b-b365-92b4e654e5c5-common/vscode/vs/workbench/contrib/bulkEdit/browser/bulkCellEdits';
-import { moveCellRange, copyCellRange, computeCellLinesContents, joinCellsWithSurrounds, joinSelectedCells, changeCellToKind } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/controller/cellOperations';
-import { NotebookCellAction, CellOverflowToolbarGroups, CELL_TITLE_CELL_GROUP_ID, CellToolbarOrder, NotebookMultiCellAction, parseMultiCellExecutionArgs, cellExecutionArgs } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
-import { CellFocusMode, EXPAND_CELL_INPUT_COMMAND_ID, EXPAND_CELL_OUTPUT_COMMAND_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
-import { NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_CELL_EDITABLE, NOTEBOOK_CELL_INPUT_COLLAPSED, NOTEBOOK_CELL_TYPE, NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_OUTPUT_FOCUSED, NOTEBOOK_CELL_LIST_FOCUSED, NOTEBOOK_CELL_OUTPUT_COLLAPSED, NOTEBOOK_CELL_HAS_OUTPUTS } from '@codingame/monaco-vscode-771c2e6d-0284-5ac1-be73-7176085eedc5-common/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
-import { moveUpIcon, moveDownIcon, splitCellIcon } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/notebookIcons';
+import { ResourceNotebookCellEdit } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/bulkEdit/browser/bulkCellEdits';
+import { moveCellRange, copyCellRange, computeCellLinesContents, joinCellsWithSurrounds, joinSelectedCells, changeCellToKind } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/controller/cellOperations';
+import { NotebookCellAction, CellOverflowToolbarGroups, CELL_TITLE_CELL_GROUP_ID, CellToolbarOrder, NotebookMultiCellAction, parseMultiCellExecutionArgs, cellExecutionArgs } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
+import { CellFocusMode, EXPAND_CELL_INPUT_COMMAND_ID, EXPAND_CELL_OUTPUT_COMMAND_ID } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_CELL_EDITABLE, NOTEBOOK_CELL_INPUT_COLLAPSED, NOTEBOOK_CELL_TYPE, NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_OUTPUT_FOCUSED, NOTEBOOK_CELL_LIST_FOCUSED, NOTEBOOK_CELL_OUTPUT_COLLAPSED, NOTEBOOK_CELL_HAS_OUTPUTS } from '@codingame/monaco-vscode-52bb4d5b-ba1a-57fd-9bee-b28824214eac-common/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
+import { moveUpIcon, moveDownIcon, splitCellIcon } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/notebookIcons';
 import { CellEditType, CellKind, NotebookSetting } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { INotificationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification.service';
 import { EditorContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/editorContextKeys';
@@ -26,7 +27,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: MOVE_CELL_UP_COMMAND_ID,
-            title: ( localize2(7441, "Move Cell Up")),
+            title: ( localize2(7526, "Move Cell Up")),
             icon: moveUpIcon,
             keybinding: {
                 primary: KeyMod.Alt | KeyCode.UpArrow,
@@ -49,7 +50,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: MOVE_CELL_DOWN_COMMAND_ID,
-            title: ( localize2(7442, "Move Cell Down")),
+            title: ( localize2(7527, "Move Cell Down")),
             icon: moveDownIcon,
             keybinding: {
                 primary: KeyMod.Alt | KeyCode.DownArrow,
@@ -72,7 +73,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: COPY_CELL_UP_COMMAND_ID,
-            title: ( localize2(7443, "Copy Cell Up")),
+            title: ( localize2(7528, "Copy Cell Up")),
             keybinding: {
                 primary: KeyMod.Alt | KeyMod.Shift | KeyCode.UpArrow,
                 when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ( InputFocusedContext.toNegated()))),
@@ -88,7 +89,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: COPY_CELL_DOWN_COMMAND_ID,
-            title: ( localize2(7444, "Copy Cell Down")),
+            title: ( localize2(7529, "Copy Cell Down")),
             keybinding: {
                 primary: KeyMod.Alt | KeyMod.Shift | KeyCode.DownArrow,
                 when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ( InputFocusedContext.toNegated()))),
@@ -114,7 +115,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: SPLIT_CELL_COMMAND_ID,
-            title: ( localize2(7445, "Split Cell")),
+            title: ( localize2(7530, "Split Cell")),
             menu: {
                 id: MenuId.NotebookCellTitle,
                 when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_CELL_EDITABLE, ( NOTEBOOK_CELL_INPUT_COLLAPSED.toNegated()))),
@@ -181,7 +182,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: JOIN_CELL_ABOVE_COMMAND_ID,
-            title: ( localize2(7446, "Join With Previous Cell")),
+            title: ( localize2(7531, "Join With Previous Cell")),
             keybinding: {
                 when: NOTEBOOK_EDITOR_FOCUSED,
                 primary: KeyMod.WinCtrl | KeyMod.Alt | KeyMod.Shift | KeyCode.KeyJ,
@@ -204,7 +205,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: JOIN_CELL_BELOW_COMMAND_ID,
-            title: ( localize2(7447, "Join With Next Cell")),
+            title: ( localize2(7532, "Join With Next Cell")),
             keybinding: {
                 when: NOTEBOOK_EDITOR_FOCUSED,
                 primary: KeyMod.WinCtrl | KeyMod.Alt | KeyCode.KeyJ,
@@ -227,7 +228,7 @@ registerAction2(class extends NotebookCellAction {
     constructor() {
         super({
             id: JOIN_SELECTED_CELLS_COMMAND_ID,
-            title: ( localize2(7448, "Join Selected Cells")),
+            title: ( localize2(7533, "Join Selected Cells")),
             menu: {
                 id: MenuId.NotebookCellTitle,
                 when: ( ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_EDITOR_EDITABLE)),
@@ -248,7 +249,7 @@ registerAction2(class ChangeCellToCodeAction extends NotebookMultiCellAction {
     constructor() {
         super({
             id: CHANGE_CELL_TO_CODE_COMMAND_ID,
-            title: ( localize2(7449, "Change Cell to Code")),
+            title: ( localize2(7534, "Change Cell to Code")),
             keybinding: {
                 when: ( ContextKeyExpr.and(
                     NOTEBOOK_EDITOR_FOCUSED,
@@ -279,7 +280,7 @@ registerAction2(class ChangeCellToMarkdownAction extends NotebookMultiCellAction
     constructor() {
         super({
             id: CHANGE_CELL_TO_MARKDOWN_COMMAND_ID,
-            title: ( localize2(7450, "Change Cell to Markdown")),
+            title: ( localize2(7535, "Change Cell to Markdown")),
             keybinding: {
                 when: ( ContextKeyExpr.and(
                     NOTEBOOK_EDITOR_FOCUSED,
@@ -318,7 +319,7 @@ registerAction2(class CollapseCellInputAction extends NotebookMultiCellAction {
     constructor() {
         super({
             id: COLLAPSE_CELL_INPUT_COMMAND_ID,
-            title: ( localize2(7451, "Collapse Cell Input")),
+            title: ( localize2(7536, "Collapse Cell Input")),
             keybinding: {
                 when: ( ContextKeyExpr.and(NOTEBOOK_CELL_LIST_FOCUSED, ( NOTEBOOK_CELL_INPUT_COLLAPSED.toNegated()), ( InputFocusedContext.toNegated()))),
                 primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyMod.CtrlCmd | KeyCode.KeyC),
@@ -342,7 +343,7 @@ registerAction2(class ExpandCellInputAction extends NotebookMultiCellAction {
     constructor() {
         super({
             id: EXPAND_CELL_INPUT_COMMAND_ID,
-            title: ( localize2(7452, "Expand Cell Input")),
+            title: ( localize2(7537, "Expand Cell Input")),
             keybinding: {
                 when: ( ContextKeyExpr.and(NOTEBOOK_CELL_LIST_FOCUSED, NOTEBOOK_CELL_INPUT_COLLAPSED)),
                 primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyMod.CtrlCmd | KeyCode.KeyC),
@@ -366,7 +367,7 @@ registerAction2(class CollapseCellOutputAction extends NotebookMultiCellAction {
     constructor() {
         super({
             id: COLLAPSE_CELL_OUTPUT_COMMAND_ID,
-            title: ( localize2(7453, "Collapse Cell Output")),
+            title: ( localize2(7538, "Collapse Cell Output")),
             keybinding: {
                 when: ( ContextKeyExpr.and(NOTEBOOK_CELL_LIST_FOCUSED, ( NOTEBOOK_CELL_OUTPUT_COLLAPSED.toNegated()), ( InputFocusedContext.toNegated()), NOTEBOOK_CELL_HAS_OUTPUTS)),
                 primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyCode.KeyT),
@@ -387,7 +388,7 @@ registerAction2(class ExpandCellOuputAction extends NotebookMultiCellAction {
     constructor() {
         super({
             id: EXPAND_CELL_OUTPUT_COMMAND_ID,
-            title: ( localize2(7454, "Expand Cell Output")),
+            title: ( localize2(7539, "Expand Cell Output")),
             keybinding: {
                 when: ( ContextKeyExpr.and(NOTEBOOK_CELL_LIST_FOCUSED, NOTEBOOK_CELL_OUTPUT_COLLAPSED)),
                 primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyCode.KeyT),
@@ -409,9 +410,9 @@ registerAction2(class extends NotebookMultiCellAction {
         super({
             id: TOGGLE_CELL_OUTPUTS_COMMAND_ID,
             precondition: NOTEBOOK_CELL_LIST_FOCUSED,
-            title: ( localize2(7455, "Toggle Outputs")),
+            title: ( localize2(7540, "Toggle Outputs")),
             metadata: {
-                description: ( localize(7455, "Toggle Outputs")),
+                description: ( localize(7540, "Toggle Outputs")),
                 args: cellExecutionArgs
             }
         });
@@ -436,7 +437,7 @@ registerAction2(class CollapseAllCellInputsAction extends NotebookMultiCellActio
     constructor() {
         super({
             id: COLLAPSE_ALL_CELL_INPUTS_COMMAND_ID,
-            title: ( localize2(7456, "Collapse All Cell Inputs")),
+            title: ( localize2(7541, "Collapse All Cell Inputs")),
             f1: true,
         });
     }
@@ -448,7 +449,7 @@ registerAction2(class ExpandAllCellInputsAction extends NotebookMultiCellAction
     constructor() {
         super({
             id: EXPAND_ALL_CELL_INPUTS_COMMAND_ID,
-            title: ( localize2(7457, "Expand All Cell Inputs")),
+            title: ( localize2(7542, "Expand All Cell Inputs")),
             f1: true
         });
     }
@@ -460,7 +461,7 @@ registerAction2(class CollapseAllCellOutputsAction extends NotebookMultiCellActi
     constructor() {
         super({
             id: COLLAPSE_ALL_CELL_OUTPUTS_COMMAND_ID,
-            title: ( localize2(7458, "Collapse All Cell Outputs")),
+            title: ( localize2(7543, "Collapse All Cell Outputs")),
             f1: true,
         });
     }
@@ -472,7 +473,7 @@ registerAction2(class ExpandAllCellOutputsAction extends NotebookMultiCellAction
     constructor() {
         super({
             id: EXPAND_ALL_CELL_OUTPUTS_COMMAND_ID,
-            title: ( localize2(7459, "Expand All Cell Outputs")),
+            title: ( localize2(7544, "Expand All Cell Outputs")),
             f1: true
         });
     }
@@ -484,7 +485,7 @@ registerAction2(class ToggleCellOutputScrolling extends NotebookMultiCellAction
     constructor() {
         super({
             id: TOGGLE_CELL_OUTPUT_SCROLLING,
-            title: ( localize2(7460, "Toggle Scroll Cell Output")),
+            title: ( localize2(7545, "Toggle Scroll Cell Output")),
             keybinding: {
                 when: ( ContextKeyExpr.and(NOTEBOOK_CELL_LIST_FOCUSED, ( InputFocusedContext.toNegated()), NOTEBOOK_CELL_HAS_OUTPUTS)),
                 primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyCode.KeyY),

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/cellDiagnostics/cellDiagnosticEditorContrib.d.ts

@@ -2,7 +2,7 @@ import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/l
 import { IMarkerService } from "@codingame/monaco-vscode-api/vscode/vs/platform/markers/common/markers.service";
 import { INotebookExecutionStateService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService.service";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
-import { INotebookEditor, INotebookEditorContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
+import { INotebookEditor, INotebookEditorContribution } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
 import { IChatAgentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service";
 export declare class CellDiagnostics extends Disposable implements INotebookEditorContribution {
     private readonly notebookEditor;

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

@@ -2,13 +2,13 @@
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { Disposable, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { IMarkerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/markers/common/markers.service';
-import { NotebookExecutionType } from '@codingame/monaco-vscode-af5ccfda-af82-504b-b365-92b4e654e5c5-common/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService';
+import { NotebookExecutionType } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService';
 import { INotebookExecutionStateService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService.service';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { NotebookSetting, CellKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
-import { registerNotebookContribution } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/notebookEditorExtensions';
+import { registerNotebookContribution } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/notebookEditorExtensions';
 import { Iterable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/iterator';
-import { CodeCellViewModel } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/viewModel/codeCellViewModel';
+import { CodeCellViewModel } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/viewModel/codeCellViewModel';
 import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service';