Skip to content

Commit 3369508

Browse files
authored
inline chat tweaks (microsoft#201126)
* streamline tel data * rename to LiveStrategy * fix up highlights
1 parent 69d84f2 commit 3369508

File tree

3 files changed

+16
-4
lines changed

3 files changed

+16
-4
lines changed

src/vs/workbench/contrib/inlineChat/browser/inlineChatController.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ import { IChatAgentService } from 'vs/workbench/contrib/chat/common/chatAgents';
4242
import { chatAgentLeader, chatSubcommandLeader } from 'vs/workbench/contrib/chat/common/chatParserTypes';
4343
import { IChatService } from 'vs/workbench/contrib/chat/common/chatService';
4444
import { EmptyResponse, ErrorResponse, ExpansionState, IInlineChatSessionService, ReplyResponse, Session, SessionExchange, SessionPrompt } from 'vs/workbench/contrib/inlineChat/browser/inlineChatSession';
45-
import { EditModeStrategy, LivePreviewStrategy, LiveStrategy3, PreviewStrategy, ProgressingEditsOptions } from 'vs/workbench/contrib/inlineChat/browser/inlineChatStrategies';
45+
import { EditModeStrategy, LivePreviewStrategy, LiveStrategy, PreviewStrategy, ProgressingEditsOptions } from 'vs/workbench/contrib/inlineChat/browser/inlineChatStrategies';
4646
import { IInlineChatMessageAppender, InlineChatZoneWidget } from 'vs/workbench/contrib/inlineChat/browser/inlineChatWidget';
4747
import { CTX_INLINE_CHAT_DID_EDIT, CTX_INLINE_CHAT_HAS_ACTIVE_REQUEST, CTX_INLINE_CHAT_HAS_STASHED_SESSION, CTX_INLINE_CHAT_LAST_FEEDBACK, CTX_INLINE_CHAT_RESPONSE_TYPES, CTX_INLINE_CHAT_SUPPORT_ISSUE_REPORTING, CTX_INLINE_CHAT_USER_DID_EDIT, EditMode, IInlineChatProgressItem, IInlineChatRequest, IInlineChatResponse, INLINE_CHAT_ID, InlineChatResponseFeedbackKind, InlineChatResponseTypes } from 'vs/workbench/contrib/inlineChat/common/inlineChat';
4848

@@ -364,7 +364,7 @@ export class InlineChatController implements IEditorContribution {
364364

365365
switch (session.editMode) {
366366
case EditMode.Live:
367-
this._strategy = this._instaService.createInstance(LiveStrategy3, session, this._editor, this._zone.value);
367+
this._strategy = this._instaService.createInstance(LiveStrategy, session, this._editor, this._zone.value);
368368
break;
369369
case EditMode.Preview:
370370
this._strategy = this._instaService.createInstance(PreviewStrategy, session, this._zone.value);

src/vs/workbench/contrib/inlineChat/browser/inlineChatSession.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@ export class Session {
156156
extension: provider.debugName,
157157
startTime: this._startTime.toISOString(),
158158
edits: false,
159+
finishedByEdit: false,
159160
rounds: '',
160161
undos: '',
161162
editMode

src/vs/workbench/contrib/inlineChat/browser/inlineChatStrategies.ts

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,7 @@ export function asProgressiveEdit(edit: IIdentifiedSingleEditOperation, wordsPer
469469

470470
// ---
471471

472-
export class LiveStrategy3 extends EditModeStrategy {
472+
export class LiveStrategy extends EditModeStrategy {
473473

474474
private readonly _decoModifiedInteractedWith = ModelDecorationOptions.register({
475475
description: 'inline-chat-modified-interacted-with',
@@ -478,7 +478,7 @@ export class LiveStrategy3 extends EditModeStrategy {
478478

479479

480480
private readonly _decoInsertedText = ModelDecorationOptions.register({
481-
description: 'inline-modified',
481+
description: 'inline-modified-line',
482482
className: 'inline-chat-inserted-range-linehighlight',
483483
isWholeLine: true,
484484
overviewRuler: {
@@ -487,6 +487,11 @@ export class LiveStrategy3 extends EditModeStrategy {
487487
}
488488
});
489489

490+
private readonly _decoInsertedTextRange = ModelDecorationOptions.register({
491+
description: 'inline-chat-inserted-range-linehighlight',
492+
className: 'inline-chat-inserted-range',
493+
});
494+
490495
private readonly _store: DisposableStore = new DisposableStore();
491496
private readonly _sessionStore: DisposableStore = new DisposableStore();
492497
private readonly _previewZone: Lazy<InlineChatFileCreatePreviewWidget>;
@@ -689,6 +694,12 @@ export class LiveStrategy3 extends EditModeStrategy {
689694
options: this._decoInsertedText
690695
});
691696

697+
for (const innerChange of innerChanges ?? []) {
698+
newDecorations.push({
699+
range: innerChange.modifiedRange,
700+
options: this._decoInsertedTextRange
701+
});
702+
}
692703

693704
// original view zone
694705
const source = new LineSource(

0 commit comments

Comments
 (0)