@codingame/monaco-vscode-api 3.2.2 → 4.0.0

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

@@ -30,7 +30,7 @@ import { SuggestController } from '../../../../editor/contrib/suggest/browser/su
 import { localizeWithPath } from '../../../../nls.js';
 import { MenuId } from '../../../../platform/actions/common/actions.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
-import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
@@ -38,7 +38,17 @@ import { ILayoutService } from '../../../../platform/layout/browser/layoutServic
 import { registerZIndex, ZIndex } from '../../../../platform/layout/browser/zIndexRegistry.js';
 import { IEditorProgressService } from '../../../../platform/progress/common/progress.js';
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
-import { registerColor, transparent, listInactiveSelectionBackground, focusBorder, errorForeground, foreground, contrastBorder, scrollbarSliderBackground, scrollbarSliderHoverBackground, scrollbarSliderActiveBackground } from '../../../../platform/theme/common/colorRegistry.js';
+import { registerColor, transparent } from '../../../../platform/theme/common/colorUtils.js';
+import { focusBorder, errorForeground, foreground, contrastBorder } from '../../../../platform/theme/common/colors/baseColors.js';
+import '../../../../platform/theme/common/colors/chartsColors.js';
+import '../../../../platform/theme/common/colors/editorColors.js';
+import '../../../../platform/theme/common/colors/inputColors.js';
+import { listInactiveSelectionBackground } from '../../../../platform/theme/common/colors/listColors.js';
+import '../../../../platform/theme/common/colors/menuColors.js';
+import '../../../../platform/theme/common/colors/minimapColors.js';
+import { scrollbarSliderBackground, scrollbarSliderHoverBackground, scrollbarSliderActiveBackground } from '../../../../platform/theme/common/colors/miscColors.js';
+import '../../../../platform/theme/common/colors/quickpickColors.js';
+import '../../../../platform/theme/common/colors/searchColors.js';
 import { PANEL_BORDER, SIDE_BAR_BACKGROUND, EDITOR_PANE_BACKGROUND } from '../../../common/theme.js';
 import { debugIconStartForeground } from '../../debug/browser/debugColors.js';
 import { CellEditState, CellFocusMode, CellRevealRangeType, ScrollToRevealBehavior } from './notebookBrowser.js';
@@ -60,7 +70,7 @@ import { NotebookEditorWorkbenchToolbar } from './viewParts/notebookEditorToolba
 import { NotebookEditorContextKeys } from './viewParts/notebookEditorWidgetContextKeys.js';
 import { NotebookOverviewRuler } from './viewParts/notebookOverviewRuler.js';
 import { ListTopCellToolbar } from './viewParts/notebookTopCellToolbar.js';
-import { SelectionStateType, CellKind, RENDERER_NOT_AVAILABLE } from '../common/notebookCommon.js';
+import { SelectionStateType, RENDERER_NOT_AVAILABLE, CellKind } from '../common/notebookCommon.js';
 import { NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_OUTPUT_FOCUSED, NOTEBOOK_OUPTUT_INPUT_FOCUSED, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_CURSOR_NAVIGATION_MODE } from '../common/notebookContextKeys.js';
 import { INotebookExecutionService } from '../common/notebookExecutionService.js';
 import { INotebookExecutionStateService } from '../common/notebookExecutionStateService.js';
@@ -82,6 +92,8 @@ import { NotebookCellOutlineProvider } from './viewModel/notebookOutlineProvider
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
 import { PixelRatio } from '../../../../base/browser/pixelRatio.js';
 import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
+import { PreventDefaultContextMenuItemsContextKeyName } from '../../webview/browser/webview.contribution.js';
+import { NotebookAccessibilityProvider } from './notebookAccessibilityProvider.js';
 const $ = $$1;
 function getDefaultNotebookCreationOptions() {
     const skipContributions = [
@@ -157,6 +169,7 @@ let NotebookEditorWidget = class NotebookEditorWidget extends Disposable {
         this.contextMenuService = contextMenuService;
         this.telemetryService = telemetryService;
         this.notebookExecutionService = notebookExecutionService;
+        this.notebookExecutionStateService = notebookExecutionStateService;
         this.editorProgressService = editorProgressService;
         this.logService = logService;
         this.keybindingService = keybindingService;
@@ -303,7 +316,8 @@ let NotebookEditorWidget = class NotebookEditorWidget extends Disposable {
                 this.layout(this._dimension);
             }
         }));
