From 105e928b69bf9dc4e1dcb63c9d4ed04c59ebc86a Mon Sep 17 00:00:00 2001 From: Martin Aeschlimann Date: Wed, 23 May 2018 16:38:51 +0200 Subject: [PATCH] [css] update dependencies --- extensions/css-language-features/package.json | 6 +- .../css-language-features/server/package.json | 6 +- .../server/src/cssServerMain.ts | 114 +++++++++++------- .../css-language-features/server/yarn.lock | 52 ++++---- extensions/css-language-features/yarn.lock | 46 +++---- 5 files changed, 126 insertions(+), 98 deletions(-) diff --git a/extensions/css-language-features/package.json b/extensions/css-language-features/package.json index b6662751be0..44a960237e0 100644 --- a/extensions/css-language-features/package.json +++ b/extensions/css-language-features/package.json @@ -695,9 +695,9 @@ ] }, "dependencies": { - "vscode-languageclient": "^4.0.0", - "vscode-languageserver-protocol-foldingprovider": "^2.0.0-next.2", - "vscode-nls": "^3.2.1" + "vscode-languageclient": "^4.1.4", + "vscode-languageserver-protocol-foldingprovider": "^2.0.1", + "vscode-nls": "^3.2.2" }, "devDependencies": { "@types/node": "7.0.43" diff --git a/extensions/css-language-features/server/package.json b/extensions/css-language-features/server/package.json index 2eb8e49941a..ac0b66dc6ce 100644 --- a/extensions/css-language-features/server/package.json +++ b/extensions/css-language-features/server/package.json @@ -8,9 +8,9 @@ "node": "*" }, "dependencies": { - "vscode-css-languageservice": "^3.0.9-next.14", - "vscode-languageserver": "^4.0.0", - "vscode-languageserver-protocol-foldingprovider": "^2.0.0-next.2" + "vscode-css-languageservice": "^3.0.9-next.15", + "vscode-languageserver": "^4.1.3", + "vscode-languageserver-protocol-foldingprovider": "^2.0.1" }, "devDependencies": { "@types/mocha": "2.2.33", diff --git a/extensions/css-language-features/server/src/cssServerMain.ts b/extensions/css-language-features/server/src/cssServerMain.ts index 6f95bc28432..8778faf2b79 100644 --- a/extensions/css-language-features/server/src/cssServerMain.ts +++ b/extensions/css-language-features/server/src/cssServerMain.ts @@ -24,7 +24,7 @@ export interface Settings { } // Create a connection for the server. -let connection: IConnection = createConnection(); +const connection: IConnection = createConnection(); console.log = connection.console.log.bind(connection.console); console.error = connection.console.error.bind(connection.console); @@ -35,12 +35,12 @@ process.on('unhandledRejection', (e: any) => { // Create a simple text document manager. The text document manager // supports full document sync only -let documents: TextDocuments = new TextDocuments(); +const documents: TextDocuments = new TextDocuments(); // Make the text document manager listen on the connection // for open, change and close text document events documents.listen(connection); -let stylesheets = getLanguageModelCache(10, 60, document => getLanguageService(document).parseStylesheet(document)); +const stylesheets = getLanguageModelCache(10, 60, document => getLanguageService(document).parseStylesheet(document)); documents.onDidClose(e => { stylesheets.onDocumentRemoved(e.document); }); @@ -64,7 +64,7 @@ connection.onInitialize((params: InitializeParams): InitializeResult => { } function getClientCapability(name: string, def: T) { - let keys = name.split('.'); + const keys = name.split('.'); let c: any = params.capabilities; for (let i = 0; c && i < keys.length; i++) { if (!c.hasOwnProperty(keys[i])) { @@ -74,11 +74,11 @@ connection.onInitialize((params: InitializeParams): InitializeResult => { } return c; } - let snippetSupport = !!getClientCapability('textDocument.completion.completionItem.snippetSupport', false); + const snippetSupport = !!getClientCapability('textDocument.completion.completionItem.snippetSupport', false); scopedSettingsSupport = !!getClientCapability('workspace.configuration', false); foldingRangeLimit = getClientCapability('textDocument.foldingRange.rangeLimit', Number.MAX_VALUE); - let capabilities: ServerCapabilities & FoldingRangeServerCapabilities = { + const capabilities: ServerCapabilities & FoldingRangeServerCapabilities = { // Tell the client that the server works in FULL text document sync mode textDocumentSync: documents.syncKind, completionProvider: snippetSupport ? { resolveProvider: false, triggerCharacters: ['/'] } : undefined, @@ -95,7 +95,7 @@ connection.onInitialize((params: InitializeParams): InitializeResult => { return { capabilities }; }); -let languageServices: { [id: string]: LanguageService } = { +const languageServices: { [id: string]: LanguageService } = { css: getCSSLanguageService(), scss: getSCSSLanguageService(), less: getLESSLanguageService() @@ -119,7 +119,7 @@ function getDocumentSettings(textDocument: TextDocument): Thenable s[0]); documentSettings[textDocument.uri] = promise; } @@ -134,7 +134,7 @@ connection.onDidChangeConfiguration(change => { }); function updateConfiguration(settings: Settings) { - for (let languageId in languageServices) { + for (const languageId in languageServices) { languageServices[languageId].configure((settings as any)[languageId]); } // reset all document settings @@ -143,7 +143,7 @@ function updateConfiguration(settings: Settings) { documents.all().forEach(triggerValidation); } -let pendingValidationRequests: { [uri: string]: NodeJS.Timer } = {}; +const pendingValidationRequests: { [uri: string]: NodeJS.Timer } = {}; const validationDelayMs = 500; // The content of a text document has changed. This event is emitted @@ -159,7 +159,7 @@ documents.onDidClose(event => { }); function cleanPendingValidation(textDocument: TextDocument): void { - let request = pendingValidationRequests[textDocument.uri]; + const request = pendingValidationRequests[textDocument.uri]; if (request) { clearTimeout(request); delete pendingValidationRequests[textDocument.uri]; @@ -175,10 +175,10 @@ function triggerValidation(textDocument: TextDocument): void { } function validateTextDocument(textDocument: TextDocument): void { - let settingsPromise = getDocumentSettings(textDocument); + const settingsPromise = getDocumentSettings(textDocument); settingsPromise.then(settings => { - let stylesheet = stylesheets.get(textDocument); - let diagnostics = getLanguageService(textDocument).doValidation(textDocument, stylesheet, settings); + const stylesheet = stylesheets.get(textDocument); + const diagnostics = getLanguageService(textDocument).doValidation(textDocument, stylesheet, settings); // Send the computed diagnostics to VSCode. connection.sendDiagnostics({ uri: textDocument.uri, diagnostics }); }, e => { @@ -188,14 +188,17 @@ function validateTextDocument(textDocument: TextDocument): void { connection.onCompletion((textDocumentPosition, token) => { return runSafe(() => { - let document = documents.get(textDocumentPosition.textDocument.uri); + const document = documents.get(textDocumentPosition.textDocument.uri); + if (!document) { + return null; + } const cssLS = getLanguageService(document); const pathCompletionList: CompletionList = { isIncomplete: false, items: [] }; cssLS.setCompletionParticipants([getPathCompletionParticipant(document, workspaceFolders, pathCompletionList)]); - const result = cssLS.doComplete(document, textDocumentPosition.position, stylesheets.get(document))!; /* TODO: remove ! once LS has null annotations */ + const result = cssLS.doComplete(document, textDocumentPosition.position, stylesheets.get(document)); return { isIncomplete: pathCompletionList.isIncomplete, items: [...pathCompletionList.items, ...result.items] @@ -205,57 +208,76 @@ connection.onCompletion((textDocumentPosition, token) => { connection.onHover((textDocumentPosition, token) => { return runSafe(() => { - let document = documents.get(textDocumentPosition.textDocument.uri); - let styleSheet = stylesheets.get(document); - return getLanguageService(document).doHover(document, textDocumentPosition.position, styleSheet); + const document = documents.get(textDocumentPosition.textDocument.uri); + if (document) { + const styleSheet = stylesheets.get(document); + return getLanguageService(document).doHover(document, textDocumentPosition.position, styleSheet); + } + return null; }, null, `Error while computing hover for ${textDocumentPosition.textDocument.uri}`, token); }); connection.onDocumentSymbol((documentSymbolParams, token) => { return runSafe(() => { - let document = documents.get(documentSymbolParams.textDocument.uri); - let stylesheet = stylesheets.get(document); - return getLanguageService(document).findDocumentSymbols(document, stylesheet); + const document = documents.get(documentSymbolParams.textDocument.uri); + if (document) { + const stylesheet = stylesheets.get(document); + return getLanguageService(document).findDocumentSymbols(document, stylesheet); + } + return []; }, [], `Error while computing document symbols for ${documentSymbolParams.textDocument.uri}`, token); }); connection.onDefinition((documentSymbolParams, token) => { return runSafe(() => { - let document = documents.get(documentSymbolParams.textDocument.uri); - let stylesheet = stylesheets.get(document); - return getLanguageService(document).findDefinition(document, documentSymbolParams.position, stylesheet); + const document = documents.get(documentSymbolParams.textDocument.uri); + if (document) { + + const stylesheet = stylesheets.get(document); + return getLanguageService(document).findDefinition(document, documentSymbolParams.position, stylesheet); + } + return null; }, null, `Error while computing definitions for ${documentSymbolParams.textDocument.uri}`, token); }); connection.onDocumentHighlight((documentSymbolParams, token) => { return runSafe(() => { - let document = documents.get(documentSymbolParams.textDocument.uri); - let stylesheet = stylesheets.get(document); - return getLanguageService(document).findDocumentHighlights(document, documentSymbolParams.position, stylesheet); + const document = documents.get(documentSymbolParams.textDocument.uri); + if (document) { + const stylesheet = stylesheets.get(document); + return getLanguageService(document).findDocumentHighlights(document, documentSymbolParams.position, stylesheet); + } + return []; }, [], `Error while computing document highlights for ${documentSymbolParams.textDocument.uri}`, token); }); connection.onReferences((referenceParams, token) => { return runSafe(() => { - let document = documents.get(referenceParams.textDocument.uri); - let stylesheet = stylesheets.get(document); - return getLanguageService(document).findReferences(document, referenceParams.position, stylesheet); + const document = documents.get(referenceParams.textDocument.uri); + if (document) { + const stylesheet = stylesheets.get(document); + return getLanguageService(document).findReferences(document, referenceParams.position, stylesheet); + } + return []; }, [], `Error while computing references for ${referenceParams.textDocument.uri}`, token); }); connection.onCodeAction((codeActionParams, token) => { return runSafe(() => { - let document = documents.get(codeActionParams.textDocument.uri); - let stylesheet = stylesheets.get(document); - return getLanguageService(document).doCodeActions(document, codeActionParams.range, codeActionParams.context, stylesheet); + const document = documents.get(codeActionParams.textDocument.uri); + if (document) { + const stylesheet = stylesheets.get(document); + return getLanguageService(document).doCodeActions(document, codeActionParams.range, codeActionParams.context, stylesheet); + } + return []; }, [], `Error while computing code actions for ${codeActionParams.textDocument.uri}`, token); }); connection.onDocumentColor((params, token) => { return runSafe(() => { - let document = documents.get(params.textDocument.uri); + const document = documents.get(params.textDocument.uri); if (document) { - let stylesheet = stylesheets.get(document); + const stylesheet = stylesheets.get(document); return getLanguageService(document).findDocumentColors(document, stylesheet); } return []; @@ -264,9 +286,9 @@ connection.onDocumentColor((params, token) => { connection.onColorPresentation((params, token) => { return runSafe(() => { - let document = documents.get(params.textDocument.uri); + const document = documents.get(params.textDocument.uri); if (document) { - let stylesheet = stylesheets.get(document); + const stylesheet = stylesheets.get(document); return getLanguageService(document).getColorPresentations(document, stylesheet, params.color, params.range); } return []; @@ -275,16 +297,22 @@ connection.onColorPresentation((params, token) => { connection.onRenameRequest((renameParameters, token) => { return runSafe(() => { - let document = documents.get(renameParameters.textDocument.uri); - let stylesheet = stylesheets.get(document); - return getLanguageService(document).doRename(document, renameParameters.position, renameParameters.newName, stylesheet); + const document = documents.get(renameParameters.textDocument.uri); + if (document) { + const stylesheet = stylesheets.get(document); + return getLanguageService(document).doRename(document, renameParameters.position, renameParameters.newName, stylesheet); + } + return null; }, null, `Error while computing renames for ${renameParameters.textDocument.uri}`, token); }); connection.onRequest(FoldingRangeRequest.type, (params, token) => { return runSafe(() => { - let document = documents.get(params.textDocument.uri); - return getLanguageService(document).getFoldingRanges(document, { rangeLimit: foldingRangeLimit }); + const document = documents.get(params.textDocument.uri); + if (document) { + return getLanguageService(document).getFoldingRanges(document, { rangeLimit: foldingRangeLimit }); + } + return null; }, null, `Error while computing folding ranges for ${params.textDocument.uri}`, token); }); diff --git a/extensions/css-language-features/server/yarn.lock b/extensions/css-language-features/server/yarn.lock index 9ab19c4c0ac..4852be4b277 100644 --- a/extensions/css-language-features/server/yarn.lock +++ b/extensions/css-language-features/server/yarn.lock @@ -10,43 +10,43 @@ version "7.0.43" resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.43.tgz#a187e08495a075f200ca946079c914e1a5fe962c" -vscode-css-languageservice@^3.0.9-next.14: - version "3.0.9-next.14" - resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-3.0.9-next.14.tgz#156822b2d8c56487ffd47105cc884fa3983664ca" +vscode-css-languageservice@^3.0.9-next.15: + version "3.0.9-next.15" + resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-3.0.9-next.15.tgz#67a91ed2cc7cf6ea46d45c2e9e9332c74df06ec5" dependencies: - vscode-languageserver-types "^3.6.1" - vscode-nls "^3.2.1" + vscode-languageserver-types "^3.7.2" + vscode-nls "^3.2.2" -vscode-jsonrpc@^3.6.0: - version "3.6.0" - resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-3.6.0.tgz#848d56995d5168950d84feb5d9c237ae5c6a02d4" +vscode-jsonrpc@^3.6.2: + version "3.6.2" + resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-3.6.2.tgz#3b5eef691159a15556ecc500e9a8a0dd143470c8" -vscode-languageserver-protocol-foldingprovider@^2.0.0-next.2: - version "2.0.0-next.2" - resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol-foldingprovider/-/vscode-languageserver-protocol-foldingprovider-2.0.0-next.2.tgz#fbb9cfdf5b8c4ac451826ba6312f1f88379f35b0" +vscode-languageserver-protocol-foldingprovider@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol-foldingprovider/-/vscode-languageserver-protocol-foldingprovider-2.0.1.tgz#051d0d9e58d1b79dc4681acd48f21797f5515bfd" dependencies: - vscode-languageserver-protocol "^3.6.0" - vscode-languageserver-types "^3.6.0" + vscode-languageserver-protocol "^3.7.2" + vscode-languageserver-types "^3.7.2" -vscode-languageserver-protocol@^3.6.0: - version "3.6.0" - resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.6.0.tgz#579642cdcccf74b0cd771c33daa3239acb40d040" +vscode-languageserver-protocol@^3.7.2: + version "3.7.2" + resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.7.2.tgz#df58621c032139010888b6a9ddc969423f9ba9d6" dependencies: - vscode-jsonrpc "^3.6.0" - vscode-languageserver-types "^3.6.0" + vscode-jsonrpc "^3.6.2" + vscode-languageserver-types "^3.7.2" -vscode-languageserver-types@^3.6.0, vscode-languageserver-types@^3.6.1: - version "3.6.1" - resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.6.1.tgz#4bc06a48dff653495f12f94b8b1e228988a1748d" +vscode-languageserver-types@^3.7.2: + version "3.7.2" + resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.7.2.tgz#aad8846f8e3e27962648554de5a8417e358f34eb" -vscode-languageserver@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-4.0.0.tgz#8b792f0d6d10acfe363d02371ed4ce53d08af88a" +vscode-languageserver@^4.1.3: + version "4.1.3" + resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-4.1.3.tgz#937d37c955b6b9c2409388413cd6f54d1eb9fe7d" dependencies: - vscode-languageserver-protocol "^3.6.0" + vscode-languageserver-protocol "^3.7.2" vscode-uri "^1.0.1" -vscode-nls@^3.2.1: +vscode-nls@^3.2.2: version "3.2.2" resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.2.tgz#3817eca5b985c2393de325197cf4e15eb2aa5350" diff --git a/extensions/css-language-features/yarn.lock b/extensions/css-language-features/yarn.lock index 37c6473e3aa..98f6af48a34 100644 --- a/extensions/css-language-features/yarn.lock +++ b/extensions/css-language-features/yarn.lock @@ -6,34 +6,34 @@ version "7.0.43" resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.43.tgz#a187e08495a075f200ca946079c914e1a5fe962c" -vscode-jsonrpc@^3.6.0: - version "3.6.0" - resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-3.6.0.tgz#848d56995d5168950d84feb5d9c237ae5c6a02d4" +vscode-jsonrpc@^3.6.2: + version "3.6.2" + resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-3.6.2.tgz#3b5eef691159a15556ecc500e9a8a0dd143470c8" -vscode-languageclient@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-4.0.0.tgz#635f5bfbcfa1385dae489b394857f1db8b459a7d" +vscode-languageclient@^4.1.4: + version "4.1.4" + resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-4.1.4.tgz#fff1a6bca4714835dca7fce35bc4ce81442fdf2c" dependencies: - vscode-languageserver-protocol "^3.6.0" + vscode-languageserver-protocol "^3.7.2" -vscode-languageserver-protocol-foldingprovider@^2.0.0-next.2: - version "2.0.0-next.2" - resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol-foldingprovider/-/vscode-languageserver-protocol-foldingprovider-2.0.0-next.2.tgz#fbb9cfdf5b8c4ac451826ba6312f1f88379f35b0" +vscode-languageserver-protocol-foldingprovider@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol-foldingprovider/-/vscode-languageserver-protocol-foldingprovider-2.0.1.tgz#051d0d9e58d1b79dc4681acd48f21797f5515bfd" dependencies: - vscode-languageserver-protocol "^3.6.0" - vscode-languageserver-types "^3.6.0" + vscode-languageserver-protocol "^3.7.2" + vscode-languageserver-types "^3.7.2" -vscode-languageserver-protocol@^3.6.0: - version "3.6.0" - resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.6.0.tgz#579642cdcccf74b0cd771c33daa3239acb40d040" +vscode-languageserver-protocol@^3.7.2: + version "3.7.2" + resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.7.2.tgz#df58621c032139010888b6a9ddc969423f9ba9d6" dependencies: - vscode-jsonrpc "^3.6.0" - vscode-languageserver-types "^3.6.0" + vscode-jsonrpc "^3.6.2" + vscode-languageserver-types "^3.7.2" -vscode-languageserver-types@^3.6.0: - version "3.6.1" - resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.6.1.tgz#4bc06a48dff653495f12f94b8b1e228988a1748d" +vscode-languageserver-types@^3.7.2: + version "3.7.2" + resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.7.2.tgz#aad8846f8e3e27962648554de5a8417e358f34eb" -vscode-nls@^3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.1.tgz#b1f3e04e8a94a715d5a7bcbc8339c51e6d74ca51" +vscode-nls@^3.2.2: + version "3.2.2" + resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.2.tgz#3817eca5b985c2393de325197cf4e15eb2aa5350"