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

update & adapt

Browse source
This commit is contained in:
Martin Aeschlimann 2019-03-04 23:24:27 +01:00
parent da22aff470
commit 485bb60924
3 changed files with 38 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

56
package-lock.json generated
View file

@ -11,21 +11,21 @@
"dev": true "dev": true
}, },
"jsonc-parser": { "jsonc-parser": {
"version": "2.0.2", "version": "2.0.3",
"resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-2.0.2.tgz", "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-2.0.3.tgz",
"integrity": "sha512-TSU435K5tEKh3g7bam1AFf+uZrISheoDsLlpmAo6wWZYqjsnd09lHYK1Qo+moK4Ikifev1Gdpa69g4NELKnCrQ==", "integrity": "sha512-WJi9y9ABL01C8CxTKxRRQkkSpY/x2bo4Gy0WuiZGrInxQqgxQpvkBCLNcDYcHOSdhx4ODgbFcgAvfL49C+PHgQ==",
"dev": true "dev": true
}, },
"monaco-editor-core": { "monaco-editor-core": {
"version": "0.15.0", "version": "0.16.0",
"resolved": "https://registry.npmjs.org/monaco-editor-core/-/monaco-editor-core-0.15.0.tgz", "resolved": "https://registry.npmjs.org/monaco-editor-core/-/monaco-editor-core-0.16.0.tgz",
"integrity": "sha512-s1zuo+p6Gl6IC4WJP6HBkr4pWULm+HdFfacB8vOFPQLLi2oJseO20UuSkxYuZTUJQIjvhNrQfLNAmPKLZaf7tg==", "integrity": "sha512-8tm8vq0SVuQ+VXZFtPIEIronK3102SYCWe8wviWu/5TV4zlDQcf4YdzI6A4CrNqbUc46dD0ngijaKWoRSViI8g==",
"dev": true "dev": true
}, },
"monaco-languages": { "monaco-languages": {
"version": "1.6.0", "version": "1.7.0",
"resolved": "https://registry.npmjs.org/monaco-languages/-/monaco-languages-1.6.0.tgz", "resolved": "https://registry.npmjs.org/monaco-languages/-/monaco-languages-1.7.0.tgz",
"integrity": "sha512-LBEWj8tngYwsq4kasQr+dIhnO4xUIEN36ns+cRepWAQiXZnzcrZ84gFHXm8f4mR4tssxvHVU5Vw7xMUYro6h3g==", "integrity": "sha512-2YrYlkCF/g2H0PDt/ERax2IStaihZ17v1JkYnj2xEALYNah0pbQvGH9gXJvdVx0EpBoSRmxVnrwwM2oBWWOjSQ==",
"dev": true "dev": true
}, },
"monaco-plugin-helpers": { "monaco-plugin-helpers": {
@ -58,9 +58,9 @@
"dev": true "dev": true
}, },
"typescript": { "typescript": {
"version": "3.1.6", "version": "3.3.3333",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-3.1.6.tgz", "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.3.3333.tgz",
"integrity": "sha512-tDMYfVtvpb96msS1lDX9MEdHrW4yOuZ4Kdc4Him9oU796XldPYF/t2+uKoX0BBa0hXXwDlqYQbXY5Rzjzc5hBA==", "integrity": "sha512-JjSKsAfuHBE/fB2oZ8NxtRTk5iGcg6hkYXMnZ3Wc+b2RSqejEqTaem11mHASMnFilHrax3sLK0GDzcJrekZYLw==",
"dev": true "dev": true
}, },
"uglify-js": { "uglify-js": {
@ -74,33 +74,33 @@
} }
}, },
"vscode-json-languageservice": { "vscode-json-languageservice": {
"version": "3.1.5", "version": "3.3.0-next.5",
"resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-3.1.5.tgz", "resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-3.3.0-next.5.tgz",
"integrity": "sha512-mUb8EUADnBOf8PM9LSx4dVoSc9fY6sh+MXAD0vxqHPI58RpbvvxWQkTDAbnJDFJZbq+9q3NrY7qenLF/YCXREg==", "integrity": "sha512-qrha0moCl0HM9ThwableibOGnDY6O/IzFKl88DStaj+0vndSgSJWXldKjMALE8yQKrKP7sVCUboDd1S0rLYhSA==",
"dev": true, "dev": true,
"requires": { "requires": {
"jsonc-parser": "^2.0.1", "jsonc-parser": "^2.0.3",
"vscode-languageserver-types": "^3.10.1", "vscode-languageserver-types": "^3.14.0",
"vscode-nls": "^3.2.4", "vscode-nls": "^4.0.0",
"vscode-uri": "^1.0.5" "vscode-uri": "^1.0.6"
} }
}, },
"vscode-languageserver-types": { "vscode-languageserver-types": {
"version": "3.10.1", "version": "3.14.0",
"resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.10.1.tgz", "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.14.0.tgz",
"integrity": "sha512-HeQ1BPYJDly4HfKs0h2TUAZyHfzTAhgQsCwsa1tW9PhuvGGsd2r3Q53FFVugwP7/2bUv3GWPoTgAuIAkIdBc4w==", "integrity": "sha512-lTmS6AlAlMHOvPQemVwo3CezxBp0sNB95KNPkqp3Nxd5VFEnuG1ByM0zlRWos0zjO3ZWtkvhal0COgiV1xIA4A==",
"dev": true "dev": true
}, },
"vscode-nls": { "vscode-nls": {
"version": "3.2.4", "version": "4.0.0",
"resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-3.2.4.tgz", "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-4.0.0.tgz",
"integrity": "sha512-FTjdqa4jDDoBjJqr36O8lmmZf/55kQ2w4ZY/+GL6K92fq765BqO3aYw21atnXUno/P04V5DWagNl4ybDIndJsw==", "integrity": "sha512-qCfdzcH+0LgQnBpZA53bA32kzp9rpq/f66Som577ObeuDlFIrtbEJ+A/+CCxjIh4G8dpJYNCKIsxpRAHIfsbNw==",
"dev": true "dev": true
}, },
"vscode-uri": { "vscode-uri": {
"version": "1.0.5", "version": "1.0.6",
"resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-1.0.5.tgz", "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-1.0.6.tgz",
"integrity": "sha1-O4majvccN/MFTXm9vdoxx7828g0=", "integrity": "sha512-sLI2L0uGov3wKVb9EB+vIQBl9tVP90nqRvxSoJ35vI3NjxE8jfsE5DSOhWgSunHSZmKS4OCi2jrtfxK7uyp2ww==",
"dev": true "dev": true
} }
} }

