@codingame/monaco-vscode-katex-common 26.2.2 → 27.0.0

package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatGutterAffordance.js

@@ -1,55 +1,88 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
+import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
+import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
 import { LineRange } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/ranges/lineRange';
-import { SelectionDirection } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/selection';
+import { CodeActionController } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/codeAction/browser/codeActionController';
 import { InlineEditsGutterIndicator, InlineSuggestionGutterMenuData, InlineEditsGutterIndicatorData, SimpleInlineSuggestModel } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/components/gutterIndicatorView';
 import { InlineEditTabAction } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViewInterface';
-import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { IAccessibilityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/common/accessibility.service';
+import { MenuId, MenuItemAction } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
+import { IMenuService } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions.service';
+import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
 import { IHoverService } from '@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { IKeybindingService } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service';
 import { IThemeService } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service';
-import { ACTION_START } from '../common/inlineChat.js';
+import { IUserInteractionService } from '@codingame/monaco-vscode-api/vscode/vs/platform/userInteraction/browser/userInteractionService.service';
+import { observableFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableFromEvent';
 import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 import { constObservable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/constObservable';
-import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
 let InlineChatGutterAffordance = class InlineChatGutterAffordance extends InlineEditsGutterIndicator {
     constructor(
-        _myEditorObs,
+        myEditorObs,
         selection,
-        _hover,
         _keybindingService,
         hoverService,
         instantiationService,
         accessibilityService,
-        themeService
+        themeService,
+        userInteractionService,
+        menuService,
+        contextKeyService
     ) {
+        const menu = menuService.createMenu(MenuId.InlineChatEditorAffordance, contextKeyService);
+        const menuObs = observableFromEvent(menu.onDidChange, () => menu.getActions({
+            renderShortTitle: false
+        }));
+        const codeActionController = CodeActionController.get(myEditorObs.editor);
+        const lightBulbObs = codeActionController?.lightBulbState;
         const data = derived(r => {
             const value = selection.read(r);
             if (!value) {
                 return undefined;
             }
+            const commandGroups = [];
+            for (const [, groupActions] of menuObs.read(r)) {
+                const group = [];
+                for (const action of groupActions) {
+                    if (action instanceof MenuItemAction) {
+                        group.push({
+                            command: {
+                                id: action.item.id,
+                                title: action.label
+                            },
+                            icon: ThemeIcon.isThemeIcon(action.item.icon) ? action.item.icon : undefined
+                        });
+                    }
+                }
+                if (group.length > 0) {
+                    commandGroups.push(group);
+                }
+            }
             const cursorPosition = value.getPosition();
             const lineRange = ( new LineRange(cursorPosition.lineNumber, cursorPosition.lineNumber + 1));
             const gutterMenuData = ( new InlineSuggestionGutterMenuData(
             undefined,
             "",
-            [],
+            commandGroups,
             undefined,
-            undefined, undefined));
-            return ( new InlineEditsGutterIndicatorData(gutterMenuData, lineRange, ( new SimpleInlineSuggestModel(() => {}, () => this._doShowHover())),
+            undefined,
+            undefined, true));
+            const lightBulbInfo = lightBulbObs?.read(r);
+            const icon = lightBulbInfo ? lightBulbInfo.icon : Codicon.sparkle;
+            return ( new InlineEditsGutterIndicatorData(gutterMenuData, lineRange, ( new SimpleInlineSuggestModel(() => {}, () => {})),
             undefined, {
-                icon: Codicon.sparkle
+                icon
             }));
         });
         const focusIsInMenu = observableValue({}, false);
         super(
-            _myEditorObs,
+            myEditorObs,
             data,
             constObservable(InlineEditTabAction.Inactive),
             constObservable(0),
@@ -58,41 +91,17 @@ let InlineChatGutterAffordance = class InlineChatGutterAffordance extends Inline
             hoverService,
             instantiationService,
             accessibilityService,
-            themeService
+            themeService,
+            userInteractionService
+        );
+        this._onDidRunAction = this._store.add(( new Emitter()));
+        this.onDidRunAction = this._onDidRunAction.event;
+        this._store.add(menu);
+        this._store.add(
+            this.onDidCloseWithCommand(commandId => this._onDidRunAction.fire(commandId))
         );
-        this._myEditorObs = _myEditorObs;
-        this._hover = _hover;
-        this._keybindingService = _keybindingService;
-        this._store.add(autorun(r => {
-            const element = _hover.read(r);
-            this._hoverVisible.set(!!element, undefined);
-        }));
-    }
-    _showHover() {
-        this._hoverService.showInstantHover({
-            target: this._iconRef.element,
-            content: this._keybindingService.appendKeybinding(( localize(8828, "Inline Chat")), ACTION_START)
-        });
-    }
-    _doShowHover() {
-        if (this._hoverVisible.get()) {
-            return;
-        }
-        const iconElement = this._iconRef.element;
-        if (!iconElement) {
-            this._hover.set(undefined, undefined);
-            return;
-        }
-        const selection = this._myEditorObs.cursorSelection.get();
-        const direction = selection?.getDirection() ?? SelectionDirection.LTR;
-        const lineNumber = selection?.getPosition().lineNumber ?? 1;
-        this._hover.set({
-            rect: iconElement.getBoundingClientRect(),
-            above: direction === SelectionDirection.RTL,
-            lineNumber
-        }, undefined);
     }
 };
-InlineChatGutterAffordance = ( __decorate([( __param(3, IKeybindingService)), ( __param(4, IHoverService)), ( __param(5, IInstantiationService)), ( __param(6, IAccessibilityService)), ( __param(7, IThemeService))], InlineChatGutterAffordance));
+InlineChatGutterAffordance = ( __decorate([( __param(2, IKeybindingService)), ( __param(3, IHoverService)), ( __param(4, IInstantiationService)), ( __param(5, IAccessibilityService)), ( __param(6, IThemeService)), ( __param(7, IUserInteractionService)), ( __param(8, IMenuService)), ( __param(9, IContextKeyService))], InlineChatGutterAffordance));
 
 export { InlineChatGutterAffordance };

package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatOverlayWidget.d.ts

@@ -7,6 +7,7 @@ import { IMenuService } from "@codingame/monaco-vscode-api/vscode/vs/platform/ac
 import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { IKeybindingService } from "@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service";
+import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { IInlineChatSession2 } from "@codingame/monaco-vscode-chat-service-override/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatSessionService";
 /**
@@ -14,36 +15,35 @@ import { IInlineChatSession2 } from "@codingame/monaco-vscode-chat-service-overr
  */
 export declare class InlineChatInputWidget extends Disposable {
     private readonly _editorObs;
-    private readonly _keybindingService;
-    private readonly _menuService;
     private readonly _contextKeyService;
+    private readonly _menuService;
     private readonly _domNode;
+    private readonly _container;
     private readonly _inputContainer;
-    private readonly _actionBar;
+    private readonly _toolbarContainer;
     private readonly _input;
     private readonly _position;
     readonly position: IObservable<IOverlayWidgetPosition | null>;
     private readonly _showStore;
     private readonly _stickyScrollHeight;
-    private _inlineStartAction;
+    private readonly _layoutData;
     private _anchorLineNumber;
     private _anchorLeft;
     private _anchorAbove;
-    constructor(_editorObs: ObservableCodeEditor, _keybindingService: IKeybindingService, _menuService: IMenuService, _contextKeyService: IContextKeyService, instantiationService: IInstantiationService, modelService: IModelService, configurationService: IConfigurationService);
+    constructor(_editorObs: ObservableCodeEditor, _contextKeyService: IContextKeyService, _menuService: IMenuService, instantiationService: IInstantiationService, modelService: IModelService, configurationService: IConfigurationService);
+    get value(): string;
     /**
      * Show the widget at the specified line.
      * @param lineNumber The line number to anchor the widget to
      * @param left Left offset relative to editor
      * @param anchorAbove Whether to anchor above the position (widget grows upward)
      */
-    show(lineNumber: number, left: number, anchorAbove: boolean): void;
+    show(lineNumber: number, left: number, anchorAbove: boolean, placeholder: string): void;
     private _updatePosition;
     /**
      * Hide the widget (removes from editor but does not dispose).
      */
-    private _hide;
-    private _refreshActions;
-    private _updateInputHeight;
+    hide(): void;
 }
 /**
  * Overlay widget that displays progress messages during inline chat requests.
@@ -52,6 +52,7 @@ export declare class InlineChatSessionOverlayWidget extends Disposable {
     private readonly _editorObs;
     private readonly _instaService;
     private readonly _keybindingService;
+    private readonly _logService;
     private readonly _domNode;
     private readonly _container;
     private readonly _statusNode;
@@ -62,7 +63,7 @@ export declare class InlineChatSessionOverlayWidget extends Disposable {
     private readonly _position;
     private readonly _minContentWidthInPx;
     private readonly _stickyScrollHeight;
-    constructor(_editorObs: ObservableCodeEditor, _instaService: IInstantiationService, _keybindingService: IKeybindingService);
+    constructor(_editorObs: ObservableCodeEditor, _instaService: IInstantiationService, _keybindingService: IKeybindingService, _logService: ILogService);
     show(session: IInlineChatSession2): void;
     hide(): void;
 }