From 0c3b6d63fab88557d1cf762f3d6d4827af3393b1 Mon Sep 17 00:00:00 2001 From: Martin Aeschlimann Date: Fri, 11 Dec 2015 11:30:28 +0100 Subject: [PATCH] Move overwriteBefore/overwriteAfter to ISuggestion #1191 - remove ISuggest.textEdit --- src/vs/editor/common/modes.ts | 2 -- .../editor/contrib/suggest/common/suggest.ts | 27 ------------------- 2 files changed, 29 deletions(-) diff --git a/src/vs/editor/common/modes.ts b/src/vs/editor/common/modes.ts index 1149b0b8a44..956c29bcad3 100644 --- a/src/vs/editor/common/modes.ts +++ b/src/vs/editor/common/modes.ts @@ -395,8 +395,6 @@ export interface ISuggestion { noAutoAccept?: boolean; overwriteBefore?: number; overwriteAfter?: number; - - textEdit?: EditorCommon.ISingleEditOperation; } export interface ISuggestResult { diff --git a/src/vs/editor/contrib/suggest/common/suggest.ts b/src/vs/editor/contrib/suggest/common/suggest.ts index e8bf9d5a3bd..3c443b01041 100644 --- a/src/vs/editor/contrib/suggest/common/suggest.ts +++ b/src/vs/editor/contrib/suggest/common/suggest.ts @@ -59,33 +59,6 @@ export function suggest(model: IModel, position: IPosition, triggerCharacter: st incomplete: suggestResult.incomplete, suggestions: suggestResult.suggestions } - - const defaultRange: IRange = { - startLineNumber: position.lineNumber, - startColumn: position.column, - endLineNumber: position.lineNumber, - endColumn: position.column - }; - - for (let suggestion of suggestResult.suggestions) { - if (!suggestion.textEdit) { - suggestion.textEdit = { - text: suggestion.codeSnippet, - range: defaultRange - }; - if (typeof suggestion.overwriteBefore === 'number' && suggestion.overwriteBefore > 0 || typeof suggestion.overwriteAfter === 'number' && suggestion.overwriteAfter > 0) { - suggestion.textEdit.range = { - startLineNumber: position.lineNumber, - startColumn: position.column - suggestion.overwriteBefore || 0, - endLineNumber: position.lineNumber, - endColumn: position.column + suggestion.overwriteAfter || 0 - } - } - } - } - - // add additional properties - mixin(suggestions2, suggestResult, false); result.push(suggestions2); } -- GitLab