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

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

@@ -26,10 +26,13 @@ import 'vscode/vscode/vs/platform/theme/common/colors/quickpickColors';
 import 'vscode/vscode/vs/platform/theme/common/colors/searchColors';
 import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService.service';
 import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
+import { CellFoldingState, CellRevealType } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { NotebookEditor } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookEditor';
 import { CellKind, NotebookSetting } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { SIDE_GROUP } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
+import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
+import { OutlineConfigKeys, OutlineTarget, OutlineConfigCollapseItemsValues } from 'vscode/vscode/vs/workbench/services/outline/browser/outline';
 import { IOutlineService } from 'vscode/vscode/vs/workbench/services/outline/browser/outline.service';
 import { Range } from 'vscode/vscode/vs/editor/common/core/range';
 import { mainWindow } from 'vscode/vscode/vs/base/browser/window';
@@ -43,9 +46,9 @@ import { disposableTimeout } from 'vscode/vscode/vs/base/common/async';
 import { IOutlinePane } from 'vscode/vscode/vs/workbench/contrib/outline/browser/outline';
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { NOTEBOOK_IS_ACTIVE_EDITOR } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
+import { NotebookOutlineConstants } from '../../viewModel/notebookOutlineEntryFactory.js';
 import { INotebookCellOutlineProviderFactory } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineProviderFactory.service';
 
