@codingame/monaco-vscode-api 4.5.2 → 5.0.0

package/vscode/src/vs/workbench/contrib/notebook/browser/controller/chat/notebookChatController.js

@@ -401,7 +401,7 @@ let NotebookChatController = class NotebookChatController extends Disposable {
         assertType(this._activeSession);
         this._warmupRequestCts?.dispose(true);
         this._warmupRequestCts = undefined;
-        this._activeSession.addInput(( (new SessionPrompt(this._widget.inlineChatWidget.value, 0, true))));
+        this._activeSession.addInput(( (new SessionPrompt(this._widget.inlineChatWidget.value))));
         assertType(this._activeSession.lastInput);
         const value = this._activeSession.lastInput.value;
         this._historyUpdate(value);
@@ -433,7 +433,7 @@ let NotebookChatController = class NotebookChatController extends Disposable {
         const request = {
             requestId: generateUuid(),
             prompt: value,
-            attempt: this._activeSession.lastInput.attempt,
+            attempt: 0,
             selection: { selectionStartLineNumber: 1, selectionStartColumn: 1, positionLineNumber: 1, positionColumn: 1 },
             wholeRange: { startLineNumber: 1, startColumn: 1, endLineNumber: 1, endColumn: 1 },
             live: true,
@@ -476,7 +476,6 @@ let NotebookChatController = class NotebookChatController extends Disposable {
                             data.markdownFragment,
                             { supportThemeIcons: true, supportHtml: true, isTrusted: false }
                         ))),
-                        providerId: this._activeSession.provider.label,
                         requestId: request.requestId,
                     };
                     progressiveChatResponse = this._widget?.inlineChatWidget.updateChatMessage(message, true);
