@codingame/monaco-vscode-chat-service-override 25.1.2 → 26.0.0

package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatWidgetService.js

@@ -1,7 +1,7 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { getWindow } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
-import { raceCancellablePromises, timeout } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
+import { timeout } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import { Emitter, Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { Disposable, combinedDisposable, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
@@ -18,7 +18,14 @@ import { ChatEditor } from '../widgetHosts/editor/chatEditor.js';
 import { ChatEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widgetHosts/editor/chatEditorInput';
 
 let ChatWidgetService = class ChatWidgetService extends Disposable {
-    constructor(editorGroupsService, viewsService, quickChatService, layoutService, editorService, chatService) {
+    constructor(
+        editorGroupsService,
+        viewsService,
+        quickChatService,
+        layoutService,
+        editorService,
+        chatService
+    ) {
         super();
         this.editorGroupsService = editorGroupsService;
         this.viewsService = viewsService;
@@ -57,7 +64,9 @@ let ChatWidgetService = class ChatWidgetService extends Disposable {
     }
     async reveal(widget, preserveFocus) {
         if (widget.viewModel?.sessionResource) {
-            const alreadyOpenWidget = await this.revealSessionIfAlreadyOpen(widget.viewModel.sessionResource, { preserveFocus });
+            const alreadyOpenWidget = await this.revealSessionIfAlreadyOpen(widget.viewModel.sessionResource, {
+                preserveFocus
+            });
             if (alreadyOpenWidget) {
                 return true;
             }
@@ -72,13 +81,12 @@ let ChatWidgetService = class ChatWidgetService extends Disposable {
         return false;
     }
     async openSession(sessionResource, target, options) {
-        if (typeof target === 'undefined' || options?.revealIfOpened) {
+        if (typeof target === "undefined" || options?.revealIfOpened) {
             const alreadyOpenWidget = await this.revealSessionIfAlreadyOpen(sessionResource, options);
             if (alreadyOpenWidget) {
                 return alreadyOpenWidget;
             }
-        }
-        else {
+        } else {
             await this.prepareSessionForMove(sessionResource, target);
         }
         if (target === ChatViewPaneTarget) {
@@ -114,11 +122,10 @@ let ChatWidgetService = class ChatWidgetService extends Disposable {
             const existingEditorWindowId = existingEditor.group.windowId;
             const isGroupActive = () => getWindow(this.layoutService.activeContainer).vscodeWindowId === existingEditorWindowId;
             let ensureFocusTransfer;
-            if (!isGroupActive()) {
-                ensureFocusTransfer = raceCancellablePromises([
-                    timeout(500),
-                    Event.toPromise(Event.once(Event.filter(this.layoutService.onDidChangeActiveContainer, isGroupActive))),
-                ]);
+            if (!isGroupActive() && !options?.preserveFocus) {
+                ensureFocusTransfer = Event.toPromise(
+                    Event.once(Event.filter(this.layoutService.onDidChangeActiveContainer, isGroupActive))
+                );
             }
             const pane = await existingEditor.group.openEditor(existingEditor.editor, options);
             await ensureFocusTransfer;
@@ -133,9 +140,7 @@ let ChatWidgetService = class ChatWidgetService extends Disposable {
     async prepareSessionForMove(sessionResource, target) {
         const existingWidget = this.getWidgetBySessionResource(sessionResource);
         if (existingWidget) {
-            const existingEditor = isIChatViewViewContext(existingWidget.viewContext) ?
-                undefined :
-                this.findExistingChatEditorByUri(sessionResource);
+            const existingEditor = isIChatViewViewContext(existingWidget.viewContext) ? undefined : this.findExistingChatEditorByUri(sessionResource);
             if (isIChatViewViewContext(existingWidget.viewContext) && target === ChatViewPaneTarget) {
                 return;
             }
@@ -143,9 +148,13 @@ let ChatWidgetService = class ChatWidgetService extends Disposable {
                 return;
             }
             if (existingEditor) {
-                await this.editorService.closeEditor({ editor: existingEditor.editor, groupId: existingEditor.group.id }, { preserveFocus: true });
-            }
-            else {
+                await this.editorService.closeEditor({
+                    editor: existingEditor.editor,
+                    groupId: existingEditor.group.id
+                }, {
+                    preserveFocus: true
+                });
+            } else {
                 await existingWidget.clear();
             }
         }
@@ -154,16 +163,17 @@ let ChatWidgetService = class ChatWidgetService extends Disposable {
         for (const group of this.editorGroupsService.groups) {
             for (const editor of group.editors) {
                 if (editor instanceof ChatEditorInput && isEqual(editor.sessionResource, sessionUri)) {
-                    return { editor, group };
+                    return {
+                        editor,
+                        group
+                    };
                 }
             }
         }
         return undefined;
     }
     isSameEditorTarget(currentGroupId, target) {
-        return typeof target === 'number' && target === currentGroupId ||
-            target === ACTIVE_GROUP && this.editorGroupsService.activeGroup?.id === currentGroupId ||
-            isEditorGroup(target) && target.id === currentGroupId;
+        return typeof target === "number" && target === currentGroupId || target === ACTIVE_GROUP && this.editorGroupsService.activeGroup?.id === currentGroupId || isEditorGroup(target) && target.id === currentGroupId;
     }
     setLastFocusedWidget(widget) {
         if (widget === this._lastFocusedWidget) {
@@ -173,37 +183,39 @@ let ChatWidgetService = class ChatWidgetService extends Disposable {
     }
     register(newWidget) {
         if (( this._widgets.some(widget => widget === newWidget))) {
-            throw ( new Error('Cannot register the same widget multiple times'));
+            throw ( new Error("Cannot register the same widget multiple times"));
         }
         this._widgets.push(newWidget);
         this._onDidAddWidget.fire(newWidget);
         if (!this._lastFocusedWidget) {
             this.setLastFocusedWidget(newWidget);
         }
-        return combinedDisposable(newWidget.onDidFocus(() => this.setLastFocusedWidget(newWidget)), newWidget.onDidChangeViewModel(({ previousSessionResource, currentSessionResource }) => {
-            if (!previousSessionResource || (currentSessionResource && isEqual(previousSessionResource, currentSessionResource))) {
-                return;
-            }
-            void timeout(200).then(() => {
-                if (!this.getWidgetBySessionResource(previousSessionResource) && this.chatService.getSession(previousSessionResource)) {
-                    this._onDidBackgroundSession.fire(previousSessionResource);
+        return combinedDisposable(
+            newWidget.onDidFocus(() => this.setLastFocusedWidget(newWidget)),
+            newWidget.onDidChangeViewModel((
+                {
+                    previousSessionResource,
+                    currentSessionResource
                 }
-            });
-        }), toDisposable(() => {
-            this._widgets.splice(this._widgets.indexOf(newWidget), 1);
-            if (this._lastFocusedWidget === newWidget) {
-                this.setLastFocusedWidget(undefined);
-            }
-        }));
+            ) => {
+                if (!previousSessionResource || (currentSessionResource && isEqual(previousSessionResource, currentSessionResource))) {
+                    return;
+                }
+                void timeout(200).then(() => {
+                    if (!this.getWidgetBySessionResource(previousSessionResource) && this.chatService.getSession(previousSessionResource)) {
+                        this._onDidBackgroundSession.fire(previousSessionResource);
+                    }
+                });
+            }),
+            toDisposable(() => {
+                this._widgets.splice(this._widgets.indexOf(newWidget), 1);
+                if (this._lastFocusedWidget === newWidget) {
+                    this.setLastFocusedWidget(undefined);
+                }
+            })
+        );
     }
 };
-ChatWidgetService = ( __decorate([
-    ( __param(0, IEditorGroupsService)),
-    ( __param(1, IViewsService)),
-    ( __param(2, IQuickChatService)),
-    ( __param(3, ILayoutService)),
-    ( __param(4, IEditorService)),
-    ( __param(5, IChatService))
-], ChatWidgetService));
+ChatWidgetService = ( __decorate([( __param(0, IEditorGroupsService)), ( __param(1, IViewsService)), ( __param(2, IQuickChatService)), ( __param(3, ILayoutService)), ( __param(4, IEditorService)), ( __param(5, IChatService))], ChatWidgetService));
 
 export { ChatWidgetService };

package/vscode/src/vs/workbench/contrib/chat/browser/widget/input/chatStatusWidget.d.ts

@@ -1,4 +1,3 @@
-import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { ICommandService } from "@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
@@ -16,8 +15,6 @@ export declare class ChatStatusWidget extends Disposable implements IChatInputPa
     private readonly telemetryService;
     static readonly ID = "chatStatusWidget";
     readonly domNode: HTMLElement;
-    private readonly _onDidChangeHeight;
-    readonly onDidChangeHeight: Event<void>;
     private messageElement;
     private actionButton;
     constructor(chatEntitlementService: IChatEntitlementService, commandService: ICommandService, configurationService: IConfigurationService, telemetryService: ITelemetryService);

package/vscode/src/vs/workbench/contrib/chat/browser/widget/input/chatStatusWidget.js

@@ -1,10 +1,8 @@
 
 import { registerCss } from '@codingame/monaco-vscode-api/css';
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-import * as chatStatusWidget from './media/chatStatusWidget.css';
 import { $ as $$1 } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { Button } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/button/button';
-import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
@@ -14,82 +12,79 @@ import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platfo
 import { defaultButtonStyles } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/browser/defaultStyles';
 import { ChatEntitlement, ChatEntitlementContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService';
 import { IChatEntitlementService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService.service';
-import { ChatInputPartWidgetsRegistry } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/widget/input/chatInputPartWidgets';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
 import { CHAT_SETUP_ACTION_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { ChatInputPartWidgetsRegistry } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/widget/input/chatInputPartWidgets';
+import * as chatStatusWidget from './media/chatStatusWidget.css';
 
 registerCss(chatStatusWidget);
 const $ = $$1;
 let ChatStatusWidget = class ChatStatusWidget extends Disposable {
-    static { this.ID = 'chatStatusWidget'; }
-    constructor(chatEntitlementService, commandService, configurationService, telemetryService) {
+    static {
+        this.ID = "chatStatusWidget";
+    }
+    constructor(
+        chatEntitlementService,
+        commandService,
+        configurationService,
+        telemetryService
+    ) {
         super();
         this.chatEntitlementService = chatEntitlementService;
         this.commandService = commandService;
         this.configurationService = configurationService;
         this.telemetryService = telemetryService;
-        this._onDidChangeHeight = this._register(( new Emitter()));
-        this.onDidChangeHeight = this._onDidChangeHeight.event;
-        this.domNode = $('.chat-status-widget');
-        this.domNode.style.display = 'none';
+        this.domNode = $(".chat-status-widget");
+        this.domNode.style.display = "none";
         this.initializeIfEnabled();
     }
     initializeIfEnabled() {
-        const enabledSku = this.configurationService.getValue('chat.statusWidget.sku');
-        if (enabledSku !== 'free' && enabledSku !== 'anonymous') {
-            return;
-        }
         const entitlement = this.chatEntitlementService.entitlement;
         const isAnonymous = this.chatEntitlementService.anonymous;
-        if (enabledSku === 'anonymous' && isAnonymous) {
-            this.createWidgetContent(enabledSku);
-        }
-        else if (enabledSku === 'free' && entitlement === ChatEntitlement.Free) {
-            this.createWidgetContent(enabledSku);
-        }
-        else {
+        const enabledSku = this.configurationService.getValue("chat.statusWidget.sku");
+        if (isAnonymous && enabledSku === "anonymous") {
+            this.createWidgetContent("anonymous");
+        } else if (entitlement === ChatEntitlement.Free) {
+            this.createWidgetContent("free");
+        } else {
             return;
         }
-        this.domNode.style.display = '';
-        this._onDidChangeHeight.fire();
+        this.domNode.style.display = "";
     }
     get height() {
-        return this.domNode.style.display === 'none' ? 0 : this.domNode.offsetHeight;
+        return this.domNode.style.display === "none" ? 0 : this.domNode.offsetHeight;
     }
     createWidgetContent(enabledSku) {
-        const contentContainer = $('.chat-status-content');
-        this.messageElement = $('.chat-status-message');
+        const contentContainer = $(".chat-status-content");
+        this.messageElement = $(".chat-status-message");
         contentContainer.appendChild(this.messageElement);
-        const actionContainer = $('.chat-status-action');
+        const actionContainer = $(".chat-status-action");
         this.actionButton = this._register(( new Button(actionContainer, {
             ...defaultButtonStyles,
             supportIcons: true
         })));
-        this.actionButton.element.classList.add('chat-status-button');
-        if (enabledSku === 'anonymous') {
+        this.actionButton.element.classList.add("chat-status-button");
+        if (enabledSku === "anonymous") {
             const message = ( localize(
-                5831,
+                6080,
                 "You've reached the limit for chat messages. Try Copilot Pro for free."
             ));
-            const buttonLabel = ( localize(5832, "Sign In"));
+            const buttonLabel = ( localize(6081, "Sign In"));
             this.messageElement.textContent = message;
             this.actionButton.label = buttonLabel;
-            this.actionButton.element.ariaLabel = ( localize(5833, "{0} {1}", message, buttonLabel));
-        }
-        else {
-            const message = ( localize(5834, "You've reached the limit for chat messages."));
-            const buttonLabel = ( localize(5835, "Upgrade"));
+            this.actionButton.element.ariaLabel = ( localize(6082, "{0} {1}", message, buttonLabel));
+        } else {
+            const message = ( localize(6083, "You've reached the limit for chat messages."));
+            const buttonLabel = ( localize(6084, "Upgrade"));
             this.messageElement.textContent = message;
             this.actionButton.label = buttonLabel;
-            this.actionButton.element.ariaLabel = ( localize(5836, "{0} {1}", message, buttonLabel));
+            this.actionButton.element.ariaLabel = ( localize(6085, "{0} {1}", message, buttonLabel));
         }
         this._register(this.actionButton.onDidClick(async () => {
-            const commandId = this.chatEntitlementService.anonymous
-                ? CHAT_SETUP_ACTION_ID
-                : 'workbench.action.chat.upgradePlan';
-            this.telemetryService.publicLog2('workbenchActionExecuted', {
+            const commandId = this.chatEntitlementService.anonymous ? CHAT_SETUP_ACTION_ID : "workbench.action.chat.upgradePlan";
+            this.telemetryService.publicLog2("workbenchActionExecuted", {
                 id: commandId,
-                from: 'chatStatusWidget'
+                from: "chatStatusWidget"
             });
             await this.commandService.executeCommand(commandId);
         }));
@@ -97,12 +92,7 @@ let ChatStatusWidget = class ChatStatusWidget extends Disposable {
         this.domNode.appendChild(actionContainer);
     }
 };
-ChatStatusWidget = ( __decorate([
-    ( __param(0, IChatEntitlementService)),
-    ( __param(1, ICommandService)),
-    ( __param(2, IConfigurationService)),
-    ( __param(3, ITelemetryService))
-], ChatStatusWidget));
+ChatStatusWidget = ( __decorate([( __param(0, IChatEntitlementService)), ( __param(1, ICommandService)), ( __param(2, IConfigurationService)), ( __param(3, ITelemetryService))], ChatStatusWidget));
 ChatInputPartWidgetsRegistry.register(ChatStatusWidget.ID, ChatStatusWidget, ( ContextKeyExpr.and(
     ChatContextKeys.chatQuotaExceeded,
     ChatContextKeys.chatSessionIsEmpty,

package/vscode/src/vs/workbench/contrib/chat/browser/widget/input/editor/chatEditorInputContentProvider.js

@@ -11,20 +11,18 @@ let ChatInputBoxContentProvider = class ChatInputBoxContentProvider extends Disp
         super();
         this.modelService = modelService;
         this.languageService = languageService;
-        this._register(textModelService.registerTextModelContentProvider(Schemas.vscodeChatInput, this));
+        this._register(
+            textModelService.registerTextModelContentProvider(Schemas.vscodeChatInput, this)
+        );
     }
     async provideTextContent(resource) {
         const existing = this.modelService.getModel(resource);
         if (existing) {
             return existing;
         }
-        return this.modelService.createModel('', this.languageService.createById('chatinput'), resource);
+        return this.modelService.createModel("", this.languageService.createById("chatinput"), resource);
     }
 };
-ChatInputBoxContentProvider = ( __decorate([
-    ( __param(0, ITextModelService)),
-    ( __param(1, IModelService)),
-    ( __param(2, ILanguageService))
-], ChatInputBoxContentProvider));
+ChatInputBoxContentProvider = ( __decorate([( __param(0, ITextModelService)), ( __param(1, IModelService)), ( __param(2, ILanguageService))], ChatInputBoxContentProvider));
 
 export { ChatInputBoxContentProvider };

package/vscode/src/vs/workbench/contrib/chat/browser/widget/input/editor/chatInputCompletions.d.ts

@@ -0,0 +1,10 @@
+import { Position } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/core/position";
+import { Range } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range";
+import { IWordAtPosition } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/core/wordHelper";
+import { ITextModel } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/model";
+export interface IChatCompletionRangeResult {
+    insert: Range;
+    replace: Range;
+    varWord: IWordAtPosition | null;
+}
+export declare function computeCompletionRanges(model: ITextModel, position: Position, reg: RegExp, onlyOnWordStart?: boolean): IChatCompletionRangeResult | undefined;