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

Stop the request on input editor model content changed #181037

Merged
merged 10 commits into from
May 2, 2023
Merged

Stop the request on input editor model content changed #181037

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
20af386
ading console logs in order to understand the code
aiday-mar Apr 27, 2023
a150f70
setting the selection only when the boolean is true
aiday-mar Apr 27, 2023
088576f
saving the position of the cursor inside of the input editor when change
aiday-mar Apr 28, 2023
b37ff6d
chanign the code
aiday-mar Apr 28, 2023
d199e12
changin the order of the code
aiday-mar Apr 28, 2023
54a75a8
remove the default boolean value and some spaces
aiday-mar Apr 28, 2023
ee098bf
removing default boolean value
aiday-mar Apr 28, 2023
2afa30f
Merge branch 'main' into aiday/stoppingInteractiveEditorComputation
aiday-mar Apr 28, 2023
3eb2d64
removing some redundant code
aiday-mar Apr 28, 2023
42e1117
move type listener into control loop, avoid listener leak
jrieken May 2, 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
15 changes: 13 additions & 2 deletions src/vs/workbench/contrib/interactiveEditor/browser/interactiveEditorController.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,12 +321,13 @@ export class InteractiveEditorController implements IEditorContribution {
@IContextKeyService contextKeyService: IContextKeyService,

) {
this._zone = this._store.add(_instaService.createInstance(InteractiveEditorZoneWidget, this._editor));
this._ctxHasActiveRequest = CTX_INTERACTIVE_EDITOR_HAS_ACTIVE_REQUEST.bindTo(contextKeyService);
this._ctxInlineDiff = CTX_INTERACTIVE_EDITOR_INLNE_DIFF.bindTo(contextKeyService);
this._ctxLastEditKind = CTX_INTERACTIVE_EDITOR_LAST_EDIT_KIND.bindTo(contextKeyService);
this._ctxLastResponseType = CTX_INTERACTIVE_EDITOR_LAST_RESPONSE_TYPE.bindTo(contextKeyService);
this._ctxLastFeedbackKind = CTX_INTERACTIVE_EDITOR_LAST_FEEDBACK_KIND.bindTo(contextKeyService);
this._zone = this._store.add(_instaService.createInstance(InteractiveEditorZoneWidget, this._editor));

}

dispose(): void {
Expand Down Expand Up @@ -474,6 +475,8 @@ export class InteractiveEditorController implements IEditorContribution {

const diffZone = this._instaService.createInstance(InteractiveEditorDiffWidget, this._editor, textModel0);

let _requestCancelledOnModelContentChanged = false;

do {

const wholeRange = wholeRangeDecoration.getRange(0);
Expand All @@ -494,7 +497,8 @@ export class InteractiveEditorController implements IEditorContribution {
this._ctsRequest = new CancellationTokenSource(this._ctsSession.token);

this._historyOffset = -1;
const inputPromise = this._zone.getInput(wholeRange.getEndPosition(), placeholder, value, this._ctsRequest.token);
const inputPromise = this._zone.getInput(wholeRange.getEndPosition(), placeholder, value, this._ctsRequest.token, _requestCancelledOnModelContentChanged);
_requestCancelledOnModelContentChanged = false;

if (textModel0Changes && editMode === EditMode.LivePreview) {

Expand Down Expand Up @@ -528,6 +532,11 @@ export class InteractiveEditorController implements IEditorContribution {
continue;
}

const typeListener = this._zone.widget.inputEditor.onDidChangeModelContent(() => {
this.cancelCurrentRequest();
_requestCancelledOnModelContentChanged = true;
});

const sw = StopWatch.create();
const request: IInteractiveEditorRequest = {
prompt: input,
Expand Down Expand Up @@ -557,6 +566,8 @@ export class InteractiveEditorController implements IEditorContribution {
this._ctxLastResponseType.set(reply?.type);
this._zone.widget.updateProgress(false);
this._logService.trace('[IE] request took', sw.elapsed(), provider.debugName);

typeListener.dispose();
}

if (this._ctsRequest.token.isCancellationRequested) {
Expand Down
21 changes: 15 additions & 6 deletions src/vs/workbench/contrib/interactiveEditor/browser/interactiveEditorWidget.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import { EmbeddedCodeEditorWidget, EmbeddedDiffEditorWidget } from 'vs/editor/br
import { HiddenItemStrategy, MenuWorkbenchToolBar } from 'vs/platform/actions/browser/toolbar';
import { ProgressBar } from 'vs/base/browser/ui/progressbar/progressbar';
import { SuggestController } from 'vs/editor/contrib/suggest/browser/suggestController';
import { IPosition } from 'vs/editor/common/core/position';
import { IPosition, Position } from 'vs/editor/common/core/position';
import { DEFAULT_FONT_FAMILY } from 'vs/workbench/browser/style';
import { createActionViewItem } from 'vs/platform/actions/browser/menuEntryActionViewItem';
import { TextEdit } from 'vs/editor/common/languages';
Expand Down Expand Up @@ -286,14 +286,23 @@ class InteractiveEditorWidget {
}
}

getInput(placeholder: string, value: string, token: CancellationToken): Promise<string | undefined> {
getInput(placeholder: string, value: string, token: CancellationToken, requestCancelledOnModelContentChanged: boolean): Promise<string | undefined> {

const currentInputEditorPosition = this.inputEditor.getPosition();
const currentInputEditorValue = this.inputEditor.getValue();

this._elements.placeholder.innerText = placeholder;
this._elements.placeholder.style.fontSize = `${this.inputEditor.getOption(EditorOption.fontSize)}px`;
this._elements.placeholder.style.lineHeight = `${this.inputEditor.getOption(EditorOption.lineHeight)}px`;

this._inputModel.setValue(value);
this.inputEditor.setSelection(this._inputModel.getFullModelRange());
this._inputModel.setValue(requestCancelledOnModelContentChanged ? currentInputEditorValue : value);
const fullInputModelRange = this._inputModel.getFullModelRange();

if (requestCancelledOnModelContentChanged) {
this.inputEditor.setPosition(currentInputEditorPosition ?? new Position(fullInputModelRange.endLineNumber, fullInputModelRange.endColumn));
} else {
this.inputEditor.setSelection(fullInputModelRange);
}
this.inputEditor.updateOptions({ ariaLabel: localize('aria-label.N', "Interactive Editor Input: {0}", placeholder) });

const disposeOnDone = new DisposableStore();
Expand Down Expand Up @@ -575,12 +584,12 @@ export class InteractiveEditorZoneWidget extends ZoneWidget {
super._relayout(this._computeHeightInLines());
}

async getInput(where: IPosition, placeholder: string, value: string, token: CancellationToken): Promise<string | undefined> {
async getInput(where: IPosition, placeholder: string, value: string, token: CancellationToken, requestCancelledOnModelContentChanged: boolean): Promise<string | undefined> {
assertType(this.editor.hasModel());
super.show(where, this._computeHeightInLines());
this._ctxVisible.set(true);

const task = this.widget.getInput(placeholder, value, token);
const task = this.widget.getInput(placeholder, value, token, requestCancelledOnModelContentChanged);
const result = await task;
return result;
}
Expand Down
Loading