@codingame/monaco-vscode-api 6.0.2 → 7.0.0

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget.js

@@ -1,38 +1,33 @@
 import { __decorate, __param } from '../../../../../../../../../external/tslib/tslib.es6.js';
+import { localizeWithPath } from '../../../../../../nls.js';
 import { $, trackFocus, addDisposableListener, getTotalWidth } from '../../../../../../base/browser/dom.js';
+import './notebookFindReplaceWidget.css.js';
+import { ActionBar } from '../../../../../../base/browser/ui/actionbar/actionbar.js';
+import { AnchorAlignment } from '../../../../../../base/browser/ui/contextview/contextview.js';
+import { DropdownMenuActionViewItem } from '../../../../../../base/browser/ui/dropdown/dropdownActionViewItem.js';
 import { FindInput } from '../../../../../../base/browser/ui/findinput/findInput.js';
 import { ProgressBar } from '../../../../../../base/browser/ui/progressbar/progressbar.js';
+import { Sash, Orientation } from '../../../../../../base/browser/ui/sash/sash.js';
+import { Toggle } from '../../../../../../base/browser/ui/toggle/toggle.js';
 import { Widget } from '../../../../../../base/browser/ui/widget.js';
+import { Action, ActionRunner, Separator } from '../../../../../../base/common/actions.js';
 import { Delayer } from '../../../../../../base/common/async.js';
+import { Codicon } from '../../../../../../base/common/codicons.js';
 import { KeyCode } from '../../../../../../base/common/keyCodes.js';
-import './notebookFindReplaceWidget.css.js';
+import { Disposable } from '../../../../../../base/common/lifecycle.js';
+import { isSafari } from '../../../../../../base/common/platform.js';
+import { ThemeIcon } from '../../../../../../base/common/themables.js';
 import { FindReplaceState } from '../../../../../../editor/contrib/find/browser/findState.js';
 import { SimpleButton, findPreviousMatchIcon, findNextMatchIcon, findSelectionIcon, findReplaceIcon, findReplaceAllIcon } from '../../../../../../editor/contrib/find/browser/findWidget.js';
-import { localizeWithPath } from '../../../../../../nls.js';
-import { ContextScopedReplaceInput, registerAndCreateHistoryNavigationContext } from '../../../../../../platform/history/browser/contextScopedHistoryWidget.js';
-import { IContextKeyService } from '../../../../../../platform/contextkey/common/contextkey.service.js';
-import { IContextViewService, IContextMenuService } from '../../../../../../platform/contextview/browser/contextView.service.js';
-import { registerIcon, widgetClose } from '../../../../../../platform/theme/common/iconRegistry.js';
-import { registerThemingParticipant } from '../../../../../../platform/theme/common/themeService.js';
-import { ThemeIcon } from '../../../../../../base/common/themables.js';
 import { parseReplaceString, ReplacePattern } from '../../../../../../editor/contrib/find/browser/replacePattern.js';
-import { Codicon } from '../../../../../../base/common/codicons.js';
+import { createAndFillInActionBarActions } from '../../../../../../platform/actions/browser/menuEntryActionViewItem.js';
 import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.service.js';
-import { Action, ActionRunner, Separator } from '../../../../../../base/common/actions.js';
+import { IContextKeyService } from '../../../../../../platform/contextkey/common/contextkey.service.js';
+import { IContextViewService, IContextMenuService } from '../../../../../../platform/contextview/browser/contextView.service.js';
+import { ContextScopedReplaceInput, registerAndCreateHistoryNavigationContext } from '../../../../../../platform/history/browser/contextScopedHistoryWidget.js';
+import { IHoverService } from '../../../../../../platform/hover/browser/hover.service.js';
 import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
-import { createAndFillInActionBarActions } from '../../../../../../platform/actions/browser/menuEntryActionViewItem.js';
-import { AnchorAlignment } from '../../../../../../base/browser/ui/contextview/contextview.js';
-import { DropdownMenuActionViewItem } from '../../../../../../base/browser/ui/dropdown/dropdownActionViewItem.js';
-import { ActionBar } from '../../../../../../base/browser/ui/actionbar/actionbar.js';
-import { filterIcon } from '../../../../extensions/browser/extensionsIcons.js';
-import { NotebookFindFilters } from './findFilters.js';
-import { isSafari } from '../../../../../../base/common/platform.js';
-import { Sash, Orientation } from '../../../../../../base/browser/ui/sash/sash.js';
 import { defaultProgressBarStyles, defaultInputBoxStyles, defaultToggleStyles } from '../../../../../../platform/theme/browser/defaultStyles.js';
-import { Toggle } from '../../../../../../base/browser/ui/toggle/toggle.js';
-import { Disposable } from '../../../../../../base/common/lifecycle.js';
-import { NotebookSetting } from '../../../common/notebookCommon.js';
-import { IHoverService } from '../../../../../../platform/hover/browser/hover.service.js';
 import { asCssVariable } from '../../../../../../platform/theme/common/colorUtils.js';
 import '../../../../../../platform/theme/common/colors/baseColors.js';
 import '../../../../../../platform/theme/common/colors/chartsColors.js';
