SystemSh0cker/monaco-editor
1
0
Fork 0
mirror of https://github.com/microsoft/monaco-editor.git synced 2025-12-23 00:22:56 +01:00
Code Issues Projects Releases Packages Activity

Adopt SnippetString, publish 1.3.1

Browse source
This commit is contained in:
Martin Aeschlimann 2017-01-27 16:06:02 +01:00
parent 6787816d8e
commit f032b58597
2 changed files with 19 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/languageFeatures.ts
View file

@ -197,7 +197,7 @@ export class CompletionAdapter implements monaco.languages.CompletionItemProvide
return;
}
let items: monaco.languages.CompletionItem[] = info.items.map(entry => {
return {
let item : monaco.languages.CompletionItem = {
label: entry.label,
insertText: entry.insertText,
sortText: entry.sortText,
@ -205,8 +205,15 @@ export class CompletionAdapter implements monaco.languages.CompletionItemProvide
documentation: entry.documentation,
detail: entry.detail,
kind: toCompletionItemKind(entry.kind),
textEdit: toTextEdit(entry.textEdit)
};
if (entry.textEdit) {
item.range = toRange(entry.textEdit.range);
item.insertText = entry.textEdit.newText;
}
if (entry.insertTextFormat === ls.InsertTextFormat.Snippet) {
item.insertText = { value: <string> item.insertText };
}
return item;
});
return {
@ -344,12 +351,10 @@ function toWorkspaceEdit(edit: ls.WorkspaceEdit): monaco.languages.WorkspaceEdit
return void 0;
}
let resourceEdits: monaco.languages.IResourceEdit[] = [];
for (let uri in edit.changes) {
let edits = edit.changes[uri];
for (let e of edits) {
resourceEdits.push({ resource: Uri.parse(uri), range: toRange(e.range), newText: e.newText });
for (let tde of edit.changes) {
for (let e of tde.edits) {
resourceEdits.push({ resource: Uri.parse(tde.textDocument.uri), range: toRange(e.range), newText: e.newText });
}
}
return {
edits: resourceEdits