@codingame/monaco-vscode-notebook-service-override 22.1.4 → 22.1.6

package/index.js

@@ -32,7 +32,11 @@ import { INotebookOriginalCellModelFactory } from '@codingame/monaco-vscode-api/
 import { INotebookOriginalModelReferenceFactory } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookOriginalModelRefFactory.service';
 import { OriginalNotebookCellModelFactory } from '@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookOriginalCellModelFactory';
 import { NotebookOriginalModelReferenceFactory } from '@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookOriginalModelRefFactory';
+import { INotebookCellOutlineDataSourceFactory } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineDataSourceFactory.service';
+import { NotebookCellOutlineDataSourceFactory } from './vscode/src/vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineDataSourceFactory.js';
 import './vscode/src/vs/workbench/contrib/notebook/browser/notebook.contribution.js';
+import { NotebookOutlineEntryFactory } from './vscode/src/vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineEntryFactory.js';
+import { INotebookOutlineEntryFactory } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineEntryFactory.service';
 
 function getServiceOverride() {
     return {
@@ -51,7 +55,9 @@ function getServiceOverride() {
         [INotebookSearchService.toString()]: new SyncDescriptor(NotebookSearchService, [], true),
         [INotebookDocumentService.toString()]: new SyncDescriptor(NotebookDocumentWorkbenchService, [], true),
         [INotebookOriginalCellModelFactory.toString()]: new SyncDescriptor(OriginalNotebookCellModelFactory, [], true),
-        [INotebookOriginalModelReferenceFactory.toString()]: new SyncDescriptor(NotebookOriginalModelReferenceFactory, [], true)
+        [INotebookOriginalModelReferenceFactory.toString()]: new SyncDescriptor(NotebookOriginalModelReferenceFactory, [], true),
+        [INotebookCellOutlineDataSourceFactory.toString()]: new SyncDescriptor(NotebookCellOutlineDataSourceFactory, [], true),
+        [INotebookOutlineEntryFactory.toString()]: new SyncDescriptor(NotebookOutlineEntryFactory, [], true)
     };
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-notebook-service-override",
-  "version": "22.1.4",
+  "version": "22.1.6",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - notebook service-override",
   "keywords": [],
@@ -15,29 +15,28 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-0cd5242b-7b61-5f66-ac25-ffa40baf8e8f-common": "22.1.4",
-    "@codingame/monaco-vscode-158b9837-fc78-5d9c-86f5-9134e4358643-common": "22.1.4",
-    "@codingame/monaco-vscode-23aade48-f094-5c08-9555-97fc9cca96c9-common": "22.1.4",
-    "@codingame/monaco-vscode-3109a756-1f83-5d09-945b-9f0fcad928f0-common": "22.1.4",
-    "@codingame/monaco-vscode-501b06ab-3f58-516b-8a1a-c29d375d3da4-common": "22.1.4",
-    "@codingame/monaco-vscode-60014c9d-b815-501d-83a9-4b08725c2ec2-common": "22.1.4",
-    "@codingame/monaco-vscode-622c0cca-d5fa-59b6-b730-0715afcf93ee-common": "22.1.4",
-    "@codingame/monaco-vscode-670aae94-7f88-54d7-90ea-6fcbef423557-common": "22.1.4",
-    "@codingame/monaco-vscode-6f9bc782-77e0-5716-93bd-b05210c768c5-common": "22.1.4",
-    "@codingame/monaco-vscode-88aa9a78-75f5-5aaa-89e9-bbdd580b3b5c-common": "22.1.4",
-    "@codingame/monaco-vscode-8ccb7637-50ea-5359-97bf-00015d7fe567-common": "22.1.4",
-    "@codingame/monaco-vscode-9ed6fe06-a052-57c2-a234-5d9b94d2e7e0-common": "22.1.4",
-    "@codingame/monaco-vscode-9ee79c1a-3f03-568b-8eac-b02513a98b68-common": "22.1.4",
-    "@codingame/monaco-vscode-a793b3ee-7ba9-5176-a019-30ec806fdd95-common": "22.1.4",
-    "@codingame/monaco-vscode-api": "22.1.4",
-    "@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common": "22.1.4",
-    "@codingame/monaco-vscode-b99aef83-0d60-5e8c-a62e-9908b6256f35-common": "22.1.4",
-    "@codingame/monaco-vscode-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common": "22.1.4",
-    "@codingame/monaco-vscode-caeb744c-8e3f-5c11-80fb-0f057d24d544-common": "22.1.4",
-    "@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common": "22.1.4",
-    "@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common": "22.1.4",
-    "@codingame/monaco-vscode-eda30bac-0984-5b42-9362-c68996b85232-common": "22.1.4",
-    "marked": "14.0.0"
+    "@codingame/monaco-vscode-0cd5242b-7b61-5f66-ac25-ffa40baf8e8f-common": "22.1.6",
+    "@codingame/monaco-vscode-158b9837-fc78-5d9c-86f5-9134e4358643-common": "22.1.6",
+    "@codingame/monaco-vscode-23aade48-f094-5c08-9555-97fc9cca96c9-common": "22.1.6",
+    "@codingame/monaco-vscode-3109a756-1f83-5d09-945b-9f0fcad928f0-common": "22.1.6",
+    "@codingame/monaco-vscode-501b06ab-3f58-516b-8a1a-c29d375d3da4-common": "22.1.6",
+    "@codingame/monaco-vscode-60014c9d-b815-501d-83a9-4b08725c2ec2-common": "22.1.6",
+    "@codingame/monaco-vscode-622c0cca-d5fa-59b6-b730-0715afcf93ee-common": "22.1.6",
+    "@codingame/monaco-vscode-670aae94-7f88-54d7-90ea-6fcbef423557-common": "22.1.6",
+    "@codingame/monaco-vscode-6f9bc782-77e0-5716-93bd-b05210c768c5-common": "22.1.6",
+    "@codingame/monaco-vscode-88aa9a78-75f5-5aaa-89e9-bbdd580b3b5c-common": "22.1.6",
+    "@codingame/monaco-vscode-8ccb7637-50ea-5359-97bf-00015d7fe567-common": "22.1.6",
+    "@codingame/monaco-vscode-9ed6fe06-a052-57c2-a234-5d9b94d2e7e0-common": "22.1.6",
+    "@codingame/monaco-vscode-9ee79c1a-3f03-568b-8eac-b02513a98b68-common": "22.1.6",
+    "@codingame/monaco-vscode-a793b3ee-7ba9-5176-a019-30ec806fdd95-common": "22.1.6",
+    "@codingame/monaco-vscode-api": "22.1.6",
+    "@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common": "22.1.6",
+    "@codingame/monaco-vscode-b99aef83-0d60-5e8c-a62e-9908b6256f35-common": "22.1.6",
+    "@codingame/monaco-vscode-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common": "22.1.6",
+    "@codingame/monaco-vscode-caeb744c-8e3f-5c11-80fb-0f057d24d544-common": "22.1.6",
+    "@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common": "22.1.6",
+    "@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common": "22.1.6",
+    "@codingame/monaco-vscode-eda30bac-0984-5b42-9362-c68996b85232-common": "22.1.6"
   },
   "main": "index.js",
   "module": "index.js",

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/outline/notebookOutline.d.ts

@@ -9,12 +9,12 @@ import { IThemeService } from "@codingame/monaco-vscode-api/vscode/vs/platform/t
 import { IEditorPane } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor";
 import { CellFoldingState, INotebookEditorPane } from "@codingame/monaco-vscode-670aae94-7f88-54d7-90ea-6fcbef423557-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
 import { NotebookEditor } from "@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/notebookEditor";
-import { INotebookCellOutlineDataSource } from "@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineDataSource";
+import { INotebookCellOutlineDataSource } from "../../viewModel/notebookOutlineDataSource.js";
 import { CellKind } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon";
 import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
 import { IBreadcrumbsDataSource, IOutline, IOutlineCreator, IOutlineListConfig, IQuickPickDataSource, IQuickPickOutlineElement, OutlineChangeEvent, OutlineTarget } from "@codingame/monaco-vscode-622c0cca-d5fa-59b6-b730-0715afcf93ee-common/vscode/vs/workbench/services/outline/browser/outline";
 import { IOutlineService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/outline/browser/outline.service";
-import { OutlineEntry } from "@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/viewModel/OutlineEntry";
+import { OutlineEntry } from "../../viewModel/OutlineEntry.js";
 import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
 import { RawContextKey } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey";
 import { INotebookExecutionStateService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService.service";

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/outline/notebookOutline.js

@@ -48,7 +48,7 @@ import { IOutlinePane } from '@codingame/monaco-vscode-0cd5242b-7b61-5f66-ac25-f
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { NOTEBOOK_IS_ACTIVE_EDITOR } from '@codingame/monaco-vscode-eda30bac-0984-5b42-9362-c68996b85232-common/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
 import { NotebookOutlineConstants } from '../../viewModel/notebookOutlineEntryFactory.js';
-import { INotebookCellOutlineDataSourceFactory } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineDataSourceFactory.service';
+import { INotebookCellOutlineDataSourceFactory } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineDataSourceFactory.service';
 import { NotebookExecutionType } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService';
 import { INotebookExecutionStateService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService.service';
 import { ILanguageFeaturesService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/languageFeatures.service';

package/vscode/src/vs/workbench/contrib/notebook/browser/controller/sectionActions.d.ts

@@ -1,7 +1,7 @@
 import { Action2 } from "@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions";
 import { ServicesAccessor } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { ICellViewModel, INotebookEditor } from "@codingame/monaco-vscode-670aae94-7f88-54d7-90ea-6fcbef423557-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
-import { OutlineEntry } from "@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/viewModel/OutlineEntry";
+import { OutlineEntry } from "../viewModel/OutlineEntry.js";
 export type NotebookOutlineEntryArgs = {
     notebookEditor: INotebookEditor;
     outlineEntry: OutlineEntry;

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

@@ -44,7 +44,7 @@ import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { ILabelService } from '@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service';
 import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import './services/notebookRendererMessagingServiceImpl.js';
-import '@codingame/monaco-vscode-622c0cca-d5fa-59b6-b730-0715afcf93ee-common/vscode/vs/workbench/services/outline/browser/outline';
+import './viewModel/notebookOutlineDataSourceFactory.js';
 import '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
 import './controller/insertCellActions.js';
 import './controller/executeActions.js';

package/vscode/src/vs/workbench/contrib/notebook/browser/viewModel/OutlineEntry.d.ts

@@ -0,0 +1,37 @@
+import { ThemeIcon } from "@codingame/monaco-vscode-api/vscode/vs/base/common/themables";
+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 { ICellViewModel } from "@codingame/monaco-vscode-670aae94-7f88-54d7-90ea-6fcbef423557-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
+import { IRange } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range";
+import { SymbolKind } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages";
+export interface IOutlineMarkerInfo {
+    readonly count: number;
+    readonly topSev: MarkerSeverity;
+}
+export declare class OutlineEntry {
+    readonly index: number;
+    readonly level: number;
+    readonly cell: ICellViewModel;
+    readonly label: string;
+    readonly isExecuting: boolean;
+    readonly isPaused: boolean;
+    readonly range?: IRange | undefined;
+    readonly symbolKind?: SymbolKind | undefined;
+    private _children;
+    private _parent;
+    private _markerInfo;
+    get icon(): ThemeIcon;
+    constructor(index: number, level: number, cell: ICellViewModel, label: string, isExecuting: boolean, isPaused: boolean, range?: IRange | undefined, symbolKind?: SymbolKind | undefined);
+    addChild(entry: OutlineEntry): void;
+    get parent(): OutlineEntry | undefined;
+    get children(): Iterable<OutlineEntry>;
+    get markerInfo(): IOutlineMarkerInfo | undefined;
+    get position(): {
+        startLineNumber: number;
+        startColumn: number;
+    } | undefined;
+    updateMarkers(markerService: IMarkerService): void;
+    clearMarkers(): void;
+    find(cell: ICellViewModel, parents: OutlineEntry[]): OutlineEntry | undefined;
+    asFlatList(bucket: OutlineEntry[]): void;
+}

package/vscode/src/vs/workbench/contrib/notebook/browser/viewModel/OutlineEntry.js

@@ -0,0 +1,98 @@
+
+import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
+import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
+import { MarkerSeverity } from '@codingame/monaco-vscode-api/vscode/vs/platform/markers/common/markers';
+import { executingStateIcon } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/notebookIcons';
+import { CellKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
+import { SymbolKinds } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages';
+
+class OutlineEntry {
+    get icon() {
+        if (this.symbolKind) {
+            return SymbolKinds.toIcon(this.symbolKind);
+        }
+        return this.isExecuting && this.isPaused ? executingStateIcon :
+            this.isExecuting ? ThemeIcon.modify(executingStateIcon, 'spin') :
+                this.cell.cellKind === CellKind.Markup ? Codicon.markdown : Codicon.code;
+    }
+    constructor(index, level, cell, label, isExecuting, isPaused, range, symbolKind) {
+        this.index = index;
+        this.level = level;
+        this.cell = cell;
+        this.label = label;
+        this.isExecuting = isExecuting;
+        this.isPaused = isPaused;
+        this.range = range;
+        this.symbolKind = symbolKind;
+        this._children = [];
+    }
+    addChild(entry) {
+        this._children.push(entry);
+        entry._parent = this;
+    }
+    get parent() {
+        return this._parent;
+    }
+    get children() {
+        return this._children;
+    }
+    get markerInfo() {
+        return this._markerInfo;
+    }
+    get position() {
+        if (this.range) {
+            return { startLineNumber: this.range.startLineNumber, startColumn: this.range.startColumn };
+        }
+        return undefined;
+    }
+    updateMarkers(markerService) {
+        if (this.cell.cellKind === CellKind.Code) {
+            const marker = markerService.read({ resource: this.cell.uri, severities: MarkerSeverity.Error | MarkerSeverity.Warning });
+            if (marker.length === 0) {
+                this._markerInfo = undefined;
+            }
+            else {
+                const topSev = marker.find(a => a.severity === MarkerSeverity.Error)?.severity ?? MarkerSeverity.Warning;
+                this._markerInfo = { topSev, count: marker.length };
+            }
+        }
+        else {
+            let topChild;
+            for (const child of this.children) {
+                child.updateMarkers(markerService);
+                if (child.markerInfo) {
+                    topChild = !topChild ? child.markerInfo.topSev : Math.max(child.markerInfo.topSev, topChild);
+                }
+            }
+            this._markerInfo = topChild && { topSev: topChild, count: 0 };
+        }
+    }
+    clearMarkers() {
+        this._markerInfo = undefined;
+        for (const child of this.children) {
+            child.clearMarkers();
+        }
+    }
+    find(cell, parents) {
+        if (cell.id === this.cell.id) {
+            return this;
+        }
+        parents.push(this);
+        for (const child of this.children) {
+            const result = child.find(cell, parents);
+            if (result) {
+                return result;
+            }
+        }
+        parents.pop();
+        return undefined;
+    }
+    asFlatList(bucket) {
+        bucket.push(this);
+        for (const child of this.children) {
+            child.asFlatList(bucket);
+        }
+    }
+}
+
+export { OutlineEntry };

package/vscode/src/vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineDataSource.d.ts

@@ -0,0 +1,36 @@
+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 { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
+import { IMarkerService } from "@codingame/monaco-vscode-api/vscode/vs/platform/markers/common/markers.service";
+import { INotebookEditor } from "@codingame/monaco-vscode-670aae94-7f88-54d7-90ea-6fcbef423557-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
+import { OutlineChangeEvent } from "@codingame/monaco-vscode-622c0cca-d5fa-59b6-b730-0715afcf93ee-common/vscode/vs/workbench/services/outline/browser/outline";
+import { OutlineEntry } from "./OutlineEntry.js";
+import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
+import { NotebookOutlineEntryFactory } from "./notebookOutlineEntryFactory.js";
+export interface INotebookCellOutlineDataSource {
+    readonly activeElement: OutlineEntry | undefined;
+    readonly entries: OutlineEntry[];
+}
+export declare class NotebookCellOutlineDataSource implements INotebookCellOutlineDataSource {
+    private readonly _editor;
+    private readonly _markerService;
+    private readonly _configurationService;
+    private readonly _outlineEntryFactory;
+    private readonly _disposables;
+    private readonly _onDidChange;
+    readonly onDidChange: Event<OutlineChangeEvent>;
+    private _uri;
+    private _entries;
+    private _activeEntry?;
+    constructor(_editor: INotebookEditor, _markerService: IMarkerService, _configurationService: IConfigurationService, _outlineEntryFactory: NotebookOutlineEntryFactory);
+    get activeElement(): OutlineEntry | undefined;
+    get entries(): OutlineEntry[];
+    get isEmpty(): boolean;
+    get uri(): URI | undefined;
+    computeFullSymbols(cancelToken: CancellationToken): Promise<void>;
+    recomputeState(): void;
+    recomputeActive(): {
+        changeEventTriggered: boolean;
+    };
+    dispose(): void;
+}

package/vscode/src/vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineDataSource.js

@@ -0,0 +1,184 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
+import { DisposableStore, MutableDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
+import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
+import { IMarkerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/markers/common/markers.service';
+import { CellKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
+import { OutlineConfigKeys } from '@codingame/monaco-vscode-622c0cca-d5fa-59b6-b730-0715afcf93ee-common/vscode/vs/workbench/services/outline/browser/outline';
+import { INotebookOutlineEntryFactory } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineEntryFactory.service';
+
+let NotebookCellOutlineDataSource = class NotebookCellOutlineDataSource {
+    constructor(_editor, _markerService, _configurationService, _outlineEntryFactory) {
+        this._editor = _editor;
+        this._markerService = _markerService;
+        this._configurationService = _configurationService;
+        this._outlineEntryFactory = _outlineEntryFactory;
+        this._disposables = ( new DisposableStore());
+        this._onDidChange = ( new Emitter());
+        this.onDidChange = this._onDidChange.event;
+        this._entries = [];
+        this.recomputeState();
+    }
+    get activeElement() {
+        return this._activeEntry;
+    }
+    get entries() {
+        return this._entries;
+    }
+    get isEmpty() {
+        return this._entries.length === 0;
+    }
+    get uri() {
+        return this._uri;
+    }
+    async computeFullSymbols(cancelToken) {
+        try {
+            const notebookEditorWidget = this._editor;
+            const notebookCells = notebookEditorWidget?.getViewModel()?.viewCells.filter((cell) => cell.cellKind === CellKind.Code);
+            if (notebookCells) {
+                const promises = [];
+                for (const cell of notebookCells.slice(0, 50)) {
+                    promises.push(this._outlineEntryFactory.cacheSymbols(cell, cancelToken));
+                }
+                await Promise.allSettled(promises);
+            }
+            this.recomputeState();
+        }
+        catch (err) {
+            console.error('Failed to compute notebook outline symbols:', err);
+            this.recomputeState();
+        }
+    }
+    recomputeState() {
+        this._disposables.clear();
+        this._activeEntry = undefined;
+        this._uri = undefined;
+        if (!this._editor.hasModel()) {
+            return;
+        }
+        this._uri = this._editor.textModel.uri;
+        const notebookEditorWidget = this._editor;
+        if (notebookEditorWidget.getLength() === 0) {
+            return;
+        }
+        const notebookCells = notebookEditorWidget.getViewModel().viewCells;
+        const entries = [];
+        for (const cell of notebookCells) {
+            entries.push(...this._outlineEntryFactory.getOutlineEntries(cell, entries.length));
+        }
+        if (entries.length > 0) {
+            const result = [entries[0]];
+            const parentStack = [entries[0]];
+            for (let i = 1; i < entries.length; i++) {
+                const entry = entries[i];
+                while (true) {
+                    const len = parentStack.length;
+                    if (len === 0) {
+                        result.push(entry);
+                        parentStack.push(entry);
+                        break;
+                    }
+                    else {
+                        const parentCandidate = parentStack[len - 1];
+                        if (parentCandidate.level < entry.level) {
+                            parentCandidate.addChild(entry);
+                            parentStack.push(entry);
+                            break;
+                        }
+                        else {
+                            parentStack.pop();
+                        }
+                    }
+                }
+            }
+            this._entries = result;
+        }
+        const markerServiceListener = ( new MutableDisposable());
+        this._disposables.add(markerServiceListener);
+        const updateMarkerUpdater = () => {
+            if (notebookEditorWidget.isDisposed) {
+                return;
+            }
+            const doUpdateMarker = (clear) => {
+                for (const entry of this._entries) {
+                    if (clear) {
+                        entry.clearMarkers();
+                    }
+                    else {
+                        entry.updateMarkers(this._markerService);
+                    }
+                }
+            };
+            const problem = this._configurationService.getValue('problems.visibility');
+            if (problem === undefined) {
+                return;
+            }
+            const config = this._configurationService.getValue(OutlineConfigKeys.problemsEnabled);
+            if (problem && config) {
+                markerServiceListener.value = this._markerService.onMarkerChanged(e => {
+                    if (notebookEditorWidget.isDisposed) {
+                        console.error('notebook editor is disposed');
+                        return;
+                    }
+                    if (( e.some(uri => ( notebookEditorWidget.getCellsInRange().some(cell => isEqual(cell.uri, uri)))))) {
+                        doUpdateMarker(false);
+                        this._onDidChange.fire({});
+                    }
+                });
+                doUpdateMarker(false);
+            }
+            else {
+                markerServiceListener.clear();
+                doUpdateMarker(true);
+            }
+        };
+        updateMarkerUpdater();
+        this._disposables.add(this._configurationService.onDidChangeConfiguration(e => {
+            if (e.affectsConfiguration('problems.visibility') || e.affectsConfiguration(OutlineConfigKeys.problemsEnabled)) {
+                updateMarkerUpdater();
+                this._onDidChange.fire({});
+            }
+        }));
+        const { changeEventTriggered } = this.recomputeActive();
+        if (!changeEventTriggered) {
+            this._onDidChange.fire({});
+        }
+    }
+    recomputeActive() {
+        let newActive;
+        const notebookEditorWidget = this._editor;
+        if (notebookEditorWidget) {
+            if (notebookEditorWidget.hasModel() && notebookEditorWidget.getLength() > 0) {
+                const cell = notebookEditorWidget.cellAt(notebookEditorWidget.getFocus().start);
+                if (cell) {
+                    for (const entry of this._entries) {
+                        newActive = entry.find(cell, []);
+                        if (newActive) {
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+        if (newActive !== this._activeEntry) {
+            this._activeEntry = newActive;
+            this._onDidChange.fire({ affectOnlyActiveElement: true });
+            return { changeEventTriggered: true };
+        }
+        return { changeEventTriggered: false };
+    }
+    dispose() {
+        this._entries.length = 0;
+        this._activeEntry = undefined;
+        this._disposables.dispose();
+    }
+};
+NotebookCellOutlineDataSource = ( __decorate([
+    ( __param(1, IMarkerService)),
+    ( __param(2, IConfigurationService)),
+    ( __param(3, INotebookOutlineEntryFactory))
+], NotebookCellOutlineDataSource));
+
+export { NotebookCellOutlineDataSource };

package/vscode/src/vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineDataSourceFactory.d.ts

@@ -0,0 +1,10 @@
+import { type IReference } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
+import type { INotebookEditor } from "@codingame/monaco-vscode-670aae94-7f88-54d7-90ea-6fcbef423557-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
+import { NotebookCellOutlineDataSource } from "./notebookOutlineDataSource.js";
+import { INotebookCellOutlineDataSourceFactory } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineDataSourceFactory.service";
+export declare class NotebookCellOutlineDataSourceFactory implements INotebookCellOutlineDataSourceFactory {
+    private readonly _data;
+    constructor(instantiationService: IInstantiationService);
+    getOrCreate(editor: INotebookEditor): IReference<NotebookCellOutlineDataSource>;
+}

package/vscode/src/vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineDataSourceFactory.js

@@ -0,0 +1,34 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { ReferenceCollection } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
+import { NotebookCellOutlineDataSource } from './notebookOutlineDataSource.js';
+
+let NotebookCellOutlineDataSourceReferenceCollection = class NotebookCellOutlineDataSourceReferenceCollection extends ReferenceCollection {
+    constructor(instantiationService) {
+        super();
+        this.instantiationService = instantiationService;
+    }
+    createReferencedObject(_key, editor) {
+        return this.instantiationService.createInstance(NotebookCellOutlineDataSource, editor);
+    }
+    destroyReferencedObject(_key, object) {
+        object.dispose();
+    }
+};
+NotebookCellOutlineDataSourceReferenceCollection = ( __decorate([
+    ( __param(0, IInstantiationService))
+], NotebookCellOutlineDataSourceReferenceCollection));
+let NotebookCellOutlineDataSourceFactory = class NotebookCellOutlineDataSourceFactory {
+    constructor(instantiationService) {
+        this._data = instantiationService.createInstance(NotebookCellOutlineDataSourceReferenceCollection);
+    }
+    getOrCreate(editor) {
+        return this._data.acquire(editor.getId(), editor);
+    }
+};
+NotebookCellOutlineDataSourceFactory = ( __decorate([
+    ( __param(0, IInstantiationService))
+], NotebookCellOutlineDataSourceFactory));
+
+export { NotebookCellOutlineDataSourceFactory };

package/vscode/src/vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineEntryFactory.d.ts

@@ -1,10 +1,10 @@
 import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
 import { IOutlineModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/contrib/documentSymbols/browser/outlineModel.service";
 import { ICellViewModel } from "@codingame/monaco-vscode-670aae94-7f88-54d7-90ea-6fcbef423557-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
-import { OutlineEntry } from "@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/viewModel/OutlineEntry";
+import { OutlineEntry } from "./OutlineEntry.js";
 import { INotebookExecutionStateService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService.service";
 import { ITextModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service";
-import { INotebookOutlineEntryFactory } from "@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineEntryFactory.service";
+import { INotebookOutlineEntryFactory } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineEntryFactory.service";
 export declare enum NotebookOutlineConstants {
     NonHeaderOutlineLevel = 7
 }

package/vscode/src/vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineEntryFactory.js

@@ -1,37 +1,142 @@
 
-import '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
-import '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
-import '@codingame/monaco-vscode-api/vscode/vs/base/common/filters';
-import '@codingame/monaco-vscode-api/vscode/vs/base/common/strings';
-import '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
-import '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
-import '@codingame/monaco-vscode-api/vscode/vs/base/common/lazy';
-import '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
-import 'marked';
-import '@codingame/monaco-vscode-api/vscode/vs/base/common/charCode';
-import '@codingame/monaco-vscode-api/vscode/vs/base/common/marshallingIds';
-import '@codingame/monaco-vscode-api/vscode/vs/base/common/path';
-import '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
-import '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
-import '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
-import '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
-import '@codingame/monaco-vscode-api/vscode/vs/base/browser/domSanitize';
-import '@codingame/monaco-vscode-api/vscode/vs/base/browser/browser';
-import '@codingame/monaco-vscode-api/vscode/vs/base/common/keybindings';
-import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
-import '@codingame/monaco-vscode-api/vscode/vs/nls';
-import '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
-import '@codingame/monaco-vscode-api/vscode/vs/editor/common/model';
-import '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/folding/browser/foldingRanges';
-import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
-import '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
-import '@codingame/monaco-vscode-api/vscode/vs/platform/markers/common/markers';
-import '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/notebookIcons';
-import '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages';
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { renderAsPlaintext } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/markdownRenderer';
+import { IOutlineModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/documentSymbols/browser/outlineModel.service';
+import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { getMarkdownHeadersInCell } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/viewModel/foldingModel';
+import { OutlineEntry } from './OutlineEntry.js';
+import { CellKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
+import { INotebookExecutionStateService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService.service';
+import { ITextModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service';
 
 var NotebookOutlineConstants;
 (function (NotebookOutlineConstants) {
     NotebookOutlineConstants[NotebookOutlineConstants["NonHeaderOutlineLevel"] = 7] = "NonHeaderOutlineLevel";
 })(NotebookOutlineConstants || (NotebookOutlineConstants = {}));
+function getMarkdownHeadersInCellFallbackToHtmlTags(fullContent) {
+    const headers = Array.from(getMarkdownHeadersInCell(fullContent));
+    if (headers.length) {
+        return headers;
+    }
+    const match = fullContent.match(/<h([1-6]).*>(.*)<\/h\1>/i);
+    if (match) {
+        const level = parseInt(match[1]);
+        const text = match[2].trim();
+        headers.push({ depth: level, text });
+    }
+    return headers;
+}
+let NotebookOutlineEntryFactory = class NotebookOutlineEntryFactory {
+    constructor(executionStateService, outlineModelService, textModelService) {
+        this.executionStateService = executionStateService;
+        this.outlineModelService = outlineModelService;
+        this.textModelService = textModelService;
+        this.cellOutlineEntryCache = {};
+        this.cachedMarkdownOutlineEntries = ( new WeakMap());
+    }
+    getOutlineEntries(cell, index) {
+        const entries = [];
+        const isMarkdown = cell.cellKind === CellKind.Markup;
+        let content = getCellFirstNonEmptyLine(cell);
+        let hasHeader = false;
+        if (isMarkdown) {
+            const fullContent = cell.getText().substring(0, 10000);
+            const cache = this.cachedMarkdownOutlineEntries.get(cell);
+            const headers = cache?.alternativeId === cell.getAlternativeId() ? cache.headers : Array.from(getMarkdownHeadersInCellFallbackToHtmlTags(fullContent));
+            this.cachedMarkdownOutlineEntries.set(cell, { alternativeId: cell.getAlternativeId(), headers });
+            for (const { depth, text } of headers) {
+                hasHeader = true;
+                entries.push(( new OutlineEntry(index++, depth, cell, text, false, false)));
+            }
+            if (!hasHeader) {
+                content = renderAsPlaintext({ value: content });
+            }
+        }
+        if (!hasHeader) {
+            const exeState = !isMarkdown && this.executionStateService.getCellExecution(cell.uri);
+            let preview = content.trim();
+            if (!isMarkdown) {
+                const cached = this.cellOutlineEntryCache[cell.id];
+                if (cached) {
+                    entries.push(( new OutlineEntry(
+                        index++,
+                        NotebookOutlineConstants.NonHeaderOutlineLevel,
+                        cell,
+                        preview,
+                        !!exeState,
+                        exeState ? exeState.isPaused : false
+                    )));
+                    cached.forEach((entry) => {
+                        entries.push(( new OutlineEntry(
+                            index++,
+                            entry.level,
+                            cell,
+                            entry.name,
+                            false,
+                            false,
+                            entry.range,
+                            entry.kind
+                        )));
+                    });
+                }
+            }
+            if (entries.length === 0) {
+                if (preview.length === 0) {
+                    preview = ( localize(9298, "empty cell"));
+                }
+                entries.push(( new OutlineEntry(
+                    index++,
+                    NotebookOutlineConstants.NonHeaderOutlineLevel,
+                    cell,
+                    preview,
+                    !!exeState,
+                    exeState ? exeState.isPaused : false
+                )));
+            }
+        }
+        return entries;
+    }
+    async cacheSymbols(cell, cancelToken) {
+        if (cell.cellKind === CellKind.Markup) {
+            return;
+        }
+        const ref = await this.textModelService.createModelReference(cell.uri);
+        try {
+            const textModel = ref.object.textEditorModel;
+            const outlineModel = await this.outlineModelService.getOrCreate(textModel, cancelToken);
+            const entries = createOutlineEntries(outlineModel.getTopLevelSymbols(), 8);
+            this.cellOutlineEntryCache[cell.id] = entries;
+        }
+        finally {
+            ref.dispose();
+        }
+    }
+};
+NotebookOutlineEntryFactory = ( __decorate([
+    ( __param(0, INotebookExecutionStateService)),
+    ( __param(1, IOutlineModelService)),
+    ( __param(2, ITextModelService))
+], NotebookOutlineEntryFactory));
+function createOutlineEntries(symbols, level) {
+    const entries = [];
+    symbols.forEach(symbol => {
+        entries.push({ name: symbol.name, range: symbol.range, level, kind: symbol.kind });
+        if (symbol.children) {
+            entries.push(...createOutlineEntries(symbol.children, level + 1));
+        }
+    });
+    return entries;
+}
+function getCellFirstNonEmptyLine(cell) {
+    const textBuffer = cell.textBuffer;
+    for (let i = 0; i < textBuffer.getLineCount(); i++) {
+        const firstNonWhitespace = textBuffer.getLineFirstNonWhitespaceColumn(i + 1);
+        const lineLength = textBuffer.getLineLength(i + 1);
+        if (firstNonWhitespace < lineLength) {
+            return textBuffer.getLineContent(i + 1);
+        }
+    }
+    return cell.getText().substring(0, 100);
+}
 
-export { NotebookOutlineConstants };
+export { NotebookOutlineConstants, NotebookOutlineEntryFactory };

package/vscode/src/vs/workbench/services/workingCopy/common/fileWorkingCopyManager.js

@@ -48,8 +48,8 @@ import { IProgressService } from '@codingame/monaco-vscode-api/vscode/vs/platfor
 var FileWorkingCopyManager_1;
 let FileWorkingCopyManager = class FileWorkingCopyManager extends Disposable {
     static { FileWorkingCopyManager_1 = this; }
-    static { this.FILE_WORKING_COPY_SAVE_CREATE_SOURCE = SaveSourceRegistry.registerSource('fileWorkingCopyCreate.source', ( localize(14085, "File Created"))); }
-    static { this.FILE_WORKING_COPY_SAVE_REPLACE_SOURCE = SaveSourceRegistry.registerSource('fileWorkingCopyReplace.source', ( localize(14086, "File Replaced"))); }
+    static { this.FILE_WORKING_COPY_SAVE_CREATE_SOURCE = SaveSourceRegistry.registerSource('fileWorkingCopyCreate.source', ( localize(14086, "File Created"))); }
+    static { this.FILE_WORKING_COPY_SAVE_REPLACE_SOURCE = SaveSourceRegistry.registerSource('fileWorkingCopyReplace.source', ( localize(14087, "File Replaced"))); }
     constructor(workingCopyTypeId, storedWorkingCopyModelFactory, untitledWorkingCopyModelFactory, fileService, lifecycleService, labelService, logService, workingCopyFileService, workingCopyBackupService, uriIdentityService, fileDialogService, filesConfigurationService, workingCopyService, notificationService, workingCopyEditorService, editorService, elevatedFileService, pathService, environmentService, dialogService, decorationsService, progressService) {
         super();
         this.workingCopyTypeId = workingCopyTypeId;
@@ -104,7 +104,7 @@ let FileWorkingCopyManager = class FileWorkingCopyManager extends Disposable {
             constructor(stored) {
                 super();
                 this.stored = stored;
-                this.label = ( localize(14087, "File Working Copy Decorations"));
+                this.label = ( localize(14088, "File Working Copy Decorations"));
                 this._onDidChange = this._register(( new Emitter()));
                 this.onDidChange = this._onDidChange.event;
                 this.registerListeners();
@@ -131,20 +131,20 @@ let FileWorkingCopyManager = class FileWorkingCopyManager extends Disposable {
                         color: listErrorForeground,
                         letter: Codicon.lockSmall,
                         strikethrough: true,
-                        tooltip: ( localize(14088, "Deleted, Read-only")),
+                        tooltip: ( localize(14089, "Deleted, Read-only")),
                     };
                 }
                 else if (isReadonly) {
                     return {
                         letter: Codicon.lockSmall,
-                        tooltip: ( localize(14089, "Read-only")),
+                        tooltip: ( localize(14090, "Read-only")),
                     };
                 }
                 else if (isOrphaned) {
                     return {
                         color: listErrorForeground,
                         strikethrough: true,
-                        tooltip: ( localize(14090, "Deleted")),
+                        tooltip: ( localize(14091, "Deleted")),
                     };
                 }
                 return undefined;
@@ -279,17 +279,17 @@ let FileWorkingCopyManager = class FileWorkingCopyManager extends Disposable {
         const { confirmed } = await this.dialogService.confirm({
             type: 'warning',
             message: ( localize(
-                14091,
+                14092,
                 "'{0}' already exists. Do you want to replace it?",
                 basename(resource)
             )),
             detail: ( localize(
-                14092,
+                14093,
                 "A file or folder with the name '{0}' already exists in the folder '{1}'. Replacing it will overwrite its current contents.",
                 basename(resource),
                 basename(dirname(resource))
             )),
-            primaryButton: ( localize(14093, "&&Replace"))
+            primaryButton: ( localize(14094, "&&Replace"))
         });
         return confirmed;
     }
@@ -297,12 +297,12 @@ let FileWorkingCopyManager = class FileWorkingCopyManager extends Disposable {
         const { confirmed } = await this.dialogService.confirm({
             type: 'warning',
             message: ( localize(
-                14094,
+                14095,
                 "'{0}' is marked as read-only. Do you want to save anyway?",
                 basename(resource)
             )),
-            detail: ( localize(14095, "Paths can be configured as read-only via settings.")),
-            primaryButton: ( localize(14096, "&&Save Anyway"))
+            detail: ( localize(14096, "Paths can be configured as read-only via settings.")),
+            primaryButton: ( localize(14097, "&&Save Anyway"))
         });
         return confirmed;
     }

package/vscode/src/vs/workbench/services/workingCopy/common/storedFileWorkingCopyManager.js

@@ -78,7 +78,7 @@ let StoredFileWorkingCopyManager = class StoredFileWorkingCopyManager extends Ba
             this._register(this.lifecycleService.onBeforeShutdown(event => event.veto(this.onBeforeShutdownWeb(), 'veto.fileWorkingCopyManager')));
         }
         else {
-            this._register(this.lifecycleService.onWillShutdown(event => event.join(this.onWillShutdownDesktop(), { id: 'join.fileWorkingCopyManager', label: ( localize(14114, "Saving working copies")) })));
+            this._register(this.lifecycleService.onWillShutdown(event => event.join(this.onWillShutdownDesktop(), { id: 'join.fileWorkingCopyManager', label: ( localize(14115, "Saving working copies")) })));
         }
     }
     onBeforeShutdownWeb() {