@@ -44,12 +39,17 @@ 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 { registerIcon, widgetClose } from '../../../../../../platform/theme/common/iconRegistry.js';
+import { registerThemingParticipant } from '../../../../../../platform/theme/common/themeService.js';
+import { filterIcon } from '../../../../extensions/browser/extensionsIcons.js';
+import { NotebookFindFilters } from './findFilters.js';
+import { NotebookSetting, NotebookFindScopeType } from '../../../common/notebookCommon.js';
 const _moduleId = "vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget";
 const NLS_FIND_INPUT_LABEL = ( localizeWithPath(_moduleId, 0, "Find"));
 const NLS_FIND_INPUT_PLACEHOLDER = ( localizeWithPath(_moduleId, 1, "Find"));
 const NLS_PREVIOUS_MATCH_BTN_LABEL = ( localizeWithPath(_moduleId, 2, "Previous Match"));
 const NLS_NEXT_MATCH_BTN_LABEL = ( localizeWithPath(_moduleId, 3, "Next Match"));
-const NLS_FIND_IN_CELL_SELECTION_BTN_LABEL = ( localizeWithPath(_moduleId, 4, "Find in Cell Selection"));
+const NLS_TOGGLE_SELECTION_FIND_TITLE = ( localizeWithPath(_moduleId, 4, "Find in Selection"));
 const NLS_CLOSE_BTN_LABEL = ( localizeWithPath(_moduleId, 5, "Close"));
 const NLS_TOGGLE_REPLACE_MODE_BTN_LABEL = ( localizeWithPath(_moduleId, 6, "Toggle Replace"));
 const NLS_REPLACE_INPUT_LABEL = ( localizeWithPath(_moduleId, 7, "Replace"));
