@codingame/monaco-vscode-api 6.0.2 → 7.0.0

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

@@ -1,17 +1,20 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { append, clearNode, setVisibility, isKeyboardEvent, Dimension, getTotalWidth, $ as $$1 } from '../../../../base/browser/dom.js';
 import { DEFAULT_FONT_FAMILY } from '../../../../base/browser/fonts.js';
+import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
 import { status } from '../../../../base/browser/ui/aria/aria.js';
-import { Range } from '../../../../editor/common/core/range.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 { HistoryNavigator } from '../../../../base/common/history.js';
+import { HistoryNavigator2 } from '../../../../base/common/history.js';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
 import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { basename, dirname } from '../../../../base/common/path.js';
 import { isMacintosh } from '../../../../base/common/platform.js';
 import { URI } from '../../../../base/common/uri.js';
 import { EditorExtensionsRegistry } from '../../../../editor/browser/editorExtensions.js';
 import { CodeEditorWidget } from '../../../../editor/browser/widget/codeEditor/codeEditorWidget.js';
+import { Range } from '../../../../editor/common/core/range.js';
 import { IModelService } from '../../../../editor/common/services/model.js';
 import { HoverController } from '../../../../editor/contrib/hover/browser/hoverController.js';
 import { localizeWithPath } from '../../../../nls.js';
@@ -29,6 +32,7 @@ import { registerAndCreateHistoryNavigationContext } from '../../../../platform/
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.service.js';
+import { ILogService } from '../../../../platform/log/common/log.service.js';
 import { INotificationService } from '../../../../platform/notification/common/notification.service.js';
 import { IThemeService } from '../../../../platform/theme/common/themeService.service.js';
 import { ResourceLabels } from '../../../browser/labels.js';
@@ -41,9 +45,6 @@ import { IChatAgentService } from '../common/chatAgents.service.js';
 import { CONTEXT_CHAT_INPUT_HAS_TEXT, CONTEXT_CHAT_INPUT_CURSOR_AT_TOP, CONTEXT_CHAT_INPUT_HAS_FOCUS, CONTEXT_IN_CHAT_INPUT } from '../common/chatContextKeys.js';
 import { IChatWidgetHistoryService } from '../common/chatWidgetHistoryService.service.js';
 import { getSimpleEditorOptions, getSimpleCodeEditorWidgetOptions } from '../../codeEditor/browser/simpleEditorOptions.js';
-import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
-import { KeyCode } from '../../../../base/common/keyCodes.js';
-import { basename, dirname } from '../../../../base/common/path.js';
 var ChatInputPart_1;
 const _moduleId = "vs/workbench/contrib/chat/browser/chatInputPart";
 const $ = $$1;
@@ -62,7 +63,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         return this._inputEditor;
     }
     constructor(
-    location, options, historyService, modelService, instantiationService, contextKeyService, configurationService, keybindingService, accessibilityService) {
+    location, options, historyService, modelService, instantiationService, contextKeyService, configurationService, keybindingService, accessibilityService, logService) {
         super();
         this.location = location;
         this.options = options;
@@ -73,6 +74,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         this.configurationService = configurationService;
         this.keybindingService = keybindingService;
         this.accessibilityService = accessibilityService;
+        this.logService = logService;
         this._onDidLoadInputState = this._register(( (new Emitter())));
         this.onDidLoadInputState = this._onDidLoadInputState.event;
         this._onDidChangeHeight = this._register(( (new Emitter())));
@@ -93,21 +95,29 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         this.followupsDisposables = this._register(( (new DisposableStore())));
         this.attachedContextDisposables = this._register(( (new DisposableStore())));
         this._inputPartHeight = 0;
-        this.onHistoryEntry = false;
         this.inHistoryNavigation = false;
         this.inputUri = ( (URI.parse(`${ChatInputPart_1.INPUT_SCHEME}:input-${ChatInputPart_1._counter++}`)));
         this.inputEditorMaxHeight = this.options.renderStyle === 'compact' ? INPUT_EDITOR_MAX_HEIGHT / 3 : INPUT_EDITOR_MAX_HEIGHT;
         this.inputEditorHasText = CONTEXT_CHAT_INPUT_HAS_TEXT.bindTo(contextKeyService);
         this.chatCursorAtTop = CONTEXT_CHAT_INPUT_CURSOR_AT_TOP.bindTo(contextKeyService);
         this.inputEditorHasFocus = CONTEXT_CHAT_INPUT_HAS_FOCUS.bindTo(contextKeyService);
-        this.history = ( (new HistoryNavigator([], 5)));
-        this._register(this.historyService.onDidClearHistory(() => this.history.clear()));
+        this.history = this.loadHistory();
+        this._register(this.historyService.onDidClearHistory(() => this.history = ( (new HistoryNavigator2([{ text: '' }], 50, historyKeyFn)))));
         this._register(this.configurationService.onDidChangeConfiguration(e => {
             if (e.affectsConfiguration(AccessibilityVerbositySettingId.Chat)) {
                 this.inputEditor.updateOptions({ ariaLabel: this._getAriaLabel() });
             }
         }));
     }
