@codingame/monaco-vscode-api 3.2.2 → 4.0.0

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

@@ -140,6 +140,8 @@ let NotebookViewModel = class NotebookViewModel extends Disposable {
         this._decorations = Object.create(null);
         this._lastDecorationId = 0;
         this._foldingRanges = null;
+        this._onDidFoldingStateChanged = ( new Emitter());
+        this.onDidFoldingStateChanged = this._onDidFoldingStateChanged.event;
         this._hiddenRanges = [];
         this._focused = true;
         this._decorationIdToCellMap = ( new Map());
@@ -367,6 +369,7 @@ let NotebookViewModel = class NotebookViewModel extends Disposable {
         }
         if (updateHiddenAreas || k < this._hiddenRanges.length) {
             this._hiddenRanges = newHiddenAreas;
+            this._onDidFoldingStateChanged.fire();
         }
         this._viewCells.forEach(cell => {
             if (cell.cellKind === CellKind.Markup) {

package/vscode/src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorStickyScroll.js

@@ -1,13 +1,10 @@
 import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
-import { localize2WithPath, localizeWithPath } from '../../../../../nls.js';
 import { addDisposableListener, EventType, getWindow, clearNode } from '../../../../../base/browser/dom.js';
+import '../../../../../base/browser/touch.js';
 import { StandardMouseEvent } from '../../../../../base/browser/mouseEvent.js';
 import { Emitter } from '../../../../../base/common/event.js';
 import { Disposable, DisposableStore } from '../../../../../base/common/lifecycle.js';
-import { Categories } from '../../../../../platform/action/common/actionCommonCategories.js';
-import { registerAction2, Action2, MenuId } from '../../../../../platform/actions/common/actions.js';
-import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
-import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
+import { MenuId } from '../../../../../platform/actions/common/actions.js';
 import { IContextMenuService } from '../../../../../platform/contextview/browser/contextView.js';
 import { CellKind } from '../../common/notebookCommon.js';
 import { Delayer } from '../../../../../base/common/async.js';
@@ -15,48 +12,6 @@ import { ThemeIcon } from '../../../../../base/common/themables.js';
 import { foldingCollapsedIcon, foldingExpandedIcon } from '../../../../../editor/contrib/folding/browser/foldingDecorations.js';
 import { FoldingController } from '../controller/foldingController.js';
 var NotebookStickyScroll_1;
-class ToggleNotebookStickyScroll extends Action2 {
-    constructor() {
-        super({
-            id: 'notebook.action.toggleNotebookStickyScroll',
-            title: {
-                ...( localize2WithPath(
-                    'vs/workbench/contrib/notebook/browser/viewParts/notebookEditorStickyScroll',
-                    'toggleStickyScroll',
-                    "Toggle Notebook Sticky Scroll"
-                )),
-                mnemonicTitle: ( localizeWithPath(
-                    'vs/workbench/contrib/notebook/browser/viewParts/notebookEditorStickyScroll',
-                    { key: 'mitoggleStickyScroll', comment: ['&& denotes a mnemonic'] },
-                    "&&Toggle Notebook Sticky Scroll"
-                )),
-            },
-            category: Categories.View,
-            toggled: {
-                condition: ( ContextKeyExpr.equals('config.notebook.stickyScroll.enabled', true)),
-                title: ( localizeWithPath(
-                    'vs/workbench/contrib/notebook/browser/viewParts/notebookEditorStickyScroll',
-                    'notebookStickyScroll',
-                    "Notebook Sticky Scroll"
-                )),
-                mnemonicTitle: ( localizeWithPath(
-                    'vs/workbench/contrib/notebook/browser/viewParts/notebookEditorStickyScroll',
-                    { key: 'miNotebookStickyScroll', comment: ['&& denotes a mnemonic'] },
-                    "&&Notebook Sticky Scroll"
-                )),
-            },
-            menu: [
-                { id: MenuId.CommandPalette },
-                { id: MenuId.NotebookStickyScrollContext }
-            ]
-        });
-    }
-    async run(accessor) {
-        const configurationService = accessor.get(IConfigurationService);
-        const newValue = !configurationService.getValue('notebook.stickyScroll.enabled');
-        return configurationService.updateValue('notebook.stickyScroll.enabled', newValue);
-    }
-}
 class NotebookStickyLine extends Disposable {
     constructor(element, foldingIcon, header, entry, notebookEditor) {
         super();
@@ -80,7 +35,7 @@ class NotebookStickyLine extends Disposable {
         const index = this.entry.index;
         const headerLevel = this.entry.level;
         const newFoldingState = ((currentState === 2) ) ? 1  : 2 ;
-        foldingController.setFoldingStateUp(index, newFoldingState, headerLevel);
+        foldingController.setFoldingStateDown(index, newFoldingState, headerLevel);
         this.focusCell();
     }
     focusCell() {
@@ -149,7 +104,6 @@ let NotebookStickyScroll = NotebookStickyScroll_1 = class NotebookStickyScroll e
         this._contextMenuService = _contextMenuService;
         this._disposables = ( new DisposableStore());
         this.currentStickyLines = ( new Map());
-        this.filteredOutlineEntries = [];
         this._onDidChangeNotebookStickyScroll = this._register(( new Emitter()));
         this.onDidChangeNotebookStickyScroll = this._onDidChangeNotebookStickyScroll.event;
         if (this.notebookEditor.notebookOptions.getDisplayOptions().stickyScrollEnabled) {
@@ -166,9 +120,19 @@ let NotebookStickyScroll = NotebookStickyScroll_1 = class NotebookStickyScroll e
     }
     onContextMenu(e) {
         const event = ( new StandardMouseEvent(getWindow(this.domNode), e));
+        const selectedElement = event.target.parentElement;
+        const selectedOutlineEntry = Array.from(( this.currentStickyLines.values())).find(entry => entry.line.element.contains(selectedElement))?.line.entry;
+        if (!selectedOutlineEntry) {
+            return;
+        }
+        const args = {
+            outlineEntry: selectedOutlineEntry,
+            notebookEditor: this.notebookEditor,
+        };
         this._contextMenuService.showContextMenu({
             menuId: MenuId.NotebookStickyScrollContext,
             getAnchor: () => event,
+            menuActionOptions: { shouldForwardArgs: true, arg: args },
         });
     }
     updateConfig(e) {
@@ -185,29 +149,27 @@ let NotebookStickyScroll = NotebookStickyScroll_1 = class NotebookStickyScroll e
             }
         }
         else if (e.stickyScrollMode && this.notebookEditor.notebookOptions.getDisplayOptions().stickyScrollEnabled) {
-            this.updateContent(computeContent(this.notebookEditor, this.notebookCellList, this.filteredOutlineEntries, this.getCurrentStickyHeight()));
+            this.updateContent(computeContent(this.notebookEditor, this.notebookCellList, this.notebookOutline.entries, this.getCurrentStickyHeight()));
         }
     }
     init() {
         this.notebookOutline.init();
-        this.filteredOutlineEntries = this.notebookOutline.entries.filter(entry => entry.level !== 7);
-        this.updateContent(computeContent(this.notebookEditor, this.notebookCellList, this.filteredOutlineEntries, this.getCurrentStickyHeight()));
+        this.updateContent(computeContent(this.notebookEditor, this.notebookCellList, this.notebookOutline.entries, this.getCurrentStickyHeight()));
         this._disposables.add(this.notebookOutline.onDidChange(() => {
-            this.filteredOutlineEntries = this.notebookOutline.entries.filter(entry => entry.level !== 7);
-            const recompute = computeContent(this.notebookEditor, this.notebookCellList, this.filteredOutlineEntries, this.getCurrentStickyHeight());
+            const recompute = computeContent(this.notebookEditor, this.notebookCellList, this.notebookOutline.entries, this.getCurrentStickyHeight());
             if (!this.compareStickyLineMaps(recompute, this.currentStickyLines)) {
                 this.updateContent(recompute);
             }
         }));
         this._disposables.add(this.notebookEditor.onDidAttachViewModel(() => {
             this.notebookOutline.init();
-            this.updateContent(computeContent(this.notebookEditor, this.notebookCellList, this.filteredOutlineEntries, this.getCurrentStickyHeight()));
+            this.updateContent(computeContent(this.notebookEditor, this.notebookCellList, this.notebookOutline.entries, this.getCurrentStickyHeight()));
         }));
         this._disposables.add(this.notebookEditor.onDidScroll(() => {
             const d = ( new Delayer(100));
             d.trigger(() => {
                 d.dispose();
-                const recompute = computeContent(this.notebookEditor, this.notebookCellList, this.filteredOutlineEntries, this.getCurrentStickyHeight());
+                const recompute = computeContent(this.notebookEditor, this.notebookCellList, this.notebookOutline.entries, this.getCurrentStickyHeight());
                 if (!this.compareStickyLineMaps(recompute, this.currentStickyLines)) {
                     this.updateContent(recompute);
                 }
@@ -263,7 +225,7 @@ let NotebookStickyScroll = NotebookStickyScroll_1 = class NotebookStickyScroll e
     }
     static computeStickyHeight(entry) {
         let height = 0;
-        if (entry.cell.cellKind === CellKind.Markup && entry.level !== 7) {
+        if (entry.cell.cellKind === CellKind.Markup && entry.level < 7) {
             height += 22;
         }
         while (entry.parent) {
@@ -277,7 +239,7 @@ let NotebookStickyScroll = NotebookStickyScroll_1 = class NotebookStickyScroll e
         const newMap = ( new Map());
         const elementsToRender = [];
         while (currentEntry) {
-            if (currentEntry.level === 7) {
+            if (currentEntry.level >= 7) {
                 currentEntry = currentEntry.parent;
                 continue;
             }
@@ -347,7 +309,7 @@ function computeContent(notebookEditor, notebookCellList, notebookOutlineEntries
     if (visibleRange.start === 0) {
         const firstCell = notebookEditor.cellAt(0);
         const firstCellEntry = NotebookStickyScroll.getVisibleOutlineEntry(0, notebookOutlineEntries);
-        if (firstCell && firstCellEntry && firstCell.cellKind === CellKind.Markup && firstCellEntry.level !== 7) {
+        if (firstCell && firstCellEntry && firstCell.cellKind === CellKind.Markup && firstCellEntry.level < 7) {
             if (notebookEditor.scrollTop > 22) {
                 const newMap = NotebookStickyScroll.checkCollapsedStickyLines(firstCellEntry, 100, notebookEditor);
                 return newMap;
@@ -364,7 +326,7 @@ function computeContent(notebookEditor, notebookCellList, notebookOutlineEntries
         }
         cellEntry = NotebookStickyScroll.getVisibleOutlineEntry(currentIndex, notebookOutlineEntries);
         if (!cellEntry) {
-            return ( new Map());
+            continue;
         }
         const nextCell = notebookEditor.cellAt(currentIndex + 1);
         if (!nextCell) {
@@ -375,9 +337,9 @@ function computeContent(notebookEditor, notebookCellList, notebookOutlineEntries
         }
         const nextCellEntry = NotebookStickyScroll.getVisibleOutlineEntry(currentIndex + 1, notebookOutlineEntries);
         if (!nextCellEntry) {
-            return ( new Map());
+            continue;
         }
-        if (nextCell.cellKind === CellKind.Markup && nextCellEntry.level !== 7) {
+        if (nextCell.cellKind === CellKind.Markup && nextCellEntry.level < 7) {
             const sectionBottom = notebookCellList.getCellViewScrollTop(nextCell);
             const currentSectionStickyHeight = NotebookStickyScroll.computeStickyHeight(cellEntry);
             const nextSectionStickyHeight = NotebookStickyScroll.computeStickyHeight(nextCellEntry);
@@ -409,5 +371,4 @@ function computeContent(notebookEditor, notebookCellList, notebookOutlineEntries
     const newMap = NotebookStickyScroll.checkCollapsedStickyLines(cellEntry, linesToRender, notebookEditor);
     return newMap;
 }
-registerAction2(ToggleNotebookStickyScroll);
-export { NotebookStickyLine, NotebookStickyScroll, ToggleNotebookStickyScroll, computeContent };
+export { NotebookStickyLine, NotebookStickyScroll, computeContent };

package/vscode/src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorToolbar.js

@@ -19,6 +19,7 @@ import { IEditorService } from '../../../../services/editor/common/editorService
 import { IWorkbenchAssignmentService } from '../../../../services/assignment/common/assignmentService.js';
 import { disposableTimeout } from '../../../../../base/common/async.js';
 import { WorkbenchToolBar } from '../../../../../platform/actions/browser/toolbar.js';
+import { WorkbenchHoverDelegate } from '../../../../../platform/hover/browser/hover.js';
 var RenderLabel;
 ( (function(RenderLabel) {
     RenderLabel[RenderLabel["Always"] = 0] = "Always";
@@ -35,15 +36,15 @@ class WorkbenchAlwaysLabelStrategy {
         this.goToMenu = goToMenu;
         this.instantiationService = instantiationService;
     }
-    actionProvider(action) {
+    actionProvider(action, options) {
         if (action.id === SELECT_KERNEL_ID) {
-            return this.instantiationService.createInstance(NotebooKernelActionViewItem, action, this.notebookEditor);
+            return this.instantiationService.createInstance(NotebooKernelActionViewItem, action, this.notebookEditor, options);
         }
         if (action instanceof MenuItemAction) {
-            return this.instantiationService.createInstance(ActionViewWithLabel, action, undefined);
+            return this.instantiationService.createInstance(ActionViewWithLabel, action, { hoverDelegate: options.hoverDelegate });
         }
         if (action instanceof SubmenuItemAction && action.item.submenu.id === MenuId.NotebookCellExecuteGoTo.id) {
-            return this.instantiationService.createInstance(UnifiedSubmenuActionView, action, undefined, true, {
+            return this.instantiationService.createInstance(UnifiedSubmenuActionView, action, { hoverDelegate: options.hoverDelegate }, true, {
                 getActions: () => {
                     return this.goToMenu.getActions().find(([group]) => group === 'navigation/execute')?.[1] ?? [];
                 }
@@ -68,23 +69,23 @@ class WorkbenchNeverLabelStrategy {
         this.goToMenu = goToMenu;
         this.instantiationService = instantiationService;
     }
-    actionProvider(action) {
+    actionProvider(action, options) {
         if (action.id === SELECT_KERNEL_ID) {
-            return this.instantiationService.createInstance(NotebooKernelActionViewItem, action, this.notebookEditor);
+            return this.instantiationService.createInstance(NotebooKernelActionViewItem, action, this.notebookEditor, options);
         }
         if (action instanceof MenuItemAction) {
-            return this.instantiationService.createInstance(MenuEntryActionViewItem, action, undefined);
+            return this.instantiationService.createInstance(MenuEntryActionViewItem, action, { hoverDelegate: options.hoverDelegate });
         }
         if (action instanceof SubmenuItemAction) {
             if (action.item.submenu.id === MenuId.NotebookCellExecuteGoTo.id) {
-                return this.instantiationService.createInstance(UnifiedSubmenuActionView, action, undefined, false, {
+                return this.instantiationService.createInstance(UnifiedSubmenuActionView, action, { hoverDelegate: options.hoverDelegate }, false, {
                     getActions: () => {
                         return this.goToMenu.getActions().find(([group]) => group === 'navigation/execute')?.[1] ?? [];
                     }
                 }, this.actionProvider.bind(this));
             }
             else {
-                return this.instantiationService.createInstance(SubmenuEntryActionViewItem, action, undefined);
+                return this.instantiationService.createInstance(SubmenuEntryActionViewItem, action, { hoverDelegate: options.hoverDelegate });
             }
         }
         return undefined;
@@ -106,17 +107,17 @@ class WorkbenchDynamicLabelStrategy {
         this.goToMenu = goToMenu;
         this.instantiationService = instantiationService;
     }
-    actionProvider(action) {
+    actionProvider(action, options) {
         if (action.id === SELECT_KERNEL_ID) {
-            return this.instantiationService.createInstance(NotebooKernelActionViewItem, action, this.notebookEditor);
+            return this.instantiationService.createInstance(NotebooKernelActionViewItem, action, this.notebookEditor, options);
         }
         const a = this.editorToolbar.primaryActions.find(a => a.action.id === action.id);
         if (!a || a.renderLabel) {
             if (action instanceof MenuItemAction) {
-                return this.instantiationService.createInstance(ActionViewWithLabel, action, undefined);
+                return this.instantiationService.createInstance(ActionViewWithLabel, action, { hoverDelegate: options.hoverDelegate });
             }
             if (action instanceof SubmenuItemAction && action.item.submenu.id === MenuId.NotebookCellExecuteGoTo.id) {
-                return this.instantiationService.createInstance(UnifiedSubmenuActionView, action, undefined, true, {
+                return this.instantiationService.createInstance(UnifiedSubmenuActionView, action, { hoverDelegate: options.hoverDelegate }, true, {
                     getActions: () => {
                         return this.goToMenu.getActions().find(([group]) => group === 'navigation/execute')?.[1] ?? [];
                     }
@@ -126,18 +127,18 @@ class WorkbenchDynamicLabelStrategy {
         }
         else {
             if (action instanceof MenuItemAction) {
-                this.instantiationService.createInstance(MenuEntryActionViewItem, action, undefined);
+                this.instantiationService.createInstance(MenuEntryActionViewItem, action, { hoverDelegate: options.hoverDelegate });
             }
             if (action instanceof SubmenuItemAction) {
                 if (action.item.submenu.id === MenuId.NotebookCellExecuteGoTo.id) {
-                    return this.instantiationService.createInstance(UnifiedSubmenuActionView, action, undefined, false, {
+                    return this.instantiationService.createInstance(UnifiedSubmenuActionView, action, { hoverDelegate: options.hoverDelegate }, false, {
                         getActions: () => {
                             return this.goToMenu.getActions().find(([group]) => group === 'navigation/execute')?.[1] ?? [];
                         }
                     }, this.actionProvider.bind(this));
                 }
                 else {
-                    return this.instantiationService.createInstance(SubmenuEntryActionViewItem, action, undefined);
+                    return this.instantiationService.createInstance(SubmenuEntryActionViewItem, action, { hoverDelegate: options.hoverDelegate });
                 }
             }
             return undefined;
@@ -229,23 +230,25 @@ let NotebookEditorWorkbenchToolbar = class NotebookEditorWorkbenchToolbar extend
             ui: true,
             notebookEditor: this.notebookEditor
         };
-        const actionProvider = (action) => {
+        const actionProvider = (action, options) => {
             if (action.id === SELECT_KERNEL_ID) {
-                return this.instantiationService.createInstance(NotebooKernelActionViewItem, action, this.notebookEditor);
+                return this.instantiationService.createInstance(NotebooKernelActionViewItem, action, this.notebookEditor, options);
             }
             if (this._renderLabel !== RenderLabel.Never) {
                 const a = this._primaryActions.find(a => a.action.id === action.id);
                 if (a && a.renderLabel) {
-                    return action instanceof MenuItemAction ? this.instantiationService.createInstance(ActionViewWithLabel, action, undefined) : undefined;
+                    return action instanceof MenuItemAction ? this.instantiationService.createInstance(ActionViewWithLabel, action, { hoverDelegate: options.hoverDelegate }) : undefined;
                 }
                 else {
-                    return action instanceof MenuItemAction ? this.instantiationService.createInstance(MenuEntryActionViewItem, action, undefined) : undefined;
+                    return action instanceof MenuItemAction ? this.instantiationService.createInstance(MenuEntryActionViewItem, action, { hoverDelegate: options.hoverDelegate }) : undefined;
                 }
             }
             else {
-                return action instanceof MenuItemAction ? this.instantiationService.createInstance(MenuEntryActionViewItem, action, undefined) : undefined;
+                return action instanceof MenuItemAction ? this.instantiationService.createInstance(MenuEntryActionViewItem, action, { hoverDelegate: options.hoverDelegate }) : undefined;
             }
         };
+        const hoverDelegate = this._register(this.instantiationService.createInstance(WorkbenchHoverDelegate, 'element', true, {}));
+        hoverDelegate.setInstantHoverTimeLimit(600);
         const leftToolbarOptions = {
             hiddenItemStrategy: 1 ,
             resetMenu: MenuId.NotebookToolbar,
@@ -254,6 +257,7 @@ let NotebookEditorWorkbenchToolbar = class NotebookEditorWorkbenchToolbar extend
             },
             getKeyBinding: action => this.keybindingService.lookupKeybinding(action.id),
             renderDropdownAsChildElement: true,
+            hoverDelegate
         };
         this._notebookLeftToolbar = this.instantiationService.createInstance(WorkbenchToolBar, this._notebookTopLeftToolbarContainer, leftToolbarOptions);
         this._register(this._notebookLeftToolbar);
@@ -261,7 +265,8 @@ let NotebookEditorWorkbenchToolbar = class NotebookEditorWorkbenchToolbar extend
         this._notebookRightToolbar = ( new ToolBar(this._notebookTopRightToolbarContainer, this.contextMenuService, {
             getKeyBinding: action => this.keybindingService.lookupKeybinding(action.id),
             actionViewItemProvider: actionProvider,
-            renderDropdownAsChildElement: true
+            renderDropdownAsChildElement: true,
+            hoverDelegate
         }));
         this._register(this._notebookRightToolbar);
         this._notebookRightToolbar.context = context;

package/vscode/src/vs/workbench/contrib/notebook/browser/viewParts/notebookKernelQuickPickStrategy.js

@@ -292,7 +292,7 @@ class KernelPickerStrategyBase {
     }
     getSuggestedLanguage(notebookTextModel) {
         const metaData = notebookTextModel.metadata;
-        let suggestedKernelLanguage = metaData.custom?.metadata?.language_info?.name;
+        let suggestedKernelLanguage = metaData?.metadata?.language_info?.name;
         if (!suggestedKernelLanguage) {
             const cellLanguages = ( notebookTextModel.cells.map(cell => cell.language)).filter(language => language !== 'markdown');
             if (cellLanguages.length > 1) {

package/vscode/src/vs/workbench/contrib/notebook/browser/viewParts/notebookKernelView.js

@@ -117,14 +117,14 @@ registerAction2(class extends Action2 {
     }
 });
 let NotebooKernelActionViewItem = class NotebooKernelActionViewItem extends ActionViewItem {
-    constructor(actualAction, _editor, _notebookKernelService, _notebookKernelHistoryService) {
+    constructor(actualAction, _editor, options, _notebookKernelService, _notebookKernelHistoryService) {
         super(undefined, ( new Action(
             'fakeAction',
             undefined,
             ThemeIcon.asClassName(selectKernelIcon),
             true,
             (event) => actualAction.run(event)
-        )), { label: false, icon: true });
+        )), { ...options, label: false, icon: true });
         this._editor = _editor;
         this._notebookKernelService = _notebookKernelService;
         this._notebookKernelHistoryService = _notebookKernelHistoryService;
@@ -166,7 +166,7 @@ let NotebooKernelActionViewItem = class NotebooKernelActionViewItem extends Acti
     }
 };
 NotebooKernelActionViewItem = ( __decorate([
-    ( __param(2, INotebookKernelService)),
-    ( __param(3, INotebookKernelHistoryService))
+    ( __param(3, INotebookKernelService)),
+    ( __param(4, INotebookKernelHistoryService))
 ], NotebooKernelActionViewItem));
 export { NotebooKernelActionViewItem };

package/vscode/src/vs/workbench/contrib/notebook/browser/viewParts/notebookTopCellToolbar.js

@@ -73,9 +73,9 @@ let ListTopCellToolbar = class ListTopCellToolbar extends Disposable {
             });
             clearNode(this.topCellToolbar);
             const toolbar = this.instantiationService.createInstance(MenuWorkbenchToolBar, this.topCellToolbar, this.notebookEditor.creationOptions.menuIds.cellTopInsertToolbar, {
-                actionViewItemProvider: action => {
+                actionViewItemProvider: (action, options) => {
                     if (action instanceof MenuItemAction) {
-                        const item = this.instantiationService.createInstance(CodiconActionViewItem, action, undefined);
+                        const item = this.instantiationService.createInstance(CodiconActionViewItem, action, { hoverDelegate: options.hoverDelegate });
                         return item;
                     }
                     return undefined;

package/vscode/src/vs/workbench/contrib/notebook/common/notebookCommon.js

@@ -3,6 +3,7 @@ import { isRelativePattern, parse as parse$1 } from '../../../../base/common/glo
 import { Iterable } from '../../../../base/common/iterator.js';
 import { Mimes } from '../../../../base/common/mime.js';
 import { Schemas } from '../../../../base/common/network.js';
+import '../../../../base/common/path.js';
 import { isWindows } from '../../../../base/common/platform.js';
 import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 import { generate, parse } from '../../../services/notebook/common/notebookDocumentService.js';
@@ -277,10 +278,16 @@ const NotebookSetting = {
     confirmDeleteRunningCell: 'notebook.confirmDeleteRunningCell',
     remoteSaving: 'notebook.experimental.remoteSave',
     gotoSymbolsAllSymbols: 'notebook.gotoSymbols.showAllSymbols',
+    outlineShowMarkdownHeadersOnly: 'notebook.outline.showMarkdownHeadersOnly',
+    outlineShowCodeCells: 'notebook.outline.showCodeCells',
+    outlineShowCodeCellSymbols: 'notebook.outline.showCodeCellSymbols',
+    breadcrumbsShowCodeCells: 'notebook.breadcrumbs.showCodeCells',
     scrollToRevealCell: 'notebook.scrolling.revealNextCellOnExecute',
     anchorToFocusedCell: 'notebook.scrolling.experimental.anchorToFocusedCell',
     cellChat: 'notebook.experimental.cellChat',
-    notebookVariablesView: 'notebook.experimental.variablesView'
+    notebookVariablesView: 'notebook.experimental.variablesView',
+    InteractiveWindowPromptToSave: 'interactiveWindow.promptToSaveOnClose',
+    cellFailureDiagnostics: 'notebook.cellFailureDiagnostics',
 };
 class NotebookWorkingCopyTypeIdentifier {
     static { this._prefix = 'notebook/'; }

package/vscode/src/vs/workbench/contrib/notebook/common/notebookContextKeys.js

@@ -29,6 +29,8 @@ const NOTEBOOK_CELL_HAS_OUTPUTS = ( new RawContextKey('notebookCellHasOutputs',
 const NOTEBOOK_CELL_INPUT_COLLAPSED = ( new RawContextKey('notebookCellInputIsCollapsed', false));
 const NOTEBOOK_CELL_OUTPUT_COLLAPSED = ( new RawContextKey('notebookCellOutputIsCollapsed', false));
 const NOTEBOOK_CELL_RESOURCE = ( new RawContextKey('notebookCellResource', ''));
+const NOTEBOOK_CELL_GENERATED_BY_CHAT = ( new RawContextKey('notebookCellGenerateByChat', false));
+const NOTEBOOK_CELL_HAS_ERROR_DIAGNOSTICS = ( new RawContextKey('notebookCellHasErrorDiagnostics', false));
 const NOTEBOOK_KERNEL = ( new RawContextKey('notebookKernel', undefined));
 const NOTEBOOK_KERNEL_COUNT = ( new RawContextKey('notebookKernelCount', 0));
 const NOTEBOOK_KERNEL_SOURCE_COUNT = ( new RawContextKey('notebookKernelSourceCount', 0));
@@ -36,4 +38,4 @@ const NOTEBOOK_KERNEL_SELECTED = ( new RawContextKey('notebookKernelSelected', f
 const NOTEBOOK_INTERRUPTIBLE_KERNEL = ( new RawContextKey('notebookInterruptibleKernel', false));
 const NOTEBOOK_MISSING_KERNEL_EXTENSION = ( new RawContextKey('notebookMissingKernelExtension', false));
 const NOTEBOOK_HAS_OUTPUTS = ( new RawContextKey('notebookHasOutputs', false));
-export { HAS_OPENED_NOTEBOOK, INTERACTIVE_WINDOW_IS_ACTIVE_EDITOR, InteractiveWindowOpen, KEYBINDING_CONTEXT_NOTEBOOK_FIND_WIDGET_FOCUSED, NOTEBOOK_CELL_EDITABLE, NOTEBOOK_CELL_EDITOR_FOCUSED, NOTEBOOK_CELL_EXECUTING, NOTEBOOK_CELL_EXECUTION_STATE, NOTEBOOK_CELL_FOCUSED, NOTEBOOK_CELL_HAS_OUTPUTS, NOTEBOOK_CELL_INPUT_COLLAPSED, NOTEBOOK_CELL_LINE_NUMBERS, NOTEBOOK_CELL_LIST_FOCUSED, NOTEBOOK_CELL_MARKDOWN_EDIT_MODE, NOTEBOOK_CELL_OUTPUT_COLLAPSED, NOTEBOOK_CELL_RESOURCE, NOTEBOOK_CELL_TOOLBAR_LOCATION, NOTEBOOK_CELL_TYPE, NOTEBOOK_CURSOR_NAVIGATION_MODE, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_HAS_OUTPUTS, NOTEBOOK_HAS_RUNNING_CELL, NOTEBOOK_HAS_SOMETHING_RUNNING, NOTEBOOK_INTERRUPTIBLE_KERNEL, NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_KERNEL, NOTEBOOK_KERNEL_COUNT, NOTEBOOK_KERNEL_SELECTED, NOTEBOOK_KERNEL_SOURCE_COUNT, NOTEBOOK_LAST_CELL_FAILED, NOTEBOOK_MISSING_KERNEL_EXTENSION, NOTEBOOK_OUPTUT_INPUT_FOCUSED, NOTEBOOK_OUTPUT_FOCUSED, NOTEBOOK_USE_CONSOLIDATED_OUTPUT_BUTTON, NOTEBOOK_VIEW_TYPE };
+export { HAS_OPENED_NOTEBOOK, INTERACTIVE_WINDOW_IS_ACTIVE_EDITOR, InteractiveWindowOpen, KEYBINDING_CONTEXT_NOTEBOOK_FIND_WIDGET_FOCUSED, NOTEBOOK_CELL_EDITABLE, NOTEBOOK_CELL_EDITOR_FOCUSED, NOTEBOOK_CELL_EXECUTING, NOTEBOOK_CELL_EXECUTION_STATE, NOTEBOOK_CELL_FOCUSED, NOTEBOOK_CELL_GENERATED_BY_CHAT, NOTEBOOK_CELL_HAS_ERROR_DIAGNOSTICS, NOTEBOOK_CELL_HAS_OUTPUTS, NOTEBOOK_CELL_INPUT_COLLAPSED, NOTEBOOK_CELL_LINE_NUMBERS, NOTEBOOK_CELL_LIST_FOCUSED, NOTEBOOK_CELL_MARKDOWN_EDIT_MODE, NOTEBOOK_CELL_OUTPUT_COLLAPSED, NOTEBOOK_CELL_RESOURCE, NOTEBOOK_CELL_TOOLBAR_LOCATION, NOTEBOOK_CELL_TYPE, NOTEBOOK_CURSOR_NAVIGATION_MODE, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_HAS_OUTPUTS, NOTEBOOK_HAS_RUNNING_CELL, NOTEBOOK_HAS_SOMETHING_RUNNING, NOTEBOOK_INTERRUPTIBLE_KERNEL, NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_KERNEL, NOTEBOOK_KERNEL_COUNT, NOTEBOOK_KERNEL_SELECTED, NOTEBOOK_KERNEL_SOURCE_COUNT, NOTEBOOK_LAST_CELL_FAILED, NOTEBOOK_MISSING_KERNEL_EXTENSION, NOTEBOOK_OUPTUT_INPUT_FOCUSED, NOTEBOOK_OUTPUT_FOCUSED, NOTEBOOK_USE_CONSOLIDATED_OUTPUT_BUTTON, NOTEBOOK_VIEW_TYPE };

package/vscode/src/vs/workbench/contrib/notebook/common/notebookEditorInput.js

@@ -15,29 +15,21 @@ import { IExtensionService } from '../../../services/extensions/common/extension
 import { localizeWithPath } from '../../../../nls.js';
 import { IEditorService } from '../../../services/editor/common/editorService.js';
 import { ITextResourceConfigurationService } from '../../../../editor/common/services/textResourceConfiguration.js';
+import { ICustomEditorLabelService } from '../../../services/editor/common/customEditorLabelService.js';
 import { IFileDialogService } from '../../../../platform/dialogs/common/dialogs.js';
 var NotebookEditorInput_1;
 let NotebookEditorInput = class NotebookEditorInput extends AbstractResourceEditorInput {
     static { NotebookEditorInput_1 = this; }
-    static { this.EditorCache = {}; }
     static getOrCreate(instantiationService, resource, preferredResource, viewType, options = {}) {
-        const cacheId = `${( resource.toString())}|${viewType}|${options._workingCopy?.typeId}`;
-        let editor = NotebookEditorInput_1.EditorCache[cacheId];
-        if (!editor) {
-            editor = instantiationService.createInstance(NotebookEditorInput_1, resource, preferredResource, viewType, options);
-            NotebookEditorInput_1.EditorCache[cacheId] = editor;
-            editor.onWillDispose(() => {
-                delete NotebookEditorInput_1.EditorCache[cacheId];
-            });
-        }
-        else if (preferredResource) {
+        const editor = instantiationService.createInstance(NotebookEditorInput_1, resource, preferredResource, viewType, options);
+        if (preferredResource) {
             editor.setPreferredResource(preferredResource);
         }
         return editor;
     }
     static { this.ID = 'workbench.input.notebook'; }
-    constructor(resource, preferredResource, viewType, options, _notebookService, _notebookModelResolverService, _fileDialogService, labelService, fileService, filesConfigurationService, extensionService, editorService, textResourceConfigurationService) {
-        super(resource, preferredResource, labelService, fileService, filesConfigurationService, textResourceConfigurationService);
+    constructor(resource, preferredResource, viewType, options, _notebookService, _notebookModelResolverService, _fileDialogService, labelService, fileService, filesConfigurationService, extensionService, editorService, textResourceConfigurationService, customEditorLabelService) {
+        super(resource, preferredResource, labelService, fileService, filesConfigurationService, textResourceConfigurationService, customEditorLabelService);
         this.viewType = viewType;
         this.options = options;
         this._notebookService = _notebookService;
@@ -287,7 +279,8 @@ NotebookEditorInput = NotebookEditorInput_1 = ( __decorate([
     ( __param(9, IFilesConfigurationService)),
     ( __param(10, IExtensionService)),
     ( __param(11, IEditorService)),
-    ( __param(12, ITextResourceConfigurationService))
+    ( __param(12, ITextResourceConfigurationService)),
+    ( __param(13, ICustomEditorLabelService))
 ], NotebookEditorInput));
 function isCompositeNotebookEditorInput(thing) {
     return !!thing

package/vscode/src/vs/workbench/contrib/notebook/common/notebookEditorModel.js

@@ -13,7 +13,7 @@ import { SimpleNotebookProviderInfo, INotebookService } from './notebookService.
 import { IFilesConfigurationService } from '../../../services/filesConfiguration/common/filesConfigurationService.js';
 var SimpleNotebookEditorModel_1;
 let SimpleNotebookEditorModel = SimpleNotebookEditorModel_1 = class SimpleNotebookEditorModel extends EditorModel {
-    constructor(resource, _hasAssociatedFilePath, viewType, _workingCopyManager, _filesConfigurationService) {
+    constructor(resource, _hasAssociatedFilePath, viewType, _workingCopyManager, scratchpad, _filesConfigurationService) {
         super();
         this.resource = resource;
         this._hasAssociatedFilePath = _hasAssociatedFilePath;
@@ -31,7 +31,7 @@ let SimpleNotebookEditorModel = SimpleNotebookEditorModel_1 = class SimpleNotebo
         this.onDidChangeReadonly = this._onDidChangeReadonly.event;
         this.onDidRevertUntitled = this._onDidRevertUntitled.event;
         this._workingCopyListeners = this._register(( new DisposableStore()));
-        this.scratchPad = viewType === 'interactive';
+        this.scratchPad = scratchpad;
     }
     dispose() {
         this._workingCopy?.dispose();
@@ -139,7 +139,7 @@ let SimpleNotebookEditorModel = SimpleNotebookEditorModel_1 = class SimpleNotebo
     }
 };
 SimpleNotebookEditorModel = SimpleNotebookEditorModel_1 = ( __decorate([
-    ( __param(4, IFilesConfigurationService))
+    ( __param(5, IFilesConfigurationService))
 ], SimpleNotebookEditorModel));
 class NotebookFileWorkingCopyModel extends Disposable {
     constructor(_notebookModel, _notebookService, _configurationService) {
@@ -235,7 +235,7 @@ class NotebookFileWorkingCopyModel extends Disposable {
         return this._notebookModel.alternativeVersionId;
     }
     pushStackElement() {
-        this._notebookModel.pushStackElement('save', undefined, undefined);
+        this._notebookModel.pushStackElement();
     }
 }
 let NotebookFileWorkingCopyModelFactory = class NotebookFileWorkingCopyModelFactory {

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

@@ -0,0 +1,10 @@
+import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+var IOutlinePane;
+( (function(IOutlinePane) {
+    IOutlinePane.Id = 'outline';
+})(IOutlinePane || (IOutlinePane = {})));
+const ctxFollowsCursor = ( new RawContextKey('outlineFollowsCursor', false));
+const ctxFilterOnType = ( new RawContextKey('outlineFiltersOnType', false));
+const ctxSortMode = ( new RawContextKey('outlineSortMode', 0 ));
+const ctxAllCollapsed = ( new RawContextKey('outlineAllCollapsed', false));
+export { IOutlinePane, ctxAllCollapsed, ctxFilterOnType, ctxFollowsCursor, ctxSortMode };

package/vscode/src/vs/workbench/contrib/preferences/browser/keybindingWidgets.js

@@ -2,7 +2,7 @@ import { __decorate, __param } from '../../../../../../../external/tslib/tslib.e
 import './media/keybindings.css.js';
 import { localizeWithPath } from '../../../../nls.js';
 import { OS } from '../../../../base/common/platform.js';
-import { Disposable, DisposableStore, toDisposable } from '../../../../base/common/lifecycle.js';
+import { DisposableStore, Disposable, toDisposable } from '../../../../base/common/lifecycle.js';
 import { Emitter } from '../../../../base/common/event.js';
 import { KeybindingLabel } from '../../../../base/browser/ui/keybindingLabel/keybindingLabel.js';
 import { Widget } from '../../../../base/browser/ui/widget.js';
@@ -13,7 +13,17 @@ import { createFastDomNode } from '../../../../base/browser/fastDomNode.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
 import { IContextViewService } from '../../../../platform/contextview/browser/contextView.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { asCssVariable, editorWidgetBackground, editorWidgetForeground, widgetShadow } from '../../../../platform/theme/common/colorRegistry.js';
+import { asCssVariable } from '../../../../platform/theme/common/colorUtils.js';
+import '../../../../platform/theme/common/colors/baseColors.js';
+import '../../../../platform/theme/common/colors/chartsColors.js';
+import { editorWidgetBackground, editorWidgetForeground, widgetShadow } from '../../../../platform/theme/common/colors/editorColors.js';
+import '../../../../platform/theme/common/colors/inputColors.js';
+import '../../../../platform/theme/common/colors/listColors.js';
+import '../../../../platform/theme/common/colors/menuColors.js';
+import '../../../../platform/theme/common/colors/minimapColors.js';
+import '../../../../platform/theme/common/colors/miscColors.js';
+import '../../../../platform/theme/common/colors/quickpickColors.js';
+import '../../../../platform/theme/common/colors/searchColors.js';
 import { SearchWidget } from './preferencesWidgets.js';
 import { Promises, timeout } from '../../../../base/common/async.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
@@ -104,6 +114,7 @@ let DefineKeybindingWidget = class DefineKeybindingWidget extends Widget {
     constructor(parent, instantiationService) {
         super();
         this.instantiationService = instantiationService;
+        this._keybindingDisposables = this._register(( new DisposableStore()));
         this._chords = null;
         this._isVisible = false;
         this._onHide = this._register(( new Emitter()));
@@ -188,10 +199,11 @@ let DefineKeybindingWidget = class DefineKeybindingWidget extends Widget {
         }
     }
     onKeybinding(keybinding) {
+        this._keybindingDisposables.clear();
         this._chords = keybinding;
         clearNode(this._outputNode);
         clearNode(this._showExistingKeybindingsNode);
-        const firstLabel = ( new KeybindingLabel(this._outputNode, OS, defaultKeybindingLabelStyles));
+        const firstLabel = this._keybindingDisposables.add(( new KeybindingLabel(this._outputNode, OS, defaultKeybindingLabelStyles)));
         firstLabel.set(this._chords?.[0] ?? undefined);
         if (this._chords) {
             for (let i = 1; i < this._chords.length; i++) {
@@ -200,7 +212,7 @@ let DefineKeybindingWidget = class DefineKeybindingWidget extends Widget {
                     'defineKeybinding.chordsTo',
                     "chord to"
                 ))));
-                const chordLabel = ( new KeybindingLabel(this._outputNode, OS, defaultKeybindingLabelStyles));
+                const chordLabel = this._keybindingDisposables.add(( new KeybindingLabel(this._outputNode, OS, defaultKeybindingLabelStyles)));
                 chordLabel.set(this._chords[i]);
             }
         }