diff --git a/extensions/css/client/src/cssMain.ts b/extensions/css/client/src/cssMain.ts index a9da1608c47..a13dabac0b9 100644 --- a/extensions/css/client/src/cssMain.ts +++ b/extensions/css/client/src/cssMain.ts @@ -9,7 +9,7 @@ import * as path from 'path'; import { languages, window, commands, workspace, ExtensionContext } from 'vscode'; import { LanguageClient, LanguageClientOptions, ServerOptions, TransportKind, RequestType, Range, TextEdit } from 'vscode-languageclient'; import { activateColorDecorations, ColorProvider } from './colorDecorators'; -import { GetConfigurationFeature } from 'vscode-languageclient/lib/proposed'; +import { ConfigurationFeature } from 'vscode-languageclient/lib/proposed'; import * as nls from 'vscode-nls'; let localize = nls.loadMessageBundle(); @@ -45,7 +45,7 @@ export function activate(context: ExtensionContext) { // Create the language client and start the client. let client = new LanguageClient('css', localize('cssserver.name', 'CSS Language Server'), serverOptions, clientOptions); - client.registerFeature(new GetConfigurationFeature(client)); + client.registerFeature(new ConfigurationFeature(client)); let disposable = client.start(); // Push the disposable to the context's subscriptions so that the diff --git a/extensions/css/npm-shrinkwrap.json b/extensions/css/npm-shrinkwrap.json index b09c91da50a..6a497e0b691 100644 --- a/extensions/css/npm-shrinkwrap.json +++ b/extensions/css/npm-shrinkwrap.json @@ -18,9 +18,9 @@ "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-3.3.1.tgz" }, "vscode-languageclient": { - "version": "3.4.0-next.4", + "version": "3.4.0-next.10", "from": "vscode-languageclient@next", - "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-3.4.0-next.4.tgz" + "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-3.4.0-next.10.tgz" }, "vscode-languageserver-types": { "version": "3.3.0", diff --git a/extensions/css/package.json b/extensions/css/package.json index 7327b530c1e..49b8f98ba2f 100644 --- a/extensions/css/package.json +++ b/extensions/css/package.json @@ -735,10 +735,10 @@ }, "dependencies": { "parse-color": "^1.0.0", - "vscode-languageclient": "^3.4.0-next.4", + "vscode-languageclient": "3.4.0-next.10", "vscode-nls": "^2.0.2" }, "devDependencies": { "@types/node": "^6.0.51" } -} \ No newline at end of file +} diff --git a/extensions/css/server/npm-shrinkwrap.json b/extensions/css/server/npm-shrinkwrap.json index 01251cf3191..63bed9e999b 100644 --- a/extensions/css/server/npm-shrinkwrap.json +++ b/extensions/css/server/npm-shrinkwrap.json @@ -13,9 +13,9 @@ "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-3.3.1.tgz" }, "vscode-languageserver": { - "version": "3.4.0-next.2", + "version": "3.4.0-next.4", "from": "vscode-languageserver@next", - "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-3.4.0-next.2.tgz" + "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-3.4.0-next.4.tgz" }, "vscode-languageserver-types": { "version": "3.3.0", diff --git a/extensions/css/server/package.json b/extensions/css/server/package.json index 9b96f1450c6..d8112cc044a 100644 --- a/extensions/css/server/package.json +++ b/extensions/css/server/package.json @@ -9,7 +9,7 @@ }, "dependencies": { "vscode-css-languageservice": "^2.1.3", - "vscode-languageserver": "^3.4.0-next.2" + "vscode-languageserver": "3.4.0-next.4" }, "devDependencies": { "@types/node": "^6.0.51" diff --git a/extensions/css/server/src/cssServerMain.ts b/extensions/css/server/src/cssServerMain.ts index 9b86bdaac5d..4b5c4e4ad2c 100644 --- a/extensions/css/server/src/cssServerMain.ts +++ b/extensions/css/server/src/cssServerMain.ts @@ -57,7 +57,7 @@ connection.onInitialize((params: InitializeParams): InitializeResult => { return !!c; } let snippetSupport = hasClientCapability('textDocument.completion.completionItem.snippetSupport'); - scopedSettingsSupport = hasClientCapability('workspace.getConfiguration'); + scopedSettingsSupport = hasClientCapability('workspace.configuration'); return { capabilities: { // Tell the client that the server works in FULL text document sync mode @@ -94,8 +94,8 @@ function getDocumentSettings(textDocument: TextDocument): Thenable s[0][0]); + let configRequestParam = { items: [{ scopeUri: textDocument.uri, section: textDocument.languageId }] }; + promise = connection.sendRequest(GetConfigurationRequest.type, configRequestParam).then(s => s[0]); documentSettings[textDocument.uri] = promise; } return promise;