development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-09-13 21:55:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Call adjustWhitespace on snippet.

Browse source
This commit is contained in:
Henning Dieterichs 2021-05-30 23:02:19 +02:00
parent db1bd650dc
commit 85f9447b72
No known key found for this signature in database
GPG key ID: 771381EFFDB9EC06
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/vs/editor/contrib/inlineCompletions/suggestWidgetAdapterModel.ts
View file

@ -13,6 +13,7 @@ import { CompletionItemInsertTextRule } from 'vs/editor/common/modes';
import { BaseGhostTextWidgetModel, GhostText } from 'vs/editor/contrib/inlineCompletions/ghostTextWidget';
import { inlineCompletionToGhostText, NormalizedInlineCompletion } from 'vs/editor/contrib/inlineCompletions/inlineCompletionsModel';
import { SnippetParser } from 'vs/editor/contrib/snippet/snippetParser';
import { SnippetSession } from 'vs/editor/contrib/snippet/snippetSession';
import { SuggestController } from 'vs/editor/contrib/suggest/suggestController';
import { ISelectedSuggestion } from 'vs/editor/contrib/suggest/suggestWidget';
@ -145,7 +146,14 @@ function getInlineCompletion(suggestController: SuggestController, position: Pos
let { insertText } = item.completion;
if (item.completion.insertTextRules! & CompletionItemInsertTextRule.InsertAsSnippet) {
insertText = new SnippetParser().text(insertText);
const snippet = new SnippetParser().parse(insertText);
const model = suggestController.editor.getModel()!;
SnippetSession.adjustWhitespace(
model, position, snippet,
true,
true
);
insertText = snippet.toString();
}
const info = suggestController.getOverwriteInfo(item, false);