@codingame/monaco-vscode-api 8.0.3 → 9.0.0

package/vscode/src/vs/workbench/contrib/chat/browser/chatWidget.js

@@ -1,10 +1,10 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { append, scheduleAtNextAnimationFrame, getWindow, Dimension, $ as $$1 } from '../../../../base/browser/dom.js';
+import { findParentWithClass, getTopLeftOffset, append, scheduleAtNextAnimationFrame, getWindow, Dimension, $ as $$1 } from '../../../../base/browser/dom.js';
 import { timeout, disposableTimeout } from '../../../../base/common/async.js';
 import { toErrorMessage } from '../../../../base/common/errorMessage.js';
 import { Emitter, Event } from '../../../../base/common/event.js';
 import { Disposable, DisposableStore, MutableDisposable, combinedDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
-import { matchesScheme, Schemas } from '../../../../base/common/network.js';
+import { Schemas } from '../../../../base/common/network.js';
 import { extUri, isEqual } from '../../../../base/common/resources.js';
 import { isDefined } from '../../../../base/common/types.js';
 import './media/chat.css.js';
@@ -26,7 +26,7 @@ import { ChatEditorOptions } from './chatOptions.js';
 import { IChatAgentService } from '../common/chatAgents.service.js';
 import { CONTEXT_IN_CHAT_SESSION, CONTEXT_CHAT_LOCATION, CONTEXT_IN_QUICK_CHAT, CONTEXT_CHAT_INPUT_HAS_AGENT, CONTEXT_CHAT_REQUEST_IN_PROGRESS, CONTEXT_RESPONSE_FILTERED } from '../common/chatContextKeys.js';
 import { ChatModelInitState } from '../common/chatModel.js';
-import { ChatRequestAgentPart, chatAgentLeader, chatSubcommandLeader } from '../common/chatParserTypes.js';
+import { ChatRequestAgentPart, formatChatQuestion, chatAgentLeader, chatSubcommandLeader } from '../common/chatParserTypes.js';
 import { ChatRequestParser } from '../common/chatRequestParser.js';
 import { IChatService } from '../common/chatService.service.js';
 import { IChatSlashCommandService } from '../common/chatSlashCommands.service.js';
@@ -37,6 +37,9 @@ const $ = $$1;
 function revealLastElement(list) {
     list.scrollTop = list.scrollHeight - list.renderHeight;
 }
+function isQuickChat(widget) {
+    return 'viewContext' in widget && 'isQuickChat' in widget.viewContext && Boolean(widget.viewContext.isQuickChat);
+}
 let ChatWidget = class ChatWidget extends Disposable {
     static { ChatWidget_1 = this; }
     static { this.CONTRIBS = []; }
@@ -70,9 +73,8 @@ let ChatWidget = class ChatWidget extends Disposable {
     get location() {
         return this._location.location;
     }
-    constructor(location, viewContext, viewOptions, styles, codeEditorService, contextKeyService, instantiationService, chatService, chatAgentService, chatWidgetService, contextMenuService, chatAccessibilityService, logService, themeService, chatSlashCommandService) {
+    constructor(location, _viewContext, viewOptions, styles, codeEditorService, contextKeyService, instantiationService, chatService, chatAgentService, chatWidgetService, contextMenuService, chatAccessibilityService, logService, themeService, chatSlashCommandService) {
         super();
-        this.viewContext = viewContext;
         this.viewOptions = viewOptions;
         this.styles = styles;
         this.contextKeyService = contextKeyService;
@@ -115,6 +117,7 @@ let ChatWidget = class ChatWidget extends Disposable {
         this._visible = false;
         this.previousTreeScrollHeight = 0;
         this.viewModelDisposables = this._register(( new DisposableStore()));
+        this.viewContext = _viewContext ?? {};
         if (typeof location === 'object') {
             this._location = location;
         }
@@ -123,16 +126,13 @@ let ChatWidget = class ChatWidget extends Disposable {
         }
         CONTEXT_IN_CHAT_SESSION.bindTo(contextKeyService).set(true);
         CONTEXT_CHAT_LOCATION.bindTo(contextKeyService).set(this._location.location);
-        CONTEXT_IN_QUICK_CHAT.bindTo(contextKeyService).set('resource' in viewContext);
+        CONTEXT_IN_QUICK_CHAT.bindTo(contextKeyService).set(isQuickChat(this));
         this.agentInInput = CONTEXT_CHAT_INPUT_HAS_AGENT.bindTo(contextKeyService);
         this.requestInProgress = CONTEXT_CHAT_REQUEST_IN_PROGRESS.bindTo(contextKeyService);
         this._register(chatWidgetService.register(this));
         this._codeBlockModelCollection = this._register(instantiationService.createInstance(CodeBlockModelCollection));
         this._register(codeEditorService.registerCodeEditorOpenHandler(async (input, _source, _sideBySide) => {
-            let resource = input.resource;
-            if (matchesScheme(resource, Schemas.vscodeCopilotBackingChatCodeBlock)) {
-                resource = resource.with({ scheme: Schemas.vscodeChatCodeBlock });
-            }
+            const resource = input.resource;
             if (resource.scheme !== Schemas.vscodeChatCodeBlock) {
                 return null;
             }
@@ -146,18 +146,30 @@ let ChatWidget = class ChatWidget extends Disposable {
             }
             this.reveal(item);
             await timeout(0);
-            for (const editor of this.renderer.editorsInUse() ?? []) {
-                if (extUri.isEqual(editor.uri, resource, true)) {
-                    const inner = editor.editor;
+            for (const codeBlockPart of this.renderer.editorsInUse()) {
+                if (extUri.isEqual(codeBlockPart.uri, resource, true)) {
+                    const editor = codeBlockPart.editor;
+                    let relativeTop = 0;
+                    const editorDomNode = editor.getDomNode();
+                    if (editorDomNode) {
+                        const row = findParentWithClass(editorDomNode, 'monaco-list-row');
+                        if (row) {
+                            relativeTop = getTopLeftOffset(editorDomNode).top - getTopLeftOffset(row).top;
+                        }
+                    }
                     if (input.options?.selection) {
-                        inner.setSelection({
+                        const editorSelectionTopOffset = editor.getTopForPosition(input.options.selection.startLineNumber, input.options.selection.startColumn);
+                        relativeTop += editorSelectionTopOffset;
+                        editor.focus();
+                        editor.setSelection({
                             startLineNumber: input.options.selection.startLineNumber,
                             startColumn: input.options.selection.startColumn,
                             endLineNumber: input.options.selection.endLineNumber ?? input.options.selection.startLineNumber,
                             endColumn: input.options.selection.endColumn ?? input.options.selection.startColumn
                         });
                     }
-                    return inner;
+                    this.reveal(item, relativeTop);
+                    return editor;
                 }
             }
             return null;
@@ -217,14 +229,6 @@ let ChatWidget = class ChatWidget extends Disposable {
                 return undefined;
             }
         })).filter(isDefined);
-        this.contribs.forEach(c => {
-            if (c.onDidChangeInputState) {
-                this._register(c.onDidChangeInputState(() => {
-                    const state = this.collectInputState();
-                    this.inputPart.updateState(state);
-                }));
-            }
-        });
     }
     getContrib(id) {
         return this.contribs.find(c => c.id === id);
@@ -338,7 +342,7 @@ let ChatWidget = class ChatWidget extends Disposable {
         this._register(this.renderer.onDidClickRerunWithAgentOrCommandDetection(item => {
             const request = this.chatService.getSession(item.sessionId)?.getRequests().find(candidate => candidate.id === item.requestId);
             if (request) {
-                this.chatService.resendRequest(request, { noCommandDetection: true, attempt: request.attempt, location: this.location }).catch(e => this.logService.error('FAILED to rerun request', e));
+                this.chatService.resendRequest(request, { noCommandDetection: true, attempt: request.attempt + 1, location: this.location }).catch(e => this.logService.error('FAILED to rerun request', e));
             }
         }));
         this.tree = scopedInstantiationService.createInstance(WorkbenchObjectTree, 'Chat', listContainer, delegate, [this.renderer], {
@@ -414,7 +418,7 @@ let ChatWidget = class ChatWidget extends Disposable {
             renderStyle: options?.renderStyle === 'minimal' ? 'compact' : options?.renderStyle,
             menus: { executeToolbar: MenuId.ChatExecute, ...this.viewOptions.menus },
             editorOverflowWidgetsDomNode: this.viewOptions.editorOverflowWidgetsDomNode,
-        }));
+        }, () => this.collectInputState()));
         this.inputPart.render(container, '', this);
         this._register(this.inputPart.onDidLoadInputState(state => {
             this.contribs.forEach(c => {
@@ -518,8 +522,8 @@ let ChatWidget = class ChatWidget extends Disposable {
     getFocus() {
         return this.tree.getFocus()[0] ?? undefined;
     }
-    reveal(item) {
-        this.tree.reveal(item);
+    reveal(item, relativeTop) {
+        this.tree.reveal(item, relativeTop);
     }
     focus(item) {
         const items = this.tree.getNode(null).children;
@@ -581,12 +585,17 @@ let ChatWidget = class ChatWidget extends Disposable {
             if (result) {
                 this.inputPart.acceptInput(isUserQuery);
                 this._onDidSubmitAgent.fire({ agent: result.agent, slashCommand: result.slashCommand });
-                this.inputPart.updateState(this.collectInputState());
-                this.inputPart.clearContext();
                 result.responseCompletePromise.then(() => {
                     const responses = this.viewModel?.getItems().filter(isResponseVM);
                     const lastResponse = responses?.[responses.length - 1];
                     this.chatAccessibilityService.acceptResponse(lastResponse, requestId);
+                    if (lastResponse?.result?.nextQuestion) {
+                        const { prompt, participant, command } = lastResponse.result.nextQuestion;
+                        const question = formatChatQuestion(this.chatAgentService, this.location, prompt, participant, command);
+                        if (question) {
+                            this.input.setValue(question, false);
+                        }
+                    }
                 });
                 return result.responseCreatedPromise;
             }
@@ -712,7 +721,6 @@ let ChatWidget = class ChatWidget extends Disposable {
         this.inputPart.saveState();
     }
     getViewState() {
-        this.inputPart.saveState();
         return { inputValue: this.getInput(), inputState: this.collectInputState() };
     }
 };
@@ -757,4 +765,4 @@ class ChatWidgetService {
         return combinedDisposable(newWidget.onDidFocus(() => this.setLastFocusedWidget(newWidget)), toDisposable(() => this._widgets.splice(this._widgets.indexOf(newWidget), 1)));
     }
 }
-export { ChatWidget, ChatWidgetService };
+export { ChatWidget, ChatWidgetService, isQuickChat };

package/vscode/src/vs/workbench/contrib/chat/browser/codeBlockPart.css.js

@@ -1,4 +1,4 @@
 import n from '../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
-var css = ".interactive-result-code-block{position:relative}.interactive-result-code-block .interactive-result-code-block-toolbar{display:none}.interactive-result-code-block .interactive-result-code-block-toolbar>.monaco-action-bar,.interactive-result-code-block .interactive-result-code-block-toolbar>.monaco-toolbar{background-color:var(--vscode-interactive-result-editor-background-color,var(--vscode-editor-background));border:1px solid var(--vscode-chat-requestBorder);height:26px;line-height:26px;max-width:70%;overflow:hidden;position:absolute;text-overflow:ellipsis;top:-13px;z-index:100}.interactive-result-code-block .interactive-result-code-block-toolbar>.monaco-action-bar{left:0}.interactive-result-code-block .interactive-result-code-block-toolbar>.monaco-toolbar{right:10px}.interactive-result-code-block .monaco-toolbar .action-item{height:24px;margin:1px 2px;width:24px}.interactive-result-code-block .monaco-toolbar .action-item .codicon{margin:1px}.interactive-result-code-block .interactive-result-code-block-toolbar:focus-within,.interactive-result-code-block.focused .interactive-result-code-block-toolbar,.interactive-result-code-block:hover .interactive-result-code-block-toolbar{border-radius:2px;display:initial}.interactive-result-code-block .interactive-result-code-block-toolbar.force-visibility .monaco-toolbar{display:initial!important}.interactive-item-container .value .rendered-markdown [data-code]{margin:16px 0}.interactive-result-code-block{background-color:var(--vscode-interactive-result-editor-background-color);border:1px solid var(--vscode-input-border,transparent)}.interactive-result-code-block:has(.monaco-editor.focused){border-color:var(--vscode-focusBorder,transparent)}.interactive-result-code-block,.interactive-result-code-block .monaco-editor,.interactive-result-code-block .monaco-editor .overflow-guard{border-radius:4px}.interactive-result-code-block .interactive-result-vulns{font-size:.9em;padding:0 8px 2px}.interactive-result-code-block .interactive-result-vulns-header{display:flex;height:22px}.interactive-result-code-block .interactive-result-vulns-header,.interactive-result-code-block .interactive-result-vulns-list{opacity:.8}.interactive-result-code-block .interactive-result-vulns-list{margin:0;padding-bottom:3px;padding-left:16px!important}.interactive-result-code-block.chat-vulnerabilities-collapsed .interactive-result-vulns-list{display:none}.interactive-result-code-block .interactive-result-vulns-list .chat-vuln-title{font-weight:700}.interactive-result-code-block.no-vulns .interactive-result-vulns{display:none}.interactive-result-code-block .interactive-result-vulns-header .monaco-button{border:none;color:var(--vscode-foreground)!important;display:inline-flex;justify-content:normal;padding:0;text-align:initial;user-select:none;width:100%}.interactive-result-code-block .interactive-result-vulns-header .monaco-text-button:focus{outline:none}.interactive-result-code-block .interactive-result-vulns-header .monaco-text-button:focus-visible{outline:1px solid var(--vscode-focusBorder)}.interactive-result-code-block.compare.no-diff .message{display:inherit}.interactive-result-code-block.compare .message{display:none;padding:6px}.interactive-result-code-block.compare .message A{color:var(--vscode-textLink-foreground);cursor:pointer}.interactive-result-code-block.compare .message A>CODE{color:var(--vscode-textLink-foreground)}.interactive-result-code-block.compare .interactive-result-header{align-items:center;border-bottom:1px solid var(--vscode-chat-requestBorder);box-sizing:border-box;display:flex;justify-content:space-between;padding:0 3px}.interactive-result-code-block.compare.no-diff .interactive-result-editor,.interactive-result-code-block.compare.no-diff .interactive-result-header{display:none}";
+var css = ".interactive-result-code-block{position:relative}.interactive-result-code-block .interactive-result-code-block-toolbar{display:none}.interactive-result-code-block .interactive-result-code-block-toolbar>.monaco-action-bar,.interactive-result-code-block .interactive-result-code-block-toolbar>.monaco-toolbar{background-color:var(--vscode-interactive-result-editor-background-color,var(--vscode-editor-background));border:1px solid var(--vscode-chat-requestBorder);height:26px;line-height:26px;max-width:70%;overflow:hidden;position:absolute;text-overflow:ellipsis;top:-15px;z-index:100}.interactive-result-code-block .interactive-result-code-block-toolbar>.monaco-action-bar{left:0}.interactive-result-code-block .interactive-result-code-block-toolbar>.monaco-toolbar{right:10px}.interactive-result-code-block .monaco-toolbar .action-item{height:24px;margin:1px 2px;width:24px}.interactive-result-code-block .monaco-toolbar .action-item .codicon{margin:1px}.interactive-result-code-block .interactive-result-code-block-toolbar:focus-within,.interactive-result-code-block.focused .interactive-result-code-block-toolbar,.interactive-result-code-block:hover .interactive-result-code-block-toolbar{border-radius:2px;display:initial}.interactive-result-code-block .interactive-result-code-block-toolbar.force-visibility .monaco-toolbar{display:initial!important}.interactive-item-container .value .rendered-markdown [data-code]{margin:16px 0}.interactive-result-code-block{background-color:var(--vscode-interactive-result-editor-background-color);border:1px solid var(--vscode-input-border,transparent)}.interactive-result-code-block:has(.monaco-editor.focused){border-color:var(--vscode-focusBorder,transparent)}.interactive-result-code-block,.interactive-result-code-block .monaco-editor,.interactive-result-code-block .monaco-editor .overflow-guard{border-radius:4px}.interactive-result-code-block .interactive-result-vulns{font-size:.9em;padding:0 8px 2px}.interactive-result-code-block .interactive-result-vulns-header{display:flex;height:22px}.interactive-result-code-block .interactive-result-vulns-header,.interactive-result-code-block .interactive-result-vulns-list{opacity:.8}.interactive-result-code-block .interactive-result-vulns-list{margin:0;padding-bottom:3px;padding-left:16px!important}.interactive-result-code-block.chat-vulnerabilities-collapsed .interactive-result-vulns-list{display:none}.interactive-result-code-block .interactive-result-vulns-list .chat-vuln-title{font-weight:700}.interactive-result-code-block.no-vulns .interactive-result-vulns{display:none}.interactive-result-code-block .interactive-result-vulns-header .monaco-button{border:none;color:var(--vscode-foreground)!important;display:inline-flex;justify-content:normal;padding:0;text-align:initial;user-select:none;width:100%}.interactive-result-code-block .interactive-result-vulns-header .monaco-text-button:focus{outline:none}.interactive-result-code-block .interactive-result-vulns-header .monaco-text-button:focus-visible{outline:1px solid var(--vscode-focusBorder)}.interactive-result-code-block.compare.no-diff .message{display:inherit}.interactive-result-code-block.compare .message{display:none;padding:6px}.interactive-result-code-block.compare .message A{color:var(--vscode-textLink-foreground);cursor:pointer}.interactive-result-code-block.compare .message A>CODE{color:var(--vscode-textLink-foreground)}.interactive-result-code-block.compare .interactive-result-header{align-items:center;border-bottom:1px solid var(--vscode-chat-requestBorder);box-sizing:border-box;display:flex;justify-content:space-between;padding:0 3px}.interactive-result-code-block.compare.no-diff .interactive-result-editor,.interactive-result-code-block.compare.no-diff .interactive-result-header{display:none}";
 n(css,{});
 export { css, css as default };

package/vscode/src/vs/workbench/contrib/chat/browser/codeBlockPart.js

@@ -1,11 +1,11 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import './codeBlockPart.css.js';
-import { append, hide, show, clearNode, reset, $ as $$1 } from '../../../../base/browser/dom.js';
+import { append, hide, show, clearNode, getTotalHeight, reset, $ as $$1 } from '../../../../base/browser/dom.js';
 import { renderFormattedText } from '../../../../base/browser/formattedTextRenderer.js';
 import { Button } from '../../../../base/browser/ui/button/button.js';
 import { Codicon } from '../../../../base/common/codicons.js';
-import { Emitter } from '../../../../base/common/event.js';
-import { Disposable, DisposableStore, MutableDisposable } from '../../../../base/common/lifecycle.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { Disposable, DisposableStore, MutableDisposable, combinedDisposable } from '../../../../base/common/lifecycle.js';
 import { Schemas } from '../../../../base/common/network.js';
 import { isEqual } from '../../../../base/common/resources.js';
 import { URI } from '../../../../base/common/uri.js';
@@ -27,7 +27,9 @@ import { BracketMatchingController } from '../../../../editor/contrib/bracketMat
 import { ColorDetector } from '../../../../editor/contrib/colorPicker/browser/colorDetector.js';
 import { ContextMenuController } from '../../../../editor/contrib/contextmenu/browser/contextmenu.js';
 import { GotoDefinitionAtPositionEditorContribution } from '../../../../editor/contrib/gotoSymbol/browser/link/goToDefinitionAtPosition.js';
-import { HoverController } from '../../../../editor/contrib/hover/browser/hoverController.js';
+import { ContentHoverController } from '../../../../editor/contrib/hover/browser/contentHoverController2.js';
+import { MarginHoverController } from '../../../../editor/contrib/hover/browser/marginHoverController.js';
+import { LinkDetector } from '../../../../editor/contrib/links/browser/links.js';
 import { MessageController } from '../../../../editor/contrib/message/browser/messageController.js';
 import { ViewportSemanticTokensContribution } from '../../../../editor/contrib/semanticTokens/browser/viewportSemanticTokens.js';
 import { SmartSelectController } from '../../../../editor/contrib/smartSelect/browser/smartSelect.js';
@@ -38,18 +40,20 @@ import { MenuWorkbenchToolBar } from '../../../../platform/actions/browser/toolb
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
 import { IDialogService } from '../../../../platform/dialogs/common/dialogs.service.js';
+import { FileKind } from '../../../../platform/files/common/files.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
 import { ILabelService } from '../../../../platform/label/common/label.service.js';
 import { IOpenerService } from '../../../../platform/opener/common/opener.service.js';
+import { ResourceLabel } from '../../../browser/labels.js';
+import { ResourceContextKey } from '../../../common/contextkeys.js';
 import { AccessibilityVerbositySettingId } from '../../accessibility/browser/accessibilityConfiguration.js';
 import { CONTEXT_CHAT_EDIT_APPLIED } from '../common/chatContextKeys.js';
 import { isResponseVM } from '../common/chatViewModel.js';
 import { MenuPreventer } from '../../codeEditor/browser/menuPreventer.js';
 import { SelectionClipboardContributionID } from '../../codeEditor/browser/selectionClipboard.js';
 import { getSimpleEditorOptions } from '../../codeEditor/browser/simpleEditorOptions.js';
-import { ResourceLabel } from '../../../browser/labels.js';
-import { FileKind } from '../../../../platform/files/common/files.js';
+import { assertType } from '../../../../base/common/types.js';
 const $ = $$1;
 const localFileLanguageId = 'vscode-local-file';
 function parseLocalFileData(text) {
@@ -93,6 +97,7 @@ let CodeBlockPart = class CodeBlockPart extends Disposable {
         this.disposableStore = this._register(( (new DisposableStore())));
         this.isDisposed = false;
         this.element = $('.interactive-result-code-block');
+        this.resourceContextKey = this._register(instantiationService.createInstance(ResourceContextKey));
         this.contextKeyService = this._register(contextKeyService.createScoped(this.element));
         const scopedInstantiationService = this._register(instantiationService.createChild(( (new ServiceCollection([IContextKeyService, this.contextKeyService])))));
         const editorElement = append(this.element, $('.interactive-result-editor'));
@@ -117,7 +122,7 @@ let CodeBlockPart = class CodeBlockPart extends Disposable {
                 multipleDefinitions: 'goto',
                 multipleImplementations: 'goto',
             },
-            ariaLabel: ( localize(10579, 'Code block')),
+            ariaLabel: ( localize(10613, 'Code block')),
             overflowWidgetsDomNode,
             ...this.getEditorOptionsFromConfig(),
         });
@@ -204,10 +209,12 @@ let CodeBlockPart = class CodeBlockPart extends Disposable {
                 ViewportSemanticTokensContribution.ID,
                 BracketMatchingController.ID,
                 SmartSelectController.ID,
-                HoverController.ID,
+                ContentHoverController.ID,
+                MarginHoverController.ID,
                 MessageController.ID,
                 GotoDefinitionAtPositionEditorContribution.ID,
-                ColorDetector.ID
+                ColorDetector.ID,
+                LinkDetector.ID,
             ])
         }));
     }
@@ -226,7 +233,7 @@ let CodeBlockPart = class CodeBlockPart extends Disposable {
         const toolbarElt = this.toolbar.getElement();
         if (this.accessibilityService.isScreenReaderOptimized()) {
             toolbarElt.style.display = 'block';
-            toolbarElt.ariaLabel = this.configurationService.getValue(AccessibilityVerbositySettingId.Chat) ? ( localize(10580, 'Toolbar for code block which can be reached via tab')) : ( localize(10581, 'Code block toolbar'));
+            toolbarElt.ariaLabel = this.configurationService.getValue(AccessibilityVerbositySettingId.Chat) ? ( localize(10614, 'Toolbar for code block which can be reached via tab')) : ( localize(10615, 'Code block toolbar'));
         }
         else {
             toolbarElt.style.display = '';
@@ -277,7 +284,7 @@ let CodeBlockPart = class CodeBlockPart extends Disposable {
             this.disposableStore.add(this.editor.onDidFocusEditorWidget(() => TabFocus.setTabFocusMode(true)));
             this.disposableStore.add(this.editor.onDidBlurEditorWidget(() => TabFocus.setTabFocusMode(false)));
         }
-        this.editor.updateOptions({ ariaLabel: ( localize(10582, "Code block {0}", data.codeBlockIndex + 1)), readOnly: !editable });
+        this.editor.updateOptions({ ariaLabel: ( localize(10616, "Code block {0}", data.codeBlockIndex + 1)), readOnly: !editable });
         if (data.hideToolbar) {
             hide(this.toolbar.getElement());
         }
@@ -301,7 +308,8 @@ let CodeBlockPart = class CodeBlockPart extends Disposable {
         this.clearWidgets();
     }
     clearWidgets() {
-        HoverController.get(this.editor)?.hideContentHover();
+        ContentHoverController.get(this.editor)?.hideContentHover();
+        MarginHoverController.get(this.editor)?.hideContentHover();
     }
     async updateEditor(data) {
         const textModel = (await data.textModel).textEditorModel;
@@ -316,14 +324,15 @@ let CodeBlockPart = class CodeBlockPart extends Disposable {
             element: data.element,
             languageId: textModel.getLanguageId()
         };
+        this.resourceContextKey.set(textModel.uri);
     }
     getVulnerabilitiesLabel() {
         if (!this.currentCodeBlockData || !this.currentCodeBlockData.vulns) {
             return '';
         }
         const referencesLabel = this.currentCodeBlockData.vulns.length > 1 ?
-            ( localize(10583, "{0} vulnerabilities", this.currentCodeBlockData.vulns.length)) :
-            ( localize(10584, "{0} vulnerability", 1));
+            ( localize(10617, "{0} vulnerabilities", this.currentCodeBlockData.vulns.length)) :
+            ( localize(10618, "{0} vulnerability", 1));
         const icon = (element) => element.vulnerabilitiesListExpanded ? Codicon.chevronDown : Codicon.chevronRight;
         return `${referencesLabel} $(${icon(this.currentCodeBlockData.element).id})`;
     }
@@ -396,7 +405,7 @@ let CodeCompareBlockPart = class CodeCompareBlockPart extends Disposable {
                 multipleDefinitions: 'goto',
                 multipleImplementations: 'goto',
             },
-            ariaLabel: ( localize(10579, 'Code block')),
+            ariaLabel: ( localize(10613, 'Code block')),
             overflowWidgetsDomNode,
             ...this.getEditorOptionsFromConfig(),
         });
@@ -455,7 +464,8 @@ let CodeCompareBlockPart = class CodeCompareBlockPart extends Disposable {
                 ViewportSemanticTokensContribution.ID,
                 BracketMatchingController.ID,
                 SmartSelectController.ID,
-                HoverController.ID,
+                ContentHoverController.ID,
+                MarginHoverController.ID,
                 GotoDefinitionAtPositionEditorContribution.ID,
             ])
         };
@@ -465,8 +475,8 @@ let CodeCompareBlockPart = class CodeCompareBlockPart extends Disposable {
             diffCodeLens: false,
             scrollBeyondLastLine: false,
             stickyScroll: { enabled: false },
-            originalAriaLabel: ( localize(10585, 'Original')),
-            modifiedAriaLabel: ( localize(10586, 'Modified')),
+            originalAriaLabel: ( localize(10619, 'Original')),
+            modifiedAriaLabel: ( localize(10620, 'Modified')),
             diffAlgorithm: 'advanced',
             readOnly: false,
             isInEmbeddedEditor: true,
@@ -498,7 +508,7 @@ let CodeCompareBlockPart = class CodeCompareBlockPart extends Disposable {
         const toolbarElt = this.toolbar.getElement();
         if (this.accessibilityService.isScreenReaderOptimized()) {
             toolbarElt.style.display = 'block';
-            toolbarElt.ariaLabel = this.configurationService.getValue(AccessibilityVerbositySettingId.Chat) ? ( localize(10580, 'Toolbar for code block which can be reached via tab')) : ( localize(10581, 'Code block toolbar'));
+            toolbarElt.ariaLabel = this.configurationService.getValue(AccessibilityVerbositySettingId.Chat) ? ( localize(10614, 'Toolbar for code block which can be reached via tab')) : ( localize(10615, 'Code block toolbar'));
         }
         else {
             toolbarElt.style.display = '';
@@ -527,7 +537,9 @@ let CodeCompareBlockPart = class CodeCompareBlockPart extends Disposable {
         this.updatePaddingForLayout();
     }
     getContentHeight() {
-        return this.diffEditor.getContentHeight();
+        return this.diffEditor.getModel()
+            ? this.diffEditor.getContentHeight()
+            : getTotalHeight(this.messageElement);
     }
     async render(data, width, token) {
         if (data.parentContextKeyService) {
@@ -538,7 +550,7 @@ let CodeCompareBlockPart = class CodeCompareBlockPart extends Disposable {
         }
         await this.updateEditor(data, token);
         this.layout(width);
-        this.diffEditor.updateOptions({ ariaLabel: ( localize(10587, "Code Edits")) });
+        this.diffEditor.updateOptions({ ariaLabel: ( localize(10621, "Code Edits")) });
         this.resourceLabel.element.setFile(data.edit.uri, {
             fileKind: FileKind.FILE,
             fileDecorations: { colors: true, badges: false }
@@ -548,8 +560,10 @@ let CodeCompareBlockPart = class CodeCompareBlockPart extends Disposable {
         this.clearWidgets();
     }
     clearWidgets() {
-        HoverController.get(this.diffEditor.getOriginalEditor())?.hideContentHover();
-        HoverController.get(this.diffEditor.getModifiedEditor())?.hideContentHover();
+        ContentHoverController.get(this.diffEditor.getOriginalEditor())?.hideContentHover();
+        ContentHoverController.get(this.diffEditor.getModifiedEditor())?.hideContentHover();
+        MarginHoverController.get(this.diffEditor.getOriginalEditor())?.hideContentHover();
+        MarginHoverController.get(this.diffEditor.getModifiedEditor())?.hideContentHover();
     }
     async updateEditor(data, token) {
         if (!isResponseVM(data.element)) {
@@ -558,18 +572,19 @@ let CodeCompareBlockPart = class CodeCompareBlockPart extends Disposable {
         const isEditApplied = Boolean(data.edit.state?.applied ?? 0);
         CONTEXT_CHAT_EDIT_APPLIED.bindTo(this.contextKeyService).set(isEditApplied);
         this.element.classList.toggle('no-diff', isEditApplied);
-        if (data.edit.state?.applied) {
+        if (isEditApplied) {
+            assertType(data.edit.state?.applied);
             const uriLabel = this.labelService.getUriLabel(data.edit.uri, { relative: true, noPrefix: true });
             let template;
             if (data.edit.state.applied === 1) {
-                template = ( localize(10588, "Made 1 change in [[``{0}``]]", uriLabel));
+                template = ( localize(10622, "Made 1 change in [[``{0}``]]", uriLabel));
             }
             else if (data.edit.state.applied < 0) {
-                template = ( localize(10589, "Edits in [[``{0}``]] have been rejected", uriLabel));
+                template = ( localize(10623, "Edits in [[``{0}``]] have been rejected", uriLabel));
             }
             else {
                 template = ( localize(
-                    10590,
+                    10624,
                     "Made {0} changes in [[``{1}``]]",
                     data.edit.state.applied,
                     uriLabel
@@ -587,10 +602,7 @@ let CodeCompareBlockPart = class CodeCompareBlockPart extends Disposable {
             reset(this.messageElement, message);
         }
         const diffData = await data.diffData;
-        if (!diffData) {
-            return;
-        }
-        if (!isEditApplied) {
+        if (!isEditApplied && diffData) {
             const viewModel = this.diffEditor.createViewModel({
                 original: diffData.original,
                 modified: diffData.modified
@@ -599,12 +611,16 @@ let CodeCompareBlockPart = class CodeCompareBlockPart extends Disposable {
             if (token.isCancellationRequested) {
                 return;
             }
+            const listener = Event.any(diffData.original.onWillDispose, diffData.modified.onWillDispose)(() => {
+                this.diffEditor.setModel(null);
+            });
             this.diffEditor.setModel(viewModel);
-            this._lastDiffEditorViewModel.value = viewModel;
+            this._lastDiffEditorViewModel.value = combinedDisposable(listener, viewModel);
         }
         else {
             this.diffEditor.setModel(null);
             this._lastDiffEditorViewModel.value = undefined;
+            this._onDidChangeContentHeight.fire();
         }
         this.toolbar.context = {
             edit: data.edit,
@@ -612,9 +628,6 @@ let CodeCompareBlockPart = class CodeCompareBlockPart extends Disposable {
             diffEditor: this.diffEditor,
         };
     }
-    clearModel() {
-        this.diffEditor.setModel(null);
-    }
 };
 CodeCompareBlockPart = ( (__decorate([
     ( (__param(4, IInstantiationService))),
@@ -698,8 +711,8 @@ let DefaultChatTextEditor = class DefaultChatTextEditor {
     async _checkSha1(model, item) {
         if (item.state?.sha1 && this._sha1.computeSHA1(model) && this._sha1.computeSHA1(model) !== item.state.sha1) {
             const result = await this.dialogService.confirm({
-                message: ( localize(10591, "The original file has been modified.")),
-                detail: ( localize(10592, "Do you want to apply the changes anyway?")),
+                message: ( localize(10625, "The original file has been modified.")),
+                detail: ( localize(10626, "Do you want to apply the changes anyway?")),
             });
             if (!result.confirmed) {
                 return false;

package/vscode/src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables.js

@@ -1,6 +1,5 @@
 import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
 import { coalesce } from '../../../../../base/common/arrays.js';
-import { Emitter } from '../../../../../base/common/event.js';
 import { MarkdownString } from '../../../../../base/common/htmlContent.js';
 import { Disposable } from '../../../../../base/common/lifecycle.js';
 import { basename } from '../../../../../base/common/resources.js';
@@ -31,11 +30,8 @@ let ChatDynamicVariableModel = class ChatDynamicVariableModel extends Disposable
         this.widget = widget;
         this.labelService = labelService;
         this._variables = [];
-        this._onDidChangeInputState = this._register(( (new Emitter())));
-        this.onDidChangeInputState = this._onDidChangeInputState.event;
         this._register(widget.inputEditor.onDidChangeModelContent(e => {
             e.changes.forEach(c => {
-                let didModifyState = false;
                 this._variables = coalesce(( (this._variables.map(ref => {
                     const intersection = Range.intersectRanges(ref.range, c.range);
                     if (intersection && !intersection.isEmpty()) {
@@ -51,12 +47,10 @@ let ChatDynamicVariableModel = class ChatDynamicVariableModel extends Disposable
                                     text: '',
                                 }]);
                         }
-                        didModifyState = true;
                         return null;
                     }
                     else if (Range.compareRangesUsingStarts(ref.range, c.range) > 0) {
                         const delta = c.text.length - c.rangeLength;
-                        didModifyState = true;
                         return {
                             ...ref,
                             range: {
@@ -69,9 +63,6 @@ let ChatDynamicVariableModel = class ChatDynamicVariableModel extends Disposable
                     }
                     return ref;
                 }))));
-                if (didModifyState) {
-                    this._onDidChangeInputState.fire();
-                }
             });
             this.updateDecorations();
         }));
@@ -89,10 +80,9 @@ let ChatDynamicVariableModel = class ChatDynamicVariableModel extends Disposable
     addReference(ref) {
         this._variables.push(ref);
         this.updateDecorations();
-        this._onDidChangeInputState.fire();
     }
     updateDecorations() {
-        this.widget.inputEditor.setDecorationsByType('chat', dynamicVariableDecorationType, ( (this._variables.map(r => ({
+        this.widget.inputEditor.setDecorationsByType('chat', dynamicVariableDecorationType, ( (this._variables.map((r) => ({
             range: r.range,
             hoverMessage: this.getHoverForReference(r)
         })))));
@@ -105,9 +95,7 @@ let ChatDynamicVariableModel = class ChatDynamicVariableModel extends Disposable
             );
         }
         else {
-            return (
-                 (value.toString())
-            );
+            return undefined;
         }
     }
 };
@@ -121,9 +109,9 @@ function isSelectAndInsertFileActionContext(context) {
 class SelectAndInsertFileAction extends Action2 {
     static { this.Name = 'files'; }
     static { this.Item = {
-        label: ( localize(7003, 'All Files')),
+        label: ( localize(6942, 'All Files')),
         description: ( localize(
-            7004,
+            6943,
             'Search for relevant files in the workspace and provide context from them'
         )),
     }; }
@@ -148,11 +136,10 @@ class SelectAndInsertFileAction extends Action2 {
         };
         let options;
         if (chatVariablesService.hasVariable(SelectAndInsertFileAction.Name)) {
-            options = {
-                providerOptions: {
-                    additionPicks: [SelectAndInsertFileAction.Item, { type: 'separator' }]
-                },
+            const providerOptions = {
+                additionPicks: [SelectAndInsertFileAction.Item, { type: 'separator' }]
             };
+            options = { providerOptions };
         }
         const picks = await quickInputService.quickAccess.pick('', options);
         if (!picks?.length) {