Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-23 01:58:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix https://github.com/microsoft/vscode-copilot-release/issues/8611 (#247739)

Browse Source
This commit is contained in:
Johannes Rieken
2025-04-29 15:47:55 +02:00
committed by GitHub
parent 440180ebf7
commit 5bf3e5d3bd
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/vs/workbench/contrib/inlineChat/browser/inlineChatController.ts
View File

@@ -55,7 +55,7 @@ import { EditorBasedInlineChatWidget } from './inlineChatWidget.js';
import { InlineChatZoneWidget } from './inlineChatZoneWidget.js';
import { ChatAgentLocation } from '../../chat/common/constants.js';
import { ChatContextKeys } from '../../chat/common/chatContextKeys.js';
import { IChatEditingService, ModifiedFileEntryState } from '../../chat/common/chatEditingService.js';
import { ModifiedFileEntryState } from '../../chat/common/chatEditingService.js';
import { observableConfigValue } from '../../../../platform/observable/common/platformObservableUtils.js';
import { ISharedWebContentExtractorService } from '../../../../platform/webContentExtractor/common/webContentExtractor.js';
import { IFileService } from '../../../../platform/files/common/files.js';
@@ -1499,16 +1499,15 @@ export async function reviewEdits(accessor: ServicesAccessor, editor: ICodeEdito
}
const chatService = accessor.get(IChatService);
const chatEditingService = accessor.get(IChatEditingService);
const uri = editor.getModel().uri;
const chatModel = chatService.startSession(ChatAgentLocation.Editor, token, false);
const editSession = await chatEditingService.createEditingSession(chatModel);
chatModel.startEditingSession(true);
const editSession = await chatModel.editingSessionObs?.promise;
const store = new DisposableStore();
store.add(chatModel);
store.add(editSession);
// STREAM
const chatRequest = chatModel?.addRequest({ text: '', parts: [] }, { variables: [] }, 0);
@@ -1526,11 +1525,11 @@ export async function reviewEdits(accessor: ServicesAccessor, editor: ICodeEdito
chatRequest.response.updateContent({ kind: 'textEdit', uri, edits: [], done: true });
if (!token.isCancellationRequested) {
chatRequest.response.complete();
chatModel.completeResponse(chatRequest);
}
const isSettled = derived(r => {
const entry = editSession.readEntry(uri, r);
const entry = editSession?.readEntry(uri, r);
if (!entry) {
return false;
}

6
src/vs/workbench/contrib/inlineChat/browser/inlineChatSessionServiceImpl.ts
View File

@@ -93,7 +93,11 @@ export class InlineChatSessionServiceImpl implements IInlineChatSessionService {
@IChatWidgetService private readonly _chatWidgetService: IChatWidgetService,
@IConfigurationService private readonly _configurationService: IConfigurationService,
) {
this.hideOnRequest = observableConfigValue(InlineChatConfigKeys.HideOnRequest, false, this._configurationService);
const v2 = observableConfigValue(InlineChatConfigKeys.EnableV2, false, this._configurationService);
this.hideOnRequest = observableConfigValue(InlineChatConfigKeys.HideOnRequest, false, this._configurationService)
.map((value, r) => v2.read(r) && value);
}
dispose() {