diff --git a/lsp-multi-server-sample/client/package-lock.json b/lsp-multi-server-sample/client/package-lock.json index 1efb62ba..2abe3ae7 100644 --- a/lsp-multi-server-sample/client/package-lock.json +++ b/lsp-multi-server-sample/client/package-lock.json @@ -10,17 +10,23 @@ "integrity": "sha512-Iyliuu8Hv4qy4TEaevQzChh9UsTEcuaKdcHXBbvJnoJSF5Td2yNENOrPK+vuOaXJJBhQZb4BNJKOxt6caaQR8A==", "dev": true }, + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + }, "vscode-jsonrpc": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-4.0.0.tgz", "integrity": "sha512-perEnXQdQOJMTDFNv+UF3h1Y0z4iSiaN9jIlb0OqIYgosPCZGYh/MCUlkFtV2668PL69lRDO32hmvL2yiidUYg==" }, "vscode-languageclient": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-4.4.2.tgz", - "integrity": "sha512-9TUzsg1UM6n1UEyPlWbDf7tK1wJAK7UGFRmGDN8sz4KmbbDiVRh6YicaB/5oRSVTpuV47PdJpYlOl3SJ0RiK1Q==", + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-5.2.1.tgz", + "integrity": "sha512-7jrS/9WnV0ruqPamN1nE7qCxn0phkH5LjSgSp9h6qoJGoeAKzwKz/PF6M+iGA/aklx4GLZg1prddhEPQtuXI1Q==", "requires": { - "vscode-languageserver-protocol": "^3.10.3" + "semver": "^5.5.0", + "vscode-languageserver-protocol": "3.14.1" } }, "vscode-languageserver-protocol": { diff --git a/lsp-multi-server-sample/client/package.json b/lsp-multi-server-sample/client/package.json index ac16c3d9..39197d6b 100644 --- a/lsp-multi-server-sample/client/package.json +++ b/lsp-multi-server-sample/client/package.json @@ -10,11 +10,11 @@ "url": "https://github.com/Microsoft/vscode-extension-samples" }, "engines": { - "vscode": "^1.32.0" + "vscode": "^1.33.0" }, "scripts": {}, "dependencies": { - "vscode-languageclient": "^4.1.4" + "vscode-languageclient": "^5.2.1" }, "devDependencies": { "@types/vscode": "^1.32.0" diff --git a/lsp-multi-server-sample/client/src/extension.ts b/lsp-multi-server-sample/client/src/extension.ts index 2026b773..b274faaa 100644 --- a/lsp-multi-server-sample/client/src/extension.ts +++ b/lsp-multi-server-sample/client/src/extension.ts @@ -72,7 +72,7 @@ export function activate(context: ExtensionContext) { ], diagnosticCollectionName: 'lsp-multi-server-example', outputChannel: outputChannel - } + }; defaultClient = new LanguageClient('lsp-multi-server-example', 'LSP Multi Server Example', serverOptions, clientOptions); defaultClient.start(); return; @@ -99,7 +99,7 @@ export function activate(context: ExtensionContext) { diagnosticCollectionName: 'lsp-multi-server-example', workspaceFolder: folder, outputChannel: outputChannel - } + }; let client = new LanguageClient('lsp-multi-server-example', 'LSP Multi Server Example', serverOptions, clientOptions); client.start(); clients.set(folder.uri.toString(), client); diff --git a/lsp-multi-server-sample/package.json b/lsp-multi-server-sample/package.json index fc6fe1fa..3c4a73f7 100644 --- a/lsp-multi-server-sample/package.json +++ b/lsp-multi-server-sample/package.json @@ -14,7 +14,7 @@ "multi-root ready" ], "engines": { - "vscode": "^1.23.0" + "vscode": "^1.33.0" }, "activationEvents": [ "onLanguage:plaintext" diff --git a/lsp-multi-server-sample/server/package-lock.json b/lsp-multi-server-sample/server/package-lock.json index af192e81..cb1017a4 100644 --- a/lsp-multi-server-sample/server/package-lock.json +++ b/lsp-multi-server-sample/server/package-lock.json @@ -5,37 +5,37 @@ "requires": true, "dependencies": { "vscode-jsonrpc": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-3.6.2.tgz", - "integrity": "sha512-T24Jb5V48e4VgYliUXMnZ379ItbrXgOimweKaJshD84z+8q7ZOZjJan0MeDe+Ugb+uqERDVV8SBmemaGMSMugA==" + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-4.0.0.tgz", + "integrity": "sha512-perEnXQdQOJMTDFNv+UF3h1Y0z4iSiaN9jIlb0OqIYgosPCZGYh/MCUlkFtV2668PL69lRDO32hmvL2yiidUYg==" }, "vscode-languageserver": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-4.1.3.tgz", - "integrity": "sha512-D6p3q9x8QPtPLRUO5d2UKizjFYfg8zLVJqKoMpAaom8Wuhl1oKRCjeLg+Cp4mgPeCwR71wbgX2BM/jL51ni/0g==", + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-5.2.1.tgz", + "integrity": "sha512-GuayqdKZqAwwaCUjDvMTAVRPJOp/SLON3mJ07eGsx/Iq9HjRymhKWztX41rISqDKhHVVyFM+IywICyZDla6U3A==", "requires": { - "vscode-languageserver-protocol": "^3.7.2", - "vscode-uri": "^1.0.1" + "vscode-languageserver-protocol": "3.14.1", + "vscode-uri": "^1.0.6" } }, "vscode-languageserver-protocol": { - "version": "3.7.2", - "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.7.2.tgz", - "integrity": "sha512-VVJwIA/FPl/FnVtrns0FPK6TLi/ET7n1Yo6tCrm6aG7+yAVwIGWdpTmKE+nbP8wEMMbHCkIabk63IJvfz2HNRg==", + "version": "3.14.1", + "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.14.1.tgz", + "integrity": "sha512-IL66BLb2g20uIKog5Y2dQ0IiigW0XKrvmWiOvc0yXw80z3tMEzEnHjaGAb3ENuU7MnQqgnYJ1Cl2l9RvNgDi4g==", "requires": { - "vscode-jsonrpc": "^3.6.2", - "vscode-languageserver-types": "^3.7.2" + "vscode-jsonrpc": "^4.0.0", + "vscode-languageserver-types": "3.14.0" } }, "vscode-languageserver-types": { - "version": "3.7.2", - "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.7.2.tgz", - "integrity": "sha512-L9D2RA+PDS2CiyhLQY5ZrOmyRvXyjc4Ha8s9PqS6mIgGxj00R5Xx2vLKBnAOVfrawJXYZST+2hioMks6SQVU7A==" + "version": "3.14.0", + "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.14.0.tgz", + "integrity": "sha512-lTmS6AlAlMHOvPQemVwo3CezxBp0sNB95KNPkqp3Nxd5VFEnuG1ByM0zlRWos0zjO3ZWtkvhal0COgiV1xIA4A==" }, "vscode-uri": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-1.0.3.tgz", - "integrity": "sha1-Yxvb9xbcyrDmUpGo3CXCMjIIWlI=" + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-1.0.8.tgz", + "integrity": "sha512-obtSWTlbJ+a+TFRYGaUumtVwb+InIUVI0Lu0VBUAPmj2cU5JutEXg3xUE0c2J5Tcy7h2DEKVJBFi+Y9ZSFzzPQ==" } } } diff --git a/lsp-multi-server-sample/server/package.json b/lsp-multi-server-sample/server/package.json index 1e2de173..be80c031 100644 --- a/lsp-multi-server-sample/server/package.json +++ b/lsp-multi-server-sample/server/package.json @@ -12,7 +12,7 @@ "url": "https://github.com/Microsoft/vscode-extension-samples" }, "dependencies": { - "vscode-languageserver": "^4.1.3" + "vscode-languageserver": "^5.2.1" }, "scripts": {} } diff --git a/lsp-multi-server-sample/server/src/server.ts b/lsp-multi-server-sample/server/src/server.ts index 0c08db5c..98609e52 100644 --- a/lsp-multi-server-sample/server/src/server.ts +++ b/lsp-multi-server-sample/server/src/server.ts @@ -18,7 +18,7 @@ let workspaceFolder: string | null; documents.onDidOpen((event) => { connection.console.log(`[Server(${process.pid}) ${workspaceFolder}] Document opened: ${event.document.uri}`); -}) +}); documents.listen(connection); connection.onInitialize((params) => { @@ -31,6 +31,6 @@ connection.onInitialize((params) => { change: TextDocumentSyncKind.None } } - } + }; }); connection.listen(); \ No newline at end of file