+    loadHistory() {
+        const history = this.historyService.getHistory(this.location);
+        if (history.length === 0) {
+            history.push({ text: '' });
+        }
+        return (
+             (new HistoryNavigator2(history, 50, historyKeyFn))
+        );
+    }
     _getAriaLabel() {
         const verbose = this.configurationService.getValue(AccessibilityVerbositySettingId.Chat);
         if (verbose) {
@@ -125,13 +135,30 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         }
         return ( localizeWithPath(_moduleId, 2, "Chat Input"));
     }
-    setState(inputValue) {
-        const history = this.historyService.getHistory(this.location);
-        this.history = ( (new HistoryNavigator(history, 50)));
-        if (typeof inputValue === 'string') {
-            this.setValue(inputValue);
+    updateState(inputState) {
+        if (this.inHistoryNavigation) {
+            return;
+        }
+        const newEntry = { text: this._inputEditor.getValue(), state: inputState };
+        if (this.history.isAtEnd()) {
+            this.history.replaceLast(newEntry);
+        }
+        else {
+            this.history.replaceLast(newEntry);
+            this.history.resetCursor();
+        }
+    }
+    initForNewChatModel(inputValue, inputState) {
+        this.history = this.loadHistory();
+        this.history.add({ text: inputValue ?? this.history.current().text, state: inputState });
+        if (inputValue) {
+            this.setValue(inputValue, false);
         }
     }
+    logInputHistory() {
+        const historyStr = ( ([...this.history].map(entry => JSON.stringify(entry)))).join('\n');
+        this.logService.info(`[${this.location}] Chat input history:`, historyStr);
+    }
     setVisible(visible) {
         this._onDidChangeVisibility.fire(visible);
     }
@@ -139,19 +166,39 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         return this.container;
     }
     showPreviousValue() {
+        if (this.history.isAtEnd()) {
+            this.saveCurrentValue();
+        }
+        else {
+            if (!( (this.history.has(
+                { text: this._inputEditor.getValue(), state: this.history.current().state }
+            )))) {
+                this.saveCurrentValue();
+                this.history.resetCursor();
+            }
+        }
         this.navigateHistory(true);
     }
     showNextValue() {
+        if (this.history.isAtEnd()) {
+            return;
+        }
+        else {
+            if (!( (this.history.has(
+                { text: this._inputEditor.getValue(), state: this.history.current().state }
+            )))) {
+                this.saveCurrentValue();
+                this.history.resetCursor();
+            }
+        }
         this.navigateHistory(false);
     }
     navigateHistory(previous) {
-        const historyEntry = (previous ?
-            (this.history.previous() ?? this.history.first()) : this.history.next())
-            ?? { text: '' };
-        this.onHistoryEntry = previous || this.history.current() !== null;
+        const historyEntry = previous ?
+            this.history.previous() : this.history.next();
         status(historyEntry.text);
         this.inHistoryNavigation = true;
-        this.setValue(historyEntry.text);
+        this.setValue(historyEntry.text, true);
         this.inHistoryNavigation = false;
         this._onDidLoadInputState.fire(historyEntry.state);
         if (previous) {
@@ -165,9 +212,16 @@ let ChatInputPart = class ChatInputPart extends Disposable {
             this._inputEditor.setPosition(getLastPosition(model));
         }
     }
-    setValue(value) {
+    setValue(value, transient) {
         this.inputEditor.setValue(value);
         this.inputEditor.setPosition({ lineNumber: 1, column: value.length + 1 });
+        if (!transient) {
+            this.saveCurrentValue();
+        }
+    }
+    saveCurrentValue() {
+        const newEntry = { text: this._inputEditor.getValue(), state: this.history.current().state };
+        this.history.replaceLast(newEntry);
     }
     focus() {
         this._inputEditor.focus();
@@ -175,17 +229,14 @@ let ChatInputPart = class ChatInputPart extends Disposable {
     hasFocus() {
         return this._inputEditor.hasWidgetFocus();
     }
-    async acceptInput(userQuery, inputState) {
-        if (userQuery) {
-            let element = this.history.getHistory().find(candidate => candidate.text === userQuery);
-            if (!element) {
-                element = { text: userQuery, state: inputState };
-            }
-            else {
-                element.state = inputState;
-            }
-            this.history.add(element);
+    async acceptInput(isUserQuery) {
+        if (isUserQuery) {
+            const userQuery = this._inputEditor.getValue();
+            const entry = { text: userQuery, state: this.history.current().state };
+            this.history.replaceLast(entry);
+            this.history.add({ text: '' });
         }
+        this._onDidLoadInputState.fire({});
         if (this.accessibilityService.isScreenReaderOptimized() && isMacintosh) {
             this._acceptInputForVoiceover();
         }
@@ -199,7 +250,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         if (!domNode) {
             return;
         }
-        this._inputEditorElement.removeChild(domNode);
+        domNode.remove();
         this._inputEditor.setValue('');
         this._inputEditorElement.appendChild(domNode);
         this._inputEditor.focus();
@@ -256,13 +307,6 @@ let ChatInputPart = class ChatInputPart extends Disposable {
             const model = this._inputEditor.getModel();
             const inputHasText = !!model && model.getValue().trim().length > 0;
             this.inputEditorHasText.set(inputHasText);
-            if (!this.inHistoryNavigation) {
-                this.onHistoryEntry = false;
-            }
-            if (!this.onHistoryEntry) {
-                this.historyNavigationForewardsEnablement.set(!inputHasText);
-                this.historyNavigationBackwardsEnablement.set(!inputHasText);
-            }
         }));
         this._register(this._inputEditor.onDidFocusEditorText(() => {
             this.inputEditorHasFocus.set(true);
@@ -281,10 +325,8 @@ let ChatInputPart = class ChatInputPart extends Disposable {
             }
             const atTop = e.position.column === 1 && e.position.lineNumber === 1;
             this.chatCursorAtTop.set(atTop);
-            if (this.onHistoryEntry) {
-                this.historyNavigationBackwardsEnablement.set(atTop);
-                this.historyNavigationForewardsEnablement.set(e.position.equals(getLastPosition(model)));
-            }
+            this.historyNavigationBackwardsEnablement.set(atTop);
+            this.historyNavigationForewardsEnablement.set(e.position.equals(getLastPosition(model)));
         }));
         this.toolbar = this._register(this.instantiationService.createInstance(MenuWorkbenchToolBar, inputContainer, this.options.menus.executeToolbar, {
             telemetrySource: this.options.menus.telemetrySource,
@@ -402,6 +444,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         if (items && items.length > 0) {
             this.followupsDisposables.add(this.instantiationService.createInstance(ChatFollowups, this.followupsContainer, items, this.location, undefined, followup => this._onDidAcceptFollowup.fire({ followup, response })));
         }
+        this._onDidChangeHeight.fire();
     }
     get contentHeight() {
         const data = this.getLayoutData();
@@ -415,6 +458,8 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         this.initAttachedContext(this.attachedContextContainer);
         const data = this.getLayoutData();
         const inputEditorHeight = Math.min(data.inputPartEditorHeight, height - data.followupsHeight - data.inputPartVerticalPadding);
+        const followupsWidth = width - data.inputPartHorizontalPadding;
+        this.followupsContainer.style.width = `${followupsWidth}px`;
         this._inputPartHeight = data.followupsHeight + inputEditorHeight + data.inputPartVerticalPadding + data.inputEditorBorder + data.implicitContextHeight;
         const initialEditorScrollWidth = this._inputEditor.getScrollWidth();
         const newEditorWidth = width - data.inputPartHorizontalPadding - data.editorBorder - data.editorPadding - data.executeToolbarWidth - data.sideToolbarWidth - data.toolbarPadding;
@@ -443,7 +488,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         };
     }
     saveState() {
-        const inputHistory = this.history.getHistory();
+        const inputHistory = [...this.history];
         this.historyService.saveHistory(this.location, inputHistory);
     }
 };
@@ -454,8 +499,10 @@ ChatInputPart = ChatInputPart_1 = ( (__decorate([
     ( (__param(5, IContextKeyService))),
     ( (__param(6, IConfigurationService))),
     ( (__param(7, IKeybindingService))),
-    ( (__param(8, IAccessibilityService)))
+    ( (__param(8, IAccessibilityService))),
+    ( (__param(9, ILogService)))
 ], ChatInputPart)));
+const historyKeyFn = (entry) => JSON.stringify(entry);
 function getLastPosition(model) {
     return { lineNumber: model.getLineCount(), column: model.getLineLength(model.getLineCount()) + 1 };
 }