diff --git a/package-lock.json b/package-lock.json index c8f97a37..f70cd2cb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17,15 +17,15 @@ "dev": true }, "monaco-editor-core": { - "version": "0.13.2", - "resolved": "https://registry.npmjs.org/monaco-editor-core/-/monaco-editor-core-0.13.2.tgz", - "integrity": "sha512-UwUpmT+37fryykVcfuG/KA3sUV/Siip2V+kzzH/F6gzi6QGAe/A/qvr5sfTALdoW55V5aVpUNctPFUw5Bm1Qeg==", + "version": "0.14.1", + "resolved": "https://registry.npmjs.org/monaco-editor-core/-/monaco-editor-core-0.14.1.tgz", + "integrity": "sha512-bWJuPbDEftxaN2bG+JZ29+aJhg0rmq+y6VmCUqPZpmw8bSevoYjuTcdLkt9BbNaGnwosAVy+vSktXgs/JW7OvQ==", "dev": true }, "monaco-languages": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/monaco-languages/-/monaco-languages-1.3.1.tgz", - "integrity": "sha512-zOrUBPBUW7RenUoQocl/O5wPlPVR5Ekb4GstgeCxD8PXM5qfU2djdIgAbxIVIPgoGemrQrKKfPV093T0Ot7n4Q==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/monaco-languages/-/monaco-languages-1.4.0.tgz", + "integrity": "sha512-39MZMAEKToktfSpOS0Soj05IvkT5vbebL9AIBGPn8fGi8WgJOcfS3YLiMu07gZKViR7CFZ4RyQJKJHglx0fPdA==", "dev": true }, "monaco-plugin-helpers": { @@ -34,7 +34,7 @@ "integrity": "sha512-7kUx8dtd5qVNVgUARBRhnM8oftPglYwlINfigC4yGUiuzqtIN22u1tly8umiOCIPR0eFiBLjt6aN23oZh2QJgg==", "dev": true, "requires": { - "typescript": "^2.7.2" + "typescript": "2.9.2" }, "dependencies": { "typescript": { @@ -64,13 +64,13 @@ "dev": true }, "uglify-js": { - "version": "3.4.6", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.6.tgz", - "integrity": "sha512-O1D7L6WcOzS1qW2ehopEm4cWm5yA6bQBozlks8jO8ODxYCy4zv+bR/la4Lwp01tpkYGNonnpXvUpYtrvSu8Yzg==", + "version": "3.4.7", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.7.tgz", + "integrity": "sha512-J0M2i1mQA+ze3EdN9SBi751DNdAXmeFLfJrd/MDIkRc3G3Gbb9OPVSx7GIQvVwfWxQARcYV2DTxIkMyDAk3o9Q==", "dev": true, "requires": { - "commander": "~2.16.0", - "source-map": "~0.6.1" + "commander": "2.16.0", + "source-map": "0.6.1" } }, "vscode-json-languageservice": { @@ -79,10 +79,10 @@ "integrity": "sha512-RiLEhif0MzwIscoxKZ0lL1fvKUbB1DLJcPXGCm/K9WouLbEQu1OuIBsMPp3NnK+ZOW7uMXZgGfpMtWow7YgOiQ==", "dev": true, "requires": { - "jsonc-parser": "^2.0.1", - "vscode-languageserver-types": "^3.10.0", - "vscode-nls": "^3.2.4", - "vscode-uri": "^1.0.5" + "jsonc-parser": "2.0.1", + "vscode-languageserver-types": "3.10.0", + "vscode-nls": "3.2.4", + "vscode-uri": "1.0.5" } }, "vscode-languageserver-types": { diff --git a/package.json b/package.json index 2bdc20ae..aa5bd03d 100644 --- a/package.json +++ b/package.json @@ -20,12 +20,12 @@ }, "devDependencies": { "jsonc-parser": "^2.0.1", - "monaco-editor-core": "0.13.2", - "monaco-languages": "1.3.1", + "monaco-editor-core": "0.14.1", + "monaco-languages": "1.4.0", "monaco-plugin-helpers": "^1.0.2", "requirejs": "^2.3.5", "typescript": "3.0.1", - "uglify-js": "^3.4.6", + "uglify-js": "^3.4.7", "vscode-json-languageservice": "3.1.4", "vscode-languageserver-types": "3.10.0" } diff --git a/src/languageFeatures.ts b/src/languageFeatures.ts index 9e9d6611..7781ac16 100644 --- a/src/languageFeatures.ts +++ b/src/languageFeatures.ts @@ -423,7 +423,7 @@ export class DocumentSymbolAdapter implements monaco.languages.DocumentSymbolPro constructor(private _worker: WorkerAccessor) { } - public provideDocumentSymbols(model: monaco.editor.IReadOnlyModel, token: CancellationToken): Thenable { + public provideDocumentSymbols(model: monaco.editor.IReadOnlyModel, token: CancellationToken): Thenable { const resource = model.uri; return wireCancellationToken(token, this._worker(resource).then(worker => worker.findDocumentSymbols(resource.toString())).then(items => { @@ -432,9 +432,11 @@ export class DocumentSymbolAdapter implements monaco.languages.DocumentSymbolPro } return items.map(item => ({ name: item.name, + detail: '', containerName: item.containerName, kind: toSymbolKind(item.kind), - location: toLocation(item.location) + range: toRange(item.location.range), + selectionRange: toRange(item.location.range) })); })); } diff --git a/test/index.html b/test/index.html index a4e5d921..367ca210 100644 --- a/test/index.html +++ b/test/index.html @@ -12,12 +12,21 @@