From 24a660f022f7c882305d56e10f6511cf9b113e42 Mon Sep 17 00:00:00 2001 From: Martin Aeschlimann Date: Mon, 16 Dec 2019 16:05:31 +0100 Subject: [PATCH] update dependencies, adopt textdocument --- package-lock.json | 59 ++++++++++++++++++++++++--------------- package.json | 9 +++--- scripts/bundle.js | 4 +++ src/fillers/vscode-nls.ts | 2 -- src/htmlWorker.ts | 21 +++++++------- 5 files changed, 56 insertions(+), 39 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9ba6a6ce..b71d6a07 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,9 +5,9 @@ "requires": true, "dependencies": { "commander": { - "version": "2.17.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz", - "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==", + "version": "2.20.3", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", "dev": true }, "monaco-editor-core": { @@ -52,36 +52,51 @@ "dev": true }, "typescript": { - "version": "3.6.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.6.3.tgz", - "integrity": "sha512-N7bceJL1CtRQ2RiG0AQME13ksR7DiuQh/QehubYcghzv20tnh+MQnQIuJddTmsbqYj+dztchykemz0zFzlvdQw==", + "version": "3.7.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.7.3.tgz", + "integrity": "sha512-Mcr/Qk7hXqFBXMN7p7Lusj1ktCBydylfQM/FZCk5glCNQJrCUKPkMHdo9R0MTFWsC/4kPFvDS0fDPvukfCkFsw==", "dev": true }, "uglify-js": { - "version": "3.4.9", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.9.tgz", - "integrity": "sha512-8CJsbKOtEbnJsTyv6LE6m6ZKniqMiFWmm9sRbopbkGs3gMPPfd3Fh8iIA4Ykv5MgaTbqHr4BaoGLJLZNhsrW1Q==", + "version": "3.7.2", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.7.2.tgz", + "integrity": "sha512-uhRwZcANNWVLrxLfNFEdltoPNhECUR3lc+UdJoG9CBpMcSnKyWA94tc3eAujB1GcMY5Uwq8ZMp4qWpxWYDQmaA==", "dev": true, "requires": { - "commander": "~2.17.1", + "commander": "~2.20.3", "source-map": "~0.6.1" } }, "vscode-html-languageservice": { - "version": "3.0.0-next.3", - "resolved": "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-3.0.0-next.3.tgz", - "integrity": "sha512-vPdZ17JSr8kAAnjNjdiH4jYySaJrXqnbT3OhnGXqc51R3jnwMXV/Jf72ctXptbpiUQM3ifHnfUcxwO+34tw6Lw==", + "version": "3.0.4-next.12", + "resolved": "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-3.0.4-next.12.tgz", + "integrity": "sha512-/wii3f22RildoI5M6Li2KNMeHTS3xt3ECgQmu5fGkG57rcxzIhO7XlKlozBCG+/NHzWss0lB30c0nfWvIKsn9g==", "dev": true, "requires": { - "vscode-languageserver-types": "^3.14.0", - "vscode-nls": "^4.0.0", - "vscode-uri": "^1.0.6" + "vscode-languageserver-textdocument": "^1.0.0-next.5", + "vscode-languageserver-types": "^3.15.0-next.6", + "vscode-nls": "^4.1.1", + "vscode-uri": "^2.1.1" + }, + "dependencies": { + "vscode-languageserver-types": { + "version": "3.15.0-next.9", + "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.15.0-next.9.tgz", + "integrity": "sha512-Rl/8qJ6932nrHCdPn+9y0x08uLVQaSLRG+U4JzhyKpWU4eJbVaDRoAcz1Llj7CErJGbPr6kdBvShPy5fRfR+Uw==", + "dev": true + } } }, + "vscode-languageserver-textdocument": { + "version": "1.0.0-next.5", + "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.0-next.5.tgz", + "integrity": "sha512-1jp/zAidN/bF/sqPimhBX1orH5G4rzRw63k75TesukJDuxm8yW79ECStWbDSy41BHGOwSGN4M69QFvhancSr5A==", + "dev": true + }, "vscode-languageserver-types": { - "version": "3.14.0", - "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.14.0.tgz", - "integrity": "sha512-lTmS6AlAlMHOvPQemVwo3CezxBp0sNB95KNPkqp3Nxd5VFEnuG1ByM0zlRWos0zjO3ZWtkvhal0COgiV1xIA4A==", + "version": "3.15.0-next.9", + "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.15.0-next.9.tgz", + "integrity": "sha512-Rl/8qJ6932nrHCdPn+9y0x08uLVQaSLRG+U4JzhyKpWU4eJbVaDRoAcz1Llj7CErJGbPr6kdBvShPy5fRfR+Uw==", "dev": true }, "vscode-nls": { @@ -91,9 +106,9 @@ "dev": true }, "vscode-uri": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-1.0.8.tgz", - "integrity": "sha512-obtSWTlbJ+a+TFRYGaUumtVwb+InIUVI0Lu0VBUAPmj2cU5JutEXg3xUE0c2J5Tcy7h2DEKVJBFi+Y9ZSFzzPQ==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-2.1.1.tgz", + "integrity": "sha512-eY9jmGoEnVf8VE8xr5znSah7Qt1P/xsCdErz+g8HYZtJ7bZqKH5E3d+6oVNm1AC/c6IHUDokbmVXKOi4qPAC9A==", "dev": true } } diff --git a/package.json b/package.json index b2c3746a..aa96bd38 100644 --- a/package.json +++ b/package.json @@ -23,9 +23,10 @@ "monaco-languages": "^1.8.0", "monaco-plugin-helpers": "^1.0.2", "requirejs": "^2.3.6", - "typescript": "^3.3.3333", - "uglify-js": "^3.4.9", - "vscode-html-languageservice": "3.0.0-next.3", - "vscode-languageserver-types": "^3.14.0" + "typescript": "^3.7.3", + "uglify-js": "^3.7.2", + "vscode-html-languageservice": "3.0.4-next.12", + "vscode-languageserver-types": "3.15.0-next.9", + "vscode-languageserver-textdocument": "^1.0.0-next.5" } } diff --git a/scripts/bundle.js b/scripts/bundle.js index 6e6e27b4..24a8a5d2 100644 --- a/scripts/bundle.js +++ b/scripts/bundle.js @@ -42,6 +42,10 @@ function bundleOne(moduleId, exclude) { name: 'vscode-languageserver-types', location: path.join(REPO_ROOT, 'node_modules/vscode-languageserver-types/lib/umd'), main: 'main' + }, { + name: 'vscode-languageserver-textdocument', + location: path.join(REPO_ROOT, 'node_modules/vscode-languageserver-textdocument/lib/umd'), + main: 'main' }, { name: 'vscode-uri', location: path.join(REPO_ROOT, 'node_modules/vscode-uri/lib/umd'), diff --git a/src/fillers/vscode-nls.ts b/src/fillers/vscode-nls.ts index fab656d2..80916897 100644 --- a/src/fillers/vscode-nls.ts +++ b/src/fillers/vscode-nls.ts @@ -3,8 +3,6 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import {LocalizeInfo, LocalizeFunc, Options, LoadFunc} from 'vscode-nls'; - export interface Options { locale?: string; cacheLanguageResolution?: boolean; diff --git a/src/htmlWorker.ts b/src/htmlWorker.ts index 75b992df..a1a26f12 100644 --- a/src/htmlWorker.ts +++ b/src/htmlWorker.ts @@ -9,7 +9,6 @@ import IWorkerContext = monaco.worker.IWorkerContext; import Thenable = monaco.Thenable; import * as htmlService from 'vscode-html-languageservice'; -import * as ls from 'vscode-languageserver-types'; import * as poli from './fillers/polyfills'; @@ -29,53 +28,53 @@ export class HTMLWorker { this._languageService = htmlService.getLanguageService(); } - doValidation(uri: string): Thenable { + doValidation(uri: string): Thenable { // not yet suported return Promise.resolve([]); } - doComplete(uri: string, position: ls.Position): Thenable { + doComplete(uri: string, position: htmlService.Position): Thenable { let document = this._getTextDocument(uri); let htmlDocument = this._languageService.parseHTMLDocument(document); return Promise.resolve(this._languageService.doComplete(document, position, htmlDocument, this._languageSettings && this._languageSettings.suggest)); } - format(uri: string, range: ls.Range, options: ls.FormattingOptions): Thenable { + format(uri: string, range: htmlService.Range, options: htmlService.FormattingOptions): Thenable { let document = this._getTextDocument(uri); let textEdits = this._languageService.format(document, range, this._languageSettings && this._languageSettings.format); return Promise.resolve(textEdits); } - doHover(uri: string, position: ls.Position): Thenable { + doHover(uri: string, position: htmlService.Position): Thenable { let document = this._getTextDocument(uri); let htmlDocument = this._languageService.parseHTMLDocument(document); let hover = this._languageService.doHover(document, position, htmlDocument); return Promise.resolve(hover); } - findDocumentHighlights(uri: string, position: ls.Position): Thenable { + findDocumentHighlights(uri: string, position: htmlService.Position): Thenable { let document = this._getTextDocument(uri); let htmlDocument = this._languageService.parseHTMLDocument(document); let highlights = this._languageService.findDocumentHighlights(document, position, htmlDocument); return Promise.resolve(highlights); } - findDocumentLinks(uri: string): Thenable { + findDocumentLinks(uri: string): Thenable { let document = this._getTextDocument(uri); let links = this._languageService.findDocumentLinks(document, null); return Promise.resolve(links); } - findDocumentSymbols(uri: string): Thenable { + findDocumentSymbols(uri: string): Thenable { let document = this._getTextDocument(uri); let htmlDocument = this._languageService.parseHTMLDocument(document); let symbols = this._languageService.findDocumentSymbols(document, htmlDocument); return Promise.resolve(symbols); } - provideFoldingRanges(uri: string, context?: { rangeLimit?: number; }): Thenable { + provideFoldingRanges(uri: string, context?: { rangeLimit?: number; }): Thenable { let document = this._getTextDocument(uri); let ranges = this._languageService.getFoldingRanges(document, context); return Promise.resolve(ranges); } - private _getTextDocument(uri: string): ls.TextDocument { + private _getTextDocument(uri: string): htmlService.TextDocument { let models = this._ctx.getMirrorModels(); for (let model of models) { if (model.uri.toString() === uri) { - return ls.TextDocument.create(uri, this._languageId, model.version, model.getValue()); + return htmlService.TextDocument.create(uri, this._languageId, model.version, model.getValue()); } } return null;