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

Adopt monaco-editor-core@0.16.0

Browse source
This commit is contained in:
Alex Dima 2019-03-04 15:57:23 +01:00
parent ff32e4a315
commit 0f97f5fd54
3 changed files with 21 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

18
package-lock.json generated
View file

@ -11,15 +11,15 @@
"dev": true "dev": true
}, },
"monaco-editor-core": { "monaco-editor-core": {
"version": "0.15.5", "version": "0.16.0",
"resolved": "https://registry.npmjs.org/monaco-editor-core/-/monaco-editor-core-0.15.5.tgz", "resolved": "https://registry.npmjs.org/monaco-editor-core/-/monaco-editor-core-0.16.0.tgz",
"integrity": "sha512-kM3KHRjj16cFdK5Z0EppKUu793JVMpsEesBSWlqdgrxcmjyDMXV6xK0oatPcAYp3eOfbbyjPhruxDXj85FKyIg==", "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": {
@ -52,9 +52,9 @@
"dev": true "dev": true
}, },
"typescript": { "typescript": {
"version": "3.2.2", "version": "3.3.3333",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-3.2.2.tgz", "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.3.3333.tgz",
"integrity": "sha512-VCj5UiSyHBjwfYacmDuc/NOk4QQixbE+Wn7MFJuS0nRuPQbof132Pw4u53dm264O8LPc2MVsc7RJNml5szurkg==", "integrity": "sha512-JjSKsAfuHBE/fB2oZ8NxtRTk5iGcg6hkYXMnZ3Wc+b2RSqejEqTaem11mHASMnFilHrax3sLK0GDzcJrekZYLw==",
"dev": true "dev": true
}, },
"uglify-js": { "uglify-js": {

6
package.json
View file

@ -20,11 +20,11 @@
"url": "https://github.com/Microsoft/monaco-typescript/issues" "url": "https://github.com/Microsoft/monaco-typescript/issues"
}, },
"devDependencies": { "devDependencies": {
"monaco-editor-core": "^0.15.5", "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.2.2", "typescript": "^3.3.3333",
"uglify-js": "^3.4.9" "uglify-js": "^3.4.9"
} }
} }

9
src/languageFeatures.ts
View file

@ -213,6 +213,7 @@ export class SuggestAdapter extends Adapter implements monaco.languages.Completi
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 wordInfo = model.getWordUntilPosition(position);
const wordRange = new Range(position.lineNumber, wordInfo.startColumn, position.lineNumber, wordInfo.endColumn);
const resource = model.uri; const resource = model.uri;
const offset = this._positionToOffset(resource, position); const offset = this._positionToOffset(resource, position);
@ -223,9 +224,17 @@ export class SuggestAdapter extends Adapter implements monaco.languages.Completi
return; return;
} }
let suggestions: MyCompletionItem[] = info.entries.map(entry => { let suggestions: MyCompletionItem[] = info.entries.map(entry => {
let range = wordRange;
if (entry.replacementSpan) {
const p1 = model.getPositionAt(entry.replacementSpan.start);
const p2 = model.getPositionAt(entry.replacementSpan.start + entry.replacementSpan.length);
range = new Range(p1.lineNumber, p1.column, p2.lineNumber, p2.column);
}
return { return {
uri: resource, uri: resource,
position: position, position: position,
range: range,
label: entry.name, label: entry.name,
insertText: entry.name, insertText: entry.name,
sortText: entry.sortText, sortText: entry.sortText,