From fe37ea75ea6f28aaaf3a3ffb2c6646b9d54f5ec0 Mon Sep 17 00:00:00 2001 From: jeanp413 Date: Fri, 6 Dec 2019 23:54:35 -0500 Subject: [PATCH] Fixes #86386 --- .../contrib/snippets/browser/snippetCompletionProvider.ts | 5 +++-- .../contrib/snippets/test/browser/snippetsService.test.ts | 8 ++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/vs/workbench/contrib/snippets/browser/snippetCompletionProvider.ts b/src/vs/workbench/contrib/snippets/browser/snippetCompletionProvider.ts index d2d8f54ccb5..96d9f026104 100644 --- a/src/vs/workbench/contrib/snippets/browser/snippetCompletionProvider.ts +++ b/src/vs/workbench/contrib/snippets/browser/snippetCompletionProvider.ts @@ -126,8 +126,9 @@ export class SnippetCompletionProvider implements CompletionItemProvider { // add remaing snippets when the current prefix ends in whitespace or when no // interesting positions have been found availableSnippets.forEach(snippet => { - const range = Range.fromPositions(position); - suggestions.push(new SnippetCompletion(snippet, { replace: range, insert: range })); + let insert = Range.fromPositions(position); + let replace = startsWith(lineSuffixLow, snippet.prefixLow) ? insert.setEndPosition(position.lineNumber, position.column + snippet.prefixLow.length) : insert; + suggestions.push(new SnippetCompletion(snippet, { replace, insert })); }); } diff --git a/src/vs/workbench/contrib/snippets/test/browser/snippetsService.test.ts b/src/vs/workbench/contrib/snippets/test/browser/snippetsService.test.ts index fd90cd10897..a8a9b46573d 100644 --- a/src/vs/workbench/contrib/snippets/test/browser/snippetsService.test.ts +++ b/src/vs/workbench/contrib/snippets/test/browser/snippetsService.test.ts @@ -438,5 +438,13 @@ suite('SnippetsService', function () { [first] = result.suggestions; assert.equal((first.range as any).insert.endColumn, 3); assert.equal((first.range as any).replace.endColumn, 3); + + model = TextModel.createFromString('not word', undefined, modeService.getLanguageIdentifier('fooLang')); + result = await provider.provideCompletionItems(model, new Position(1, 1), context)!; + + assert.equal(result.suggestions.length, 1); + [first] = result.suggestions; + assert.equal((first.range as any).insert.endColumn, 1); + assert.equal((first.range as any).replace.endColumn, 9); }); }); -- GitLab