From 7b1cedcfe4a8cfc0e54cc34a0cf05d0883f8fdbd Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Mon, 14 Oct 2019 11:48:59 +0200 Subject: [PATCH] fix #82491 --- src/vs/editor/contrib/suggest/suggestController.ts | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/vs/editor/contrib/suggest/suggestController.ts b/src/vs/editor/contrib/suggest/suggestController.ts index b8cb308422c..1ae5015e015 100644 --- a/src/vs/editor/contrib/suggest/suggestController.ts +++ b/src/vs/editor/contrib/suggest/suggestController.ts @@ -242,8 +242,7 @@ export class SuggestController implements IEditorContribution { const model = this._editor.getModel(); const modelVersionNow = model.getAlternativeVersionId(); const { completion: suggestion, position } = event.item; - const editorPosition = this._editor.getPosition(); - const columnDelta = editorPosition.column - position.column; + const columnDelta = this._editor.getPosition().column - position.column; // pushing undo stops *before* additional text edits and // *after* the main edit @@ -256,7 +255,7 @@ export class SuggestController implements IEditorContribution { } // keep item in memory - this._memoryService.memorize(model, editorPosition, event.item); + this._memoryService.memorize(model, this._editor.getPosition(), event.item); let { insertText } = suggestion; if (!(suggestion.insertTextRules! & CompletionItemInsertTextRule.InsertAsSnippet)) { @@ -265,7 +264,7 @@ export class SuggestController implements IEditorContribution { let overwriteBefore = position.column - suggestion.range.startColumn; let overwriteAfter = suggestion.range.endColumn - position.column; - let suffixDelta = this._lineSuffix.value ? this._lineSuffix.value.delta(editorPosition) : 0; + let suffixDelta = this._lineSuffix.value ? this._lineSuffix.value.delta(this._editor.getPosition()) : 0; let word: IWordAtPosition | null; if (!keepSuffix) { // don't overwrite anything right of the cursor @@ -273,7 +272,7 @@ export class SuggestController implements IEditorContribution { } else if (overwriteAfter === 0 && (word = model.getWordAtPosition(position))) { // compute fallback overwrite length - overwriteAfter = word.endColumn - editorPosition.column; + overwriteAfter = word.endColumn - this._editor.getPosition().column; } SnippetController2.get(this._editor).insert(insertText, { -- GitLab