@codingame/monaco-vscode-notebook-service-override 13.1.7 → 14.0.1

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookInlineVariables.js

@@ -0,0 +1,310 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { CancellationTokenSource, CancellationToken } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
+import { onUnexpectedExternalError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
+import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
+import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { ResourceMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/map';
+import { isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
+import { format, noBreakWhitespace } from '@codingame/monaco-vscode-api/vscode/vs/base/common/strings';
+import { Constants } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uint';
+import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
+import { InjectedTextCursorStops } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model';
+import { ILanguageFeaturesService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/languageFeatures';
+import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { registerAction2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
+import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
+import { State } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/debug/common/debug';
+import { IDebugService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/debug/common/debug.service';
+import { NotebookSetting } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
+import { NotebookExecutionType } from '@codingame/monaco-vscode-af5ccfda-af82-504b-b365-92b4e654e5c5-common/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService';
+import { INotebookExecutionStateService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService.service';
+import { INotebookKernelService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookKernelService.service';
+import { NotebookAction } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/controller/coreActions';
+import { registerNotebookContribution } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/notebookEditorExtensions';
+
+const MAX_INLINE_DECORATOR_LENGTH = 150;
+const variableRegex = ( new RegExp(
+'(?:[a-zA-Z_][a-zA-Z0-9_]*\\.)*' +
+    '[a-zA-Z_][a-zA-Z0-9_]*', 'g'));
+class InlineSegment {
+    constructor(column, text) {
+        this.column = column;
+        this.text = text;
+    }
+}
+let NotebookInlineVariablesController = class NotebookInlineVariablesController extends Disposable {
+    static { this.id = 'notebook.inlineVariablesController'; }
+    constructor(notebookEditor, notebookKernelService, notebookExecutionStateService, languageFeaturesService, configurationService, debugService) {
+        super();
+        this.notebookEditor = notebookEditor;
+        this.notebookKernelService = notebookKernelService;
+        this.notebookExecutionStateService = notebookExecutionStateService;
+        this.languageFeaturesService = languageFeaturesService;
+        this.configurationService = configurationService;
+        this.debugService = debugService;
+        this.cellDecorationIds = ( new Map());
+        this.cellContentListeners = ( new ResourceMap());
+        this.currentCancellationTokenSources = ( new ResourceMap());
+        this._register(this.notebookExecutionStateService.onDidChangeExecution(async (e) => {
+            if (!this.configurationService.getValue(NotebookSetting.notebookInlineValues)) {
+                return;
+            }
+            if (e.type === NotebookExecutionType.cell) {
+                await this.updateInlineVariables(e);
+            }
+        }));
+        this._register(Event.runAndSubscribe(this.configurationService.onDidChangeConfiguration, e => {
+            if (!e || e.affectsConfiguration(NotebookSetting.notebookInlineValues)) {
+                if (!this.configurationService.getValue(NotebookSetting.notebookInlineValues)) {
+                    this.clearNotebookInlineDecorations();
+                }
+            }
+        }));
+    }
+    async updateInlineVariables(event) {
+        if (event.changed) {
+            return;
+        }
+        const cell = this.notebookEditor.getCellByHandle(event.cellHandle);
+        if (!cell) {
+            return;
+        }
+        const existingSource = this.currentCancellationTokenSources.get(cell.uri);
+        if (existingSource) {
+            existingSource.cancel();
+        }
+        this.currentCancellationTokenSources.set(cell.uri, ( new CancellationTokenSource()));
+        const token = this.currentCancellationTokenSources.get(cell.uri).token;
+        if (this.debugService.state !== State.Inactive) {
+            this._clearNotebookInlineDecorations();
+            return;
+        }
+        if (!this.notebookEditor.textModel?.uri || !isEqual(this.notebookEditor.textModel.uri, event.notebook)) {
+            return;
+        }
+        const model = await cell.resolveTextModel();
+        if (!model) {
+            return;
+        }
+        this.clearCellInlineDecorations(cell);
+        const inlineDecorations = [];
+        if (( this.languageFeaturesService.inlineValuesProvider.has(model))) {
+            const lastLine = model.getLineCount();
+            const lastColumn = model.getLineMaxColumn(lastLine);
+            const ctx = {
+                frameId: 0,
+                stoppedLocation: ( new Range(lastLine, lastColumn, lastLine, lastColumn))
+            };
+            const providers = this.languageFeaturesService.inlineValuesProvider.ordered(model).reverse();
+            const lineDecorations = ( new Map());
+            const fullCellRange = ( new Range(1, 1, lastLine, lastColumn));
+            const promises = providers.flatMap(provider => Promise.resolve(provider.provideInlineValues(model, fullCellRange, ctx, token)).then(async (result) => {
+                if (result) {
+                    let kernel;
+                    const kernelVars = [];
+                    if (( result.some(iv => iv.type === 'variable'))) {
+                        if (!this.notebookEditor.hasModel()) {
+                            return;
+                        }
+                        kernel = this.notebookKernelService.getMatchingKernel(this.notebookEditor.textModel);
+                        const variables = kernel.selected?.provideVariables(event.notebook, undefined, 'named', 0, token);
+                        if (!variables) {
+                            return;
+                        }
+                        for await (const v of variables) {
+                            kernelVars.push(v);
+                        }
+                    }
+                    for (const iv of result) {
+                        let text = undefined;
+                        switch (iv.type) {
+                            case 'text':
+                                text = iv.text;
+                                break;
+                            case 'variable': {
+                                const name = iv.variableName;
+                                if (!name) {
+                                    continue;
+                                }
+                                const value = kernelVars.find(v => v.name === name)?.value;
+                                if (!value) {
+                                    continue;
+                                }
+                                text = format('{0} = {1}', name, value);
+                                break;
+                            }
+                            case 'expression': {
+                                continue;
+                            }
+                        }
+                        if (text) {
+                            const line = iv.range.startLineNumber;
+                            let lineSegments = lineDecorations.get(line);
+                            if (!lineSegments) {
+                                lineSegments = [];
+                                lineDecorations.set(line, lineSegments);
+                            }
+                            if (!( lineSegments.some(iv => iv.text === text))) {
+                                lineSegments.push(( new InlineSegment(iv.range.startColumn, text)));
+                            }
+                        }
+                    }
+                }
+            }, err => {
+                onUnexpectedExternalError(err);
+            }));
+            await Promise.all(promises);
+            lineDecorations.forEach((segments, line) => {
+                if (segments.length > 0) {
+                    segments = segments.sort((a, b) => a.column - b.column);
+                    const text = ( segments.map(s => s.text)).join(', ');
+                    inlineDecorations.push(...this.createNotebookInlineValueDecoration(line, text));
+                }
+            });
+        }
+        else {
+            if (!this.notebookEditor.hasModel()) {
+                return;
+            }
+            const kernel = this.notebookKernelService.getMatchingKernel(this.notebookEditor.textModel);
+            const variables = kernel?.selected?.provideVariables(event.notebook, undefined, 'named', 0, CancellationToken.None);
+            if (!variables) {
+                return;
+            }
+            const vars = [];
+            for await (const v of variables) {
+                vars.push(v);
+            }
+            const varNames = ( vars.map(v => v.name));
+            const document = cell.textModel;
+            if (!document) {
+                return;
+            }
+            for (let i = 1; i <= document.getLineCount(); i++) {
+                const line = document.getLineContent(i);
+                if (line.trimStart().startsWith('#')) {
+                    continue;
+                }
+                for (let match = variableRegex.exec(line); match; match = variableRegex.exec(line)) {
+                    const name = match[0];
+                    if (varNames.includes(name)) {
+                        const inlineVal = name + ' = ' + vars.find(v => v.name === name)?.value;
+                        inlineDecorations.push(...this.createNotebookInlineValueDecoration(i, inlineVal));
+                    }
+                }
+            }
+        }
+        if (inlineDecorations.length > 0) {
+            this.updateCellInlineDecorations(cell, inlineDecorations);
+            this.initCellContentListener(cell);
+        }
+    }
+    updateCellInlineDecorations(cell, decorations) {
+        const oldDecorations = this.cellDecorationIds.get(cell) ?? [];
+        this.cellDecorationIds.set(cell, cell.deltaModelDecorations(oldDecorations, decorations));
+    }
+    initCellContentListener(cell) {
+        const cellModel = cell.textModel;
+        if (!cellModel) {
+            return;
+        }
+        this.cellContentListeners.set(cell.uri, cellModel.onDidChangeContent(() => {
+            this.clearCellInlineDecorations(cell);
+        }));
+    }
+    clearCellInlineDecorations(cell) {
+        const cellDecorations = this.cellDecorationIds.get(cell) ?? [];
+        if (cellDecorations) {
+            cell.deltaModelDecorations(cellDecorations, []);
+            this.cellDecorationIds.delete(cell);
+        }
+        const listener = this.cellContentListeners.get(cell.uri);
+        if (listener) {
+            listener.dispose();
+            this.cellContentListeners.delete(cell.uri);
+        }
+    }
+    _clearNotebookInlineDecorations() {
+        this.cellDecorationIds.forEach((_, cell) => {
+            this.clearCellInlineDecorations(cell);
+        });
+    }
+    clearNotebookInlineDecorations() {
+        this._clearNotebookInlineDecorations();
+    }
+    createNotebookInlineValueDecoration(lineNumber, contentText, column = Constants.MAX_SAFE_SMALL_INTEGER) {
+        if (contentText.length > MAX_INLINE_DECORATOR_LENGTH) {
+            contentText = contentText.substring(0, MAX_INLINE_DECORATOR_LENGTH) + '...';
+        }
+        return [
+            {
+                range: {
+                    startLineNumber: lineNumber,
+                    endLineNumber: lineNumber,
+                    startColumn: column,
+                    endColumn: column
+                },
+                options: {
+                    description: 'nb-inline-value-decoration-spacer',
+                    after: {
+                        content: noBreakWhitespace,
+                        cursorStops: InjectedTextCursorStops.None
+                    },
+                    showIfCollapsed: true,
+                }
+            },
+            {
+                range: {
+                    startLineNumber: lineNumber,
+                    endLineNumber: lineNumber,
+                    startColumn: column,
+                    endColumn: column
+                },
+                options: {
+                    description: 'nb-inline-value-decoration',
+                    after: {
+                        content: this.replaceWsWithNoBreakWs(contentText),
+                        inlineClassName: 'nb-inline-value',
+                        inlineClassNameAffectsLetterSpacing: true,
+                        cursorStops: InjectedTextCursorStops.None
+                    },
+                    showIfCollapsed: true,
+                }
+            },
+        ];
+    }
+    replaceWsWithNoBreakWs(str) {
+        return str.replace(/[ \t]/g, noBreakWhitespace);
+    }
+    dispose() {
+        super.dispose();
+        this._clearNotebookInlineDecorations();
+        this.currentCancellationTokenSources.forEach(source => source.cancel());
+        this.currentCancellationTokenSources.clear();
+    }
+};
+NotebookInlineVariablesController = ( __decorate([
+    ( __param(1, INotebookKernelService)),
+    ( __param(2, INotebookExecutionStateService)),
+    ( __param(3, ILanguageFeaturesService)),
+    ( __param(4, IConfigurationService)),
+    ( __param(5, IDebugService))
+], NotebookInlineVariablesController));
+registerNotebookContribution(NotebookInlineVariablesController.id, NotebookInlineVariablesController);
+registerAction2(class ClearNotebookInlineValues extends NotebookAction {
+    constructor() {
+        super({
+            id: 'notebook.clearAllInlineValues',
+            title: ( localize(7537, 'Clear All Inline Values')),
+        });
+    }
+    runWithContext(accessor, context) {
+        const editor = context.notebookEditor;
+        const controller = editor.getContribution(NotebookInlineVariablesController.id);
+        controller.clearNotebookInlineDecorations();
+        return Promise.resolve();
+    }
+});
+
+export { NotebookInlineVariablesController };

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

@@ -11,7 +11,7 @@ import { IViewDescriptorService } from '@codingame/monaco-vscode-api/vscode/vs/w
 import { VIEWLET_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/debug/common/debug';
 import { NOTEBOOK_VARIABLE_VIEW_ENABLED } from './notebookVariableContextKeys.js';
 import { NotebookVariablesView } from './notebookVariablesView.js';
-import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { variablesViewIcon } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/notebookIcons';
 import { NotebookSetting } 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';
@@ -63,7 +63,7 @@ let NotebookVariables = class NotebookVariables extends Disposable {
         if (debugViewContainer) {
             const viewsRegistry = ( Registry.as(Extensions.ViewsRegistry));
             const viewDescriptor = {
-                id: 'workbench.notebook.variables', name: ( localize2(7396, "Notebook Variables")),
+                id: 'workbench.notebook.variables', name: ( localize2(7540, "Notebook Variables")),
                 containerIcon: variablesViewIcon, ctorDescriptor: ( new SyncDescriptor(NotebookVariablesView)),
                 order: 50, weight: 5, canToggleVisibility: true, canMoveView: true, collapsed: false, when: NOTEBOOK_VARIABLE_VIEW_ENABLED
             };

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariablesDataSource.js

@@ -78,7 +78,7 @@ class NotebookVariableDataSource {
                     notebook: parent.notebook,
                     id: parent.id + `${last + 1}`,
                     extHostId: parent.extHostId,
-                    name: ( localize(7397, "Display limit reached")),
+                    name: ( localize(7541, "Display limit reached")),
                     value: '',
                     indexedChildrenCount: 0,
                     hasNamedChildren: false

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariablesTree.js

@@ -56,10 +56,10 @@ NotebookVariableRenderer = NotebookVariableRenderer_1 = ( __decorate([
 ], NotebookVariableRenderer));
 class NotebookVariableAccessibilityProvider {
     getWidgetAriaLabel() {
-        return localize(7398, "Notebook Variables");
+        return localize(7542, "Notebook Variables");
     }
     getAriaLabel(element) {
-        return localize(7399, "Variable {0}, value {1}", element.name, element.value);
+        return localize(7543, "Variable {0}, value {1}", element.name, element.value);
     }
 }
 

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariablesView.js

@@ -22,18 +22,18 @@ import { IViewDescriptorService } from '@codingame/monaco-vscode-api/vscode/vs/w
 import { CONTEXT_VARIABLE_NAME, CONTEXT_VARIABLE_VALUE, CONTEXT_VARIABLE_TYPE, CONTEXT_VARIABLE_INTERFACES, CONTEXT_VARIABLE_LANGUAGE, CONTEXT_VARIABLE_EXTENSIONID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/debug/common/debug';
 import { NotebookVariableDataSource } from './notebookVariablesDataSource.js';
 import { NotebookVariablesDelegate, NotebookVariableRenderer, NotebookVariableAccessibilityProvider } from './notebookVariablesTree.js';
-import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { INotebookExecutionStateService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService.service';
 import { INotebookKernelService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookKernelService.service';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
-import { isCompositeNotebookEditorInput } from '@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/common/notebookEditorInput';
+import { isCompositeNotebookEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookEditorInput';
 
 var NotebookVariablesView_1;
 let NotebookVariablesView = class NotebookVariablesView extends ViewPane {
     static { NotebookVariablesView_1 = this; }
     static { this.ID = 'notebookVariablesView'; }
-    static { this.NOTEBOOK_TITLE = ( localize2(7400, "Notebook Variables")); }
-    static { this.REPL_TITLE = ( localize2(7401, "REPL Variables")); }
+    static { this.NOTEBOOK_TITLE = ( localize2(7544, "Notebook Variables")); }
+    static { this.REPL_TITLE = ( localize2(7545, "REPL Variables")); }
     constructor(options, editorService, notebookKernelService, notebookExecutionStateService, keybindingService, contextMenuService, contextKeyService, configurationService, instantiationService, viewDescriptorService, openerService, quickInputService, commandService, themeService, telemetryService, hoverService, menuService) {
         super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService);
         this.editorService = editorService;

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

@@ -7,12 +7,12 @@ import { IEditorOptions } from "@codingame/monaco-vscode-api/vscode/vs/platform/
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { IThemeService } from "@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service";
 import { IEditorPane } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor";
-import { CellFoldingState, INotebookEditorPane } from "@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
+import { CellFoldingState, INotebookEditorPane } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
 import { NotebookEditor } from "@codingame/monaco-vscode-6f9bc782-77e0-5716-93bd-b05210c768c5-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 { 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-d6e33d82-c101-549d-a885-0807ab3e0cfb-common/vscode/vs/workbench/services/outline/browser/outline";
+import { IBreadcrumbsDataSource, IOutline, IOutlineCreator, IOutlineListConfig, IQuickPickDataSource, IQuickPickOutlineElement, OutlineChangeEvent, OutlineTarget } from "@codingame/monaco-vscode-d4a98668-f793-5361-a9cf-1e6ae6d62ce3-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 { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
@@ -38,7 +38,6 @@ export declare class NotebookOutlinePaneProvider implements IDataSource<Notebook
     private showMarkdownHeadersOnly;
     constructor(outlineDataSourceRef: IReference<INotebookCellOutlineDataSource> | undefined, _configurationService: IConfigurationService);
     getActiveEntry(): OutlineEntry | undefined;
-    private filterEntry;
     getChildren(element: NotebookCellOutline | OutlineEntry): Iterable<OutlineEntry>;
     dispose(): void;
 }
@@ -74,7 +73,9 @@ export declare class NotebookCellOutline implements IOutline<OutlineEntry> {
     private _treeDataSource;
     private _quickPickDataSource;
     private _breadcrumbsDataSource;
+    private outlineShowCodeCells;
     private outlineShowCodeCellSymbols;
+    private outlineShowMarkdownHeadersOnly;
     get activeElement(): OutlineEntry | undefined;
     get entries(): OutlineEntry[];
     get uri(): URI | undefined;

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

@@ -27,13 +27,13 @@ import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/quic
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/searchColors';
 import { IThemeService } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service';
 import { Extensions } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
-import { CellFoldingState, CellRevealType } from '@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { CellFoldingState, CellRevealType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { NotebookEditor } from '@codingame/monaco-vscode-6f9bc782-77e0-5716-93bd-b05210c768c5-common/vscode/vs/workbench/contrib/notebook/browser/notebookEditor';
 import { CellKind, NotebookSetting, NotebookCellsChangeType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { SIDE_GROUP } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { LifecyclePhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle';
-import { OutlineConfigKeys, OutlineTarget, OutlineConfigCollapseItemsValues } from '@codingame/monaco-vscode-d6e33d82-c101-549d-a885-0807ab3e0cfb-common/vscode/vs/workbench/services/outline/browser/outline';
+import { OutlineConfigKeys, OutlineTarget, OutlineConfigCollapseItemsValues } from '@codingame/monaco-vscode-d4a98668-f793-5361-a9cf-1e6ae6d62ce3-common/vscode/vs/workbench/services/outline/browser/outline';
 import { IOutlineService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/outline/browser/outline.service';
 import { CancellationToken } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
@@ -47,10 +47,10 @@ import { MenuEntryActionViewItem, getActionBarActions } from '@codingame/monaco-
 import { disposableTimeout, Delayer } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import { IOutlinePane } from '@codingame/monaco-vscode-0cd5242b-7b61-5f66-ac25-ffa40baf8e8f-common/vscode/vs/workbench/contrib/outline/browser/outline';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
-import { NOTEBOOK_IS_ACTIVE_EDITOR } from '@codingame/monaco-vscode-4a36e358-d94d-55e0-86ee-3bcd543d9d3f-common/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
+import { NOTEBOOK_IS_ACTIVE_EDITOR } from '@codingame/monaco-vscode-771c2e6d-0284-5ac1-be73-7176085eedc5-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 { NotebookExecutionType } from '@codingame/monaco-vscode-972e8507-3a64-566d-8bc0-b78993998562-common/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService';
+import { NotebookExecutionType } from '@codingame/monaco-vscode-af5ccfda-af82-504b-b365-92b4e654e5c5-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';
 
@@ -315,6 +315,15 @@ NotebookQuickPickProvider = ( __decorate([
     ( __param(1, IConfigurationService)),
     ( __param(2, IThemeService))
 ], NotebookQuickPickProvider));
+function filterEntry(entry, showMarkdownHeadersOnly, showCodeCells, showCodeCellSymbols) {
+    if ((showMarkdownHeadersOnly && entry.cell.cellKind === CellKind.Markup && entry.level === NotebookOutlineConstants.NonHeaderOutlineLevel) ||
+        (!showCodeCells && entry.cell.cellKind === CellKind.Code) ||
+        (!showCodeCellSymbols && entry.cell.cellKind === CellKind.Code && entry.level > NotebookOutlineConstants.NonHeaderOutlineLevel)
+    ) {
+        return true;
+    }
+    return false;
+}
 let NotebookOutlinePaneProvider = class NotebookOutlinePaneProvider {
     constructor(outlineDataSourceRef, _configurationService) {
         this.outlineDataSourceRef = outlineDataSourceRef;
@@ -340,12 +349,12 @@ let NotebookOutlinePaneProvider = class NotebookOutlinePaneProvider {
         if (!newActive) {
             return undefined;
         }
-        if (!this.filterEntry(newActive)) {
+        if (!filterEntry(newActive, this.showMarkdownHeadersOnly, this.showCodeCells, this.showCodeCellSymbols)) {
             return newActive;
         }
         let parent = newActive.parent;
         while (parent) {
-            if (this.filterEntry(parent)) {
+            if (filterEntry(parent, this.showMarkdownHeadersOnly, this.showCodeCells, this.showCodeCellSymbols)) {
                 parent = parent.parent;
             }
             else {
@@ -354,15 +363,6 @@ let NotebookOutlinePaneProvider = class NotebookOutlinePaneProvider {
         }
         return undefined;
     }
-    filterEntry(entry) {
-        if ((this.showMarkdownHeadersOnly && entry.cell.cellKind === CellKind.Markup && entry.level === NotebookOutlineConstants.NonHeaderOutlineLevel) ||
-            (!this.showCodeCells && entry.cell.cellKind === CellKind.Code) ||
-            (!this.showCodeCellSymbols && entry.cell.cellKind === CellKind.Code && entry.level > NotebookOutlineConstants.NonHeaderOutlineLevel)
-        ) {
-            return true;
-        }
-        return false;
-    }
     *getChildren(element) {
         const isOutline = element instanceof NotebookCellOutline;
         const entries = isOutline ? this.outlineDataSourceRef?.object?.entries ?? [] : element.children;
@@ -455,7 +455,12 @@ let NotebookCellOutline = class NotebookCellOutline {
         return this._outlineDataSourceReference?.object?.uri;
     }
     get isEmpty() {
-        return this._outlineDataSourceReference?.object?.isEmpty ?? true;
+        if (!this._outlineDataSourceReference?.object?.entries) {
+            return true;
+        }
+        return !( this._outlineDataSourceReference.object.entries.some(entry => {
+            return !filterEntry(entry, this.outlineShowMarkdownHeadersOnly, this.outlineShowCodeCells, this.outlineShowCodeCellSymbols);
+        }));
     }
     checkDelayer() {
         if (this.delayerRecomputeState.isTriggered()) {
@@ -481,7 +486,9 @@ let NotebookCellOutline = class NotebookCellOutline {
         this.delayerRecomputeState = this._disposables.add(( new Delayer(300)));
         this.delayerRecomputeActive = this._disposables.add(( new Delayer(200)));
         this.delayerRecomputeSymbols = this._disposables.add(( new Delayer(2000)));
+        this.outlineShowCodeCells = this._configurationService.getValue(NotebookSetting.outlineShowCodeCells);
         this.outlineShowCodeCellSymbols = this._configurationService.getValue(NotebookSetting.outlineShowCodeCellSymbols);
+        this.outlineShowMarkdownHeadersOnly = this._configurationService.getValue(NotebookSetting.outlineShowMarkdownHeadersOnly);
         this.initializeOutline();
         const delegate = ( new NotebookOutlineVirtualDelegate());
         const renderers = [this._instantiationService.createInstance(NotebookOutlineRenderer, this._editor.getControl(), this._target)];
@@ -523,6 +530,9 @@ let NotebookCellOutline = class NotebookCellOutline {
                 e.affectsConfiguration(NotebookSetting.outlineShowCodeCells) ||
                 e.affectsConfiguration(NotebookSetting.outlineShowCodeCellSymbols) ||
                 e.affectsConfiguration(NotebookSetting.breadcrumbsShowCodeCells)) {
+                this.outlineShowCodeCells = this._configurationService.getValue(NotebookSetting.outlineShowCodeCells);
+                this.outlineShowCodeCellSymbols = this._configurationService.getValue(NotebookSetting.outlineShowCodeCellSymbols);
+                this.outlineShowMarkdownHeadersOnly = this._configurationService.getValue(NotebookSetting.outlineShowMarkdownHeadersOnly);
                 this.delayedRecomputeState();
             }
         }));
@@ -718,33 +728,33 @@ const NotebookOutlineContext = {
             type: 'boolean',
             default: true,
             markdownDescription: ( localize(
-                7402,
+                7546,
                 "When enabled, notebook outline will show only markdown cells containing a header."
             ))
         },
         [NotebookSetting.outlineShowCodeCells]: {
             type: 'boolean',
             default: false,
-            markdownDescription: ( localize(7403, "When enabled, notebook outline shows code cells."))
+            markdownDescription: ( localize(7547, "When enabled, notebook outline shows code cells."))
         },
         [NotebookSetting.outlineShowCodeCellSymbols]: {
             type: 'boolean',
             default: true,
             markdownDescription: ( localize(
-                7404,
+                7548,
                 "When enabled, notebook outline shows code cell symbols. Relies on `notebook.outline.showCodeCells` being enabled."
             ))
         },
         [NotebookSetting.breadcrumbsShowCodeCells]: {
             type: 'boolean',
             default: true,
-            markdownDescription: ( localize(7405, "When enabled, notebook breadcrumbs contain code cells."))
+            markdownDescription: ( localize(7549, "When enabled, notebook breadcrumbs contain code cells."))
         },
         [NotebookSetting.gotoSymbolsAllSymbols]: {
             type: 'boolean',
             default: true,
             markdownDescription: ( localize(
-                7406,
+                7550,
                 "When enabled, the Go to Symbol Quick Pick will display full code symbols from the notebook, as well as Markdown headers."
             ))
         },
@@ -752,7 +762,7 @@ const NotebookOutlineContext = {
 });
 MenuRegistry.appendMenuItem(MenuId.ViewTitle, {
     submenu: MenuId.NotebookOutlineFilter,
-    title: ( localize(7407, "Filter Entries")),
+    title: ( localize(7551, "Filter Entries")),
     icon: Codicon.filter,
     group: 'navigation',
     order: -1,
@@ -762,7 +772,7 @@ registerAction2(class ToggleShowMarkdownHeadersOnly extends Action2 {
     constructor() {
         super({
             id: 'notebook.outline.toggleShowMarkdownHeadersOnly',
-            title: ( localize(7408, "Markdown Headers Only")),
+            title: ( localize(7552, "Markdown Headers Only")),
             f1: false,
             toggled: {
                 condition: ( ContextKeyExpr.equals('config.notebook.outline.showMarkdownHeadersOnly', true))
@@ -783,7 +793,7 @@ registerAction2(class ToggleCodeCellEntries extends Action2 {
     constructor() {
         super({
             id: 'notebook.outline.toggleCodeCells',
-            title: ( localize(7409, "Code Cells")),
+            title: ( localize(7553, "Code Cells")),
             f1: false,
             toggled: {
                 condition: ( ContextKeyExpr.equals('config.notebook.outline.showCodeCells', true))
@@ -805,7 +815,7 @@ registerAction2(class ToggleCodeCellSymbolEntries extends Action2 {
     constructor() {
         super({
             id: 'notebook.outline.toggleCodeCellSymbols',
-            title: ( localize(7410, "Code Cell Symbols")),
+            title: ( localize(7554, "Code Cell Symbols")),
             f1: false,
             toggled: {
                 condition: ( ContextKeyExpr.equals('config.notebook.outline.showCodeCellSymbols', true))

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/profile/notebookProfile.js

@@ -53,7 +53,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.setProfile',
-            title: ( localize(7411, "Set Profile"))
+            title: ( localize(7555, "Set Profile"))
         });
     }
     async run(accessor, args) {