[html] update langauge server

extensions/html/npm-shrinkwrap.json

@@ -18,9 +18,14 @@
       "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-3.3.1.tgz"
     },
     "vscode-languageclient": {
-      "version": "3.4.0-next.10",
+      "version": "3.4.0-next.17",
       "from": "vscode-languageclient@next",
-      "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-3.4.0-next.10.tgz"
+      "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-3.4.0-next.17.tgz"
+    },
+    "vscode-languageserver-protocol": {
+      "version": "3.1.0",
+      "from": "vscode-languageserver-protocol@>=3.1.0 <4.0.0",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.1.0.tgz"
     },
     "vscode-languageserver-types": {
       "version": "3.3.0",

extensions/html/package.json

@@ -16,7 +16,7 @@
     "compile": "gulp compile-extension:html-client && gulp compile-extension:html-server",
     "postinstall": "cd server && npm install",
     "update-grammar": "node ../../build/npm/update-grammar.js textmate/html.tmbundle Syntaxes/HTML.plist ./syntaxes/html.json",
-    "install-client-next": "npm install vscode-languageserver-types@next -f -S && npm install vscode-languageclient@next -f -S",
+    "install-client-next": "npm install vscode-languageserver-types -f -S && npm install vscode-languageclient@next -f -S",
     "install-client-local": "npm install ../../../vscode-languageserver-node/types -f -S && npm install ../../../vscode-languageserver-node/client -f -S"
   },
   "contributes": {
@@ -215,7 +215,7 @@
   },
   "dependencies": {
     "vscode-extension-telemetry": "0.0.8",
-    "vscode-languageclient": "3.4.0-next.10",
+    "vscode-languageclient": "3.4.0-next.17",
     "vscode-languageserver-types": "^3.3.0",
     "vscode-nls": "2.0.2"
   },

extensions/html/server/npm-shrinkwrap.json

@@ -18,9 +18,14 @@
       "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-3.3.1.tgz"
     },
     "vscode-languageserver": {
-      "version": "3.4.0-next.4",
+      "version": "3.4.0-next.6",
       "from": "vscode-languageserver@next",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-3.4.0-next.4.tgz"
+      "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-3.4.0-next.6.tgz"
+    },
+    "vscode-languageserver-protocol": {
+      "version": "3.1.0",
+      "from": "vscode-languageserver-protocol@>=3.1.0 <4.0.0",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.1.0.tgz"
     },
     "vscode-languageserver-types": {
       "version": "3.3.0",

extensions/html/server/package.json

@@ -10,7 +10,7 @@
   "dependencies": {
     "vscode-css-languageservice": "^2.1.3",
     "vscode-html-languageservice": "^2.0.7",
-    "vscode-languageserver": "3.4.0-next.4",
+    "vscode-languageserver": "3.4.0-next.6",
     "vscode-languageserver-types": "^3.3.0",
     "vscode-nls": "^2.0.2",
     "vscode-uri": "^1.0.1"

extensions/html/server/src/htmlServerMain.ts

@@ -9,7 +9,7 @@ import { DocumentContext } from 'vscode-html-languageservice';
 import { TextDocument, Diagnostic, DocumentLink, Range, SymbolInformation } from 'vscode-languageserver-types';
 import { getLanguageModes, LanguageModes, Settings } from './modes/languageModes';
 
-import { GetConfigurationRequest } from 'vscode-languageserver/lib/protocol.proposed';
+import { GetConfigurationRequest } from 'vscode-languageserver-protocol/lib/protocol.configuration.proposed';
 
 import { format } from './modes/formatting';
 import { pushAll } from './utils/arrays';