@@ -504,7 +503,7 @@ let NotebookChatController = class NotebookChatController extends Disposable {
             }
             else {
                 const markdownContents = ( (new MarkdownString('', { supportThemeIcons: true, supportHtml: true, isTrusted: false })));
-                const replyResponse = response = this._instantiationService.createInstance(ReplyResponse, reply, markdownContents, this._activeSession.textModelN.uri, this._activeSession.textModelN.getAlternativeVersionId(), progressEdits, request.requestId);
+                const replyResponse = response = this._instantiationService.createInstance(ReplyResponse, reply, markdownContents, this._activeSession.textModelN.uri, this._activeSession.textModelN.getAlternativeVersionId(), progressEdits, request.requestId, undefined);
                 for (let i = progressEdits.length; i < replyResponse.allLocalEdits.length; i++) {
                     await this._makeChanges(replyResponse.allLocalEdits[i], undefined);
                 }
@@ -592,7 +591,7 @@ let NotebookChatController = class NotebookChatController extends Disposable {
             return;
         }
         const markdownContents = ( (new MarkdownString('', { supportThemeIcons: true, supportHtml: true, isTrusted: false })));
-        const response = this._instantiationService.createInstance(ReplyResponse, reply, markdownContents, this._activeSession.textModelN.uri, this._activeSession.textModelN.getAlternativeVersionId(), [], request.requestId);
+        const response = this._instantiationService.createInstance(ReplyResponse, reply, markdownContents, this._activeSession.textModelN.uri, this._activeSession.textModelN.getAlternativeVersionId(), [], request.requestId, undefined);
         const followups = await this._activeSession.provider.provideFollowups(this._activeSession.session, response.raw, token);
         if (followups && this._widget) {
             const widget = this._widget;

package/vscode/src/vs/workbench/contrib/notebook/browser/controller/editActions.js

@@ -20,7 +20,7 @@ import { NotebookCellAction, CELL_TITLE_CELL_GROUP_ID, findTargetCellEditor, NOT
 import { NotebookIndentUsingTabs, NotebookIndentUsingSpaces, NotebookChangeTabDisplaySize, NotebookIndentationToTabsAction, NotebookIndentationToSpacesAction } from './notebookIndentationActions.js';
 import { QUIT_EDIT_CELL_COMMAND_ID, CellEditState, CHANGE_CELL_LANGUAGE, DETECT_CELL_LANGUAGE, getNotebookEditorFromEditorPane } from '../notebookBrowser.js';
 import { CellKind, NotebookCellExecutionState, NotebookSetting } from '../../common/notebookCommon.js';
-import { NOTEBOOK_CELL_LIST_FOCUSED, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_CELL_TYPE, NOTEBOOK_CELL_MARKDOWN_EDIT_MODE, NOTEBOOK_CELL_EDITABLE, NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_OUTPUT_FOCUSED, NOTEBOOK_CELL_HAS_OUTPUTS, NOTEBOOK_USE_CONSOLIDATED_OUTPUT_BUTTON, NOTEBOOK_HAS_OUTPUTS, NOTEBOOK_IS_ACTIVE_EDITOR } from '../../common/notebookContextKeys.js';
+import { NOTEBOOK_CELL_LIST_FOCUSED, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_OUTPUT_INPUT_FOCUSED, NOTEBOOK_CELL_TYPE, NOTEBOOK_CELL_MARKDOWN_EDIT_MODE, NOTEBOOK_CELL_EDITABLE, NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_OUTPUT_FOCUSED, NOTEBOOK_CELL_HAS_OUTPUTS, NOTEBOOK_USE_CONSOLIDATED_OUTPUT_BUTTON, NOTEBOOK_HAS_OUTPUTS, NOTEBOOK_IS_ACTIVE_EDITOR } from '../../common/notebookContextKeys.js';
 import { INotebookExecutionStateService } from '../../common/notebookExecutionStateService.service.js';
 import { INotebookKernelService } from '../../common/notebookKernelService.service.js';
 import { IEditorService } from '../../../../services/editor/common/editorService.service.js';
@@ -42,7 +42,8 @@ registerAction2(class EditCellAction extends NotebookCellAction {
                     NOTEBOOK_CELL_LIST_FOCUSED,
                     ContextKeyExpr.not(InputFocusedContextKey),
                      (NOTEBOOK_EDITOR_EDITABLE.isEqualTo(true)),
-                     (EditorContextKeys.hoverFocused.toNegated())
+                     (EditorContextKeys.hoverFocused.toNegated()),
+                     (NOTEBOOK_OUTPUT_INPUT_FOCUSED.toNegated())
                 ))),
                 primary: 3 ,
                 weight: 200
@@ -137,7 +138,11 @@ registerAction2(class DeleteCellAction extends NotebookCellAction {
                 mac: {
                     primary: 2048  | 1
                 },
-                when: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ContextKeyExpr.not(InputFocusedContextKey)))),
+                when: ( (ContextKeyExpr.and(
+                    NOTEBOOK_EDITOR_FOCUSED,
+                    ContextKeyExpr.not(InputFocusedContextKey),
+                     (NOTEBOOK_OUTPUT_INPUT_FOCUSED.toNegated())
+                ))),
                 weight: 200
             },
             menu: [

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

@@ -1,5 +1,6 @@
 import { Emitter, Event } from '../../../../base/common/event.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
+import '../../../../base/common/arrays.js';
 import '../../../../base/common/observableInternal/derived.js';
 import '../../../../base/common/observableInternal/autorun.js';
 import { observableFromEvent } from '../../../../base/common/observableInternal/utils.js';

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

@@ -20,7 +20,7 @@ import { createEditorOpenError, DEFAULT_EDITOR_ASSOCIATION, isEditorOpenError, c
 import { SELECT_KERNEL_ID } from './controller/coreActions.js';
 import { INotebookEditorService } from './services/notebookEditorService.service.js';
 import { NotebooKernelActionViewItem } from './viewParts/notebookKernelView.js';
-import { NOTEBOOK_EDITOR_ID, NotebookWorkingCopyTypeIdentifier } from '../common/notebookCommon.js';
+import { NOTEBOOK_EDITOR_ID, NotebookWorkingCopyTypeIdentifier, CellKind } from '../common/notebookCommon.js';
 import { NotebookEditorInput } from '../common/notebookEditorInput.js';
 import { NotebookPerfMarks } from '../common/notebookPerformance.js';
 import { IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.service.js';
@@ -34,6 +34,7 @@ import { streamToBuffer } from '../../../../base/common/buffer.js';
 import { ILogService } from '../../../../platform/log/common/log.service.js';
 import { INotebookEditorWorkerService } from '../common/services/notebookWorkerService.service.js';
 import { IPreferencesService } from '../../../services/preferences/common/preferences.service.js';
+import { StopWatch } from '../../../../base/common/stopwatch.js';
 var NotebookEditor_1;
 const _moduleId = "vs/workbench/contrib/notebook/browser/notebookEditor";
 const NOTEBOOK_EDITOR_VIEW_STATE_PREFERENCE_KEY = 'NotebookEditorViewState';
@@ -253,7 +254,7 @@ let NotebookEditor = class NotebookEditor extends EditorPane {
             if (perfMarksCaptured) {
                 return;
             }
-            this._handlePerfMark(perf, input);
+            this._handlePerfMark(perf, input, model.notebook);
             this._handlePromptRecommendations(model.notebook);
         }
         catch (e) {
@@ -307,7 +308,7 @@ let NotebookEditor = class NotebookEditor extends EditorPane {
             throw error;
         }
     }
-    _handlePerfMark(perf, input) {
+    _handlePerfMark(perf, input, notebook) {
         const perfMarks = perf.value;
         const startTime = perfMarks['startTime'];
         const extensionActivated = perfMarks['extensionActivated'];
@@ -332,6 +333,30 @@ let NotebookEditor = class NotebookEditor extends EditorPane {
                 editorLoadingTimespan = editorLoaded - startTime;
             }
         }
+        let codeCellCount = undefined;
+        let mdCellCount = undefined;
+        let outputCount = undefined;
+        let outputBytes = undefined;
+        let codeLength = undefined;
+        let markdownLength = undefined;
+        let notebookStatsLoaded = undefined;
+        if (notebook) {
+            const stopWatch = ( (new StopWatch()));
+            for (const cell of notebook.cells) {
+                if (cell.cellKind === CellKind.Code) {
+                    codeCellCount = (codeCellCount || 0) + 1;
+                    codeLength = (codeLength || 0) + cell.getTextLength();
+                    outputCount = (outputCount || 0) + cell.outputs.length;
+                    outputBytes = (outputBytes || 0) + cell.outputs.reduce((prev, cur) => prev + cur.outputs.reduce((size, item) => size + item.data.byteLength, 0), 0);
+                }
+                else {
+                    mdCellCount = (mdCellCount || 0) + 1;
+                    markdownLength = (codeLength || 0) + cell.getTextLength();
+                }
+            }
+            notebookStatsLoaded = stopWatch.elapsed();
+        }
+        this.logService.trace(`[NotebookEditor] open notebook perf ${notebook?.uri.toString() ?? ''} - extensionActivation: ${extensionActivationTimespan}, inputLoad: ${inputLoadingTimespan}, webviewComm: ${webviewCommLoadingTimespan}, customMarkdown: ${customMarkdownLoadingTimespan}, editorLoad: ${editorLoadingTimespan}`);
         this.telemetryService.publicLog2('notebook/editorOpenPerf', {
             scheme: input.resource.scheme,
             ext: extname(input.resource),
@@ -340,7 +365,14 @@ let NotebookEditor = class NotebookEditor extends EditorPane {
             inputLoaded: inputLoadingTimespan,
             webviewCommLoaded: webviewCommLoadingTimespan,
             customMarkdownLoaded: customMarkdownLoadingTimespan,
-            editorLoaded: editorLoadingTimespan
+            editorLoaded: editorLoadingTimespan,
+            codeCellCount,
+            mdCellCount,
+            outputCount,
+            outputBytes,
+            codeLength,
+            markdownLength,
+            notebookStatsLoaded
         });
     }
     _handlePromptRecommendations(model) {

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

@@ -72,7 +72,7 @@ import { NotebookEditorContextKeys } from './viewParts/notebookEditorWidgetConte
 import { NotebookOverviewRuler } from './viewParts/notebookOverviewRuler.js';
 import { ListTopCellToolbar } from './viewParts/notebookTopCellToolbar.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 { NOTEBOOK_EDITOR_FOCUSED, NOTEBOOK_OUTPUT_FOCUSED, NOTEBOOK_OUTPUT_INPUT_FOCUSED, NOTEBOOK_EDITOR_EDITABLE, NOTEBOOK_CURSOR_NAVIGATION_MODE } from '../common/notebookContextKeys.js';
 import { INotebookExecutionService } from '../common/notebookExecutionService.service.js';
 import { INotebookExecutionStateService } from '../common/notebookExecutionStateService.service.js';
 import { INotebookKernelService } from '../common/notebookKernelService.service.js';
@@ -89,7 +89,6 @@ import { Schemas } from '../../../../base/common/network.js';
 import { DropIntoEditorController } from '../../../../editor/contrib/dropOrPasteInto/browser/dropIntoEditorController.js';
 import { CopyPasteController } from '../../../../editor/contrib/dropOrPasteInto/browser/copyPasteController.js';
 import { NotebookStickyScroll } from './viewParts/notebookEditorStickyScroll.js';
-import { NotebookCellOutlineProvider } from './viewModel/notebookOutlineProvider.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.service.js';
 import { PixelRatio } from '../../../../base/browser/pixelRatio.js';
 import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
@@ -269,7 +268,6 @@ let NotebookEditorWidget = class NotebookEditorWidget extends Disposable {
             this._updateOutputRenderers();
         }));
         this._register(this.instantiationService.createInstance(NotebookEditorContextKeys, this));
-        this._notebookOutline = this._register(this.instantiationService.createInstance(NotebookCellOutlineProvider, this, 4 ));
         this._register(notebookKernelService.onDidChangeSelectedNotebooks(e => {
             if (isEqual(e.notebook, this.viewModel?.uri)) {
                 this._loadKernelPreloads();
@@ -306,7 +304,8 @@ let NotebookEditorWidget = class NotebookEditorWidget extends Disposable {
                 || e.outputFontFamily
                 || e.outputWordWrap
                 || e.outputScrolling
-                || e.outputLinkifyFilePaths) {
+                || e.outputLinkifyFilePaths
+                || e.minimalError) {
                 this._styleElement?.remove();
                 this._createLayoutStyles();
                 this._webview?.updateOptions({
@@ -331,6 +330,7 @@ let NotebookEditorWidget = class NotebookEditorWidget extends Disposable {
         this._overlayContainer.id = `notebook-${id}`;
         this._overlayContainer.className = 'notebookOverlay';
         this._overlayContainer.classList.add('notebook-editor');
+        this._overlayContainer.inert = true;
         this._overlayContainer.style.visibility = 'hidden';
         container.appendChild(this._overlayContainer);
         this._createBody(this._overlayContainer);
@@ -338,7 +338,7 @@ let NotebookEditorWidget = class NotebookEditorWidget extends Disposable {
         this._isVisible = true;
         this._editorFocus = NOTEBOOK_EDITOR_FOCUSED.bindTo(this.scopedContextKeyService);
         this._outputFocus = NOTEBOOK_OUTPUT_FOCUSED.bindTo(this.scopedContextKeyService);
-        this._outputInputFocus = NOTEBOOK_OUPTUT_INPUT_FOCUSED.bindTo(this.scopedContextKeyService);
+        this._outputInputFocus = NOTEBOOK_OUTPUT_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);
@@ -844,7 +844,7 @@ let NotebookEditorWidget = class NotebookEditorWidget extends Disposable {
         }));
     }
     _registerNotebookStickyScroll() {
-        this._notebookStickyScroll = this._register(this.instantiationService.createInstance(NotebookStickyScroll, this._notebookStickyScrollContainer, this, this._notebookOutline, this._list));
+        this._notebookStickyScroll = this._register(this.instantiationService.createInstance(NotebookStickyScroll, this._notebookStickyScrollContainer, this, this._list));
         const localDisposableStore = this._register(( (new DisposableStore())));
         this._register(this._notebookStickyScroll.onDidChangeNotebookStickyScroll((sizeDelta) => {
             const d = localDisposableStore.add(scheduleAtNextAnimationFrame(getWindow(this.getDomNode()), () => {
@@ -1463,6 +1463,7 @@ let NotebookEditorWidget = class NotebookEditorWidget extends Disposable {
             this._list.layout(newCellListHeight, dimension.width);
             this._list.updateOptions({ paddingBottom: this._allowScrollBeyondLastLine() ? Math.max(0, (newCellListHeight - 50)) : 0, paddingTop: 0 });
         }
+        this._overlayContainer.inert = false;
         this._overlayContainer.style.visibility = 'visible';
         this._overlayContainer.style.display = 'block';
         this._overlayContainer.style.position = 'absolute';
@@ -1568,6 +1569,7 @@ let NotebookEditorWidget = class NotebookEditorWidget extends Disposable {
     onWillHide() {
         this._isVisible = false;
         this._editorFocus.set(false);
+        this._overlayContainer.inert = true;
         this._overlayContainer.style.visibility = 'hidden';
         this._overlayContainer.style.left = '-50000px';
         this._notebookTopToolbarContainer.style.display = 'none';
@@ -1915,6 +1917,7 @@ let NotebookEditorWidget = class NotebookEditorWidget extends Disposable {
             if (itemDOM && itemDOM.ownerDocument.activeElement && itemDOM.contains(itemDOM.ownerDocument.activeElement)) {
                 itemDOM.ownerDocument.activeElement.blur();
             }
+            this._webview?.blurOutput();
             cell.updateEditState(CellEditState.Preview, 'focusNotebookCell');
             cell.focusMode = CellFocusMode.Container;
             this.focusElement(cell);

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

@@ -1,6 +1,7 @@
 import { PixelRatio } from '../../../../base/browser/pixelRatio.js';
 import { Emitter } from '../../../../base/common/event.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
+import { isObject } from '../../../../base/common/types.js';
 import { FontMeasurements } from '../../../../editor/browser/config/fontMeasurements.js';
 import { BareFontInfo } from '../../../../editor/common/config/fontInfo.js';
 import { NotebookSetting } from '../common/notebookCommon.js';
@@ -52,7 +53,8 @@ class NotebookOptions extends Disposable {
         const showFoldingControls = this._computeShowFoldingControlsOption();
         const fontSize = this.configurationService.getValue('editor.fontSize');
         const markupFontSize = this.configurationService.getValue(NotebookSetting.markupFontSize);
-        const editorOptionsCustomizations = this.configurationService.getValue(NotebookSetting.cellEditorOptionsCustomizations);
+        let editorOptionsCustomizations = this.configurationService.getValue(NotebookSetting.cellEditorOptionsCustomizations) ?? {};
+        editorOptionsCustomizations = isObject(editorOptionsCustomizations) ? editorOptionsCustomizations : {};
         const interactiveWindowCollapseCodeCells = this.configurationService.getValue(NotebookSetting.interactiveWindowCollapseCodeCells);
         let outputLineHeightSettingValue;
         const deprecatedOutputLineHeightSetting = this.configurationService.getValue(NotebookSetting.outputLineHeightDeprecated);
@@ -94,6 +96,7 @@ class NotebookOptions extends Disposable {
         const outputWordWrap = this.configurationService.getValue(NotebookSetting.outputWordWrap);
         const outputLineLimit = this.configurationService.getValue(NotebookSetting.textOutputLineLimit) ?? 30;
         const linkifyFilePaths = this.configurationService.getValue(NotebookSetting.LinkifyOutputFilePaths) ?? true;
+        const minimalErrors = this.configurationService.getValue(NotebookSetting.minimalErrorRendering);
         const editorTopPadding = this._computeEditorTopPadding();
         this._layoutConfiguration = {
             ...(compactView ? compactConfigConstants : defaultConfigConstants),
@@ -134,7 +137,8 @@ class NotebookOptions extends Disposable {
             outputScrolling: outputScrolling,
             outputWordWrap: outputWordWrap,
             outputLineLimit: outputLineLimit,
-            outputLinkifyFilePaths: linkifyFilePaths
+            outputLinkifyFilePaths: linkifyFilePaths,
+            outputMinimalError: minimalErrors
         };
         this._register(this.configurationService.onDidChangeConfiguration(e => {
             this._updateConfiguration(e);
@@ -268,6 +272,7 @@ class NotebookOptions extends Disposable {
         const outputScrolling = e.affectsConfiguration(NotebookSetting.outputScrolling);
         const outputWordWrap = e.affectsConfiguration(NotebookSetting.outputWordWrap);
         const outputLinkifyFilePaths = e.affectsConfiguration(NotebookSetting.LinkifyOutputFilePaths);
+        const minimalError = e.affectsConfiguration(NotebookSetting.minimalErrorRendering);
         if (!cellStatusBarVisibility
             && !cellToolbarLocation
             && !cellToolbarInteraction
@@ -292,7 +297,8 @@ class NotebookOptions extends Disposable {
             && !outputLineHeight
             && !outputScrolling
             && !outputWordWrap
-            && !outputLinkifyFilePaths) {
+            && !outputLinkifyFilePaths
+            && !minimalError) {
             return;
         }
         let configuration = Object.assign({}, this._layoutConfiguration);
@@ -373,6 +379,9 @@ class NotebookOptions extends Disposable {
         if (outputLinkifyFilePaths) {
             configuration.outputLinkifyFilePaths = this.configurationService.getValue(NotebookSetting.LinkifyOutputFilePaths);
         }
+        if (minimalError) {
+            configuration.outputMinimalError = this.configurationService.getValue(NotebookSetting.minimalErrorRendering);
+        }
         this._layoutConfiguration = ( Object.freeze(configuration));
         this._onDidChangeOptions.fire({
             cellStatusBarVisibility,
@@ -399,7 +408,8 @@ class NotebookOptions extends Disposable {
             outputLineHeight,
             outputScrolling,
             outputWordWrap,
-            outputLinkifyFilePaths: outputLinkifyFilePaths
+            outputLinkifyFilePaths,
+            minimalError
         });
     }
     _computeInsertToolbarPositionOption(isReadOnly) {
@@ -580,6 +590,7 @@ class NotebookOptions extends Disposable {
             outputWordWrap: this._layoutConfiguration.outputWordWrap,
             outputLineLimit: this._layoutConfiguration.outputLineLimit,
             outputLinkifyFilePaths: this._layoutConfiguration.outputLinkifyFilePaths,
+            minimalError: this._layoutConfiguration.outputMinimalError
         };
     }
     computeDiffWebviewOptions() {
@@ -600,7 +611,8 @@ class NotebookOptions extends Disposable {
             outputScrolling: this._layoutConfiguration.outputScrolling,
             outputWordWrap: this._layoutConfiguration.outputWordWrap,
             outputLineLimit: this._layoutConfiguration.outputLineLimit,
-            outputLinkifyFilePaths: false
+            outputLinkifyFilePaths: false,
+            minimalError: false
         };
     }
     computeIndicatorPosition(totalHeight, foldHintHeight, viewType) {

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

@@ -3,7 +3,6 @@ import { reset, EventType, addDisposableListener, EventHelper } from '../../../.
 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 { ThemeIcon } from '../../../../../../base/common/themables.js';
 import { MenuEntryActionViewItem, SubmenuEntryActionViewItem } from '../../../../../../platform/actions/browser/menuEntryActionViewItem.js';
@@ -11,6 +10,7 @@ import { MenuItemAction } from '../../../../../../platform/actions/common/action
 import { IContextMenuService } from '../../../../../../platform/contextview/browser/contextView.service.js';
 import { IKeybindingService } from '../../../../../../platform/keybinding/common/keybinding.service.js';
 import { IThemeService } from '../../../../../../platform/theme/common/themeService.service.js';
+import { IHoverService } from '../../../../../../platform/hover/browser/hover.service.js';
 class CodiconActionViewItem extends MenuEntryActionViewItem {
     updateLabel() {
         if (this.options.label && this.label) {
@@ -34,11 +34,12 @@ class ActionViewWithLabel extends MenuEntryActionViewItem {
     }
 }
 let UnifiedSubmenuActionView = class UnifiedSubmenuActionView extends SubmenuEntryActionViewItem {
-    constructor(action, options, renderLabel, subActionProvider, subActionViewItemProvider, _keybindingService, _contextMenuService, _themeService) {
+    constructor(action, options, renderLabel, subActionProvider, subActionViewItemProvider, _keybindingService, _contextMenuService, _themeService, _hoverService) {
         super(action, { ...options, hoverDelegate: options?.hoverDelegate ?? getDefaultHoverDelegate('element') }, _keybindingService, _contextMenuService, _themeService);
         this.renderLabel = renderLabel;
         this.subActionProvider = subActionProvider;
         this.subActionViewItemProvider = subActionViewItemProvider;
+        this._hoverService = _hoverService;
     }
     render(container) {
         super.render(container);
@@ -46,7 +47,7 @@ let UnifiedSubmenuActionView = class UnifiedSubmenuActionView extends SubmenuEnt
         container.classList.add('notebook-action-view-item-unified');
         this._actionLabel = document.createElement('a');
         container.appendChild(this._actionLabel);
-        this._hover = this._register(setupCustomHover(this.options.hoverDelegate ?? getDefaultHoverDelegate('element'), this._actionLabel, ''));
+        this._hover = this._register(this._hoverService.setupUpdatableHover(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)));
@@ -92,6 +93,7 @@ let UnifiedSubmenuActionView = class UnifiedSubmenuActionView extends SubmenuEnt
 UnifiedSubmenuActionView = ( __decorate([
     ( __param(5, IKeybindingService)),
     ( __param(6, IContextMenuService)),
-    ( __param(7, IThemeService))
+    ( __param(7, IThemeService)),
+    ( __param(8, IHoverService))
 ], UnifiedSubmenuActionView));
 export { ActionViewWithLabel, CodiconActionViewItem, UnifiedSubmenuActionView };

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

@@ -34,10 +34,10 @@ let CellComments = class CellComments extends CellContentPart {
         this._initialized = true;
         const info = await this._getCommentThreadForCell(element);
         if (info) {
-            this._createCommentTheadWidget(info.owner, info.thread);
+            await this._createCommentTheadWidget(info.owner, info.thread);
         }
     }
-    _createCommentTheadWidget(owner, commentThread) {
+    async _createCommentTheadWidget(owner, commentThread) {
         this._commentThreadWidget?.dispose();
         this.commentTheadDisposables.clear();
         this._commentThreadWidget = this.instantiationService.createInstance(CommentThreadWidget, this.container, this.notebookEditor, owner, this.notebookEditor.textModel.uri, this.contextKeyService, this.instantiationService, commentThread, undefined, undefined, {
@@ -48,7 +48,7 @@ let CellComments = class CellComments extends CellContentPart {
             collapse: () => { }
         });
         const layoutInfo = this.notebookEditor.getLayoutInfo();
-        this._commentThreadWidget.display(layoutInfo.fontInfo.lineHeight);
+        await this._commentThreadWidget.display(layoutInfo.fontInfo.lineHeight);
         this._applyTheme();
         this.commentTheadDisposables.add(this._commentThreadWidget.onDidResize(() => {
             if (this.currentElement?.cellKind === CellKind.Code && this._commentThreadWidget) {
@@ -61,7 +61,7 @@ let CellComments = class CellComments extends CellContentPart {
             if (this.currentElement) {
                 const info = await this._getCommentThreadForCell(this.currentElement);
                 if (!this._commentThreadWidget && info) {
-                    this._createCommentTheadWidget(info.owner, info.thread);
+                    await this._createCommentTheadWidget(info.owner, info.thread);
                     const layoutInfo = this.currentElement.layoutInfo;
                     this.container.style.top = `${layoutInfo.outputContainerOffset + layoutInfo.outputTotalHeight}px`;
                     this.currentElement.commentHeight = this._calculateCommentThreadHeight(this._commentThreadWidget.getDimensions().height);
@@ -77,7 +77,7 @@ let CellComments = class CellComments extends CellContentPart {
                         this.currentElement.commentHeight = this._calculateCommentThreadHeight(this._commentThreadWidget.getDimensions().height);
                         return;
                     }
-                    this._commentThreadWidget.updateCommentThread(info.thread);
+                    await this._commentThreadWidget.updateCommentThread(info.thread);
                     this.currentElement.commentHeight = this._calculateCommentThreadHeight(this._commentThreadWidget.getDimensions().height);
                 }
             }

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

@@ -64,15 +64,15 @@ class CellEditorOptions extends CellContentPart {
     _computeEditorOptions() {
         const value = this.base.value;
         const cellEditorOverridesRaw = this.notebookOptions.getDisplayOptions().editorOptionsCustomizations;
-        const indentSize = cellEditorOverridesRaw['editor.indentSize'];
+        const indentSize = cellEditorOverridesRaw?.['editor.indentSize'];
         if (indentSize !== undefined) {
             this.indentSize = indentSize;
         }
-        const insertSpaces = cellEditorOverridesRaw['editor.insertSpaces'];
+        const insertSpaces = cellEditorOverridesRaw?.['editor.insertSpaces'];
         if (insertSpaces !== undefined) {
             this.insertSpaces = insertSpaces;
         }
-        const tabSize = cellEditorOverridesRaw['editor.tabSize'];
+        const tabSize = cellEditorOverridesRaw?.['editor.tabSize'];
         if (tabSize !== undefined) {
             this.tabSize = tabSize;
         }

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

@@ -15,7 +15,6 @@ 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/hover/updatableHoverWidget.js';
 import { IHoverService } from '../../../../../../platform/hover/browser/hover.service.js';
 import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.service.js';
 const $ = $$1;
@@ -211,7 +210,7 @@ let CellStatusBarItem = class CellStatusBarItem extends Disposable {
     set maxWidth(v) {
         this.container.style.maxWidth = v + 'px';
     }
-    constructor(_context, _hoverDelegate, _editor, itemModel, maxWidth, _telemetryService, _commandService, _notificationService, _themeService) {
+    constructor(_context, _hoverDelegate, _editor, itemModel, maxWidth, _telemetryService, _commandService, _notificationService, _themeService, _hoverService) {
         super();
         this._context = _context;
         this._hoverDelegate = _hoverDelegate;
@@ -220,6 +219,7 @@ let CellStatusBarItem = class CellStatusBarItem extends Disposable {
         this._commandService = _commandService;
         this._notificationService = _notificationService;
         this._themeService = _themeService;
+        this._hoverService = _hoverService;
         this.container = $('.cell-status-item');
         this._itemDisposables = this._register(( new DisposableStore()));
         this.updateItem(itemModel, maxWidth);
@@ -254,7 +254,7 @@ let CellStatusBarItem = class CellStatusBarItem extends Disposable {
         this.container.setAttribute('role', role || '');
         if (item.tooltip) {
             const hoverContent = typeof item.tooltip === 'string' ? item.tooltip : { markdown: item.tooltip };
-            this._itemDisposables.add(setupCustomHover(this._hoverDelegate, this.container, hoverContent));
+            this._itemDisposables.add(this._hoverService.setupUpdatableHover(this._hoverDelegate, this.container, hoverContent));
         }
         this.container.classList.toggle('cell-status-item-has-command', !!item.command);
         if (item.command) {
@@ -298,6 +298,7 @@ CellStatusBarItem = ( __decorate([
     ( __param(5, ITelemetryService)),
     ( __param(6, ICommandService)),
     ( __param(7, INotificationService)),
-    ( __param(8, IThemeService))
+    ( __param(8, IThemeService)),
+    ( __param(9, IHoverService))
 ], CellStatusBarItem));
 export { CellEditorStatusBar };

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

@@ -63,6 +63,7 @@ let BetweenCellToolbar = class BetweenCellToolbar extends CellOverlayPart {
             ui: true,
             cell: element,
             notebookEditor: this._notebookEditor,
+            source: 'insertToolbar',
             $mid: 13
         };
         this.updateInternalLayoutNow(element);
@@ -153,6 +154,7 @@ let CellTitleToolbarPart = class CellTitleToolbarPart extends CellOverlayPart {
             ui: true,
             cell: element,
             notebookEditor: this._notebookEditor,
+            source: 'cellToolbar',
             $mid: 13
         });
     }

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

@@ -37,7 +37,7 @@ let FoldedCellHint = class FoldedCellHint extends CellContentPart {
         else if (element.foldingState === 2 ) {
             const idx = this._notebookEditor.getViewModel().getCellIndex(element);
             const length = this._notebookEditor.getViewModel().getFoldedLength(idx);
-            reset(this._container, this.getRunFoldedSectionButton({ start: idx, end: idx + length }), this.getHiddenCellsLabel(length), this.getHiddenCellHintButton(element));
+            reset(this._container, this.getRunFoldedSectionButton({ start: idx, end: idx + length + 1 }), this.getHiddenCellsLabel(length), this.getHiddenCellHintButton(element));
             show(this._container);
             const foldHintTop = element.layoutInfo.previewHeight;
             this._container.style.top = `${foldHintTop}px`;

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

@@ -17,11 +17,10 @@ class NotebookCellAnchor {
         const newFocusBottom = cellListView.elementTop(focusedIndex) + cellListView.elementHeight(focusedIndex) + heightDelta;
         const viewBottom = cellListView.renderHeight + cellListView.getScrollTop();
         const focusStillVisible = viewBottom > newFocusBottom;
-        const anchorFocusedSetting = this.configurationService.getValue(NotebookSetting.anchorToFocusedCell);
         const allowScrolling = this.configurationService.getValue(NotebookSetting.scrollToRevealCell) !== 'none';
         const growing = heightDelta > 0;
-        const autoAnchor = allowScrolling && growing && !focusStillVisible && anchorFocusedSetting !== 'off';
-        if (autoAnchor || anchorFocusedSetting === 'on') {
+        const autoAnchor = allowScrolling && growing && !focusStillVisible;
+        if (autoAnchor) {
             this.watchAchorDuringExecution(executingCellUri);
             return true;
         }

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

@@ -164,6 +164,7 @@ let BackLayerWebView = class BackLayerWebView extends Themable {
                 outputScrolling: this.options.outputScrolling,
                 outputWordWrap: this.options.outputWordWrap,
                 linkifyFilePaths: this.options.outputLinkifyFilePaths,
+                minimalError: this.options.minimalError
             }
         });
     }
@@ -194,7 +195,8 @@ let BackLayerWebView = class BackLayerWebView extends Themable {
             lineLimit: this.options.outputLineLimit,
             outputScrolling: this.options.outputScrolling,
             outputWordWrap: this.options.outputWordWrap,
-            linkifyFilePaths: this.options.outputLinkifyFilePaths
+            linkifyFilePaths: this.options.outputLinkifyFilePaths,
+            minimalError: this.options.minimalError
         };
         const preloadScript = preloadsScriptStr({
             ...this.options,
@@ -762,6 +764,9 @@ let BackLayerWebView = class BackLayerWebView extends Themable {
                 }
                 case 'notebookPerformanceMessage': {
                     this.notebookEditor.updatePerformanceMetadata(data.cellId, data.executionId, data.duration, data.rendererId);
+                    if (data.mimeType && data.outputSize && data.rendererId === 'vscode.builtin-renderer') {
+                        this._sendPerformanceData(data.mimeType, data.outputSize, data.duration);
+                    }
                     break;
                 }
                 case 'outputInputFocus': {
@@ -778,6 +783,14 @@ let BackLayerWebView = class BackLayerWebView extends Themable {
         }));
         return initializePromise.p;
     }
+    _sendPerformanceData(mimeType, outputSize, renderTime) {
+        const telemetryData = {
+            mimeType,
+            outputSize,
+            renderTime
+        };
+        this.telemetryService.publicLog2('NotebookCellOutputRender', telemetryData);
+    }
     _handleNotebookCellResource(uri) {
         const notebookResource = uri.path.length > 0 ? uri : this.documentUri;
         const lineMatch = /(?:^|&)line=([^&]+)/.exec(uri.query);
@@ -1448,6 +1461,14 @@ let BackLayerWebView = class BackLayerWebView extends Themable {
             alternateId: alternateId
         });
     }
+    blurOutput() {
+        if (this._disposed) {
+            return;
+        }
+        this._sendMessageToWebview({
+            type: 'blur-output'
+        });
+    }
     async find(query, options) {
         if (query === '') {
             this._sendMessageToWebview({