@codingame/monaco-vscode-api 6.0.3 → 7.0.1

package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatActions.js

@@ -9,7 +9,6 @@ import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contex
 import { IsWindowsContext, IsLinuxContext } from '../../../../../platform/contextkey/common/contextkeys.js';
 import { KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { IQuickInputService } from '../../../../../platform/quickinput/common/quickInput.service.js';
-import { ViewAction } from '../../../../browser/parts/views/viewPane.js';
 import { showChatView, CHAT_VIEW_ID } from '../chat.js';
 import { IChatWidgetService } from '../chat.service.js';
 import { ChatEditorInput } from '../chatEditorInput.js';
@@ -67,10 +66,9 @@ class OpenChatGlobalAction extends Action2 {
         chatWidget.focusInput();
     }
 }
-class ChatHistoryAction extends ViewAction {
+class ChatHistoryAction extends Action2 {
     constructor() {
         super({
-            viewId: CHAT_VIEW_ID,
             id: `workbench.action.chat.history`,
             title: ( localize2WithPath(_moduleId, 2, "Show Chats...")),
             menu: {
@@ -85,12 +83,11 @@ class ChatHistoryAction extends ViewAction {
             precondition: CONTEXT_CHAT_ENABLED
         });
     }
-    async runInView(accessor, view) {
+    async run(accessor) {
         const chatService = accessor.get(IChatService);
         const quickInputService = accessor.get(IQuickInputService);
         const viewsService = accessor.get(IViewsService);
         const editorService = accessor.get(IEditorService);
-        const items = chatService.getHistory();
         const openInEditorButton = {
             iconClass: ThemeIcon.asClassName(Codicon.file),
             tooltip: ( localizeWithPath(_moduleId, 3, "Open in Editor")),
@@ -99,18 +96,23 @@ class ChatHistoryAction extends ViewAction {
             iconClass: ThemeIcon.asClassName(Codicon.x),
             tooltip: ( localizeWithPath(_moduleId, 4, "Delete")),
         };
-        const picks = ( (items.map((i) => ({
-            label: i.title,
-            chat: i,
-            buttons: [
-                openInEditorButton,
-                deleteButton
-            ]
-        }))));
+        const getPicks = () => {
+            const items = chatService.getHistory();
+            return (
+                 (items.map((i) => ({
+                    label: i.title,
+                    chat: i,
+                    buttons: [
+                        openInEditorButton,
+                        deleteButton
+                    ]
+                })))
+            );
+        };
         const store = ( (new DisposableStore()));
         const picker = store.add(quickInputService.createQuickPick());
         picker.placeholder = ( localizeWithPath(_moduleId, 5, "Switch to chat"));
-        picker.items = picks;
+        picker.items = getPicks();
         store.add(picker.onDidTriggerItemButton(context => {
             if (context.button === openInEditorButton) {
                 editorService.openEditor({ resource: ChatEditorInput.getNewEditorUri(), options: { target: { sessionId: context.item.chat.sessionId }, pinned: true } }, ACTIVE_GROUP);
@@ -118,7 +120,7 @@ class ChatHistoryAction extends ViewAction {
             }
             else if (context.button === deleteButton) {
                 chatService.removeHistoryEntry(context.item.chat.sessionId);
-                picker.items = picks.filter(i => i !== context.item);
+                picker.items = getPicks();
             }
         }));
         store.add(picker.onDidAccept(async () => {

package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.js

@@ -142,6 +142,7 @@ class CancelAction extends Action2 {
             keybinding: {
                 weight: KeybindingWeight.WorkbenchContrib,
                 primary: KeyMod$1.CtrlCmd | KeyCode.Escape,
+                win: { primary: KeyMod$1.Alt | KeyCode.Backspace },
             }
         });
     }

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

@@ -3,6 +3,7 @@ import { h, $, append } from '../../../../base/browser/dom.js';
 import { renderIcon } from '../../../../base/browser/ui/iconLabel/iconLabels.js';
 import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
 import { Codicon } from '../../../../base/common/codicons.js';
+import { Emitter } from '../../../../base/common/event.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { FileAccess } from '../../../../base/common/network.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
@@ -20,6 +21,8 @@ let ChatAgentHover = class ChatAgentHover extends Disposable {
         this.chatAgentService = chatAgentService;
         this.extensionService = extensionService;
         this.chatAgentNameService = chatAgentNameService;
+        this._onDidChangeContents = this._register(( (new Emitter())));
+        this.onDidChangeContents = this._onDidChangeContents.event;
         const hoverElement = h('.chat-agent-hover@root', [
             h('.chat-agent-hover-header', [
                 h('.chat-agent-hover-icon@icon'),
@@ -79,6 +82,7 @@ let ChatAgentHover = class ChatAgentHover extends Disposable {
                 const extension = extensions[0];
                 if (extension?.publisherDomain?.verified) {
                     this.domNode.classList.toggle('verifiedPublisher', true);
+                    this._onDidChangeContents.fire();
                 }
             });
         }

package/vscode/src/vs/workbench/contrib/chat/browser/chatContentParts/chatCollections.js

@@ -0,0 +1,27 @@
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+class ResourcePool extends Disposable {
+    get inUse() {
+        return this._inUse;
+    }
+    constructor(_itemFactory) {
+        super();
+        this._itemFactory = _itemFactory;
+        this.pool = [];
+        this._inUse = ( new Set());
+    }
+    get() {
+        if (this.pool.length > 0) {
+            const item = this.pool.pop();
+            this._inUse.add(item);
+            return item;
+        }
+        const item = this._register(this._itemFactory());
+        this._inUse.add(item);
+        return item;
+    }
+    release(item) {
+        this._inUse.delete(item);
+        this.pool.push(item);
+    }
+}
+export { ResourcePool };

package/vscode/src/vs/workbench/contrib/chat/browser/chatContentParts/chatCommandContentPart.js

@@ -0,0 +1,35 @@
+import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
+import { $ as $$1 } from '../../../../../base/browser/dom.js';
+import { Button } from '../../../../../base/browser/ui/button/button.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { localizeWithPath } from '../../../../../nls.js';
+import { ICommandService } from '../../../../../platform/commands/common/commands.service.js';
+import { defaultButtonStyles } from '../../../../../platform/theme/browser/defaultStyles.js';
+import { isResponseVM } from '../../common/chatViewModel.js';
+const _moduleId = "vs/workbench/contrib/chat/browser/chatContentParts/chatCommandContentPart";
+const $ = $$1;
+let ChatCommandButtonContentPart = class ChatCommandButtonContentPart extends Disposable {
+    constructor(commandButton, context, commandService) {
+        super();
+        this.commandService = commandService;
+        this.domNode = $('.chat-command-button');
+        const enabled = !isResponseVM(context.element) || !context.element.isStale;
+        const tooltip = enabled ?
+            commandButton.command.tooltip :
+            ( localizeWithPath(_moduleId, 0, "Button not available in restored chat"));
+        const button = this._register(( (new Button(
+            this.domNode,
+            { ...defaultButtonStyles, supportIcons: true, title: tooltip }
+        ))));
+        button.label = commandButton.command.title;
+        button.enabled = enabled;
+        this._register(button.onDidClick(() => this.commandService.executeCommand(commandButton.command.id, ...(commandButton.command.arguments ?? []))));
+    }
+    hasSameContent(other) {
+        return other.kind === 'command';
+    }
+};
+ChatCommandButtonContentPart = ( (__decorate([
+    ( (__param(2, ICommandService)))
+], ChatCommandButtonContentPart)));
+export { ChatCommandButtonContentPart };

package/vscode/src/vs/workbench/contrib/chat/browser/chatContentParts/chatConfirmationContentPart.js

@@ -0,0 +1,51 @@
+import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
+import { Emitter } from '../../../../../base/common/event.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { localizeWithPath } from '../../../../../nls.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { ChatConfirmationWidget } from './chatConfirmationWidget.js';
+import { IChatService } from '../../common/chatService.service.js';
+import { isResponseVM } from '../../common/chatViewModel.js';
+const _moduleId = "vs/workbench/contrib/chat/browser/chatContentParts/chatConfirmationContentPart";
+let ChatConfirmationContentPart = class ChatConfirmationContentPart extends Disposable {
+    constructor(confirmation, context, instantiationService, chatService) {
+        super();
+        this.instantiationService = instantiationService;
+        this.chatService = chatService;
+        this._onDidChangeHeight = this._register(( (new Emitter())));
+        this.onDidChangeHeight = this._onDidChangeHeight.event;
+        const element = context.element;
+        const confirmationWidget = this._register(this.instantiationService.createInstance(ChatConfirmationWidget, confirmation.title, confirmation.message, [
+            { label: ( localizeWithPath(_moduleId, 0, "Accept")), data: confirmation.data },
+            { label: ( localizeWithPath(_moduleId, 1, "Dismiss")), data: confirmation.data, isSecondary: true },
+        ]));
+        confirmationWidget.setShowButtons(!confirmation.isUsed);
+        this._register(confirmationWidget.onDidClick(async (e) => {
+            if (isResponseVM(element)) {
+                const prompt = `${e.label}: "${confirmation.title}"`;
+                const data = e.isSecondary ?
+                    { rejectedConfirmationData: [e.data] } :
+                    { acceptedConfirmationData: [e.data] };
+                data.agentId = element.agent?.id;
+                data.slashCommand = element.slashCommand?.name;
+                if (await this.chatService.sendRequest(element.sessionId, prompt, data)) {
+                    confirmation.isUsed = true;
+                    confirmationWidget.setShowButtons(false);
+                    this._onDidChangeHeight.fire();
+                }
+            }
+        }));
+        this.domNode = confirmationWidget.domNode;
+    }
+    hasSameContent(other) {
+        return other.kind === 'confirmation';
+    }
+    addDisposable(disposable) {
+        this._register(disposable);
+    }
+};
+ChatConfirmationContentPart = ( (__decorate([
+    ( (__param(2, IInstantiationService))),
+    ( (__param(3, IChatService)))
+], ChatConfirmationContentPart)));
+export { ChatConfirmationContentPart };

package/vscode/src/vs/workbench/contrib/chat/browser/{chatConfirmationWidget.js → chatContentParts/chatConfirmationWidget.js}

@@ -1,13 +1,13 @@
-import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { h } from '../../../../base/browser/dom.js';
+import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
+import { h } from '../../../../../base/browser/dom.js';
 import './media/chatConfirmationWidget.css.js';
-import { Button } from '../../../../base/browser/ui/button/button.js';
-import { Emitter } from '../../../../base/common/event.js';
-import { MarkdownString } from '../../../../base/common/htmlContent.js';
-import { Disposable } from '../../../../base/common/lifecycle.js';
-import { MarkdownRenderer } from '../../../../editor/browser/widget/markdownRenderer/browser/markdownRenderer.js';
-import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { defaultButtonStyles } from '../../../../platform/theme/browser/defaultStyles.js';
+import { Button } from '../../../../../base/browser/ui/button/button.js';
+import { Emitter } from '../../../../../base/common/event.js';
+import { MarkdownString } from '../../../../../base/common/htmlContent.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { MarkdownRenderer } from '../../../../../editor/browser/widget/markdownRenderer/browser/markdownRenderer.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { defaultButtonStyles } from '../../../../../platform/theme/browser/defaultStyles.js';
 let ChatConfirmationWidget = class ChatConfirmationWidget extends Disposable {
     get onDidClick() { return this._onDidClick.event; }
     get domNode() {

package/vscode/src/vs/workbench/contrib/chat/browser/chatContentParts/chatMarkdownContentPart.js

@@ -0,0 +1,131 @@
+import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
+import { $ as $$1 } from '../../../../../base/browser/dom.js';
+import { Emitter } from '../../../../../base/common/event.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { equalsIgnoreCase } from '../../../../../base/common/strings.js';
+import { Range } from '../../../../../editor/common/core/range.js';
+import { ITextModelService } from '../../../../../editor/common/services/resolverService.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 { ResourcePool } from './chatCollections.js';
+import { ChatMarkdownDecorationsRenderer } from '../chatMarkdownDecorationsRenderer.js';
+import { localFileLanguageId, parseLocalFileData, CodeBlockPart } from '../codeBlockPart.js';
+import { isRequestVM, isResponseVM } from '../../common/chatViewModel.js';
+const $ = $$1;
+let ChatMarkdownContentPart = class ChatMarkdownContentPart extends Disposable {
+    constructor(markdown, context, editorPool, fillInIncompleteTokens = false, codeBlockStartIndex = 0, renderer, currentWidth, codeBlockModelCollection, rendererOptions, contextKeyService, textModelService, instantiationService) {
+        super();
+        this.markdown = markdown;
+        this.editorPool = editorPool;
+        this.codeBlockModelCollection = codeBlockModelCollection;
+        this.textModelService = textModelService;
+        this.allRefs = [];
+        this._onDidChangeHeight = this._register(( new Emitter()));
+        this.onDidChangeHeight = this._onDidChangeHeight.event;
+        this.codeblocks = [];
+        const element = context.element;
+        const markdownDecorationsRenderer = instantiationService.createInstance(ChatMarkdownDecorationsRenderer);
+        const orderedDisposablesList = [];
+        let codeBlockIndex = codeBlockStartIndex;
+        const result = this._register(renderer.render(markdown, {
+            fillInIncompleteTokens,
+            codeBlockRendererSync: (languageId, text) => {
+                const index = codeBlockIndex++;
+                let textModel;
+                let range;
+                let vulns;
+                if (equalsIgnoreCase(languageId, localFileLanguageId)) {
+                    try {
+                        const parsedBody = parseLocalFileData(text);
+                        range = parsedBody.range && Range.lift(parsedBody.range);
+                        textModel = this.textModelService.createModelReference(parsedBody.uri).then(ref => ref.object);
+                    }
+                    catch (e) {
+                        return $('div');
+                    }
+                }
+                else {
+                    if (!isRequestVM(element) && !isResponseVM(element)) {
+                        console.error('Trying to render code block in welcome', element.id, index);
+                        return $('div');
+                    }
+                    const sessionId = isResponseVM(element) || isRequestVM(element) ? element.sessionId : '';
+                    const modelEntry = this.codeBlockModelCollection.getOrCreate(sessionId, element, index);
+                    vulns = modelEntry.vulns;
+                    textModel = modelEntry.model;
+                }
+                const hideToolbar = isResponseVM(element) && element.errorDetails?.responseIsFiltered;
+                const ref = this.renderCodeBlock({ languageId, textModel, codeBlockIndex: index, element, range, hideToolbar, parentContextKeyService: contextKeyService, vulns }, text, currentWidth, rendererOptions.editableCodeBlock);
+                this.allRefs.push(ref);
+                this._register(ref.object.onDidChangeContentHeight(() => this._onDidChangeHeight.fire()));
+                const info = {
+                    codeBlockIndex: index,
+                    element,
+                    focus() {
+                        ref.object.focus();
+                    },
+                    uri: ref.object.uri
+                };
+                this.codeblocks.push(info);
+                orderedDisposablesList.push(ref);
+                return ref.object.element;
+            },
+            asyncRenderCallback: () => this._onDidChangeHeight.fire(),
+        }));
+        this._register(markdownDecorationsRenderer.walkTreeAndAnnotateReferenceLinks(result.element));
+        orderedDisposablesList.reverse().forEach(d => this._register(d));
+        this.domNode = result.element;
+    }
+    renderCodeBlock(data, text, currentWidth, editableCodeBlock) {
+        const ref = this.editorPool.get();
+        const editorInfo = ref.object;
+        if (isResponseVM(data.element)) {
+            this.codeBlockModelCollection.update(data.element.sessionId, data.element, data.codeBlockIndex, { text, languageId: data.languageId });
+        }
+        editorInfo.render(data, currentWidth, editableCodeBlock);
+        return ref;
+    }
+    hasSameContent(other) {
+        return other.kind === 'markdownContent' && other.content.value === this.markdown.value;
+    }
+    layout(width) {
+        this.allRefs.forEach(ref => ref.object.layout(width));
+    }
+    addDisposable(disposable) {
+        this._register(disposable);
+    }
+};
+ChatMarkdownContentPart = ( __decorate([
+    ( __param(9, IContextKeyService)),
+    ( __param(10, ITextModelService)),
+    ( __param(11, IInstantiationService))
+], ChatMarkdownContentPart));
+let EditorPool = class EditorPool extends Disposable {
+    inUse() {
+        return this._pool.inUse;
+    }
+    constructor(options, delegate, overflowWidgetsDomNode, instantiationService) {
+        super();
+        this._pool = this._register(( new ResourcePool(() => {
+            return instantiationService.createInstance(CodeBlockPart, options, MenuId.ChatCodeBlock, delegate, overflowWidgetsDomNode);
+        })));
+    }
+    get() {
+        const codeBlock = this._pool.get();
+        let stale = false;
+        return {
+            object: codeBlock,
+            isStale: () => stale,
+            dispose: () => {
+                codeBlock.reset();
+                stale = true;
+                this._pool.release(codeBlock);
+            }
+        };
+    }
+};
+EditorPool = ( __decorate([
+    ( __param(3, IInstantiationService))
+], EditorPool));
+export { ChatMarkdownContentPart, EditorPool };

package/vscode/src/vs/workbench/contrib/chat/browser/chatContentParts/chatProgressContentPart.js

@@ -0,0 +1,37 @@
+import { $ } from '../../../../../base/browser/dom.js';
+import { alert } from '../../../../../base/browser/ui/aria/aria.js';
+import { Codicon } from '../../../../../base/common/codicons.js';
+import { MarkdownString } from '../../../../../base/common/htmlContent.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { ThemeIcon } from '../../../../../base/common/themables.js';
+import { isResponseVM } from '../../common/chatViewModel.js';
+class ChatProgressContentPart extends Disposable {
+    constructor(progress, renderer, context, forceShowSpinner, forceShowMessage) {
+        super();
+        const followingContent = context.content.slice(context.index + 1);
+        this.showSpinner = forceShowSpinner ?? shouldShowSpinner(followingContent, context.element);
+        const hideMessage = forceShowMessage !== true && ( followingContent.some(part => part.kind !== 'progressMessage'));
+        if (hideMessage) {
+            this.domNode = $('');
+            return;
+        }
+        if (this.showSpinner) {
+            alert(progress.content.value);
+        }
+        const codicon = this.showSpinner ? ThemeIcon.modify(Codicon.loading, 'spin').id : Codicon.check.id;
+        const markdown = ( new MarkdownString(`$(${codicon}) ${progress.content.value}`, {
+            supportThemeIcons: true
+        }));
+        const result = this._register(renderer.render(markdown));
+        result.element.classList.add('progress-step');
+        this.domNode = result.element;
+    }
+    hasSameContent(other, followingContent, element) {
+        const showSpinner = shouldShowSpinner(followingContent, element);
+        return other.kind === 'progressMessage' && this.showSpinner === showSpinner;
+    }
+}
+function shouldShowSpinner(followingContent, element) {
+    return isResponseVM(element) && !element.isComplete && followingContent.length === 0;
+}
+export { ChatProgressContentPart };