Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-25 19:18:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

add CompletionItemInsertTextRules on modes.ts so that we can have that in vscode.d.ts, #57093

Browse Source
This commit is contained in:
Johannes Rieken
2018-10-17 12:27:42 +02:00
parent cceb269135
commit 349c18db22
7 changed files with 45 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/vs/workbench/api/node/extHostLanguageFeatures.ts
View File

@@ -683,19 +683,19 @@ class SuggestAdapter {
// 'insertText'-logic
if (item.textEdit) {
result.insertText = item.textEdit.newText;
result.insertTextIsSnippet = false;
result.insertTextRules = modes.CompletionItemInsertTextRule.AdjustWhitespace;
} else if (typeof item.insertText === 'string') {
result.insertText = item.insertText;
result.insertTextIsSnippet = false;
result.insertTextRules = modes.CompletionItemInsertTextRule.AdjustWhitespace;
} else if (item.insertText instanceof SnippetString) {
result.insertText = item.insertText.value;
result.insertTextIsSnippet = true;
result.insertTextRules = modes.CompletionItemInsertTextRule.AdjustWhitespace | modes.CompletionItemInsertTextRule.InsertAsSnippet;
} else {
result.insertText = item.label;
result.insertTextIsSnippet = false;
result.insertTextRules = modes.CompletionItemInsertTextRule.AdjustWhitespace;
}
// 'overwrite[Before|After]'-logic

2
src/vs/workbench/api/node/extHostTypeConverters.ts
View File

@@ -556,7 +556,7 @@ export namespace Suggest {
result.range = Range.to(suggestion.range);
// 'inserText'-logic
if (suggestion.insertTextIsSnippet) {
if (suggestion.insertTextRules & modes.CompletionItemInsertTextRule.InsertAsSnippet) {
result.insertText = new types.SnippetString(suggestion.insertText);
} else {
result.insertText = suggestion.insertText;