Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-08-09 07:13:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use shared history class in terminal chat

Browse Source 
Fixes vscode-copilot#4261
This commit is contained in:
Daniel Imms
2024-03-12 07:38:53 -07:00
parent d82863512b
commit 11ea49cdb2
3 changed files with 55 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChat.ts
+2
View File
@@ -21,6 +21,8 @@ export const enum TerminalChatCommandId {
RunCommand = 'workbench.action.terminal.chat.runCommand',
InsertCommand = 'workbench.action.terminal.chat.insertCommand',
ViewInChat = 'workbench.action.terminal.chat.viewInChat',
PreviousFromHistory = 'workbench.action.terminal.chat.previousFromHistory',
NextFromHistory = 'workbench.action.terminal.chat.nextFromHistory',
}
export const MENU_TERMINAL_CHAT_INPUT = MenuId.for('terminalChatInput');
src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatActions.ts
+40 -1
View File
@@ -40,7 +40,7 @@ registerActiveXtermAction({
return;
}
const contr = TerminalChatController.activeChatWidget || TerminalChatController.get(activeInstance);
contr?.chatWidget?.reveal();
contr?.reveal();
}
});
@@ -368,3 +368,42 @@ registerActiveXtermAction({
}
});
registerActiveXtermAction({
id: TerminalChatCommandId.PreviousFromHistory,
title: localize2('previousFromHistory', 'Previous From History'),
precondition: ContextKeyExpr.and(
ContextKeyExpr.has(`config.${TerminalSettingId.ExperimentalInlineChat}`),
TerminalChatContextKeys.responseContainsCodeBlock.notEqualsTo(undefined)
),
keybinding: {
weight: KeybindingWeight.EditorCore + 10, // win against core_command
primary: KeyCode.UpArrow,
},
run: (_xterm, _accessor, activeInstance) => {
if (isDetachedTerminalInstance(activeInstance)) {
return;
}
const contr = TerminalChatController.activeChatWidget || TerminalChatController.get(activeInstance);
contr?.populateHistory(true);
}
});
registerActiveXtermAction({
id: TerminalChatCommandId.NextFromHistory,
title: localize2('nextFromHistory', 'Next From History'),
precondition: ContextKeyExpr.and(
ContextKeyExpr.has(`config.${TerminalSettingId.ExperimentalInlineChat}`),
TerminalChatContextKeys.responseContainsCodeBlock.notEqualsTo(undefined)
),
keybinding: {
weight: KeybindingWeight.EditorCore + 10, // win against core_command
primary: KeyCode.DownArrow,
},
run: (_xterm, _accessor, activeInstance) => {
if (isDetachedTerminalInstance(activeInstance)) {
return;
}
const contr = TerminalChatController.activeChatWidget || TerminalChatController.get(activeInstance);
contr?.populateHistory(false);
}
});
src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatController.ts
+13
View File
@@ -25,6 +25,7 @@ import { TerminalChatWidget } from 'vs/workbench/contrib/terminalContrib/chat/br
import { ChatModel, ChatRequestModel, IChatRequestVariableData, getHistoryEntriesFromModel } from 'vs/workbench/contrib/chat/common/chatModel';
import { TerminalChatContextKeys } from 'vs/workbench/contrib/terminalContrib/chat/browser/terminalChat';
import { MarkdownString } from 'vs/base/common/htmlContent';
import { InlineChatHistory } from 'vs/workbench/contrib/inlineChat/browser/inlineChatHistory';
const enum Message {
NONE = 0,
@@ -71,6 +72,7 @@ export class TerminalChatController extends Disposable implements ITerminalContr
private _currentRequest: ChatRequestModel | undefined;
private readonly _history: InlineChatHistory;
private _lastInput: string | undefined;
private _lastResponseContent: string | undefined;
get lastResponseContent(): string | undefined {
@@ -106,6 +108,8 @@ export class TerminalChatController extends Disposable implements ITerminalContr
this._responseSupportsIssueReportingContextKey = TerminalChatContextKeys.responseSupportsIssueReporting.bindTo(this._contextKeyService);
this._sessionResponseVoteContextKey = TerminalChatContextKeys.sessionResponseVote.bindTo(this._contextKeyService);
this._history = this._instantiationService.createInstance(InlineChatHistory, 'terminal-chat-history');
if (!this._configurationService.getValue(TerminalSettingId.ExperimentalInlineChat)) {
return;
}
@@ -270,6 +274,7 @@ export class TerminalChatController extends Disposable implements ITerminalContr
};
await model.waitForInitialization();
this._history.update(this._lastInput);
const request: IParsedChatRequest = {
text: this._lastInput,
parts: []
@@ -376,6 +381,14 @@ export class TerminalChatController extends Disposable implements ITerminalContr
}
}
populateHistory(up: boolean) {
const entry = this._history.populateHistory(this.getInput(), up);
if (entry) {
this.updateInput(entry, true);
}
}
// TODO: Move to register calls, don't override
override dispose() {
if (this._currentRequest) {
this._model.value?.cancelRequest(this._currentRequest);