Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

use undo-loop instead of undo-edit when discarding chat session #184063

Merged
merged 2 commits into from
Jun 1, 2023
Merged

use undo-loop instead of undo-edit when discarding chat session #184063

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1610fc8
use undo-loop instead of undo-edit when discarding chat session
jrieken Jun 1, 2023
a01f5a9
fix tests, wait for correct state
jrieken Jun 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions src/vs/workbench/contrib/interactiveEditor/browser/interactiveEditorSession.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { URI } from 'vs/base/common/uri';
import { Event } from 'vs/base/common/event';
import { ResourceEdit, ResourceFileEdit, ResourceTextEdit } from 'vs/editor/browser/services/bulkEditService';
import { TextEdit } from 'vs/editor/common/languages';
import { ITextModel, ITextSnapshot } from 'vs/editor/common/model';
import { ITextModel } from 'vs/editor/common/model';
import { EditMode, IInteractiveEditorSessionProvider, IInteractiveEditorSession, IInteractiveEditorBulkEditResponse, IInteractiveEditorEditResponse, IInteractiveEditorMessageResponse, IInteractiveEditorResponse, IInteractiveEditorService } from 'vs/workbench/contrib/interactiveEditor/common/interactiveEditor';
import { IRange, Range } from 'vs/editor/common/core/range';
import { IActiveCodeEditor, ICodeEditor } from 'vs/editor/browser/editorBrowser';
Expand Down Expand Up @@ -60,12 +60,14 @@ export class Session {
private _lastInput: string | undefined;
private _lastExpansionState: boolean | undefined;
private _lastTextModelChanges: LineRangeMapping[] | undefined;
private _lastSnapshot: ITextSnapshot | undefined;
private _isUnstashed: boolean = false;
private readonly _exchange: SessionExchange[] = [];
private readonly _startTime = new Date();
private readonly _teldata: Partial<TelemetryData>;

readonly textModelNAltVersion: number;
private _textModelNSnapshotAltVersion: number | undefined;

constructor(
readonly editMode: EditMode,
readonly editor: ICodeEditor,
Expand All @@ -75,6 +77,7 @@ export class Session {
readonly session: IInteractiveEditorSession,
private readonly _wholeRangeMarkerId: string
) {
this.textModelNAltVersion = textModelN.getAlternativeVersionId();
this._teldata = {
extension: provider.debugName,
startTime: this._startTime.toISOString(),
Expand Down Expand Up @@ -109,8 +112,8 @@ export class Session {
this._lastExpansionState = state;
}

get lastSnapshot(): ITextSnapshot | undefined {
return this._lastSnapshot;
get textModelNSnapshotAltVersion(): number | undefined {
return this._textModelNSnapshotAltVersion;
}

get wholeRange(): Range {
Expand All @@ -119,7 +122,7 @@ export class Session {
}

createSnapshot(): void {
this._lastSnapshot = this.textModelN.createSnapshot();
this._textModelNSnapshotAltVersion = this.textModelN.getAlternativeVersionId();
}

addExchange(exchange: SessionExchange): void {
Expand Down
17 changes: 5 additions & 12 deletions src/vs/workbench/contrib/interactiveEditor/browser/interactiveEditorStrategies.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storag
import { InteractiveEditorFileCreatePreviewWidget, InteractiveEditorLivePreviewWidget } from 'vs/workbench/contrib/interactiveEditor/browser/interactiveEditorLivePreviewWidget';
import { EditResponse, Session } from 'vs/workbench/contrib/interactiveEditor/browser/interactiveEditorSession';
import { InteractiveEditorWidget } from 'vs/workbench/contrib/interactiveEditor/browser/interactiveEditorWidget';
import { getValueFromSnapshot } from 'vs/workbench/contrib/interactiveEditor/browser/utils';
import { CTX_INTERACTIVE_EDITOR_SHOWING_DIFF, CTX_INTERACTIVE_EDITOR_DOCUMENT_CHANGED } from 'vs/workbench/contrib/interactiveEditor/common/interactiveEditor';
import { IEditorService, SIDE_GROUP } from 'vs/workbench/services/editor/common/editorService';

Expand Down Expand Up @@ -274,19 +273,13 @@ export class LiveStrategy extends EditModeStrategy {
}

async cancel() {
const { textModelN: modelN, textModel0: model0, lastSnapshot } = this._session;
if (modelN.isDisposed() || (model0.isDisposed() && !lastSnapshot)) {
const { textModelN: modelN, textModelNAltVersion, textModelNSnapshotAltVersion } = this._session;
if (modelN.isDisposed()) {
return;
}

const newText = lastSnapshot
? getValueFromSnapshot(lastSnapshot)
: model0.getValue();

const edits = await this._editorWorkerService.computeMoreMinimalEdits(modelN.uri, [{ range: modelN.getFullModelRange(), text: newText }]);
if (edits) {
const operations = edits.map(e => EditOperation.replace(Range.lift(e.range), e.text));
modelN.pushEditOperations(null, operations, () => null);
const targetAltVersion = textModelNSnapshotAltVersion ?? textModelNAltVersion;
while (targetAltVersion < modelN.getAlternativeVersionId() && modelN.canUndo()) {
modelN.undo();
}
}

Expand Down
14 changes: 1 addition & 13 deletions src/vs/workbench/contrib/interactiveEditor/browser/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import { LineRange } from 'vs/editor/common/core/lineRange';
import { Range } from 'vs/editor/common/core/range';
import { ITextModel, ITextSnapshot } from 'vs/editor/common/model';
import { ITextModel } from 'vs/editor/common/model';

export function invertLineRange(range: LineRange, model: ITextModel): LineRange[] {
if (range.isEmpty) {
Expand All @@ -20,15 +20,3 @@ export function invertLineRange(range: LineRange, model: ITextModel): LineRange[
export function lineRangeAsRange(r: LineRange): Range {
return new Range(r.startLineNumber, 1, r.endLineNumberExclusive - 1, 1);
}

export function getValueFromSnapshot(snapshot: ITextSnapshot): string {
let result = '';
while (true) {
const chunk = snapshot.read();
if (chunk === null) {
break;
}
result += chunk;
}
return result;
}
3 changes: 1 addition & 2 deletions src/vs/workbench/contrib/interactiveEditor/test/browser/interactiveEditorController.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,8 @@ suite('InteractiveEditorController', function () {
ctrl = instaService.createInstance(TestController, editor);
const run = ctrl.run({ message: 'Hello', autoSend: true });

await Event.toPromise(Event.filter(ctrl.onDidChangeState, e => e === State.SHOW_RESPONSE));
await Event.toPromise(Event.filter(ctrl.onDidChangeState, e => e === State.WAIT_FOR_INPUT));
assert.ok(ctrl.getWidgetPosition() !== undefined);

await ctrl.cancelSession();

await run;
Expand Down