SystemSh0cker/monaco-editor
1
0
Fork 0
mirror of https://github.com/microsoft/monaco-editor.git synced 2025-12-22 13:55:41 +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

14
package.json
View file

@ -1,13 +1,13 @@
{ {
"name": "monaco-css", "name": "monaco-css",
"version": "1.3.0", "version": "1.3.1",
"description": "CSS, LESS and SCSS plugin for the Monaco Editor", "description": "CSS, LESS and SCSS plugin for the Monaco Editor",
"scripts": { "scripts": {
"compile": "gulp compile", "compile": "gulp compile",
"watch": "gulp watch", "watch": "gulp watch",
"prepublish": "gulp release", "prepublish": "gulp release",
"install-service-next": "npm install vscode-css-languageservice@next -f -S", "install-service-next": "npm install vscode-css-languageservice@next -f -D && npm install vscode-languageserver-types@next -f -D",
"install-service-local": "npm install ../vscode-css-languageservice -f -S" "install-service-local": "npm install ../vscode-css-languageservice -f -D && npm install ../vscode-languageserver-node/types -f -D"
}, },
"author": "Microsoft Corporation", "author": "Microsoft Corporation",
"license": "MIT", "license": "MIT",
@ -25,12 +25,12 @@
"gulp-tsb": "^2.0.0", "gulp-tsb": "^2.0.0",
"gulp-uglify": "^1.5.3", "gulp-uglify": "^1.5.3",
"merge-stream": "^1.0.0", "merge-stream": "^1.0.0",
"monaco-editor-core": "^0.8.0", "monaco-editor-core": "^0.8.1",
"monaco-languages": "^0.7.0", "monaco-languages": "^0.7.0",
"object-assign": "^4.1.0", "object-assign": "^4.1.0",
"rimraf": "^2.5.2", "rimraf": "^2.5.2",
"typescript": "2.0.3", "typescript": "^2.1.5",
"vscode-css-languageservice": "^1.0.8", "vscode-css-languageservice": "^2.0.0-next.9",
"vscode-languageserver-types": "^1.0.2" "vscode-languageserver-types": "^3.0.2-beta.5"
} }
} }

19
src/languageFeatures.ts
View file

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