From fc003cdb4e8d9124ea3eb1ac4055d0dd01259ae3 Mon Sep 17 00:00:00 2001 From: HeeJae Chang Date: Thu, 12 May 2022 09:45:51 -0700 Subject: [PATCH 1/3] moved lsp to latest version that has race fixed --- package-lock.json | 84 +++++++++++++++++++++++------------------------ package.json | 8 ++--- 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4cbae75049e6..e42846156c51 100644 --- a/package-lock.json +++ b/package-lock.json @@ -37,10 +37,10 @@ "vscode-debugadapter": "^1.28.0", "vscode-debugprotocol": "^1.28.0", "vscode-extension-telemetry": "0.4.5", - "vscode-jsonrpc": "8.0.0", - "vscode-languageclient": "8.0.0", - "vscode-languageserver": "8.0.0", - "vscode-languageserver-protocol": "3.17.0", + "vscode-jsonrpc": "8.0.1", + "vscode-languageclient": "8.0.1", + "vscode-languageserver": "8.0.1", + "vscode-languageserver-protocol": "3.17.1", "vscode-nls": "^5.0.1", "vscode-tas-client": "^0.1.22", "winreg": "^1.2.4", @@ -14388,21 +14388,21 @@ } }, "node_modules/vscode-jsonrpc": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.0.0.tgz", - "integrity": "sha512-gc16lr5REIvxqCLQ9Bwf0fQMCnX5eSFoXeXymSXh80HXUtk7E3TWqT/QduFmWK6PSjruWpwc9X2mmpD1WBcS2g==", + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.0.1.tgz", + "integrity": "sha512-N/WKvghIajmEvXpatSzvTvOIz61ZSmOSa4BRA4pTLi+1+jozquQKP/MkaylP9iB68k73Oua1feLQvH3xQuigiQ==", "engines": { "node": ">=14.0.0" } }, "node_modules/vscode-languageclient": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-8.0.0.tgz", - "integrity": "sha512-4/jsbWE2G609rkJ36uZTrXEsoCmZjhTOpIw1La3ILEnHclhtHe4X/nZp8WGrTKvT/jh/sGhJqWzLPnTcoiQO3g==", + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-8.0.1.tgz", + "integrity": "sha512-9XoE+HJfaWvu7Y75H3VmLo5WLCtsbxEgEhrLPqwt7eyoR49lUIyyrjb98Yfa50JCMqF2cePJAEVI6oe2o1sIhw==", "dependencies": { "minimatch": "^3.0.4", "semver": "^7.3.5", - "vscode-languageserver-protocol": "3.17.0" + "vscode-languageserver-protocol": "3.17.1" }, "engines": { "vscode": "^1.67.0" @@ -14434,29 +14434,29 @@ } }, "node_modules/vscode-languageserver": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-8.0.0.tgz", - "integrity": "sha512-qa2ue4cFHJN2nyLCe4P9WG6R7c+KfVox/6q90aJFc5oZb9sE2VjijDwxq0u9oWNScn/7QpESUvGE8OEHTuktXw==", + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-8.0.1.tgz", + "integrity": "sha512-sn7SjBwWm3OlmLtgg7jbM0wBULppyL60rj8K5HF0ny/MzN+GzPBX1kCvYdybhl7UW63V5V5tRVnyB8iwC73lSQ==", "dependencies": { - "vscode-languageserver-protocol": "3.17.0" + "vscode-languageserver-protocol": "3.17.1" }, "bin": { "installServerIntoExtension": "bin/installServerIntoExtension" } }, "node_modules/vscode-languageserver-protocol": { - "version": "3.17.0", - "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.0.tgz", - "integrity": "sha512-SizljNNWWcgKCoXFL8xvzQptzH599YUVmde7wS/ESxgRRzAiIf6jR7i+CoiLU6G/6ySG351MNSvc8z33ncmLNQ==", + "version": "3.17.1", + "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.1.tgz", + "integrity": "sha512-BNlAYgQoYwlSgDLJhSG+DeA8G1JyECqRzM2YO6tMmMji3Ad9Mw6AW7vnZMti90qlAKb0LqAlJfSVGEdqMMNzKg==", "dependencies": { - "vscode-jsonrpc": "8.0.0", - "vscode-languageserver-types": "3.17.0" + "vscode-jsonrpc": "8.0.1", + "vscode-languageserver-types": "3.17.1" } }, "node_modules/vscode-languageserver-types": { - "version": "3.17.0", - "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.0.tgz", - "integrity": "sha512-ECJg27DKWEfkIUuNyjMydPsl5Lu7XX1xmwEpZ61I4oeK1qFNbfp3tSZUVmeMPPgnNjasd1rrb3on9jbSe5g3nQ==" + "version": "3.17.1", + "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.1.tgz", + "integrity": "sha512-K3HqVRPElLZVVPtMeKlsyL9aK0GxGQpvtAUTfX4k7+iJ4mc1M+JM+zQwkgGy2LzY0f0IAafe8MKqIkJrxfGGjQ==" }, "node_modules/vscode-nls": { "version": "5.0.1", @@ -26755,18 +26755,18 @@ "integrity": "sha512-YhPiPcelqM5xyYWmD46jIcsxLYWkPZhAxlBkzqmpa218fMtTT17ERdOZVCXcs1S5AjvDHlq43yCgi8TaVQjjEg==" }, "vscode-jsonrpc": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.0.0.tgz", - "integrity": "sha512-gc16lr5REIvxqCLQ9Bwf0fQMCnX5eSFoXeXymSXh80HXUtk7E3TWqT/QduFmWK6PSjruWpwc9X2mmpD1WBcS2g==" + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.0.1.tgz", + "integrity": "sha512-N/WKvghIajmEvXpatSzvTvOIz61ZSmOSa4BRA4pTLi+1+jozquQKP/MkaylP9iB68k73Oua1feLQvH3xQuigiQ==" }, "vscode-languageclient": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-8.0.0.tgz", - "integrity": "sha512-4/jsbWE2G609rkJ36uZTrXEsoCmZjhTOpIw1La3ILEnHclhtHe4X/nZp8WGrTKvT/jh/sGhJqWzLPnTcoiQO3g==", + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-8.0.1.tgz", + "integrity": "sha512-9XoE+HJfaWvu7Y75H3VmLo5WLCtsbxEgEhrLPqwt7eyoR49lUIyyrjb98Yfa50JCMqF2cePJAEVI6oe2o1sIhw==", "requires": { "minimatch": "^3.0.4", "semver": "^7.3.5", - "vscode-languageserver-protocol": "3.17.0" + "vscode-languageserver-protocol": "3.17.1" }, "dependencies": { "minimatch": { @@ -26788,26 +26788,26 @@ } }, "vscode-languageserver": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-8.0.0.tgz", - "integrity": "sha512-qa2ue4cFHJN2nyLCe4P9WG6R7c+KfVox/6q90aJFc5oZb9sE2VjijDwxq0u9oWNScn/7QpESUvGE8OEHTuktXw==", + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-8.0.1.tgz", + "integrity": "sha512-sn7SjBwWm3OlmLtgg7jbM0wBULppyL60rj8K5HF0ny/MzN+GzPBX1kCvYdybhl7UW63V5V5tRVnyB8iwC73lSQ==", "requires": { - "vscode-languageserver-protocol": "3.17.0" + "vscode-languageserver-protocol": "3.17.1" } }, "vscode-languageserver-protocol": { - "version": "3.17.0", - "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.0.tgz", - "integrity": "sha512-SizljNNWWcgKCoXFL8xvzQptzH599YUVmde7wS/ESxgRRzAiIf6jR7i+CoiLU6G/6ySG351MNSvc8z33ncmLNQ==", + "version": "3.17.1", + "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.1.tgz", + "integrity": "sha512-BNlAYgQoYwlSgDLJhSG+DeA8G1JyECqRzM2YO6tMmMji3Ad9Mw6AW7vnZMti90qlAKb0LqAlJfSVGEdqMMNzKg==", "requires": { - "vscode-jsonrpc": "8.0.0", - "vscode-languageserver-types": "3.17.0" + "vscode-jsonrpc": "8.0.1", + "vscode-languageserver-types": "3.17.1" } }, "vscode-languageserver-types": { - "version": "3.17.0", - "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.0.tgz", - "integrity": "sha512-ECJg27DKWEfkIUuNyjMydPsl5Lu7XX1xmwEpZ61I4oeK1qFNbfp3tSZUVmeMPPgnNjasd1rrb3on9jbSe5g3nQ==" + "version": "3.17.1", + "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.1.tgz", + "integrity": "sha512-K3HqVRPElLZVVPtMeKlsyL9aK0GxGQpvtAUTfX4k7+iJ4mc1M+JM+zQwkgGy2LzY0f0IAafe8MKqIkJrxfGGjQ==" }, "vscode-nls": { "version": "5.0.1", diff --git a/package.json b/package.json index fbb191db65b0..3b8c7f71476d 100644 --- a/package.json +++ b/package.json @@ -1803,10 +1803,10 @@ "vscode-debugadapter": "^1.28.0", "vscode-debugprotocol": "^1.28.0", "vscode-extension-telemetry": "0.4.5", - "vscode-jsonrpc": "8.0.0", - "vscode-languageclient": "8.0.0", - "vscode-languageserver": "8.0.0", - "vscode-languageserver-protocol": "3.17.0", + "vscode-jsonrpc": "8.0.1", + "vscode-languageclient": "8.0.1", + "vscode-languageserver": "8.0.1", + "vscode-languageserver-protocol": "3.17.1", "vscode-nls": "^5.0.1", "vscode-tas-client": "^0.1.22", "winreg": "^1.2.4", From 819e2f43eab864a8a73251decf54122859372351 Mon Sep 17 00:00:00 2001 From: HeeJae Chang Date: Thu, 12 May 2022 10:52:53 -0700 Subject: [PATCH 2/3] updated middleware --- package-lock.json | 42 +++++++++++++++++++++--------------------- package.json | 2 +- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/package-lock.json b/package-lock.json index e42846156c51..4e8a58fe62cf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "2022.7.0-dev", "license": "MIT", "dependencies": { - "@vscode/jupyter-lsp-middleware": "^0.2.42", + "@vscode/jupyter-lsp-middleware": "^0.2.45", "arch": "^2.1.0", "diff-match-patch": "^1.0.0", "fs-extra": "^10.0.1", @@ -1022,15 +1022,15 @@ "dev": true }, "node_modules/@vscode/jupyter-lsp-middleware": { - "version": "0.2.42", - "resolved": "https://registry.npmjs.org/@vscode/jupyter-lsp-middleware/-/jupyter-lsp-middleware-0.2.42.tgz", - "integrity": "sha512-jo4oWTemnjdrvtWTygKs8qj8+4EKyjW+iCYWzts2JUwX2yGM5ZQRnAIDztCOdvmMnWqvScAISKNn4FIoi6qxBA==", + "version": "0.2.45", + "resolved": "https://registry.npmjs.org/@vscode/jupyter-lsp-middleware/-/jupyter-lsp-middleware-0.2.45.tgz", + "integrity": "sha512-X51dpmYuHxmgLLBv2cXVraUPvFg2OgNiMjmNHTLKEcfESbqn6IO2LG9WgP2oSqtwLH1YOzfBYgtxQh/dnjtHUA==", "dependencies": { - "@vscode/lsp-notebook-concat": "^0.1.10", + "@vscode/lsp-notebook-concat": "^0.1.12", "fast-myers-diff": "^3.0.1", "sha.js": "^2.4.11", - "vscode-languageclient": "^8.0.0-next.18", - "vscode-languageserver-protocol": "^3.17.0-next.20", + "vscode-languageclient": "^8.0.1", + "vscode-languageserver-protocol": "^3.17.1", "vscode-uri": "^3.0.2" }, "engines": { @@ -1038,12 +1038,12 @@ } }, "node_modules/@vscode/lsp-notebook-concat": { - "version": "0.1.10", - "resolved": "https://registry.npmjs.org/@vscode/lsp-notebook-concat/-/lsp-notebook-concat-0.1.10.tgz", - "integrity": "sha512-h59VRugCuFpebO9tdQJS4rC6zrLnEY1xEJtUX/GHHq3+ZVmiiXNPshnS14Cm4krnYvV2+PqhAP0R1z5Oysk5/w==", + "version": "0.1.12", + "resolved": "https://registry.npmjs.org/@vscode/lsp-notebook-concat/-/lsp-notebook-concat-0.1.12.tgz", + "integrity": "sha512-8pNf5Cyw6TKqoIMHEfuJGkIq2yhycAmkEmNNL1U/x/Ct1InLIckQ9cBTVI6cAr9do8kW3jCTM8kjZocBWrU4SA==", "dependencies": { "object-hash": "^3.0.0", - "vscode-languageserver-protocol": "^3.17.0-next.20", + "vscode-languageserver-protocol": "^3.17.1", "vscode-uri": "^3.0.2" } }, @@ -16190,25 +16190,25 @@ "dev": true }, "@vscode/jupyter-lsp-middleware": { - "version": "0.2.42", - "resolved": "https://registry.npmjs.org/@vscode/jupyter-lsp-middleware/-/jupyter-lsp-middleware-0.2.42.tgz", - "integrity": "sha512-jo4oWTemnjdrvtWTygKs8qj8+4EKyjW+iCYWzts2JUwX2yGM5ZQRnAIDztCOdvmMnWqvScAISKNn4FIoi6qxBA==", + "version": "0.2.45", + "resolved": "https://registry.npmjs.org/@vscode/jupyter-lsp-middleware/-/jupyter-lsp-middleware-0.2.45.tgz", + "integrity": "sha512-X51dpmYuHxmgLLBv2cXVraUPvFg2OgNiMjmNHTLKEcfESbqn6IO2LG9WgP2oSqtwLH1YOzfBYgtxQh/dnjtHUA==", "requires": { - "@vscode/lsp-notebook-concat": "^0.1.10", + "@vscode/lsp-notebook-concat": "^0.1.12", "fast-myers-diff": "^3.0.1", "sha.js": "^2.4.11", - "vscode-languageclient": "^8.0.0-next.18", - "vscode-languageserver-protocol": "^3.17.0-next.20", + "vscode-languageclient": "^8.0.1", + "vscode-languageserver-protocol": "^3.17.1", "vscode-uri": "^3.0.2" } }, "@vscode/lsp-notebook-concat": { - "version": "0.1.10", - "resolved": "https://registry.npmjs.org/@vscode/lsp-notebook-concat/-/lsp-notebook-concat-0.1.10.tgz", - "integrity": "sha512-h59VRugCuFpebO9tdQJS4rC6zrLnEY1xEJtUX/GHHq3+ZVmiiXNPshnS14Cm4krnYvV2+PqhAP0R1z5Oysk5/w==", + "version": "0.1.12", + "resolved": "https://registry.npmjs.org/@vscode/lsp-notebook-concat/-/lsp-notebook-concat-0.1.12.tgz", + "integrity": "sha512-8pNf5Cyw6TKqoIMHEfuJGkIq2yhycAmkEmNNL1U/x/Ct1InLIckQ9cBTVI6cAr9do8kW3jCTM8kjZocBWrU4SA==", "requires": { "object-hash": "^3.0.0", - "vscode-languageserver-protocol": "^3.17.0-next.20", + "vscode-languageserver-protocol": "^3.17.1", "vscode-uri": "^3.0.2" } }, diff --git a/package.json b/package.json index 3b8c7f71476d..150657f638d4 100644 --- a/package.json +++ b/package.json @@ -1775,7 +1775,7 @@ "webpack": "webpack" }, "dependencies": { - "@vscode/jupyter-lsp-middleware": "^0.2.42", + "@vscode/jupyter-lsp-middleware": "^0.2.45", "arch": "^2.1.0", "diff-match-patch": "^1.0.0", "fs-extra": "^10.0.1", From f5499fe6034834aba5dc93a374f1849c855a09e9 Mon Sep 17 00:00:00 2001 From: HeeJae Chang Date: Thu, 12 May 2022 11:35:01 -0700 Subject: [PATCH 3/3] added news entry --- news/1 Enhancements/19139.md | Bin 0 -> 234 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 news/1 Enhancements/19139.md diff --git a/news/1 Enhancements/19139.md b/news/1 Enhancements/19139.md new file mode 100644 index 0000000000000000000000000000000000000000..24c801b21c0cc1d2b2e1fbaf7d758b5826cbbd13 GIT binary patch literal 234 zcmZXPy$ZrW5QL`|e1|Kw3EJ7)rV}6F$QczR7m`!*^y;^p6oSRh{>(7D`+1+$D=Dhz zq5x*_vGgN-P^}Z#FukMce74a`2UXe;du`z(Od^kH23W(Oe_hed-OVw(Tg10RYmD76 mz&BpaiUeN>QwOzF6FH*GdM;aQ-+$Hd=gNv(?4Mq1t@H(NS1Bz3 literal 0 HcmV?d00001