@codingame/monaco-vscode-api 4.5.2 → 5.0.0

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

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { getTotalHeight, append, scheduleAtNextAnimationFrame, getWindow, Dimension, $ as $$1 } from '../../../../base/browser/dom.js';
+import { 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';
@@ -8,6 +8,7 @@ import { Schemas } from '../../../../base/common/network.js';
 import { isEqual } from '../../../../base/common/resources.js';
 import { isDefined } from '../../../../base/common/types.js';
 import './media/chat.css.js';
+import './media/chatAgentHover.css.js';
 import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
 import { MenuId } from '../../../../platform/actions/common/actions.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
@@ -24,7 +25,6 @@ import { ChatListDelegate, ChatListItemRenderer } from './chatListRenderer.js';
 import { ChatEditorOptions } from './chatOptions.js';
 import { IChatAgentService } from '../common/chatAgents.service.js';
 import { CONTEXT_IN_CHAT_SESSION, CONTEXT_CHAT_LOCATION, CONTEXT_CHAT_INPUT_HAS_AGENT, CONTEXT_CHAT_REQUEST_IN_PROGRESS, CONTEXT_RESPONSE_FILTERED } from '../common/chatContextKeys.js';
-import { IChatContributionService } from '../common/chatContributionService.service.js';
 import { ChatModelInitState } from '../common/chatModel.js';
 import { ChatRequestAgentPart, extractAgentAndCommand, chatAgentLeader, chatSubcommandLeader } from '../common/chatParserTypes.js';
 import { ChatRequestParser } from '../common/chatRequestParser.js';
@@ -32,7 +32,6 @@ import { IChatService } from '../common/chatService.service.js';
 import { IChatSlashCommandService } from '../common/chatSlashCommands.service.js';
 import { isResponseVM, isRequestVM, isWelcomeVM, ChatViewModel } from '../common/chatViewModel.js';
 import { CodeBlockModelCollection } from '../common/codeBlockModelCollection.js';
-import { IViewsService } from '../../../services/views/common/viewsService.service.js';
 var ChatWidget_1;
 const $ = $$1;
 function revealLastElement(list) {
@@ -151,9 +150,6 @@ let ChatWidget = class ChatWidget extends Disposable {
     get supportsFileReferences() {
         return !!this.viewOptions.supportsFileReferences;
     }
-    get providerId() {
-        return this.viewModel?.providerId || '';
-    }
     get input() {
         return this.inputPart;
     }
@@ -164,23 +160,24 @@ let ChatWidget = class ChatWidget extends Disposable {
         return this.inputPart.inputUri;
     }
     get contentHeight() {
-        return getTotalHeight(this.inputPart.element) + this.tree.contentHeight;
+        return this.inputPart.contentHeight + this.tree.contentHeight;
     }
     render(parent) {
         const viewId = 'viewId' in this.viewContext ? this.viewContext.viewId : undefined;
         this.editorOptions = this._register(this.instantiationService.createInstance(ChatEditorOptions, viewId, this.styles.listForeground, this.styles.inputEditorBackground, this.styles.resultEditorBackground));
         const renderInputOnTop = this.viewOptions.renderInputOnTop ?? false;
+        const renderFollowups = this.viewOptions.renderFollowups ?? !renderInputOnTop;
         const renderStyle = this.viewOptions.renderStyle;
         this.container = append(parent, $('.interactive-session'));
         if (renderInputOnTop) {
-            this.createInput(this.container, { renderFollowups: false, renderStyle });
+            this.createInput(this.container, { renderFollowups, renderStyle });
             this.listContainer = append(this.container, $(`.interactive-list`));
         }
         else {
             this.listContainer = append(this.container, $(`.interactive-list`));
-            this.createInput(this.container, { renderFollowups: true, renderStyle });
+            this.createInput(this.container, { renderFollowups, renderStyle });
         }
-        this.createList(this.listContainer, { renderStyle, editableCodeBlock: this.viewOptions.editableCodeBlocks });
+        this.createList(this.listContainer, { ...this.viewOptions.rendererOptions, renderStyle });
         this._register(this.editorOptions.onDidChange(() => this.onDidStyleChange()));
         this.onDidStyleChange();
         if (this.viewModel) {
@@ -406,7 +403,6 @@ let ChatWidget = class ChatWidget extends Disposable {
                 return;
             }
             this.chatService.notifyUserAction({
-                providerId: this.viewModel.providerId,
                 sessionId: this.viewModel.sessionId,
                 requestId: e.response.requestId,
                 agentId: e.response.agent?.id,
@@ -463,7 +459,7 @@ let ChatWidget = class ChatWidget extends Disposable {
             }
             this.requestInProgress.set(this.viewModel.requestInProgress);
             this.onDidChangeItems();
-            if (( events.some(e => e?.kind === 'addRequest'))) {
+            if (( events.some(e => e?.kind === 'addRequest')) && this.visible) {
                 revealLastElement(this.tree);
                 this.focusInput();
             }
@@ -473,7 +469,7 @@ let ChatWidget = class ChatWidget extends Disposable {
             this.viewModel = undefined;
             this.onDidChangeItems();
         }));
-        this.inputPart.setState(model.providerId, viewState.inputValue);
+        this.inputPart.setState(viewState.inputValue);
         this.contribs.forEach(c => {
             if (c.setInputState && viewState.inputState?.[c.id]) {
                 c.setInputState(viewState.inputState?.[c.id]);
@@ -539,7 +535,7 @@ let ChatWidget = class ChatWidget extends Disposable {
                 'query' in opts ? opts.query :
                     `${opts.prefix} ${editorValue}`;
             const isUserQuery = !opts || 'prefix' in opts;
-            const result = await this.chatService.sendRequest(this.viewModel.sessionId, input, this.inputPart.implicitContextEnabled, this.location, { selectedAgent: this._lastSelectedAgent });
+            const result = await this.chatService.sendRequest(this.viewModel.sessionId, input, { implicitVariablesEnabled: this.inputPart.implicitContextEnabled, location: this.location, parserContext: { selectedAgent: this._lastSelectedAgent } });
             if (result) {
                 const inputState = this.collectInputState();
                 this.inputPart.acceptInput(isUserQuery ? input : undefined, isUserQuery ? inputState : undefined);
@@ -685,13 +681,11 @@ ChatWidget = ChatWidget_1 = ( __decorate([
     ( __param(13, IThemeService)),
     ( __param(14, IChatSlashCommandService))
 ], ChatWidget));
-let ChatWidgetService = class ChatWidgetService {
+class ChatWidgetService {
     get lastFocusedWidget() {
         return this._lastFocusedWidget;
     }
-    constructor(viewsService, chatContributionService) {
-        this.viewsService = viewsService;
-        this.chatContributionService = chatContributionService;
+    constructor() {
         this._widgets = [];
         this._lastFocusedWidget = undefined;
     }
@@ -701,11 +695,6 @@ let ChatWidgetService = class ChatWidgetService {
     getWidgetBySessionId(sessionId) {
         return this._widgets.find(w => w.viewModel?.sessionId === sessionId);
     }
-    async revealViewForProvider(providerId) {
-        const viewId = this.chatContributionService.getViewIdForProvider(providerId);
-        const view = await this.viewsService.openView(viewId);
-        return view?.widget;
-    }
     setLastFocusedWidget(widget) {
         if (widget === this._lastFocusedWidget) {
             return;
@@ -719,9 +708,5 @@ let ChatWidgetService = class ChatWidgetService {
         this._widgets.push(newWidget);
         return combinedDisposable(newWidget.onDidFocus(() => this.setLastFocusedWidget(newWidget)), toDisposable(() => this._widgets.splice(this._widgets.indexOf(newWidget), 1)));
     }
-};
-ChatWidgetService = ( __decorate([
-    ( __param(0, IViewsService)),
-    ( __param(1, IChatContributionService))
-], ChatWidgetService));
+}
 export { ChatWidget, ChatWidgetService };

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 .monaco-toolbar{background-color:var(--vscode-interactive-result-editor-background-color,var(--vscode-editor-background));border:1px solid var(--vscode-chat-requestBorder);display:none;height:26px;position:absolute;right:10px;top:-13px;z-index:100}.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 .monaco-toolbar:focus-within,.interactive-result-code-block.focused .monaco-toolbar,.interactive-result-code-block:hover .monaco-toolbar{border-radius:2px;display:initial}.interactive-result-code-block .interactive-result-code-block-toolbar.force-visibility .monaco-toolbar{display:initial!important}.interactive-result-code-block{background-color:var(--vscode-interactive-result-editor-background-color);border:1px solid var(--vscode-input-border,transparent);margin:16px 0}.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)}";
+var css = ".interactive-result-code-block{position:relative}.interactive-result-code-block .monaco-toolbar{background-color:var(--vscode-interactive-result-editor-background-color,var(--vscode-editor-background));border:1px solid var(--vscode-chat-requestBorder);display:none;height:26px;position:absolute;right:10px;top:-13px;z-index:100}.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 .monaco-toolbar:focus-within,.interactive-result-code-block.focused .monaco-toolbar,.interactive-result-code-block:hover .monaco-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}";
 n(css,{});
 export { css, css as default };

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

@@ -1,10 +1,10 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import './codeBlockPart.css.js';
-import { append, hide, show, clearNode, $ as $$1 } from '../../../../base/browser/dom.js';
+import { append, hide, show, clearNode, reset, $ as $$1 } from '../../../../base/browser/dom.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 } from '../../../../base/common/lifecycle.js';
+import { Disposable, DisposableStore, MutableDisposable } from '../../../../base/common/lifecycle.js';
 import { Schemas } from '../../../../base/common/network.js';
 import { URI } from '../../../../base/common/uri.js';
 import { EditorExtensionsRegistry } from '../../../../editor/browser/editorExtensions.js';
@@ -16,7 +16,6 @@ import { ITextModelService } from '../../../../editor/common/services/resolverSe
 import { BracketMatchingController } from '../../../../editor/contrib/bracketMatching/browser/bracketMatching.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/hover.js';
 import { ViewportSemanticTokensContribution } from '../../../../editor/contrib/semanticTokens/browser/viewportSemanticTokens.js';
 import { SmartSelectController } from '../../../../editor/contrib/smartSelect/browser/smartSelect.js';
 import { WordHighlighterContribution } from '../../../../editor/contrib/wordHighlighter/browser/wordHighlighter.js';
@@ -32,6 +31,18 @@ import { MenuPreventer } from '../../codeEditor/browser/menuPreventer.js';
 import { SelectionClipboardContributionID } from '../../codeEditor/browser/selectionClipboard.js';
 import { getSimpleEditorOptions } from '../../codeEditor/browser/simpleEditorOptions.js';
 import { TabFocus } from '../../../../editor/browser/config/tabFocus.js';
+import { DiffEditorWidget } from '../../../../editor/browser/widget/diffEditor/diffEditorWidget.js';
+import { HoverController } from '../../../../editor/contrib/hover/browser/hoverController.js';
+import { CONTEXT_CHAT_EDIT_APPLIED } from '../common/chatContextKeys.js';
+import { ILabelService } from '../../../../platform/label/common/label.service.js';
+import { renderFormattedText } from '../../../../base/browser/formattedTextRenderer.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.service.js';
+import { TextEdit } from '../../../../editor/common/languages.js';
+import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
+import { isEqual } from '../../../../base/common/resources.js';
+import { DefaultModelSHA1Computer } from '../../../../editor/common/services/modelService.js';
+import { IDialogService } from '../../../../platform/dialogs/common/dialogs.service.js';
+import { TextModelText } from '../../../../editor/common/model/textModelText.js';
 const _moduleId = "vs/workbench/contrib/chat/browser/codeBlockPart";
 const $ = $$1;
 const localFileLanguageId = 'vscode-local-file';
@@ -73,6 +84,7 @@ let CodeBlockPart = class CodeBlockPart extends Disposable {
         this._onDidChangeContentHeight = this._register(( (new Emitter())));
         this.onDidChangeContentHeight = this._onDidChangeContentHeight.event;
         this.currentScrollWidth = 0;
+        this.disposableStore = this._register(( (new DisposableStore())));
         this.element = $('.interactive-result-code-block');
         this.contextKeyService = this._register(contextKeyService.createScoped(this.element));
         const scopedInstantiationService = instantiationService.createChild(( (new ServiceCollection([IContextKeyService, this.contextKeyService]))));
@@ -247,8 +259,9 @@ let CodeBlockPart = class CodeBlockPart extends Disposable {
         await this.updateEditor(data);
         this.layout(width);
         if (editable) {
-            this._register(this.editor.onDidFocusEditorWidget(() => TabFocus.setTabFocusMode(true)));
-            this._register(this.editor.onDidBlurEditorWidget(() => TabFocus.setTabFocusMode(false)));
+            this.disposableStore.clear();
+            this.disposableStore.add(this.editor.onDidFocusEditorWidget(() => TabFocus.setTabFocusMode(true)));
+            this.disposableStore.add(this.editor.onDidBlurEditorWidget(() => TabFocus.setTabFocusMode(false)));
         }
         this.editor.updateOptions({ ariaLabel: ( localizeWithPath(_moduleId, 3, "Code block {0}", data.codeBlockIndex + 1)), readOnly: !editable });
         if (data.hideToolbar) {
@@ -331,4 +344,351 @@ ChatCodeBlockContentProvider = ( (__decorate([
     ( (__param(0, ITextModelService))),
     ( (__param(1, IModelService)))
 ], ChatCodeBlockContentProvider)));
-export { ChatCodeBlockContentProvider, CodeBlockPart, localFileLanguageId, parseLocalFileData };
+let CodeCompareBlockPart = class CodeCompareBlockPart extends Disposable {
+    constructor(options, menuId, delegate, overflowWidgetsDomNode, instantiationService, contextKeyService, modelService, configurationService, accessibilityService, labelService, openerService) {
+        super();
+        this.options = options;
+        this.menuId = menuId;
+        this.modelService = modelService;
+        this.configurationService = configurationService;
+        this.accessibilityService = accessibilityService;
+        this.labelService = labelService;
+        this.openerService = openerService;
+        this._onDidChangeContentHeight = this._register(( (new Emitter())));
+        this.onDidChangeContentHeight = this._onDidChangeContentHeight.event;
+        this._lastDiffEditorViewModel = this._store.add(( (new MutableDisposable())));
+        this.currentScrollWidth = 0;
+        this.element = $('.interactive-result-code-block');
+        this.element.classList.add('compare');
+        this.messageElement = append(this.element, $('.message'));
+        this.messageElement.setAttribute('role', 'status');
+        this.messageElement.tabIndex = 0;
+        this.contextKeyService = this._register(contextKeyService.createScoped(this.element));
+        const scopedInstantiationService = instantiationService.createChild(( (new ServiceCollection([IContextKeyService, this.contextKeyService]))));
+        const editorElement = append(this.element, $('.interactive-result-editor'));
+        this.diffEditor = this.createDiffEditor(scopedInstantiationService, editorElement, {
+            ...getSimpleEditorOptions(this.configurationService),
+            lineNumbers: 'on',
+            selectOnLineNumbers: true,
+            scrollBeyondLastLine: false,
+            lineDecorationsWidth: 12,
+            dragAndDrop: false,
+            padding: { top: defaultCodeblockPadding, bottom: defaultCodeblockPadding },
+            mouseWheelZoom: false,
+            scrollbar: {
+                vertical: 'hidden',
+                alwaysConsumeMouseWheel: false
+            },
+            definitionLinkOpensInPeek: false,
+            gotoLocation: {
+                multiple: 'goto',
+                multipleDeclarations: 'goto',
+                multipleDefinitions: 'goto',
+                multipleImplementations: 'goto',
+            },
+            ariaLabel: ( localizeWithPath(_moduleId, 0, 'Code block')),
+            overflowWidgetsDomNode,
+            ...this.getEditorOptionsFromConfig(),
+        });
+        const toolbarElement = append(this.element, $('.interactive-result-code-block-toolbar'));
+        const editorScopedService = this.diffEditor.getModifiedEditor().contextKeyService.createScoped(toolbarElement);
+        const editorScopedInstantiationService = scopedInstantiationService.createChild(( (new ServiceCollection([IContextKeyService, editorScopedService]))));
+        this.toolbar = this._register(editorScopedInstantiationService.createInstance(MenuWorkbenchToolBar, toolbarElement, menuId, {
+            menuOptions: {
+                shouldForwardArgs: true
+            }
+        }));
+        this._register(this.toolbar.onDidChangeDropdownVisibility(e => {
+            toolbarElement.classList.toggle('force-visibility', e);
+        }));
+        this._configureForScreenReader();
+        this._register(this.accessibilityService.onDidChangeScreenReaderOptimized(() => this._configureForScreenReader()));
+        this._register(this.configurationService.onDidChangeConfiguration((e) => {
+            if (( (e.affectedKeys.has(
+                "accessibility.verbosity.panelChat"
+            )))) {
+                this._configureForScreenReader();
+            }
+        }));
+        this._register(this.options.onDidChange(() => {
+            this.diffEditor.updateOptions(this.getEditorOptionsFromConfig());
+        }));
+        this._register(this.diffEditor.getModifiedEditor().onDidScrollChange(e => {
+            this.currentScrollWidth = e.scrollWidth;
+        }));
+        this._register(this.diffEditor.onDidContentSizeChange(e => {
+            if (e.contentHeightChanged) {
+                this._onDidChangeContentHeight.fire();
+            }
+        }));
+        this._register(this.diffEditor.getModifiedEditor().onDidBlurEditorWidget(() => {
+            this.element.classList.remove('focused');
+            WordHighlighterContribution.get(this.diffEditor.getModifiedEditor())?.stopHighlighting();
+            this.clearWidgets();
+        }));
+        this._register(this.diffEditor.getModifiedEditor().onDidFocusEditorWidget(() => {
+            this.element.classList.add('focused');
+            WordHighlighterContribution.get(this.diffEditor.getModifiedEditor())?.restoreViewState(true);
+        }));
+        if (delegate.onDidScroll) {
+            this._register(delegate.onDidScroll(e => {
+                this.clearWidgets();
+            }));
+        }
+    }
+    get uri() {
+        return this.diffEditor.getModifiedEditor().getModel()?.uri;
+    }
+    createDiffEditor(instantiationService, parent, options) {
+        const widgetOptions = {
+            isSimpleWidget: false,
+            contributions: EditorExtensionsRegistry.getSomeEditorContributions([
+                MenuPreventer.ID,
+                SelectionClipboardContributionID,
+                ContextMenuController.ID,
+                WordHighlighterContribution.ID,
+                ViewportSemanticTokensContribution.ID,
+                BracketMatchingController.ID,
+                SmartSelectController.ID,
+                HoverController.ID,
+                GotoDefinitionAtPositionEditorContribution.ID,
+            ])
+        };
+        return this._register(instantiationService.createInstance(DiffEditorWidget, parent, {
+            scrollbar: { useShadows: false, alwaysConsumeMouseWheel: false, ignoreHorizontalScrollbarInContentHeight: true, },
+            renderMarginRevertIcon: false,
+            diffCodeLens: false,
+            scrollBeyondLastLine: false,
+            stickyScroll: { enabled: false },
+            originalAriaLabel: ( localizeWithPath(_moduleId, 6, 'Original')),
+            modifiedAriaLabel: ( localizeWithPath(_moduleId, 7, 'Modified')),
+            diffAlgorithm: 'advanced',
+            readOnly: false,
+            isInEmbeddedEditor: true,
+            useInlineViewWhenSpaceIsLimited: false,
+            hideUnchangedRegions: { enabled: true, contextLineCount: 1 },
+            ...options
+        }, { originalEditor: widgetOptions, modifiedEditor: widgetOptions }));
+    }
+    focus() {
+        this.diffEditor.focus();
+    }
+    updatePaddingForLayout() {
+        const horizontalScrollbarVisible = this.currentScrollWidth > this.diffEditor.getModifiedEditor().getLayoutInfo().contentWidth;
+        const scrollbarHeight = this.diffEditor.getModifiedEditor().getLayoutInfo().horizontalScrollbarHeight;
+        const bottomPadding = horizontalScrollbarVisible ?
+            Math.max(defaultCodeblockPadding - scrollbarHeight, 2) :
+            defaultCodeblockPadding;
+        this.diffEditor.updateOptions({ padding: { top: defaultCodeblockPadding, bottom: bottomPadding } });
+    }
+    _configureForScreenReader() {
+        const toolbarElt = this.toolbar.getElement();
+        if (this.accessibilityService.isScreenReaderOptimized()) {
+            toolbarElt.style.display = 'block';
+            toolbarElt.ariaLabel = this.configurationService.getValue("accessibility.verbosity.panelChat" ) ? ( localizeWithPath(_moduleId, 1, 'Toolbar for code block which can be reached via tab')) : ( localizeWithPath(_moduleId, 2, 'Code block toolbar'));
+        }
+        else {
+            toolbarElt.style.display = '';
+        }
+    }
+    getEditorOptionsFromConfig() {
+        return {
+            wordWrap: this.options.configuration.resultEditor.wordWrap,
+            fontLigatures: this.options.configuration.resultEditor.fontLigatures,
+            bracketPairColorization: this.options.configuration.resultEditor.bracketPairColorization,
+            fontFamily: this.options.configuration.resultEditor.fontFamily === 'default' ?
+                EDITOR_FONT_DEFAULTS.fontFamily :
+                this.options.configuration.resultEditor.fontFamily,
+            fontSize: this.options.configuration.resultEditor.fontSize,
+            fontWeight: this.options.configuration.resultEditor.fontWeight,
+            lineHeight: this.options.configuration.resultEditor.lineHeight,
+        };
+    }
+    layout(width) {
+        const contentHeight = this.getContentHeight();
+        const editorBorder = 2;
+        const dimension = { width: width - editorBorder, height: contentHeight };
+        this.element.style.height = `${dimension.height}px`;
+        this.element.style.width = `${dimension.width}px`;
+        this.diffEditor.layout(dimension);
+        this.updatePaddingForLayout();
+    }
+    getContentHeight() {
+        return this.diffEditor.getContentHeight();
+    }
+    async render(data, width, token) {
+        if (data.parentContextKeyService) {
+            this.contextKeyService.updateParent(data.parentContextKeyService);
+        }
+        if (this.options.configuration.resultEditor.wordWrap === 'on') {
+            this.layout(width);
+        }
+        await this.updateEditor(data, token);
+        this.layout(width);
+        this.diffEditor.updateOptions({ ariaLabel: ( localizeWithPath(_moduleId, 8, "Code Edits")) });
+        if (data.hideToolbar) {
+            hide(this.toolbar.getElement());
+        }
+        else {
+            show(this.toolbar.getElement());
+        }
+    }
+    reset() {
+        this.clearWidgets();
+    }
+    clearWidgets() {
+        HoverController.get(this.diffEditor.getOriginalEditor())?.hideContentHover();
+        HoverController.get(this.diffEditor.getModifiedEditor())?.hideContentHover();
+    }
+    async updateEditor(data, token) {
+        if (!isResponseVM(data.element)) {
+            return;
+        }
+        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) {
+            const uriLabel = this.labelService.getUriLabel(data.edit.uri, { relative: true, noPrefix: true });
+            const template = data.edit.state.applied > 1
+                ? ( localizeWithPath(
+                _moduleId,
+                9,
+                "Made {0} changes in [[{1}]]",
+                data.edit.state.applied,
+                uriLabel
+            ))
+                : ( localizeWithPath(_moduleId, 10, "Made 1 change in [[{0}]]", uriLabel));
+            const message = renderFormattedText(template, {
+                actionHandler: {
+                    callback: () => {
+                        this.openerService.open(data.edit.uri, { fromUserGesture: true, allowCommands: false });
+                    },
+                    disposables: this._store,
+                }
+            });
+            reset(this.messageElement, message);
+        }
+        const diffData = await data.diffData;
+        if (!diffData) {
+            return;
+        }
+        if (!isEditApplied) {
+            const viewModel = this.diffEditor.createViewModel({
+                original: diffData.original,
+                modified: diffData.modified
+            });
+            await viewModel.waitForDiff();
+            if (token.isCancellationRequested) {
+                return;
+            }
+            this.diffEditor.setModel(viewModel);
+            this._lastDiffEditorViewModel.value = viewModel;
+        }
+        else {
+            this.diffEditor.setModel(null);
+            this._lastDiffEditorViewModel.value = undefined;
+        }
+        this.toolbar.context = {
+            edit: data.edit,
+            element: data.element,
+            diffEditor: this.diffEditor,
+        };
+    }
+};
+CodeCompareBlockPart = ( (__decorate([
+    ( (__param(4, IInstantiationService))),
+    ( (__param(5, IContextKeyService))),
+    ( (__param(6, IModelService))),
+    ( (__param(7, IConfigurationService))),
+    ( (__param(8, IAccessibilityService))),
+    ( (__param(9, ILabelService))),
+    ( (__param(10, IOpenerService)))
+], CodeCompareBlockPart)));
+let DefaultChatTextEditor = class DefaultChatTextEditor {
+    constructor(modelService, editorService, dialogService) {
+        this.modelService = modelService;
+        this.editorService = editorService;
+        this.dialogService = dialogService;
+        this._sha1 = ( (new DefaultModelSHA1Computer()));
+    }
+    async apply(response, item) {
+        if (!response.response.value.includes(item)) {
+            return;
+        }
+        if (item.state?.applied) {
+            return;
+        }
+        let diffEditor;
+        for (const candidate of this.editorService.listDiffEditors()) {
+            if (!candidate.getContainerDomNode().isConnected) {
+                continue;
+            }
+            const model = candidate.getModel();
+            if (!model || !isEqual(model.original.uri, item.uri) || model.modified.uri.scheme !== Schemas.vscodeChatCodeCompreBlock) {
+                diffEditor = candidate;
+                break;
+            }
+        }
+        const edits = diffEditor
+            ? await this._applyWithDiffEditor(diffEditor, item)
+            : await this._apply(item);
+        response.setEditApplied(item, edits);
+    }
+    async _applyWithDiffEditor(diffEditor, item) {
+        const model = diffEditor.getModel();
+        if (!model) {
+            return 0;
+        }
+        const diff = diffEditor.getDiffComputationResult();
+        if (!diff || diff.identical) {
+            return 0;
+        }
+        if (!(await this._checkSha1(model.original, item))) {
+            return 0;
+        }
+        const modified = ( (new TextModelText(model.modified)));
+        const edits = ( (diff.changes2.map(i => i.toRangeMapping().toTextEdit(modified).toSingleEditOperation())));
+        model.original.pushStackElement();
+        model.original.pushEditOperations(null, edits, () => null);
+        model.original.pushStackElement();
+        return edits.length;
+    }
+    async _apply(item) {
+        const ref = await this.modelService.createModelReference(item.uri);
+        try {
+            if (!(await this._checkSha1(ref.object.textEditorModel, item))) {
+                return 0;
+            }
+            ref.object.textEditorModel.pushStackElement();
+            let total = 0;
+            for (const group of item.edits) {
+                const edits = ( (group.map(TextEdit.asEditOperation)));
+                ref.object.textEditorModel.pushEditOperations(null, edits, () => null);
+                total += edits.length;
+            }
+            ref.object.textEditorModel.pushStackElement();
+            return total;
+        }
+        finally {
+            ref.dispose();
+        }
+    }
+    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: ( localizeWithPath(_moduleId, 11, "The original file has been modified.")),
+                detail: ( localizeWithPath(_moduleId, 12, "Do you want to apply the changes anyway?")),
+            });
+            if (!result.confirmed) {
+                return false;
+            }
+        }
+        return true;
+    }
+};
+DefaultChatTextEditor = ( (__decorate([
+    ( (__param(0, ITextModelService))),
+    ( (__param(1, ICodeEditorService))),
+    ( (__param(2, IDialogService)))
+], DefaultChatTextEditor)));
+export { ChatCodeBlockContentProvider, CodeBlockPart, CodeCompareBlockPart, DefaultChatTextEditor, localFileLanguageId, parseLocalFileData };

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

@@ -8,6 +8,7 @@ import { Range } from '../../../../../editor/common/core/range.js';
 import { ITextModelService } from '../../../../../editor/common/services/resolverService.js';
 import { localizeWithPath } from '../../../../../nls.js';
 import { Action2, registerAction2 } from '../../../../../platform/actions/common/actions.js';
+import { ICommandService } from '../../../../../platform/commands/common/commands.service.js';
 import { ILabelService } from '../../../../../platform/label/common/label.service.js';
 import { ILogService } from '../../../../../platform/log/common/log.service.js';
 import { IQuickInputService } from '../../../../../platform/quickinput/common/quickInput.service.js';
@@ -202,9 +203,41 @@ class AddDynamicVariableAction extends Action2 {
         if (!isAddDynamicVariableContext(context)) {
             return;
         }
+        let range = context.range;
+        const variableData = context.variableData;
+        const doCleanup = () => {
+            context.widget.inputEditor.executeEdits('chatInsertDynamicVariableWithArguments', [{ range: context.range, text: `` }]);
+        };
+        if (context.command) {
+            const commandService = accessor.get(ICommandService);
+            const selection = await commandService.executeCommand(context.command.id, ...(context.command.arguments ?? []));
+            if (!selection) {
+                doCleanup();
+                return;
+            }
+            const insertText = ':' + selection;
+            const insertRange = ( (new Range(
+                range.startLineNumber,
+                range.endColumn,
+                range.endLineNumber,
+                range.endColumn + insertText.length
+            )));
+            range = ( (new Range(
+                range.startLineNumber,
+                range.startColumn,
+                range.endLineNumber,
+                range.endColumn + insertText.length
+            )));
+            const editor = context.widget.inputEditor;
+            const success = editor.executeEdits('chatInsertDynamicVariableWithArguments', [{ range: insertRange, text: insertText + ' ' }]);
+            if (!success) {
+                doCleanup();
+                return;
+            }
+        }
         context.widget.getContrib(ChatDynamicVariableModel.ID)?.addReference({
-            range: context.range,
-            data: context.variableData
+            range: range,
+            data: variableData
         });
     }
 }