-var NotebookCellOutline_1;
 const _moduleId = "vs/workbench/contrib/notebook/browser/contrib/outline/notebookOutline";
 class NotebookOutlineTemplate {
     static { this.templateId = 'NotebookOutlineRenderer'; }
@@ -117,7 +120,7 @@ let NotebookOutlineRenderer = class NotebookOutlineRenderer {
         template.decoration.innerText = '';
         if (markerInfo) {
             const problem = this._configurationService.getValue('problems.visibility');
-            const useBadges = this._configurationService.getValue("outline.problems.badges" );
+            const useBadges = this._configurationService.getValue(OutlineConfigKeys.problemsBadges);
             if (!useBadges || !problem) {
                 template.decoration.classList.remove('bubble');
                 template.decoration.innerText = '';
@@ -134,7 +137,7 @@ let NotebookOutlineRenderer = class NotebookOutlineRenderer {
             if (problem === undefined) {
                 return;
             }
-            const useColors = this._configurationService.getValue("outline.problems.colors" );
+            const useColors = this._configurationService.getValue(OutlineConfigKeys.problemsColors);
             if (!useColors || !problem) {
                 template.container.style.removeProperty('--outline-element-color');
                 template.decoration.style.setProperty('--outline-element-color', color?.toString() ?? 'inherit');
@@ -143,7 +146,7 @@ let NotebookOutlineRenderer = class NotebookOutlineRenderer {
                 template.container.style.setProperty('--outline-element-color', color?.toString() ?? 'inherit');
             }
         }
-        if (this._target === 1 ) {
+        if (this._target === OutlineTarget.OutlinePane) {
             const nbCell = node.element.cell;
             const nbViewModel = this._editor?.getViewModel();
             if (!nbViewModel) {
@@ -154,7 +157,7 @@ let NotebookOutlineRenderer = class NotebookOutlineRenderer {
             const scopedContextKeyService = template.elementDisposables.add(this._contextKeyService.createScoped(template.container));
             NotebookOutlineContext.CellKind.bindTo(scopedContextKeyService).set(isCodeCell ? CellKind.Code : CellKind.Markup);
             NotebookOutlineContext.CellHasChildren.bindTo(scopedContextKeyService).set(length > 0);
-            NotebookOutlineContext.CellHasHeader.bindTo(scopedContextKeyService).set(node.element.level !== 7 );
+            NotebookOutlineContext.CellHasHeader.bindTo(scopedContextKeyService).set(node.element.level !== NotebookOutlineConstants.NonHeaderOutlineLevel);
             NotebookOutlineContext.OutlineElementTarget.bindTo(scopedContextKeyService).set(this._target);
             this.setupFolding(isCodeCell, nbViewModel, scopedContextKeyService, template, nbCell);
             const outlineEntryToolbar = template.elementDisposables.add(( (new ToolBar(template.actionMenu, this._contextMenuService, {
@@ -181,7 +184,7 @@ let NotebookOutlineRenderer = class NotebookOutlineRenderer {
         clearNode(templateData.actionMenu);
     }
     setupFolding(isCodeCell, nbViewModel, scopedContextKeyService, template, nbCell) {
-        const foldingState = isCodeCell ? 0  : (nbCell.foldingState);
+        const foldingState = isCodeCell ? CellFoldingState.None : (nbCell.foldingState);
         const foldingStateCtx = NotebookOutlineContext.CellFoldingState.bindTo(scopedContextKeyService);
         foldingStateCtx.set(foldingState);
         if (!isCodeCell) {
@@ -274,7 +277,7 @@ let NotebookQuickPickProvider = class NotebookQuickPickProvider {
         const { hasFileIcons } = this._themeService.getFileIconTheme();
         const showSymbols = this._configurationService.getValue(NotebookSetting.gotoSymbolsAllSymbols);
         const isSymbol = (element) => !!element.symbolKind;
-        const isCodeCell = (element) => ((element.cell.cellKind === CellKind.Code && element.level === 7) );
+        const isCodeCell = (element) => (element.cell.cellKind === CellKind.Code && element.level === NotebookOutlineConstants.NonHeaderOutlineLevel);
         for (let i = 0; i < bucket.length; i++) {
             const element = bucket[i];
             const nextElement = bucket[i + 1];
@@ -302,6 +305,61 @@ NotebookQuickPickProvider = ( (__decorate([
     ( (__param(1, IConfigurationService))),
     ( (__param(2, IThemeService)))
 ], NotebookQuickPickProvider)));
+let NotebookOutlinePaneProvider = class NotebookOutlinePaneProvider {
+    constructor(_getEntries, _configurationService) {
+        this._getEntries = _getEntries;
+        this._configurationService = _configurationService;
+    }
+    *getChildren(element) {
+        const showCodeCells = this._configurationService.getValue(NotebookSetting.outlineShowCodeCells);
+        const showCodeCellSymbols = this._configurationService.getValue(NotebookSetting.outlineShowCodeCellSymbols);
+        const showMarkdownHeadersOnly = this._configurationService.getValue(NotebookSetting.outlineShowMarkdownHeadersOnly);
+        const isOutline = element instanceof NotebookCellOutline;
+        const entries = isOutline ? this._getEntries() : element.children;
+        for (const entry of entries) {
+            if (entry.cell.cellKind === CellKind.Markup) {
+                if (!showMarkdownHeadersOnly) {
+                    yield entry;
+                }
+                else if (entry.level < NotebookOutlineConstants.NonHeaderOutlineLevel) {
+                    yield entry;
+                }
+            }
+            else if (showCodeCells && entry.cell.cellKind === CellKind.Code) {
+                if (showCodeCellSymbols) {
+                    yield entry;
+                }
+                else if (entry.level === NotebookOutlineConstants.NonHeaderOutlineLevel) {
+                    yield entry;
+                }
+            }
+        }
+    }
+};
+NotebookOutlinePaneProvider = ( (__decorate([
+    ( (__param(1, IConfigurationService)))
+], NotebookOutlinePaneProvider)));
+let NotebookBreadcrumbsProvider = class NotebookBreadcrumbsProvider {
+    constructor(_getActiveElement, _configurationService) {
+        this._getActiveElement = _getActiveElement;
+        this._configurationService = _configurationService;
+    }
+    getBreadcrumbElements() {
+        const result = [];
+        const showCodeCells = this._configurationService.getValue(NotebookSetting.breadcrumbsShowCodeCells);
+        let candidate = this._getActiveElement();
+        while (candidate) {
+            if (showCodeCells || candidate.cell.cellKind !== CellKind.Code) {
+                result.unshift(candidate);
+            }
+            candidate = candidate.parent;
+        }
+        return result;
+    }
+};
+NotebookBreadcrumbsProvider = ( (__decorate([
+    ( (__param(1, IConfigurationService)))
+], NotebookBreadcrumbsProvider)));
 class NotebookComparator {
     constructor() {
         this._collator = new WindowIdleValue(mainWindow, () => new Intl.Collator(undefined, { numeric: true }));
@@ -316,7 +374,7 @@ class NotebookComparator {
         return this._collator.value.compare(a.label, b.label);
     }
 }
-let NotebookCellOutline = NotebookCellOutline_1 = class NotebookCellOutline {
+let NotebookCellOutline = class NotebookCellOutline {
     get entries() {
         return this._outlineProviderReference?.object?.entries ?? [];
     }
@@ -352,16 +410,11 @@ let NotebookCellOutline = NotebookCellOutline_1 = class NotebookCellOutline {
             installSelectionListener();
         }));
         installSelectionListener();
-        const treeDataSource = {
-            getChildren: parent => {
-                return this.getChildren(parent, _configurationService);
-            }
-        };
         const delegate = ( (new NotebookOutlineVirtualDelegate()));
         const renderers = [instantiationService.createInstance(NotebookOutlineRenderer, this._editor.getControl(), _target)];
         const comparator = ( (new NotebookComparator()));
         const options = {
-            collapseByDefault: _target === 2  || ((_target === 1  && _configurationService.getValue("outline.collapseItems" ) === "alwaysCollapse") ),
+            collapseByDefault: _target === OutlineTarget.Breadcrumbs || (_target === OutlineTarget.OutlinePane && _configurationService.getValue(OutlineConfigKeys.collapseItems) === OutlineConfigCollapseItemsValues.Collapsed),
             expandOnlyOnTwistieClick: true,
             multipleSelectionSupport: false,
             accessibilityProvider: ( (new NotebookOutlineAccessibility())),
@@ -369,48 +422,15 @@ let NotebookCellOutline = NotebookCellOutline_1 = class NotebookCellOutline {
             keyboardNavigationLabelProvider: ( (new NotebookNavigationLabelProvider()))
         };
         this.config = {
-            breadcrumbsDataSource: {
-                getBreadcrumbElements: () => {
-                    const result = [];
-                    let candidate = this.activeElement;
-                    while (candidate) {
-                        result.unshift(candidate);
-                        candidate = candidate.parent;
-                    }
-                    return result;
-                }
-            },
-            quickPickDataSource: instantiationService.createInstance(NotebookQuickPickProvider, () => (this._outlineProviderReference?.object?.entries ?? [])),
-            treeDataSource,
+            treeDataSource: instantiationService.createInstance(NotebookOutlinePaneProvider, () => (this.entries ?? [])),
+            quickPickDataSource: instantiationService.createInstance(NotebookQuickPickProvider, () => (this.entries ?? [])),
+            breadcrumbsDataSource: instantiationService.createInstance(NotebookBreadcrumbsProvider, () => (this.activeElement)),
             delegate,
             renderers,
             comparator,
             options
         };
     }
-    *getChildren(parent, configurationService) {
-        const showCodeCells = configurationService.getValue(NotebookSetting.outlineShowCodeCells);
-        const showCodeCellSymbols = configurationService.getValue(NotebookSetting.outlineShowCodeCellSymbols);
-        const showMarkdownHeadersOnly = configurationService.getValue(NotebookSetting.outlineShowMarkdownHeadersOnly);
-        for (const entry of parent instanceof NotebookCellOutline_1 ? (this._outlineProviderReference?.object?.entries ?? []) : parent.children) {
-            if (entry.cell.cellKind === CellKind.Markup) {
-                if (!showMarkdownHeadersOnly) {
-                    yield entry;
-                }
-                else if (entry.level < 7 ) {
-                    yield entry;
-                }
-            }
-            else if (showCodeCells && entry.cell.cellKind === CellKind.Code) {
-                if (showCodeCellSymbols) {
-                    yield entry;
-                }
-                else if (entry.level === 7 ) {
-                    yield entry;
-                }
-            }
-        }
-    }
     async setFullSymbols(cancelToken) {
         await this._outlineProviderReference?.object?.setFullSymbols(cancelToken);
     }
@@ -426,7 +446,7 @@ let NotebookCellOutline = NotebookCellOutline_1 = class NotebookCellOutline {
             options: {
                 ...options,
                 override: this._editor.input?.editorId,
-                cellRevealType: 5 ,
+                cellRevealType: CellRevealType.NearTopIfOutsideViewport,
                 selection: entry.position
             },
         }, sideBySide ? SIDE_GROUP : undefined);
@@ -492,7 +512,7 @@ let NotebookCellOutline = NotebookCellOutline_1 = class NotebookCellOutline {
         this._localDisposables.dispose();
     }
 };
-NotebookCellOutline = NotebookCellOutline_1 = ( (__decorate([
+NotebookCellOutline = ( (__decorate([
     ( (__param(2, IInstantiationService))),
     ( (__param(3, IEditorService))),
     ( (__param(4, IConfigurationService)))
@@ -511,10 +531,10 @@ let NotebookOutlineCreator = class NotebookOutlineCreator {
         const outline = this._instantiationService.createInstance(NotebookCellOutline, editor, target);
         const showAllGotoSymbols = this._configurationService.getValue(NotebookSetting.gotoSymbolsAllSymbols);
         const showAllOutlineSymbols = this._configurationService.getValue(NotebookSetting.outlineShowCodeCellSymbols);
-        if (target === 4  && showAllGotoSymbols) {
+        if (target === OutlineTarget.QuickPick && showAllGotoSymbols) {
             await outline.setFullSymbols(cancelToken);
         }
-        else if (target === 1  && showAllOutlineSymbols) {
+        else if (target === OutlineTarget.OutlinePane && showAllOutlineSymbols) {
             void outline.setFullSymbols(cancelToken);
         }
         return outline;
@@ -529,10 +549,10 @@ const NotebookOutlineContext = {
     CellKind: ( (new RawContextKey('notebookCellKind', undefined))),
     CellHasChildren: ( (new RawContextKey('notebookCellHasChildren', false))),
     CellHasHeader: ( (new RawContextKey('notebookCellHasHeader', false))),
-    CellFoldingState: ( (new RawContextKey('notebookCellFoldingState', 0 ))),
+    CellFoldingState: ( (new RawContextKey('notebookCellFoldingState', CellFoldingState.None))),
     OutlineElementTarget: ( (new RawContextKey('notebookOutlineElementTarget', undefined))),
 };
-( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(NotebookOutlineCreator, 4 );
+( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(NotebookOutlineCreator, LifecyclePhase.Eventually);
 ( (Registry.as(Extensions$1.Configuration))).registerConfiguration({
     id: 'notebook',
     order: 100,
@@ -654,4 +674,4 @@ registerAction2(class ToggleCodeCellSymbolEntries extends Action2 {
     }
 });
 
-export { NotebookCellOutline, NotebookOutlineContext, NotebookOutlineCreator };
+export { NotebookBreadcrumbsProvider, NotebookCellOutline, NotebookOutlineContext, NotebookOutlineCreator, NotebookOutlinePaneProvider, NotebookQuickPickProvider };