@@ -62,7 +62,7 @@ const NOTEBOOK_FIND_IN_MARKUP_INPUT = ( localizeWithPath(_moduleId, 13, "Markdow
 const NOTEBOOK_FIND_IN_MARKUP_PREVIEW = ( localizeWithPath(_moduleId, 14, "Rendered Markdown"));
 const NOTEBOOK_FIND_IN_CODE_INPUT = ( localizeWithPath(_moduleId, 15, "Code Cell Source"));
 const NOTEBOOK_FIND_IN_CODE_OUTPUT = ( localizeWithPath(_moduleId, 16, "Code Cell Output"));
-const NOTEBOOK_FIND_WIDGET_INITIAL_WIDTH = 318;
+const NOTEBOOK_FIND_WIDGET_INITIAL_WIDTH = 419;
 const NOTEBOOK_FIND_WIDGET_INITIAL_HORIZONTAL_PADDING = 4;
 let NotebookFindFilterActionViewItem = class NotebookFindFilterActionViewItem extends DropdownMenuActionViewItem {
     constructor(filters, action, options, actionRunner, contextMenuService) {
@@ -261,15 +261,15 @@ let SimpleFindReplaceWidget = class SimpleFindReplaceWidget extends Widget {
         this._isVisible = false;
         this._isReplaceVisible = false;
         this.foundMatch = false;
-        this.selectionDecorationIds = [];
+        this.cellSelectionDecorationIds = [];
+        this.textSelectionDecorationIds = [];
         const findFilters = this._configurationService.getValue(NotebookSetting.findFilters) ?? { markupSource: true, markupPreview: true, codeSource: true, codeOutput: true };
         this._filters = ( (new NotebookFindFilters(
             findFilters.markupSource,
             findFilters.markupPreview,
             findFilters.codeSource,
             findFilters.codeOutput,
-            false,
-            []
+            { findScopeType: NotebookFindScopeType.None }
         )));
         this._state.change({ filters: this._filters }, false);
         this._filters.onDidChange(() => {
@@ -371,22 +371,47 @@ let SimpleFindReplaceWidget = class SimpleFindReplaceWidget extends Widget {
         }, hoverService))));
         this.inSelectionToggle = this._register(( (new Toggle({
             icon: findSelectionIcon,
-            title: NLS_FIND_IN_CELL_SELECTION_BTN_LABEL,
+            title: NLS_TOGGLE_SELECTION_FIND_TITLE,
             isChecked: false,
             inputActiveOptionBackground: asCssVariable(inputActiveOptionBackground),
             inputActiveOptionBorder: asCssVariable(inputActiveOptionBorder),
             inputActiveOptionForeground: asCssVariable(inputActiveOptionForeground),
         }))));
+        this.inSelectionToggle.domNode.style.display = 'inline';
         this.inSelectionToggle.onChange(() => {
             const checked = this.inSelectionToggle.checked;
-            this._filters.searchInRanges = checked;
             if (checked) {
-                this._filters.selectedRanges = this._notebookEditor.getSelections();
-                this.setCellSelectionDecorations();
+                const cellSelection = this._notebookEditor.getSelections();
+                const textSelection = this._notebookEditor.getSelectionViewModels()[0].getSelections();
+                if (cellSelection.length > 1 || ( (cellSelection.some(range => range.end - range.start > 1)))) {
+                    this._filters.findScope = {
+                        findScopeType: NotebookFindScopeType.Cells,
+                        selectedCellRanges: cellSelection
+                    };
+                    this.setCellSelectionDecorations();
+                }
+                else if (textSelection.length > 1 || ( (textSelection.some(range => range.endLineNumber - range.startLineNumber >= 1)))) {
+                    this._filters.findScope = {
+                        findScopeType: NotebookFindScopeType.Text,
+                        selectedCellRanges: cellSelection,
+                        selectedTextRanges: textSelection
+                    };
+                    this.setTextSelectionDecorations(textSelection, this._notebookEditor.getSelectionViewModels()[0]);
+                }
+                else {
+                    this._filters.findScope = {
+                        findScopeType: NotebookFindScopeType.Cells,
+                        selectedCellRanges: cellSelection
+                    };
+                    this.setCellSelectionDecorations();
+                }
             }
             else {
-                this._filters.selectedRanges = [];
+                this._filters.findScope = {
+                    findScopeType: NotebookFindScopeType.None
+                };
                 this.clearCellSelectionDecorations();
+                this.clearTextSelectionDecorations();
             }
         });
         const closeBtn = this._register(( (new SimpleButton({
@@ -402,21 +427,6 @@ let SimpleFindReplaceWidget = class SimpleFindReplaceWidget extends Widget {
         this._innerFindDomNode.appendChild(this.nextBtn.domNode);
         this._innerFindDomNode.appendChild(this.inSelectionToggle.domNode);
         this._innerFindDomNode.appendChild(closeBtn.domNode);
-        this.searchInSelectionEnabled = this._configurationService.getValue(NotebookSetting.findScope);
-        this.inSelectionToggle.domNode.style.display = this.searchInSelectionEnabled ? 'inline' : 'none';
-        this._configurationService.onDidChangeConfiguration(e => {
-            if (e.affectsConfiguration(NotebookSetting.findScope)) {
-                this.searchInSelectionEnabled = this._configurationService.getValue(NotebookSetting.findScope);
-                if (this.searchInSelectionEnabled) {
-                    this.inSelectionToggle.domNode.style.display = 'inline';
-                }
-                else {
-                    this.inSelectionToggle.domNode.style.display = 'none';
-                    this.inSelectionToggle.checked = false;
-                    this.clearCellSelectionDecorations();
-                }
-            }
-        });
         this._domNode.appendChild(this._innerFindDomNode);
         this.onkeyup(this._innerFindDomNode, e => {
             if (e.equals(KeyCode.Escape)) {
@@ -559,18 +569,40 @@ let SimpleFindReplaceWidget = class SimpleFindReplaceWidget extends Widget {
                 options: { className: 'nb-multiCellHighlight', outputClassName: 'nb-multiCellHighlight' }
             });
         }
-        this.selectionDecorationIds = this._notebookEditor.deltaCellDecorations([], decorations);
+        this.cellSelectionDecorationIds = this._notebookEditor.deltaCellDecorations([], decorations);
     }
     clearCellSelectionDecorations() {
-        this._notebookEditor.deltaCellDecorations(this.selectionDecorationIds, []);
+        this._notebookEditor.deltaCellDecorations(this.cellSelectionDecorationIds, []);
+    }
+    setTextSelectionDecorations(textRanges, cell) {
+        this._notebookEditor.changeModelDecorations(changeAccessor => {
+            const decorations = [];
+            for (const range of textRanges) {
+                decorations.push({
+                    ownerId: cell.handle,
+                    decorations: [{
+                            range: range,
+                            options: {
+                                description: 'text search range for notebook search scope',
+                                isWholeLine: true,
+                                className: 'nb-findScope'
+                            }
+                        }]
+                });
+            }
+            this.textSelectionDecorationIds = changeAccessor.deltaDecorations([], decorations);
+        });
+    }
+    clearTextSelectionDecorations() {
+        this._notebookEditor.changeModelDecorations(changeAccessor => {
+            changeAccessor.deltaDecorations(this.textSelectionDecorationIds, []);
+        });
     }
     _updateMatchesCount() {
     }
     dispose() {
         super.dispose();
-        if (this._domNode && this._domNode.parentElement) {
-            this._domNode.parentElement.removeChild(this._domNode);
-        }
+        this._domNode.remove();
     }
     getDomNode() {
         return this._domNode;
@@ -598,14 +630,6 @@ let SimpleFindReplaceWidget = class SimpleFindReplaceWidget extends Widget {
         if (initialInput) {
             this._findInput.setValue(initialInput);
         }
-        if (this.searchInSelectionEnabled && options?.searchInRanges !== undefined) {
-            this._filters.searchInRanges = options.searchInRanges;
-            this.inSelectionToggle.checked = options.searchInRanges;
-            if (options.searchInRanges && options.selectedRanges) {
-                this._filters.selectedRanges = options.selectedRanges;
-                this.setCellSelectionDecorations();
-            }
-        }
         this._isVisible = true;
         setTimeout(() => {
             this._domNode.classList.add('visible', 'visible-transition');
@@ -645,7 +669,10 @@ let SimpleFindReplaceWidget = class SimpleFindReplaceWidget extends Widget {
     hide() {
         if (this._isVisible) {
             this.inSelectionToggle.checked = false;
-            this._notebookEditor.deltaCellDecorations(this.selectionDecorationIds, []);
+            this._notebookEditor.deltaCellDecorations(this.cellSelectionDecorationIds, []);
+            this._notebookEditor.changeModelDecorations(changeAccessor => {
+                changeAccessor.deltaDecorations(this.textSelectionDecorationIds, []);
+            });
             this._domNode.classList.remove('visible-transition');
             this._domNode.setAttribute('aria-hidden', 'true');
             setTimeout(() => {

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindWidget.js

@@ -255,9 +255,7 @@ let NotebookFindWidget = class NotebookFindWidget extends SimpleFindReplaceWidge
         }
         this._matchesCount.style.width = MAX_MATCHES_COUNT_WIDTH + 'px';
         this._matchesCount.title = '';
-        if (this._matchesCount.firstChild) {
-            this._matchesCount.removeChild(this._matchesCount.firstChild);
-        }
+        this._matchesCount.firstChild?.remove();
         let label;
         if (this._state.matchesCount > 0) {
             let matchesCount = String(this._state.matchesCount);

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

@@ -1,6 +1,7 @@
 import { localizeWithPath } from '../../../../../nls.js';
 import { registerAction2, Action2, MenuId } from '../../../../../platform/actions/common/actions.js';
 import { IClipboardService } from '../../../../../platform/clipboard/common/clipboardService.service.js';
+import { IOpenerService } from '../../../../../platform/opener/common/opener.service.js';
 import { NOTEBOOK_ACTIONS_CATEGORY } from './coreActions.js';
 import { NOTEBOOK_CELL_HAS_OUTPUTS } from '../../common/notebookContextKeys.js';
 import { copyIcon } from '../notebookIcons.js';
@@ -8,7 +9,7 @@ import { ILogService } from '../../../../../platform/log/common/log.service.js';
 import { copyCellOutput } from '../contrib/clipboard/cellOutputClipboard.js';
 import { IEditorService } from '../../../../services/editor/common/editorService.service.js';
 import { getNotebookEditorFromEditorPane } from '../notebookBrowser.js';
-import { CellKind } from '../../common/notebookCommon.js';
+import { CellKind, CellUri } from '../../common/notebookCommon.js';
 const _moduleId = "vs/workbench/contrib/notebook/browser/controller/cellOutputActions";
 const COPY_OUTPUT_COMMAND_ID = 'notebook.cellOutput.copy';
 registerAction2(class CopyCellOutputAction extends Action2 {
@@ -77,7 +78,7 @@ function getOutputViewModelFromId(outputId, notebookEditor) {
     if (notebookViewModel) {
         const codeCells = notebookViewModel.viewCells.filter(cell => cell.cellKind === CellKind.Code);
         for (const cell of codeCells) {
-            const output = cell.outputsViewModels.find(output => output.model.outputId === outputId);
+            const output = cell.outputsViewModels.find(output => output.model.outputId === outputId || output.model.alternativeOutputId === outputId);
             if (output) {
                 return output;
             }
@@ -85,4 +86,39 @@ function getOutputViewModelFromId(outputId, notebookEditor) {
     }
     return undefined;
 }
-export { COPY_OUTPUT_COMMAND_ID };
+const OPEN_OUTPUT_COMMAND_ID = 'notebook.cellOutput.openInTextEditor';
+registerAction2(class OpenCellOutputInEditorAction extends Action2 {
+    constructor() {
+        super({
+            id: OPEN_OUTPUT_COMMAND_ID,
+            title: ( localizeWithPath(_moduleId, 1, "Open Cell Output in Text Editor")),
+            f1: false,
+            category: NOTEBOOK_ACTIONS_CATEGORY,
+            icon: copyIcon,
+        });
+    }
+    getNoteboookEditor(editorService, outputContext) {
+        if (outputContext && 'notebookEditor' in outputContext) {
+            return outputContext.notebookEditor;
+        }
+        return getNotebookEditorFromEditorPane(editorService.activeEditorPane);
+    }
+    async run(accessor, outputContext) {
+        const notebookEditor = this.getNoteboookEditor(accessor.get(IEditorService), outputContext);
+        if (!notebookEditor) {
+            return;
+        }
+        let outputViewModel;
+        if (outputContext && 'outputId' in outputContext && typeof outputContext.outputId === 'string') {
+            outputViewModel = getOutputViewModelFromId(outputContext.outputId, notebookEditor);
+        }
+        else if (outputContext && 'outputViewModel' in outputContext) {
+            outputViewModel = outputContext.outputViewModel;
+        }
+        const openerService = accessor.get(IOpenerService);
+        if (outputViewModel?.model.outputId && notebookEditor.textModel?.uri) {
+            openerService.open(CellUri.generateCellOutputUri(notebookEditor.textModel.uri, outputViewModel.model.outputId));
+        }
+    }
+});
+export { COPY_OUTPUT_COMMAND_ID, OPEN_OUTPUT_COMMAND_ID };

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

@@ -19,4 +19,5 @@ const MENU_CELL_CHAT_WIDGET = MenuId.for('cellChatWidget');
 const MENU_CELL_CHAT_WIDGET_STATUS = MenuId.for('cellChatWidget.status');
 MenuId.for('cellChatWidget.feedback');
 MenuId.for('cellChatWidget.toolbar');
-export { CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_NOTEBOOK_CHAT_HAS_ACTIVE_REQUEST, CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION, CTX_NOTEBOOK_CHAT_USER_DID_EDIT, MENU_CELL_CHAT_INPUT, MENU_CELL_CHAT_WIDGET, MENU_CELL_CHAT_WIDGET_STATUS };
+const CTX_NOTEBOOK_CHAT_HAS_AGENT = ( (new RawContextKey('notebookChatAgentRegistered', false, ( localizeWithPath(_moduleId, 4, "Whether a chat agent for notebook is registered")))));
+export { CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_NOTEBOOK_CHAT_HAS_ACTIVE_REQUEST, CTX_NOTEBOOK_CHAT_HAS_AGENT, CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION, CTX_NOTEBOOK_CHAT_USER_DID_EDIT, MENU_CELL_CHAT_INPUT, MENU_CELL_CHAT_WIDGET, MENU_CELL_CHAT_WIDGET_STATUS };

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

@@ -18,7 +18,6 @@ import { ILanguageService } from '../../../../../../editor/common/languages/lang
 import { IEditorWorkerService } from '../../../../../../editor/common/services/editorWorker.js';
 import { IModelService } from '../../../../../../editor/common/services/model.js';
 import { localizeWithPath } from '../../../../../../nls.js';
-import { MenuId } from '../../../../../../platform/actions/common/actions.js';
 import { IContextKeyService } from '../../../../../../platform/contextkey/common/contextkey.service.js';
 import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
 import { StorageScope, StorageTarget } from '../../../../../../platform/storage/common/storage.js';
@@ -28,7 +27,6 @@ import { IChatService } from '../../../../chat/common/chatService.service.js';
 import { countWords } from '../../../../chat/common/chatWordCounter.js';
 import { InlineChatWidget } from '../../../../inlineChat/browser/inlineChatWidget.js';
 import { performAsyncTextEdit, asProgressiveEdit } from '../../../../inlineChat/browser/utils.js';
-import { MENU_INLINE_CHAT_WIDGET } from '../../../../inlineChat/common/inlineChat.js';
 import { insertCell, runDeleteAction } from '../cellOperations.js';
 import { CTX_NOTEBOOK_CHAT_HAS_ACTIVE_REQUEST, CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_NOTEBOOK_CHAT_USER_DID_EDIT, CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION, MENU_CELL_CHAT_WIDGET_STATUS } from './notebookChatContext.js';
 import { registerNotebookContribution } from '../../notebookEditorExtensions.js';
@@ -316,14 +314,16 @@ let NotebookChatController = class NotebookChatController extends Disposable {
         const result = this._modelService.createModel('', null, inputUri, false);
         fakeParentEditor.setModel(result);
         const inlineChatWidget = this._widgetDisposableStore.add(this._instantiationService.createInstance(InlineChatWidget, ChatAgentLocation.Notebook, {
-            telemetrySource: 'notebook-generate-cell',
-            inputMenuId: MenuId.ChatExecute,
-            widgetMenuId: MENU_INLINE_CHAT_WIDGET,
             statusMenuId: MENU_CELL_CHAT_WIDGET_STATUS,
-            rendererOptions: {
-                renderTextEditsAsSummary: (uri) => {
-                    return isEqual(uri, this._widget?.parentEditor.getModel()?.uri)
-                        || isEqual(uri, this._notebookEditor.textModel?.uri);
+            chatWidgetViewOptions: {
+                rendererOptions: {
+                    renderTextEditsAsSummary: (uri) => {
+                        return isEqual(uri, this._widget?.parentEditor.getModel()?.uri)
+                            || isEqual(uri, this._notebookEditor.textModel?.uri);
+                    }
+                },
+                menus: {
+                    telemetrySource: 'notebook-generate-cell'
                 }
             }
         }));
@@ -362,6 +362,9 @@ let NotebookChatController = class NotebookChatController extends Disposable {
             }, 0, this._store);
             this._sessionCtor = createCancelablePromise(async (token) => {
                 await this._startSession(token);
+                assertType(this._model.value);
+                const model = this._model.value;
+                this._widget?.inlineChatWidget.setChatModel(model);
                 if (fakeParentEditor.hasModel()) {
                     if (this._widget) {
                         this._focusWidget();
@@ -422,8 +425,6 @@ let NotebookChatController = class NotebookChatController extends Disposable {
         await this._sessionCtor;
         assertType(this._model.value);
         assertType(this._strategy);
-        const model = this._model.value;
-        this._widget.inlineChatWidget.setChatModel(model);
         const lastInput = this._widget.inlineChatWidget.value;
         this._historyUpdate(lastInput);
         const editor = this._widget.parentEditor;

package/vscode/src/vs/workbench/contrib/notebook/browser/media/notebookCellChat.css.js

@@ -1,4 +1,4 @@
 import n from '../../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
-var css = ".monaco-workbench .notebookOverlay .cell-chat-part{background:var(--vscode-inlineChat-background);border:1px solid var(--vscode-inlineChat-border);border-radius:6px;color:inherit;display:none;padding:6px}.monaco-workbench .notebookOverlay .cell-chat-part .cell-chat-container{padding:8px 8px 0}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat{color:inherit}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .body{display:flex}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .body .content{border-radius:2px;box-sizing:border-box;display:flex;outline:1px solid var(--vscode-inlineChatInput-border);outline-offset:-1px}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .body .content.synthetic-focus{outline:1px solid var(--vscode-inlineChatInput-focusBorder)}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .body .content .input{align-items:center;background-color:var(--vscode-inlineChatInput-background);cursor:text;display:flex;justify-content:space-between;padding:2px 2px 2px 6px}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .body .content .input .monaco-editor-background{background-color:var(--vscode-inlineChatInput-background)}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .body .content .input .editor-placeholder{color:var(--vscode-inlineChatInput-placeholderForeground);overflow:hidden;position:absolute;text-overflow:ellipsis;white-space:nowrap;z-index:1}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .body .content .input .editor-placeholder.hidden{display:none}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .body .content .input .editor-container{vertical-align:middle}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .body .toolbar{align-self:stretch;background:var(--vscode-inlineChatInput-background);border-bottom-right-radius:2px;border-top-right-radius:2px;display:flex;flex-direction:column;padding-right:4px}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .body .toolbar .actions-container{display:flex;flex-direction:row;gap:4px}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .body>.widget-toolbar{padding-left:4px}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .progress{left:19px;position:relative;width:calc(100% - 18px)}.monaco-workbench .part.editor>.content .monaco-editor .inline-chat .progress .monaco-progress-container{top:0}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .status{align-items:center;display:flex;justify-content:space-between;margin-top:4px}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .status.actions{margin-top:4px}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .status .actions.hidden{display:none}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .status .label{align-self:baseline;color:var(--vscode-descriptionForeground);display:flex;font-size:11px;overflow:hidden}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .status .label.hidden{display:none}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .status .label.info{margin-right:auto;padding-left:2px}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .status .label.info>.codicon{font-size:12px;line-height:18px;padding:0 5px}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .status .label.status{align-self:center;margin-left:auto;padding-left:10px;padding-right:4px}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .status .label .slash-command-pill CODE{background-color:var(--vscode-chat-slashCommandBackground);border-radius:3px;color:var(--vscode-chat-slashCommandForeground);padding:0 1px}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .markdownMessage{padding:10px 5px}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .markdownMessage.hidden{display:none}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .markdownMessage .message *{margin:unset}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .markdownMessage .message code{background-color:var(--vscode-textPreformat-background);border-radius:4px;color:var(--vscode-textPreformat-foreground);font-family:var(--monaco-monospace-font);font-size:12px;padding:1px 3px}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .markdownMessage .message .interactive-result-code-block{margin:16px 0}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .markdownMessage .message{-webkit-line-clamp:none;-webkit-box-orient:vertical;display:-webkit-box;overflow:hidden;-webkit-user-select:text;user-select:text}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .markdownMessage .message[state=cropped]{-webkit-line-clamp:var(--vscode-inline-chat-cropped,3)}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .markdownMessage .message[state=expanded]{-webkit-line-clamp:var(--vscode-inline-chat-expanded,10)}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .status .label A{color:var(--vscode-textLink-foreground);cursor:pointer}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .status .label.error{color:var(--vscode-errorForeground)}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .status .label.warn{color:var(--vscode-editorWarning-foreground)}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .status .actions{display:flex}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .status .actions>.monaco-button,.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .status .actions>.monaco-button-dropdown{margin-right:6px}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .status .actions>.monaco-button-dropdown>.monaco-dropdown-button{align-items:center;display:flex;padding:0 4px}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .status .actions>.monaco-button.codicon{display:flex}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .status .actions>.monaco-button.codicon:before{align-self:center}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .status .actions .monaco-text-button{padding:2px 4px;white-space:nowrap}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .status .monaco-toolbar .action-item{padding:0 2px}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .status .monaco-toolbar .action-label.checked{background-color:var(--vscode-inputOption-activeBackground);color:var(--vscode-inputOption-activeForeground);outline:1px solid var(--vscode-inputOption-activeBorder)}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .status .monaco-toolbar .action-item.button-item .action-label:is(:hover,:focus){background-color:var(--vscode-button-hoverBackground)}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .preview{display:none}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .previewDiff{border:1px solid var(--vscode-inlineChat-border);border-bottom-left-radius:2px;border-bottom-right-radius:2px;border-top:none;display:inherit;margin:0 2px 6px;padding:6px}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .previewCreateTitle{padding-top:6px}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .previewCreate{border:1px solid var(--vscode-inlineChat-border);border-radius:2px;display:inherit;margin:0 2px 6px;padding:6px}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .previewCreate.hidden,.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .previewCreateTitle.hidden,.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .previewDiff.hidden{display:none}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat-lines-deleted-range-inline{background-color:var(--vscode-diffEditor-removedTextBackground);opacity:.6;text-decoration:line-through}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat-lines-inserted-range{background-color:var(--vscode-diffEditor-insertedTextBackground)}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat-block-selection{background-color:var(--vscode-inlineChat-regionHighlight)}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat-slash-command{opacity:0}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat-slash-command-detail{opacity:.5}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat-diff-widget .monaco-diff-editor .monaco-editor .margin-view-overlays,.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat-diff-widget .monaco-diff-editor .monaco-editor-background{background-color:var(--vscode-inlineChat-regionHighlight)}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat-newfile-widget{background-color:var(--vscode-inlineChat-regionHighlight);padding:3px 0 6px}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat-newfile-widget .title{align-items:center;display:flex;justify-content:space-between;padding:3px 6px 3px 0}.monaco-workbench .notebookOverlay .cell-chat-part .glyph-margin-widgets .cgmr.codicon-inline-chat-opaque,.monaco-workbench .notebookOverlay .cell-chat-part .glyph-margin-widgets .cgmr.codicon-inline-chat-transparent{cursor:pointer;display:block;transition:opacity .2s ease-in-out}.monaco-workbench .notebookOverlay .cell-chat-part .glyph-margin-widgets .cgmr.codicon-inline-chat-opaque{opacity:.5}.monaco-workbench .notebookOverlay .cell-chat-part .glyph-margin-widgets .cgmr.codicon-inline-chat-transparent{opacity:0}.monaco-workbench .notebookOverlay .cell-chat-part .glyph-margin-widgets .cgmr.codicon-inline-chat-opaque:hover,.monaco-workbench .notebookOverlay .cell-chat-part .glyph-margin-widgets .cgmr.codicon-inline-chat-transparent:hover{opacity:1}";
+var css = ".monaco-workbench .notebookOverlay .cell-chat-part{background:var(--vscode-inlineChat-background);border:1px solid var(--vscode-inlineChat-border);border-radius:6px;color:inherit;display:none;padding:6px}.monaco-workbench .notebookOverlay .cell-chat-part .cell-chat-container{padding:8px 8px 0}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat{color:inherit}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .body{display:flex}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .body .content{border-radius:2px;box-sizing:border-box;display:flex;outline:1px solid var(--vscode-inlineChatInput-border);outline-offset:-1px}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .body .content.synthetic-focus{outline:1px solid var(--vscode-inlineChatInput-focusBorder)}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .body .content .input{align-items:center;background-color:var(--vscode-inlineChatInput-background);cursor:text;display:flex;justify-content:space-between;padding:2px 2px 2px 6px}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .body .content .input .monaco-editor-background{background-color:var(--vscode-inlineChatInput-background)}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .body .content .input .editor-placeholder{color:var(--vscode-inlineChatInput-placeholderForeground);overflow:hidden;position:absolute;text-overflow:ellipsis;white-space:nowrap;z-index:1}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .body .content .input .editor-placeholder.hidden{display:none}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .body .content .input .editor-container{vertical-align:middle}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .body .toolbar{align-self:stretch;background:var(--vscode-inlineChatInput-background);border-bottom-right-radius:2px;border-top-right-radius:2px;display:flex;flex-direction:column;padding-right:4px}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .body .toolbar .actions-container{display:flex;flex-direction:row;gap:4px}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .body>.widget-toolbar{padding-left:4px}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .progress{left:19px;position:relative;width:calc(100% - 18px)}.monaco-workbench .part.editor>.content .monaco-editor .inline-chat .progress .monaco-progress-container{top:0}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .status{align-items:center;display:flex;justify-content:space-between;margin-top:4px}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .status.actions{margin-top:4px}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .status .actions.hidden{display:none}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .status .label{align-self:baseline;color:var(--vscode-descriptionForeground);display:flex;font-size:11px;overflow:hidden}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .status .label.hidden{display:none}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .status .label.info{margin-right:auto;padding-left:2px}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .status .label.info>.codicon{font-size:12px;line-height:18px;padding:0 5px}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .status .label.status{align-self:center;margin-left:auto;padding-left:10px;padding-right:4px}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .status .label .slash-command-pill CODE{background-color:var(--vscode-chat-slashCommandBackground);border-radius:3px;color:var(--vscode-chat-slashCommandForeground);padding:0 1px}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .markdownMessage{padding:10px 5px}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .markdownMessage.hidden{display:none}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .markdownMessage .message *{margin:unset}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .markdownMessage .message code{background-color:var(--vscode-textPreformat-background);border-radius:4px;color:var(--vscode-textPreformat-foreground);font-family:var(--monaco-monospace-font);font-size:12px;padding:1px 3px}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .markdownMessage .message .interactive-result-code-block{margin:16px 0}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .markdownMessage .message{-webkit-line-clamp:none;-webkit-box-orient:vertical;display:-webkit-box;overflow:hidden;-webkit-user-select:text;user-select:text}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .status .label A{color:var(--vscode-textLink-foreground);cursor:pointer}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .status .label.error{color:var(--vscode-errorForeground)}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .status .label.warn{color:var(--vscode-editorWarning-foreground)}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .status .actions{display:flex}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .status .actions>.monaco-button,.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .status .actions>.monaco-button-dropdown{margin-right:6px}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .status .actions>.monaco-button-dropdown>.monaco-dropdown-button{align-items:center;display:flex;padding:0 4px}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .status .actions>.monaco-button.codicon{display:flex}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .status .actions>.monaco-button.codicon:before{align-self:center}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .status .actions .monaco-text-button{padding:2px 4px;white-space:nowrap}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .status .monaco-toolbar .action-item{padding:0 2px}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .status .monaco-toolbar .action-label.checked{background-color:var(--vscode-inputOption-activeBackground);color:var(--vscode-inputOption-activeForeground);outline:1px solid var(--vscode-inputOption-activeBorder)}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .status .monaco-toolbar .action-item.button-item .action-label:is(:hover,:focus){background-color:var(--vscode-button-hoverBackground)}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .preview{display:none}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .previewDiff{border:1px solid var(--vscode-inlineChat-border);border-bottom-left-radius:2px;border-bottom-right-radius:2px;border-top:none;display:inherit;margin:0 2px 6px;padding:6px}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .previewCreateTitle{padding-top:6px}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .previewCreate{border:1px solid var(--vscode-inlineChat-border);border-radius:2px;display:inherit;margin:0 2px 6px;padding:6px}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .previewCreate.hidden,.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .previewCreateTitle.hidden,.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat .previewDiff.hidden{display:none}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat-lines-deleted-range-inline{background-color:var(--vscode-diffEditor-removedTextBackground);opacity:.6;text-decoration:line-through}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat-lines-inserted-range{background-color:var(--vscode-diffEditor-insertedTextBackground)}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat-block-selection{background-color:var(--vscode-inlineChat-regionHighlight)}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat-slash-command{opacity:0}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat-slash-command-detail{opacity:.5}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat-diff-widget .monaco-diff-editor .monaco-editor .margin-view-overlays,.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat-diff-widget .monaco-diff-editor .monaco-editor-background{background-color:var(--vscode-inlineChat-regionHighlight)}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat-newfile-widget{background-color:var(--vscode-inlineChat-regionHighlight);padding:3px 0 6px}.monaco-workbench .notebookOverlay .cell-chat-part .inline-chat-newfile-widget .title{align-items:center;display:flex;justify-content:space-between;padding:3px 6px 3px 0}.monaco-workbench .notebookOverlay .cell-chat-part .glyph-margin-widgets .cgmr.codicon-inline-chat-opaque,.monaco-workbench .notebookOverlay .cell-chat-part .glyph-margin-widgets .cgmr.codicon-inline-chat-transparent{cursor:pointer;display:block;transition:opacity .2s ease-in-out}.monaco-workbench .notebookOverlay .cell-chat-part .glyph-margin-widgets .cgmr.codicon-inline-chat-opaque{opacity:.5}.monaco-workbench .notebookOverlay .cell-chat-part .glyph-margin-widgets .cgmr.codicon-inline-chat-transparent{opacity:0}.monaco-workbench .notebookOverlay .cell-chat-part .glyph-margin-widgets .cgmr.codicon-inline-chat-opaque:hover,.monaco-workbench .notebookOverlay .cell-chat-part .glyph-margin-widgets .cgmr.codicon-inline-chat-transparent:hover{opacity:1}";
 n(css,{});
 export { css, css as default };

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

@@ -34,7 +34,7 @@ class NotebookAccessibilityProvider extends Disposable {
     }
     getAriaLabel(element) {
         const event = Event.filter(this.onDidAriaLabelChange, e => e === element);
-        return observableFromEvent(event, () => {
+        return observableFromEvent(this, event, () => {
             const viewModel = this.viewModel();
             if (!viewModel) {
                 return '';

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

@@ -1,4 +1,4 @@
-import { NOTEBOOK_EDITOR_ID } from '../common/notebookCommon.js';
+import { NOTEBOOK_EDITOR_ID, REPL_EDITOR_ID } from '../common/notebookCommon.js';
 import { isCompositeNotebookEditorInput } from '../common/notebookEditorInput.js';
 import { cellRangesToIndexes, reduceCellRanges } from '../common/notebookRange.js';
 const EXPAND_CELL_INPUT_COMMAND_ID = 'notebook.cell.expandCellInput';
@@ -98,7 +98,8 @@ function getNotebookEditorFromEditorPane(editorPane) {
         return editorPane.getControl();
     }
     const input = editorPane.input;
-    if (input && isCompositeNotebookEditorInput(input)) {
+    const isInteractiveEditor = input && isCompositeNotebookEditorInput(input);
+    if (isInteractiveEditor || editorPane.getId() === REPL_EDITOR_ID) {
         return editorPane.getControl()?.notebookEditor;
     }
     return undefined;