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

Adopt monaco-editor-core@0.14.1

Browse source
This commit is contained in:
Alex Dima 2018-08-10 12:18:07 +02:00
parent be47b28d96
commit b08b71f7e4
3 changed files with 23 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

29
package-lock.json generated
View file

@ -4,16 +4,23 @@
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {
"commander": {
"version": "2.16.0",
"resolved": "https://registry.npmjs.org/commander/-/commander-2.16.0.tgz",
"integrity": "sha512-sVXqklSaotK9at437sFlFpyOcJonxe0yST/AG9DkQKUdIE6IqGIMv4SfAQSKaJbSdVEJYItASCrBiVQHq1HQew==",
"dev": true
},
"monaco-editor-core": { "monaco-editor-core": {
"version": "0.12.0", "version": "0.14.1",
"resolved": "https://registry.npmjs.org/monaco-editor-core/-/monaco-editor-core-0.12.0.tgz", "resolved": "https://registry.npmjs.org/monaco-editor-core/-/monaco-editor-core-0.14.1.tgz",
"integrity": "sha512-wOoEVAoZtrarDRcQC32Fp0ocacpQd6/Nb0FmUZOHeD3swZuPZhDLOxTyoNLjKq3d+h/6g+IARBLnDaLT5OQD4g==", "integrity": "sha512-bWJuPbDEftxaN2bG+JZ29+aJhg0rmq+y6VmCUqPZpmw8bSevoYjuTcdLkt9BbNaGnwosAVy+vSktXgs/JW7OvQ==",
"dev": true "dev": true
}, },
"monaco-languages": { "monaco-languages": {
"version": "1.4.0", "version": "1.4.0",
"resolved": "https://registry.npmjs.org/monaco-languages/-/monaco-languages-1.4.0.tgz", "resolved": "https://registry.npmjs.org/monaco-languages/-/monaco-languages-1.4.0.tgz",
"integrity": "sha512-39MZMAEKToktfSpOS0Soj05IvkT5vbebL9AIBGPn8fGi8WgJOcfS3YLiMu07gZKViR7CFZ4RyQJKJHglx0fPdA==" "integrity": "sha512-39MZMAEKToktfSpOS0Soj05IvkT5vbebL9AIBGPn8fGi8WgJOcfS3YLiMu07gZKViR7CFZ4RyQJKJHglx0fPdA==",
"dev": true
}, },
"monaco-plugin-helpers": { "monaco-plugin-helpers": {
"version": "1.0.2", "version": "1.0.2",
@ -51,21 +58,13 @@
"dev": true "dev": true
}, },
"uglify-js": { "uglify-js": {
"version": "3.4.6", "version": "3.4.7",
"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.6.tgz", "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.7.tgz",
"integrity": "sha512-O1D7L6WcOzS1qW2ehopEm4cWm5yA6bQBozlks8jO8ODxYCy4zv+bR/la4Lwp01tpkYGNonnpXvUpYtrvSu8Yzg==", "integrity": "sha512-J0M2i1mQA+ze3EdN9SBi751DNdAXmeFLfJrd/MDIkRc3G3Gbb9OPVSx7GIQvVwfWxQARcYV2DTxIkMyDAk3o9Q==",
"dev": true, "dev": true,
"requires": { "requires": {
"commander": "2.16.0", "commander": "2.16.0",
"source-map": "0.6.1" "source-map": "0.6.1"
},
"dependencies": {
"commander": {
"version": "2.16.0",
"resolved": "https://registry.npmjs.org/commander/-/commander-2.16.0.tgz",
"integrity": "sha512-sVXqklSaotK9at437sFlFpyOcJonxe0yST/AG9DkQKUdIE6IqGIMv4SfAQSKaJbSdVEJYItASCrBiVQHq1HQew==",
"dev": true
}
} }
} }
} }

4
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.12.0", "monaco-editor-core": "0.14.1",
"monaco-languages": "^1.4.0", "monaco-languages": "^1.4.0",
"monaco-plugin-helpers": "^1.0.2", "monaco-plugin-helpers": "^1.0.2",
"requirejs": "^2.3.5", "requirejs": "^2.3.5",
"typescript": "3.0.1", "typescript": "3.0.1",
"uglify-js": "^3.4.6" "uglify-js": "^3.4.7"
} }
} }

15
src/languageFeatures.ts
View file

@ -461,7 +461,7 @@ export class ReferenceAdapter extends Adapter implements monaco.languages.Refere
export class OutlineAdapter extends Adapter implements monaco.languages.DocumentSymbolProvider { export class OutlineAdapter extends Adapter implements monaco.languages.DocumentSymbolProvider {
public provideDocumentSymbols(model: monaco.editor.IReadOnlyModel, token: CancellationToken): Thenable<monaco.languages.SymbolInformation[]> { public provideDocumentSymbols(model: monaco.editor.IReadOnlyModel, token: CancellationToken): Thenable<monaco.languages.DocumentSymbol[]> {
const resource = model.uri; const resource = model.uri;
return wireCancellationToken(token, this._worker(resource).then(worker => worker.getNavigationBarItems(resource.toString())).then(items => { return wireCancellationToken(token, this._worker(resource).then(worker => worker.getNavigationBarItems(resource.toString())).then(items => {
@ -469,14 +469,13 @@ export class OutlineAdapter extends Adapter implements monaco.languages.Document
return; return;
} }
const convert = (bucket: monaco.languages.SymbolInformation[], item: ts.NavigationBarItem, containerLabel?: string): void => { const convert = (bucket: monaco.languages.DocumentSymbol[], item: ts.NavigationBarItem, containerLabel?: string): void => {
let result: monaco.languages.SymbolInformation = { let result: monaco.languages.DocumentSymbol = {
name: item.text, name: item.text,
detail: '',
kind: <monaco.languages.SymbolKind>(outlineTypeTable[item.kind] || monaco.languages.SymbolKind.Variable), kind: <monaco.languages.SymbolKind>(outlineTypeTable[item.kind] || monaco.languages.SymbolKind.Variable),
location: { range: this._textSpanToRange(resource, item.spans[0]),
uri: resource, selectionRange: this._textSpanToRange(resource, item.spans[0]),
range: this._textSpanToRange(resource, item.spans[0])
},
containerName: containerLabel containerName: containerLabel
}; };
@ -489,7 +488,7 @@ export class OutlineAdapter extends Adapter implements monaco.languages.Document
bucket.push(result); bucket.push(result);
} }
let result: monaco.languages.SymbolInformation[] = []; let result: monaco.languages.DocumentSymbol[] = [];
items.forEach(item => convert(result, item)); items.forEach(item => convert(result, item));
return result; return result;
})); }));