more inline chat controller alignment (#239785)

* remove `InlineChatController#onWillStartSession`

* more inline chat controller alignment

* more inline chat controller alignment

* fix compile errors
This commit is contained in:
Johannes Rieken
2025-02-06 12:22:23 +01:00
committed by GitHub
parent 18191a16c8
commit 330e6bfeb9
12 changed files with 114 additions and 106 deletions

View File

@@ -8,7 +8,7 @@ import { ICodeEditor, MouseTargetType } from '../../../../editor/browser/editorB
import { IEditorContribution } from '../../../../editor/common/editorCommon.js';
import { localize, localize2 } from '../../../../nls.js';
import { ContextKeyExpr, IContextKey, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
import { InlineChatController, State } from './inlineChatController.js';
import { InlineChatController } from './inlineChatController.js';
import { ACTION_START, CTX_INLINE_CHAT_HAS_AGENT, CTX_INLINE_CHAT_VISIBLE, InlineChatConfigKeys } from '../common/inlineChat.js';
import { EditorAction2, ServicesAccessor } from '../../../../editor/browser/editorExtensions.js';
import { EditOperation } from '../../../../editor/common/core/editOperation.js';
@@ -83,22 +83,14 @@ export class InlineChatExpandLineAction extends EditorAction2 {
return null;
});
let lastState: State | undefined;
const d = ctrl.onDidEnterState(e => lastState = e);
// trigger chat
const accepted = await ctrl.run({
autoSend: true,
message: lineContent.trim(),
position: new Position(lineNumber, startColumn)
});
try {
// trigger chat
await ctrl.run({
autoSend: true,
message: lineContent.trim(),
position: new Position(lineNumber, startColumn)
});
} finally {
d.dispose();
}
if (lastState === State.CANCEL) {
if (!accepted) {
model.pushEditOperations(null, undoEdits, () => null);
}
}