Skip to content

Commit

Permalink
only store/restore view state for additional edits, not for the main …
Browse files Browse the repository at this point in the history
…edit #97430
  • Loading branch information
jrieken committed May 12, 2020
1 parent f60d9ef commit c4e781b
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions src/vs/editor/contrib/suggest/suggestController.ts
Original file line number Diff line number Diff line change
Expand Up @@ -278,14 +278,15 @@ export class SuggestController implements IEditorContribution {
// keep item in memory
this._memoryService.memorize(model, this.editor.getPosition(), item);

const scrollState = StableEditorScrollState.capture(this.editor);

if (Array.isArray(item.completion.additionalTextEdits)) {
// sync additional edits
const scrollState = StableEditorScrollState.capture(this.editor);
this.editor.executeEdits(
'suggestController.additionalTextEdits.sync',
item.completion.additionalTextEdits.map(edit => EditOperation.replace(Range.lift(edit.range), edit.text))
);
scrollState.restoreRelativeVerticalPositionOfCursor(this.editor);

} else if (!item.isResolved) {
// async additional edits
Expand Down Expand Up @@ -352,8 +353,6 @@ export class SuggestController implements IEditorContribution {
adjustWhitespace: !(item.completion.insertTextRules! & CompletionItemInsertTextRule.KeepWhitespace)
});

scrollState.restoreRelativeVerticalPositionOfCursor(this.editor);

if (!(flags & InsertFlags.NoAfterUndoStop)) {
this.editor.pushUndoStop();
}
Expand Down

0 comments on commit c4e781b

Please sign in to comment.