-        this._register(editorGroupsService.activePart.onDidScroll(e => {
+        const container = creationOptions.codeWindow ? this.layoutService.getContainer(creationOptions.codeWindow) : this.layoutService.mainContainer;
+        this._register(editorGroupsService.getPart(container).onDidScroll(e => {
             if (!this._shadowElement || !this._isVisible) {
                 return;
             }
@@ -316,12 +330,7 @@ let NotebookEditorWidget = class NotebookEditorWidget extends Disposable {
         this._overlayContainer.className = 'notebookOverlay';
         this._overlayContainer.classList.add('notebook-editor');
         this._overlayContainer.style.visibility = 'hidden';
-        if (creationOptions.codeWindow) {
-            this.layoutService.getContainer(creationOptions.codeWindow).appendChild(this._overlayContainer);
-        }
-        else {
-            this.layoutService.mainContainer.appendChild(this._overlayContainer);
-        }
+        container.appendChild(this._overlayContainer);
         this._createBody(this._overlayContainer);
         this._generateFontInfo();
         this._isVisible = true;
@@ -330,6 +339,7 @@ let NotebookEditorWidget = class NotebookEditorWidget extends Disposable {
         this._outputInputFocus = NOTEBOOK_OUPTUT_INPUT_FOCUSED.bindTo(this.scopedContextKeyService);
         this._editorEditable = NOTEBOOK_EDITOR_EDITABLE.bindTo(this.scopedContextKeyService);
         this._cursorNavMode = NOTEBOOK_CURSOR_NAVIGATION_MODE.bindTo(this.scopedContextKeyService);
+        ( new RawContextKey(PreventDefaultContextMenuItemsContextKeyName, false)).bindTo(this.scopedContextKeyService).set(true);
         this._editorEditable.set(!creationOptions.isReadOnly);
         let contributions;
         if (Array.isArray(this.creationOptions.contributions)) {
@@ -707,29 +717,13 @@ let NotebookEditorWidget = class NotebookEditorWidget extends Disposable {
         });
         this._listDelegate = this.instantiationService.createInstance(NotebookCellListDelegate, getWindow(this.getDomNode()));
         this._register(this._listDelegate);
-        const createNotebookAriaLabel = () => {
-            const keybinding = this.keybindingService.lookupKeybinding("editor.action.accessibilityHelp" )?.getLabel();
-            if (this.configurationService.getValue("accessibility.verbosity.notebook" )) {
-                return keybinding
-                    ? ( localizeWithPath(
-                    'vs/workbench/contrib/notebook/browser/notebookEditorWidget',
-                    'notebookTreeAriaLabelHelp',
-                    "Notebook\nUse {0} for accessibility help",
-                    keybinding
-                ))
-                    : ( localizeWithPath(
-                    'vs/workbench/contrib/notebook/browser/notebookEditorWidget',
-                    'notebookTreeAriaLabelHelpNoKb',
-                    "Notebook\nRun the Open Accessibility Help command for more information",
-                    keybinding
-                ));
-            }
-            return ( localizeWithPath(
-                'vs/workbench/contrib/notebook/browser/notebookEditorWidget',
-                'notebookTreeAriaLabel',
-                "Notebook"
-            ));
-        };
+        const accessibilityProvider = ( new NotebookAccessibilityProvider(
+            this.notebookExecutionStateService,
+            () => this.viewModel,
+            this.keybindingService,
+            this.configurationService
+        ));
+        this._register(accessibilityProvider);
         this._list = this.instantiationService.createInstance(NotebookCellList, 'NotebookCellList', this._body, this._viewContext.notebookOptions, this._listDelegate, renderers, this.scopedContextKeyService, {
             setRowLineHeight: false,
             setRowHeight: false,
@@ -762,19 +756,7 @@ let NotebookEditorWidget = class NotebookEditorWidget extends Disposable {
                 listInactiveFocusBackground: notebookEditorBackground,
                 listInactiveFocusOutline: notebookEditorBackground,
             },
-            accessibilityProvider: {
-                getAriaLabel: (element) => {
-                    if (!this.viewModel) {
-                        return '';
-                    }
-                    const index = this.viewModel.getCellIndex(element);
-                    if (index >= 0) {
-                        return `Cell ${index}, ${element.cellKind === CellKind.Markup ? 'markdown' : 'code'}  cell`;
-                    }
-                    return '';
-                },
-                getWidgetAriaLabel: createNotebookAriaLabel
-            },
+            accessibilityProvider
         });
         this._dndController.setList(this._list);
         this._register(this._list);
@@ -817,8 +799,8 @@ let NotebookEditorWidget = class NotebookEditorWidget extends Disposable {
             this._onDidChangeVisibleRanges.fire();
         }));
         this._register(this._list.onDidScroll((e) => {
-            this._onDidScroll.fire();
             if (e.scrollTop !== e.oldScrollTop) {
+                this._onDidScroll.fire();
                 this.clearActiveCellWidgets();
             }
         }));
@@ -837,7 +819,7 @@ let NotebookEditorWidget = class NotebookEditorWidget extends Disposable {
         this._registerNotebookStickyScroll();
         this._register(this.configurationService.onDidChangeConfiguration(e => {
             if (e.affectsConfiguration("accessibility.verbosity.notebook" )) {
-                this._list.ariaLabel = createNotebookAriaLabel();
+                this._list.ariaLabel = accessibilityProvider?.getWidgetAriaLabel();
             }
         }));
     }
@@ -1573,6 +1555,12 @@ let NotebookEditorWidget = class NotebookEditorWidget extends Disposable {
             this._list.focusContainer(clearSelection);
         }
     }
+    selectOutputContent(cell) {
+        this._webview?.selectOutputContents(cell);
+    }
+    selectInputContents(cell) {
+        this._webview?.selectInputContents(cell);
+    }
     onWillHide() {
         this._isVisible = false;
         this._editorFocus.set(false);
@@ -1678,8 +1666,8 @@ let NotebookEditorWidget = class NotebookEditorWidget extends Disposable {
     async revealInCenterIfOutsideViewport(cell) {
         await this._list.revealCell(cell, 4 );
     }
-    revealFirstLineIfOutsideViewport(cell) {
-        this._list.revealCell(cell, 6 );
+    async revealFirstLineIfOutsideViewport(cell) {
+        await this._list.revealCell(cell, 6 );
     }
     async revealLineInViewAsync(cell, line) {
         return this._list.revealRangeInCell(cell, ( new Range(line, 1, line, 1)), CellRevealRangeType.Default);
@@ -1907,11 +1895,13 @@ let NotebookEditorWidget = class NotebookEditorWidget extends Disposable {
             if (!this._webview) {
                 return;
             }
-            const focusElementId = options?.outputId ?? cell.id;
+            const firstOutputId = cell.outputsViewModels.find(o => o.model.alternativeOutputId)?.model.alternativeOutputId;
+            const focusElementId = options?.outputId ?? firstOutputId ?? cell.id;
             this._webview.focusOutput(focusElementId, options?.altOutputId, options?.outputWebviewFocused || this._webviewFocused);
             cell.updateEditState(CellEditState.Preview, 'focusNotebookCell');
             cell.focusMode = CellFocusMode.Output;
             cell.focusedOutputId = options?.outputId;
+            this._outputFocus.set(true);
             if (!options?.skipReveal) {
                 this.revealInCenterIfOutsideViewport(cell);
             }
@@ -1930,7 +1920,7 @@ let NotebookEditorWidget = class NotebookEditorWidget extends Disposable {
                     await this.revealInView(cell);
                 }
                 else if (options?.revealBehavior === ScrollToRevealBehavior.firstLine) {
-                    this.revealFirstLineIfOutsideViewport(cell);
+                    await this.revealFirstLineIfOutsideViewport(cell);
                 }
                 else if (options?.revealBehavior === ScrollToRevealBehavior.fullCell) {
                     await this.revealInView(cell);

package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellActionView.js

@@ -1,14 +1,16 @@
 import { __decorate, __param } from '../../../../../../../../../external/tslib/tslib.es6.js';
+import { reset, EventType, addDisposableListener, EventHelper } from '../../../../../../base/browser/dom.js';
+import { isUndefinedOrNull } from '../../../../../../base/common/types.js';
+import { EventType as EventType$1 } from '../../../../../../base/browser/touch.js';
+import { getDefaultHoverDelegate } from '../../../../../../base/browser/ui/hover/hoverDelegateFactory.js';
+import { setupCustomHover } from '../../../../../../base/browser/ui/hover/updatableHoverWidget.js';
 import { renderLabelWithIcons } from '../../../../../../base/browser/ui/iconLabel/iconLabels.js';
-import { reset } from '../../../../../../base/browser/dom.js';
+import { ThemeIcon } from '../../../../../../base/common/themables.js';
 import { MenuEntryActionViewItem, SubmenuEntryActionViewItem } from '../../../../../../platform/actions/browser/menuEntryActionViewItem.js';
 import { MenuItemAction } from '../../../../../../platform/actions/common/actions.js';
 import { IContextMenuService } from '../../../../../../platform/contextview/browser/contextView.js';
 import { IKeybindingService } from '../../../../../../platform/keybinding/common/keybinding.js';
 import { IThemeService } from '../../../../../../platform/theme/common/themeService.js';
-import { ThemeIcon } from '../../../../../../base/common/themables.js';
-import { setupCustomHover } from '../../../../../../base/browser/ui/iconLabel/iconLabelHover.js';
-import { getDefaultHoverDelegate } from '../../../../../../base/browser/ui/hover/hoverDelegate.js';
 class CodiconActionViewItem extends MenuEntryActionViewItem {
     updateLabel() {
         if (this.options.label && this.label) {
@@ -33,7 +35,7 @@ class ActionViewWithLabel extends MenuEntryActionViewItem {
 }
 let UnifiedSubmenuActionView = class UnifiedSubmenuActionView extends SubmenuEntryActionViewItem {
     constructor(action, options, renderLabel, subActionProvider, subActionViewItemProvider, _keybindingService, _contextMenuService, _themeService) {
-        super(action, options, _keybindingService, _contextMenuService, _themeService);
+        super(action, { ...options, hoverDelegate: options?.hoverDelegate ?? getDefaultHoverDelegate('element') }, _keybindingService, _contextMenuService, _themeService);
         this.renderLabel = renderLabel;
         this.subActionProvider = subActionProvider;
         this.subActionViewItemProvider = subActionViewItemProvider;
@@ -41,16 +43,25 @@ let UnifiedSubmenuActionView = class UnifiedSubmenuActionView extends SubmenuEnt
     render(container) {
         super.render(container);
         container.classList.add('notebook-action-view-item');
+        container.classList.add('notebook-action-view-item-unified');
         this._actionLabel = document.createElement('a');
         container.appendChild(this._actionLabel);
-        const hoverDelegate = this.options.hoverDelegate ?? getDefaultHoverDelegate('element');
-        this._hover = this._register(setupCustomHover(hoverDelegate, this._actionLabel, ''));
+        this._hover = this._register(setupCustomHover(this.options.hoverDelegate ?? getDefaultHoverDelegate('element'), this._actionLabel, ''));
         this.updateLabel();
+        for (const event of [EventType.CLICK, EventType.MOUSE_DOWN, EventType$1.Tap]) {
+            this._register(addDisposableListener(container, event, e => this.onClick(e, true)));
+        }
+    }
+    onClick(event, preserveFocus = false) {
+        EventHelper.stop(event, true);
+        const context = isUndefinedOrNull(this._context) ? this.options?.useEventAsContext ? event : { preserveFocus } : this._context;
+        this.actionRunner.run(this._primaryAction ?? this._action, context);
     }
     updateLabel() {
         const actions = this.subActionProvider.getActions();
         if (this._actionLabel) {
             const primaryAction = actions[0];
+            this._primaryAction = primaryAction;
             if (primaryAction && primaryAction instanceof MenuItemAction) {
                 const element = this.element;
                 if (element && primaryAction.item.icon && ThemeIcon.isThemeIcon(primaryAction.item.icon)) {

package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellComments.js

@@ -96,7 +96,7 @@ let CellComments = class CellComments extends CellContentPart {
         if (this.notebookEditor.hasModel()) {
             const commentInfos = coalesce(await this.commentService.getNotebookComments(element.uri));
             if (commentInfos.length && commentInfos[0].threads.length) {
-                return { owner: commentInfos[0].owner, thread: commentInfos[0].threads[0] };
+                return { owner: commentInfos[0].uniqueOwner, thread: commentInfos[0].threads[0] };
             }
         }
         return null;

package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellContextKeys.js

@@ -2,12 +2,13 @@ import { __decorate, __param } from '../../../../../../../../../external/tslib/t
 import { Disposable, DisposableStore } from '../../../../../../base/common/lifecycle.js';
 import { IContextKeyService } from '../../../../../../platform/contextkey/common/contextkey.js';
 import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { NotebookChatController } from '../../controller/chat/notebookChatController.js';
 import { CellFocusMode, CellEditState } from '../../notebookBrowser.js';
 import { CellContentPart } from '../cellPart.js';
 import { CodeCellViewModel } from '../../viewModel/codeCellViewModel.js';
 import { MarkupCellViewModel } from '../../viewModel/markupCellViewModel.js';
 import { NotebookCellExecutionState } from '../../../common/notebookCommon.js';
-import { NOTEBOOK_CELL_TYPE, NOTEBOOK_CELL_EDITABLE, NOTEBOOK_CELL_FOCUSED, NOTEBOOK_CELL_EDITOR_FOCUSED, NOTEBOOK_CELL_MARKDOWN_EDIT_MODE, NOTEBOOK_CELL_EXECUTION_STATE, NOTEBOOK_CELL_EXECUTING, NOTEBOOK_CELL_HAS_OUTPUTS, NOTEBOOK_CELL_INPUT_COLLAPSED, NOTEBOOK_CELL_OUTPUT_COLLAPSED, NOTEBOOK_CELL_LINE_NUMBERS, NOTEBOOK_CELL_RESOURCE } from '../../../common/notebookContextKeys.js';
+import { NOTEBOOK_CELL_TYPE, NOTEBOOK_CELL_EDITABLE, NOTEBOOK_CELL_FOCUSED, NOTEBOOK_CELL_EDITOR_FOCUSED, NOTEBOOK_CELL_MARKDOWN_EDIT_MODE, NOTEBOOK_CELL_EXECUTION_STATE, NOTEBOOK_CELL_EXECUTING, NOTEBOOK_CELL_HAS_OUTPUTS, NOTEBOOK_CELL_INPUT_COLLAPSED, NOTEBOOK_CELL_OUTPUT_COLLAPSED, NOTEBOOK_CELL_LINE_NUMBERS, NOTEBOOK_CELL_GENERATED_BY_CHAT, NOTEBOOK_CELL_RESOURCE, NOTEBOOK_CELL_HAS_ERROR_DIAGNOSTICS } from '../../../common/notebookContextKeys.js';
 import { NotebookExecutionType, INotebookExecutionStateService } from '../../../common/notebookExecutionStateService.js';
 let CellContextKeyPart = class CellContextKeyPart extends CellContentPart {
     constructor(notebookEditor, instantiationService) {
@@ -42,7 +43,9 @@ let CellContextKeyManager = class CellContextKeyManager extends Disposable {
             this.cellContentCollapsed = NOTEBOOK_CELL_INPUT_COLLAPSED.bindTo(this._contextKeyService);
             this.cellOutputCollapsed = NOTEBOOK_CELL_OUTPUT_COLLAPSED.bindTo(this._contextKeyService);
             this.cellLineNumbers = NOTEBOOK_CELL_LINE_NUMBERS.bindTo(this._contextKeyService);
+            this.cellGeneratedByChat = NOTEBOOK_CELL_GENERATED_BY_CHAT.bindTo(this._contextKeyService);
             this.cellResource = NOTEBOOK_CELL_RESOURCE.bindTo(this._contextKeyService);
+            this.cellHasErrorDiagnostics = NOTEBOOK_CELL_HAS_ERROR_DIAGNOSTICS.bindTo(this._contextKeyService);
             if (element) {
                 this.updateForElement(element);
             }
@@ -62,6 +65,7 @@ let CellContextKeyManager = class CellContextKeyManager extends Disposable {
         this.elementDisposables.add(element.onDidChangeState(e => this.onDidChangeState(e)));
         if (element instanceof CodeCellViewModel) {
             this.elementDisposables.add(element.onDidChangeOutputs(() => this.updateForOutputs()));
+            this.elementDisposables.add(element.cellDiagnostics.onDidDiagnosticsChange(() => this.updateForDiagnostics()));
         }
         this.elementDisposables.add(this.notebookEditor.onDidChangeActiveCell(() => this.updateForFocusState()));
         if (this.element instanceof MarkupCellViewModel) {
@@ -76,9 +80,19 @@ let CellContextKeyManager = class CellContextKeyManager extends Disposable {
             this.updateForEditState();
             this.updateForCollapseState();
             this.updateForOutputs();
+            this.updateForChat();
+            this.updateForDiagnostics();
             this.cellLineNumbers.set(this.element.lineNumbers);
             this.cellResource.set(( this.element.uri.toString()));
         });
+        const chatController = NotebookChatController.get(this.notebookEditor);
+        if (chatController) {
+            this.elementDisposables.add(chatController.onDidChangePromptCache(e => {
+                if (( e.cell.toString()) === ( this.element.uri.toString())) {
+                    this.updateForChat();
+                }
+            }));
+        }
     }
     onDidChangeState(e) {
         this._contextKeyService.bufferChangeEvents(() => {
@@ -170,6 +184,19 @@ let CellContextKeyManager = class CellContextKeyManager extends Disposable {
             this.cellHasOutputs.set(false);
         }
     }
+    updateForChat() {
+        const chatController = NotebookChatController.get(this.notebookEditor);
+        if (!chatController || !this.element) {
+            this.cellGeneratedByChat.set(false);
+            return;
+        }
+        this.cellGeneratedByChat.set(chatController.isCellGeneratedByChat(this.element));
+    }
+    updateForDiagnostics() {
+        if (this.element instanceof CodeCellViewModel) {
+            this.cellHasErrorDiagnostics.set(!!this.element.cellDiagnostics.ErrorDetails);
+        }
+    }
 };
 CellContextKeyManager = ( __decorate([
     ( __param(2, IContextKeyService)),

package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellStatusPart.js

@@ -15,7 +15,7 @@ import { IThemeService } from '../../../../../../platform/theme/common/themeServ
 import { CellFocusMode } from '../../notebookBrowser.js';
 import { CellContentPart } from '../cellPart.js';
 import { CodeCellViewModel } from '../../viewModel/codeCellViewModel.js';
-import { setupCustomHover } from '../../../../../../base/browser/ui/iconLabel/iconLabelHover.js';
+import { setupCustomHover } from '../../../../../../base/browser/ui/hover/updatableHoverWidget.js';
 import { IHoverService } from '../../../../../../platform/hover/browser/hover.js';
 import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
 const $ = $$1;
@@ -227,7 +227,7 @@ let CellStatusBarItem = class CellStatusBarItem extends Disposable {
     updateItem(item, maxWidth) {
         this._itemDisposables.clear();
         if (!this._currentItem || this._currentItem.text !== item.text) {
-            ( new SimpleIconLabel(this.container)).text = item.text.replace(/\n/g, ' ');
+            this._itemDisposables.add(( new SimpleIconLabel(this.container))).text = item.text.replace(/\n/g, ' ');
         }
         const resolveColor = (color) => {
             return isThemeColor(color) ?

package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellToolbars.js

@@ -13,6 +13,7 @@ import { CodiconActionViewItem } from './cellActionView.js';
 import { CellOverlayPart } from '../cellPart.js';
 import { registerCellToolbarStickyScroll } from './cellToolbarStickyScroll.js';
 import { WorkbenchToolBar } from '../../../../../../platform/actions/browser/toolbar.js';
+import { createInstantHoverDelegate } from '../../../../../../base/browser/ui/hover/hoverDelegateFactory.js';
 let BetweenCellToolbar = class BetweenCellToolbar extends CellOverlayPart {
     constructor(_notebookEditor, _titleToolbarContainer, _bottomCellToolbarContainer, instantiationService, contextMenuService, contextKeyService, menuService) {
         super();
@@ -28,13 +29,13 @@ let BetweenCellToolbar = class BetweenCellToolbar extends CellOverlayPart {
             return this._betweenCellToolbar;
         }
         const betweenCellToolbar = this._register(( new ToolBar(this._bottomCellToolbarContainer, this.contextMenuService, {
-            actionViewItemProvider: action => {
+            actionViewItemProvider: (action, options) => {
                 if (action instanceof MenuItemAction) {
                     if (this._notebookEditor.notebookOptions.getDisplayOptions().insertToolbarAlignment === 'center') {
-                        return this.instantiationService.createInstance(CodiconActionViewItem, action, undefined);
+                        return this.instantiationService.createInstance(CodiconActionViewItem, action, { hoverDelegate: options.hoverDelegate });
                     }
                     else {
-                        return this.instantiationService.createInstance(MenuEntryActionViewItem, action, undefined);
+                        return this.instantiationService.createInstance(MenuEntryActionViewItem, action, { hoverDelegate: options.hoverDelegate });
                     }
                 }
                 return undefined;
@@ -120,13 +121,15 @@ let CellTitleToolbarPart = class CellTitleToolbarPart extends CellOverlayPart {
         if (this._view) {
             return this._view;
         }
+        const hoverDelegate = this._register(createInstantHoverDelegate());
         const toolbar = this._register(this.instantiationService.createInstance(WorkbenchToolBar, this.toolbarContainer, {
             actionViewItemProvider: (action, options) => {
                 return createActionViewItem(this.instantiationService, action, options);
             },
-            renderDropdownAsChildElement: true
+            renderDropdownAsChildElement: true,
+            hoverDelegate
         }));
-        const deleteToolbar = this._register(this.instantiationService.invokeFunction(accessor => createDeleteToolbar(accessor, this.toolbarContainer, 'cell-delete-toolbar')));
+        const deleteToolbar = this._register(this.instantiationService.invokeFunction(accessor => createDeleteToolbar(accessor, this.toolbarContainer, hoverDelegate, 'cell-delete-toolbar')));
         if (model.deleteActions.primary.length !== 0 || model.deleteActions.secondary.length !== 0) {
             deleteToolbar.setActions(model.deleteActions.primary, model.deleteActions.secondary);
         }
@@ -209,7 +212,7 @@ function getCellToolbarActions(menu) {
     createAndFillInActionBarActions(menu, { shouldForwardArgs: true }, result, g => /^inline/.test(g));
     return result;
 }
-function createDeleteToolbar(accessor, container, elementClass) {
+function createDeleteToolbar(accessor, container, hoverDelegate, elementClass) {
     const contextMenuService = accessor.get(IContextMenuService);
     const keybindingService = accessor.get(IKeybindingService);
     const instantiationService = accessor.get(IInstantiationService);
@@ -218,7 +221,8 @@ function createDeleteToolbar(accessor, container, elementClass) {
         actionViewItemProvider: (action, options) => {
             return createActionViewItem(instantiationService, action, options);
         },
-        renderDropdownAsChildElement: true
+        renderDropdownAsChildElement: true,
+        hoverDelegate
     }));
     if (elementClass) {
         toolbar.getElement().classList.add(elementClass);

package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/codeCellRunToolbar.js

@@ -64,7 +64,7 @@ let RunToolbar = class RunToolbar extends CellContentPart {
         const executionContextKeyService = this._register(getCodeCellExecutionContextKeyService(contextKeyService));
         this.toolbar = this._register(( new ToolBar(container, this.contextMenuService, {
             getKeyBinding: keybindingProvider,
-            actionViewItemProvider: _action => {
+            actionViewItemProvider: (_action, _options) => {
                 actionViewItemDisposables.clear();
                 const primary = this.getCellToolbarActions(this.primaryMenu).primary[0];
                 if (!(primary instanceof MenuItemAction)) {
@@ -75,6 +75,7 @@ let RunToolbar = class RunToolbar extends CellContentPart {
                     return undefined;
                 }
                 const item = this.instantiationService.createInstance(DropdownWithPrimaryActionViewItem, primary, dropdownAction, secondary, 'notebook-cell-run-toolbar', this.contextMenuService, {
+                    ..._options,
                     getKeyBinding: keybindingProvider
                 });
                 actionViewItemDisposables.add(item.onDidChangeDropdownVisibility(visible => {

package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/foldedCellHint.js

@@ -1,3 +1,4 @@
+import { __decorate, __param } from '../../../../../../../../../external/tslib/tslib.es6.js';
 import { hide, reset, show, $, addDisposableListener, EventType } from '../../../../../../base/browser/dom.js';
 import { Codicon } from '../../../../../../base/common/codicons.js';
 import { ThemeIcon } from '../../../../../../base/common/themables.js';
@@ -5,31 +6,44 @@ import { localizeWithPath } from '../../../../../../nls.js';
 import { FoldingController } from '../../controller/foldingController.js';
 import { CellEditState } from '../../notebookBrowser.js';
 import { CellContentPart } from '../cellPart.js';
-class FoldedCellHint extends CellContentPart {
-    constructor(_notebookEditor, _container) {
+import { executingStateIcon } from '../../notebookIcons.js';
+import { INotebookExecutionStateService } from '../../../common/notebookExecutionStateService.js';
+import { NotebookCellExecutionState } from '../../../common/notebookCommon.js';
+import { MutableDisposable } from '../../../../../../base/common/lifecycle.js';
+let FoldedCellHint = class FoldedCellHint extends CellContentPart {
+    constructor(_notebookEditor, _container, _notebookExecutionStateService) {
         super();
         this._notebookEditor = _notebookEditor;
         this._container = _container;
+        this._notebookExecutionStateService = _notebookExecutionStateService;
+        this._runButtonListener = this._register(( new MutableDisposable()));
+        this._cellExecutionListener = this._register(( new MutableDisposable()));
     }
     didRenderCell(element) {
         this.update(element);
     }
     update(element) {
         if (!this._notebookEditor.hasModel()) {
+            this._cellExecutionListener.clear();
+            this._runButtonListener.clear();
             return;
         }
         if (element.isInputCollapsed || element.getEditState() === CellEditState.Editing) {
+            this._cellExecutionListener.clear();
+            this._runButtonListener.clear();
             hide(this._container);
         }
         else if (element.foldingState === 2 ) {
             const idx = this._notebookEditor.getViewModel().getCellIndex(element);
             const length = this._notebookEditor.getViewModel().getFoldedLength(idx);
-            reset(this._container, this.getHiddenCellsLabel(length), this.getHiddenCellHintButton(element));
+            reset(this._container, this.getRunFoldedSectionButton({ start: idx, end: idx + length }), this.getHiddenCellsLabel(length), this.getHiddenCellHintButton(element));
             show(this._container);
             const foldHintTop = element.layoutInfo.previewHeight;
             this._container.style.top = `${foldHintTop}px`;
         }
         else {
+            this._cellExecutionListener.clear();
+            this._runButtonListener.clear();
             hide(this._container);
         }
     }
@@ -60,8 +74,38 @@ class FoldedCellHint extends CellContentPart {
         }));
         return expandIcon;
     }
+    getRunFoldedSectionButton(range) {
+        const runAllContainer = $('span.folded-cell-run-section-button');
+        const cells = this._notebookEditor.getCellsInRange(range);
+        const isRunning = ( cells.some(cell => {
+            const cellExecution = this._notebookExecutionStateService.getCellExecution(cell.uri);
+            return cellExecution && cellExecution.state === NotebookCellExecutionState.Executing;
+        }));
+        const runAllIcon = isRunning ?
+            ThemeIcon.modify(executingStateIcon, 'spin') :
+            Codicon.play;
+        runAllContainer.classList.add(...ThemeIcon.asClassNameArray(runAllIcon));
+        this._runButtonListener.value = addDisposableListener(runAllContainer, EventType.CLICK, () => {
+            this._notebookEditor.executeNotebookCells(cells);
+        });
+        this._cellExecutionListener.value = this._notebookExecutionStateService.onDidChangeExecution(() => {
+            const isRunning = ( cells.some(cell => {
+                const cellExecution = this._notebookExecutionStateService.getCellExecution(cell.uri);
+                return cellExecution && cellExecution.state === NotebookCellExecutionState.Executing;
+            }));
+            const runAllIcon = isRunning ?
+                ThemeIcon.modify(executingStateIcon, 'spin') :
+                Codicon.play;
+            runAllContainer.className = '';
+            runAllContainer.classList.add('folded-cell-run-section-button', ...ThemeIcon.asClassNameArray(runAllIcon));
+        });
+        return runAllContainer;
+    }
     updateInternalLayoutNow(element) {
         this.update(element);
     }
-}
+};
+FoldedCellHint = ( __decorate([
+    ( __param(2, INotebookExecutionStateService))
+], FoldedCellHint));
 export { FoldedCellHint };

package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/markupCell.js

@@ -6,7 +6,7 @@ import { CancellationTokenSource } from '../../../../../../base/common/cancellat
 import { Codicon } from '../../../../../../base/common/codicons.js';
 import { ThemeIcon } from '../../../../../../base/common/themables.js';
 import { Disposable, DisposableStore, MutableDisposable, toDisposable } from '../../../../../../base/common/lifecycle.js';
-import { CodeEditorWidget } from '../../../../../../editor/browser/widget/codeEditorWidget.js';
+import { CodeEditorWidget } from '../../../../../../editor/browser/widget/codeEditor/codeEditorWidget.js';
 import { EditorContextKeys } from '../../../../../../editor/common/editorContextKeys.js';
 import { ILanguageService } from '../../../../../../editor/common/languages/language.js';
 import { tokenizeToStringSync } from '../../../../../../editor/common/languages/textToHtmlTokenizer.js';

package/vscode/src/vs/workbench/contrib/notebook/browser/view/notebookCellList.js

@@ -708,7 +708,9 @@ let NotebookCellList = class NotebookCellList extends WorkbenchList {
                 this._revealInViewWithMinimalScrolling(index);
                 break;
         }
-        if (cell.getEditState() === CellEditState.Editing && !cell.editorAttached) {
+        if ((
+        (
+        cell.getEditState() === CellEditState.Editing || (revealType === 6  && cell.cellKind === CellKind.Code))) && !cell.editorAttached) {
             return getEditorAttachedPromise(cell);
         }
         return;

package/vscode/src/vs/workbench/contrib/notebook/browser/view/notebookCellListView.js

@@ -218,8 +218,19 @@ class NotebookCellListView extends ListView {
         this.eventuallyUpdateScrollDimensions();
     }
     removeWhitespace(id) {
-        this.notebookRangeMap.removeWhitespace(id);
-        this.eventuallyUpdateScrollDimensions();
+        const scrollTop = this.scrollTop;
+        const previousRenderRange = this.getRenderRange(this.lastRenderTop, this.lastRenderHeight);
+        const currentPosition = this.notebookRangeMap.getWhitespacePosition(id);
+        if (currentPosition > scrollTop) {
+            this.notebookRangeMap.removeWhitespace(id);
+            this.render(previousRenderRange, scrollTop, this.lastRenderHeight, undefined, undefined, false);
+            this._rerender(scrollTop, this.renderHeight, false);
+            this.eventuallyUpdateScrollDimensions();
+        }
+        else {
+            this.notebookRangeMap.removeWhitespace(id);
+            this.eventuallyUpdateScrollDimensions();
+        }
     }
     getWhitespacePosition(id) {
         return this.notebookRangeMap.getWhitespacePosition(id);