diff --git a/extensions/css-language-features/package.json b/extensions/css-language-features/package.json index ade358261dc76a27b5acc3e21339961b3be25099..68897a4ea97a161e9a9d2f3751d8e41b99df3f05 100644 --- a/extensions/css-language-features/package.json +++ b/extensions/css-language-features/package.json @@ -708,7 +708,7 @@ ] }, "dependencies": { - "vscode-languageclient": "^5.1.0-next.4", + "vscode-languageclient": "^5.1.0-next.6", "vscode-nls": "^3.2.4" }, "devDependencies": { diff --git a/extensions/css-language-features/server/package.json b/extensions/css-language-features/server/package.json index 512a08bbf85c9b589f68f91bd108562bfed60744..c616b3b1807bbd791933fa8e1fe594a673c9e0b2 100644 --- a/extensions/css-language-features/server/package.json +++ b/extensions/css-language-features/server/package.json @@ -9,8 +9,8 @@ }, "main": "./out/cssServerMain", "dependencies": { - "vscode-css-languageservice": "^3.0.10-next.3", - "vscode-languageserver": "^5.1.0-next.3" + "vscode-css-languageservice": "^3.0.10", + "vscode-languageserver": "^5.1.0-next.5" }, "devDependencies": { "@types/mocha": "2.2.33", @@ -29,4 +29,4 @@ "install-server-local": "npm install ../../../../vscode-languageserver-node/server -f", "test": "../../../node_modules/.bin/mocha" } -} \ No newline at end of file +} diff --git a/extensions/css-language-features/server/src/cssServerMain.ts b/extensions/css-language-features/server/src/cssServerMain.ts index 853f6690473182f2380fc0b0bf93fea09d9a552d..92ec10fc73c54c834a71cf21a9003c32eec22ebf 100644 --- a/extensions/css-language-features/server/src/cssServerMain.ts +++ b/extensions/css-language-features/server/src/cssServerMain.ts @@ -283,7 +283,7 @@ connection.onCodeAction((codeActionParams, token) => { 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 getLanguageService(document).doCodeActions2(document, codeActionParams.range, codeActionParams.context, stylesheet); } return []; }, [], `Error while computing code actions for ${codeActionParams.textDocument.uri}`, token); diff --git a/extensions/css-language-features/server/yarn.lock b/extensions/css-language-features/server/yarn.lock index 58d1e5b3d3556c7823264d16cc7deacf94e77d97..b9f5305f33ae28159a3c717a784a185f7bf80d37 100644 --- a/extensions/css-language-features/server/yarn.lock +++ b/extensions/css-language-features/server/yarn.lock @@ -194,42 +194,42 @@ supports-color@5.4.0: dependencies: has-flag "^3.0.0" -vscode-css-languageservice@^3.0.10-next.3: - version "3.0.10-next.3" - resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-3.0.10-next.3.tgz#d663f03b8a9bf11222bd2cd39e9aa05e1a58c58d" +vscode-css-languageservice@^3.0.10: + version "3.0.10" + resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-3.0.10.tgz#71ece7e0d19227e9f21bcd5d5d928f817a7d701e" dependencies: - vscode-languageserver-types "^3.10.1" - vscode-nls "^3.2.4" + vscode-languageserver-types "^3.12.0" + vscode-nls "^3.2.5" 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@^3.12.0: - version "3.12.0" - resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.12.0.tgz#5b23501292abad88f0463b01e83ff98e64a37652" +vscode-languageserver-protocol@^3.13.0-next.1: + version "3.13.0-next.1" + resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.13.0-next.1.tgz#24d15aa5769e4b035f6ce38342685959e1eb454e" dependencies: vscode-jsonrpc "^3.6.2" - vscode-languageserver-types "^3.12.0" - -vscode-languageserver-types@^3.10.1: - version "3.10.1" - resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.10.1.tgz#d5d5f44f688a3b2aa9857dc53cb9cacca73fe35a" + vscode-languageserver-types "^3.13.0-next.1" vscode-languageserver-types@^3.12.0: version "3.12.0" resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.12.0.tgz#f96051381b6a050b7175b37d6cb5d2f2eb64b944" -vscode-languageserver@^5.1.0-next.3: - version "5.1.0-next.3" - resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-5.1.0-next.3.tgz#352ce1f0f8bdfc47c1236277ebe865e25b087ccd" +vscode-languageserver-types@^3.13.0-next.1: + version "3.13.0-next.1" + resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.13.0-next.1.tgz#dd91b78b13a2a6c7131e8291e3db3183cf566280" + +vscode-languageserver@^5.1.0-next.5: + version "5.1.0-next.5" + resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-5.1.0-next.5.tgz#d343278b4de448a31f9db146b98638898c8d4f55" dependencies: - vscode-languageserver-protocol "^3.12.0" + vscode-languageserver-protocol "^3.13.0-next.1" vscode-uri "^1.0.5" -vscode-nls@^3.2.4: - version "3.2.4" - resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.4.tgz#2166b4183c8aea884d20727f5449e62be69fd398" +vscode-nls@^3.2.5: + version "3.2.5" + resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.5.tgz#25520c1955108036dec607c85e00a522f247f1a4" vscode-uri@^1.0.5: version "1.0.6" diff --git a/extensions/css-language-features/yarn.lock b/extensions/css-language-features/yarn.lock index 958bba3af28718c99bea3f85ca7b77fac6ac802b..c636c1f728ef10b75692b6d01a794f946ab4a1c4 100644 --- a/extensions/css-language-features/yarn.lock +++ b/extensions/css-language-features/yarn.lock @@ -141,23 +141,23 @@ 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@^5.1.0-next.4: - version "5.1.0-next.4" - resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-5.1.0-next.4.tgz#2f96b4aa198c45f3e897b7f330c597a401ca95f2" +vscode-languageclient@^5.1.0-next.6: + version "5.1.0-next.6" + resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-5.1.0-next.6.tgz#b04f49f645a51e864d607e85a43d2b0d2f101d5d" dependencies: semver "^5.5.0" - vscode-languageserver-protocol "^3.12.0" + vscode-languageserver-protocol "^3.13.0-next.1" -vscode-languageserver-protocol@^3.12.0: - version "3.12.0" - resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.12.0.tgz#5b23501292abad88f0463b01e83ff98e64a37652" +vscode-languageserver-protocol@^3.13.0-next.1: + version "3.13.0-next.1" + resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.13.0-next.1.tgz#24d15aa5769e4b035f6ce38342685959e1eb454e" dependencies: vscode-jsonrpc "^3.6.2" - vscode-languageserver-types "^3.12.0" + vscode-languageserver-types "^3.13.0-next.1" -vscode-languageserver-types@^3.12.0: - version "3.12.0" - resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.12.0.tgz#f96051381b6a050b7175b37d6cb5d2f2eb64b944" +vscode-languageserver-types@^3.13.0-next.1: + version "3.13.0-next.1" + resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.13.0-next.1.tgz#dd91b78b13a2a6c7131e8291e3db3183cf566280" vscode-nls@^3.2.4: version "3.2.4"