12
package.json
View file

@ -19,14 +19,14 @@
"url": "https://github.com/Microsoft/monaco-json/issues" "url": "https://github.com/Microsoft/monaco-json/issues"
}, },
"devDependencies": { "devDependencies": {
"jsonc-parser": "^2.0.2", "jsonc-parser": "^2.0.3",
"monaco-editor-core": "0.15.0", "monaco-editor-core": "0.16.0",
"monaco-languages": "1.6.0", "monaco-languages": "1.7.0",
"monaco-plugin-helpers": "^1.0.2", "monaco-plugin-helpers": "^1.0.2",
"requirejs": "^2.3.6", "requirejs": "^2.3.6",
"typescript": "3.1.6", "typescript": "3.3.3333",
"uglify-js": "^3.4.9", "uglify-js": "^3.4.9",
"vscode-json-languageservice": "3.1.5", "vscode-json-languageservice": "3.3.0-next.5",
"vscode-languageserver-types": "3.10.1" "vscode-languageserver-types": "3.14.0"
} }
} }

5
src/languageFeatures.ts
View file

@ -234,7 +234,6 @@ export class CompletionAdapter implements monaco.languages.CompletionItemProvide
} }
provideCompletionItems(model: monaco.editor.IReadOnlyModel, position: Position, context: monaco.languages.CompletionContext, token: CancellationToken): Thenable<monaco.languages.CompletionList> { provideCompletionItems(model: monaco.editor.IReadOnlyModel, position: Position, context: monaco.languages.CompletionContext, token: CancellationToken): Thenable<monaco.languages.CompletionList> {
const wordInfo = model.getWordUntilPosition(position);
const resource = model.uri; const resource = model.uri;
return this._worker(resource).then(worker => { return this._worker(resource).then(worker => {
@ -243,6 +242,9 @@ export class CompletionAdapter implements monaco.languages.CompletionItemProvide
if (!info) { if (!info) {
return; return;
} }
const wordInfo = model.getWordUntilPosition(position);
const wordRange = new Range(position.lineNumber, wordInfo.startColumn, position.lineNumber, wordInfo.endColumn);
let items: monaco.languages.CompletionItem[] = info.items.map(entry => { let items: monaco.languages.CompletionItem[] = info.items.map(entry => {
let item: monaco.languages.CompletionItem = { let item: monaco.languages.CompletionItem = {
label: entry.label, label: entry.label,
@ -251,6 +253,7 @@ export class CompletionAdapter implements monaco.languages.CompletionItemProvide
filterText: entry.filterText, filterText: entry.filterText,
documentation: entry.documentation, documentation: entry.documentation,
detail: entry.detail, detail: entry.detail,
range: wordRange,
kind: toCompletionItemKind(entry.kind), kind: toCompletionItemKind(entry.kind),
}; };
if (entry.textEdit) { if (entry.textEdit) {