From 68199cb57c8e389927776d87e8e35b6da7ad9ca6 Mon Sep 17 00:00:00 2001 From: David Barbet Date: Fri, 14 Nov 2025 12:10:42 -0800 Subject: [PATCH 1/3] Update to new language client with range semantic tokens refresh --- package-lock.json | 126 ++++++++++++++++++++++++++++++++-------------- package.json | 4 +- 2 files changed, 90 insertions(+), 40 deletions(-) diff --git a/package-lock.json b/package-lock.json index a53c2c19c1..0de9817a4f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -28,7 +28,7 @@ "semver": "7.5.4", "vscode-html-languageservice": "^5.3.1", "vscode-jsonrpc": "9.0.0-next.8", - "vscode-languageclient": "10.0.0-next.15", + "vscode-languageclient": "10.0.0-next.18", "vscode-languageserver-protocol": "3.17.6-next.13", "vscode-languageserver-textdocument": "1.0.12", "vscode-languageserver-types": "3.17.6-next.6", @@ -77,7 +77,7 @@ "vscode-textmate": "^6.0.0" }, "engines": { - "vscode": "^1.98.0" + "vscode": "^1.106.0" } }, "node_modules/@ampproject/remapping": { @@ -1608,6 +1608,27 @@ "dev": true, "license": "BSD-3-Clause" }, + "node_modules/@isaacs/balanced-match": { + "version": "4.0.1", + "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@isaacs/balanced-match/-/balanced-match-4.0.1.tgz", + "integrity": "sha1-MIHa28NGBmG3UedZHX+upd853Sk=", + "license": "MIT", + "engines": { + "node": "20 || >=22" + } + }, + "node_modules/@isaacs/brace-expansion": { + "version": "5.0.0", + "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@isaacs/brace-expansion/-/brace-expansion-5.0.0.tgz", + "integrity": "sha1-Sz2rq32OdaQpQUqWvWe/TB0T4PM=", + "license": "MIT", + "dependencies": { + "@isaacs/balanced-match": "^4.0.1" + }, + "engines": { + "node": "20 || >=22" + } + }, "node_modules/@isaacs/cliui": { "version": "8.0.2", "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@isaacs/cliui/-/cliui-8.0.2.tgz", @@ -14616,35 +14637,26 @@ } }, "node_modules/vscode-languageclient": { - "version": "10.0.0-next.15", - "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/vscode-languageclient/-/vscode-languageclient-10.0.0-next.15.tgz", - "integrity": "sha1-zVrmrEADwsucCB4HhekpAyJN1lU=", + "version": "10.0.0-next.18", + "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/vscode-languageclient/-/vscode-languageclient-10.0.0-next.18.tgz", + "integrity": "sha1-OTsUfnv4qhjhms74o9y0i4vf+ME=", "license": "MIT", "dependencies": { - "minimatch": "^10.0.1", + "minimatch": "^10.0.3", "semver": "^7.7.1", - "vscode-languageserver-protocol": "3.17.6-next.13" + "vscode-languageserver-protocol": "3.17.6-next.15" }, "engines": { "vscode": "^1.91.0" } }, - "node_modules/vscode-languageclient/node_modules/brace-expansion": { - "version": "2.0.2", - "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/brace-expansion/-/brace-expansion-2.0.2.tgz", - "integrity": "sha1-VPxTI3phPYVMe9N0Y6rRffhyFOc=", - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0" - } - }, "node_modules/vscode-languageclient/node_modules/minimatch": { - "version": "10.0.1", - "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/minimatch/-/minimatch-10.0.1.tgz", - "integrity": "sha1-zgUhhWtFPIbiXyxMDQPm/33cRAs=", - "license": "ISC", + "version": "10.1.1", + "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/minimatch/-/minimatch-10.1.1.tgz", + "integrity": "sha1-5uYbmwwdyrEWtafRRY6LaunnOlU=", + "license": "BlueOak-1.0.0", "dependencies": { - "brace-expansion": "^2.0.1" + "@isaacs/brace-expansion": "^5.0.0" }, "engines": { "node": "20 || >=22" @@ -14665,6 +14677,25 @@ "node": ">=10" } }, + "node_modules/vscode-languageclient/node_modules/vscode-jsonrpc": { + "version": "9.0.0-next.10", + "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/vscode-jsonrpc/-/vscode-jsonrpc-9.0.0-next.10.tgz", + "integrity": "sha1-piEsWE8lY4TPa07dhpZiF2ORi6Y=", + "license": "MIT", + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/vscode-languageclient/node_modules/vscode-languageserver-protocol": { + "version": "3.17.6-next.15", + "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.6-next.15.tgz", + "integrity": "sha1-9QqUda6tacDpDgMPHt6XFL83GYc=", + "license": "MIT", + "dependencies": { + "vscode-jsonrpc": "9.0.0-next.10", + "vscode-languageserver-types": "3.17.6-next.6" + } + }, "node_modules/vscode-languageserver-protocol": { "version": "3.17.6-next.13", "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.6-next.13.tgz", @@ -16071,6 +16102,19 @@ "integrity": "sha1-Siho111taWPkI7z5C3/RvjQ0CdM=", "dev": true }, + "@isaacs/balanced-match": { + "version": "4.0.1", + "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@isaacs/balanced-match/-/balanced-match-4.0.1.tgz", + "integrity": "sha1-MIHa28NGBmG3UedZHX+upd853Sk=" + }, + "@isaacs/brace-expansion": { + "version": "5.0.0", + "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@isaacs/brace-expansion/-/brace-expansion-5.0.0.tgz", + "integrity": "sha1-Sz2rq32OdaQpQUqWvWe/TB0T4PM=", + "requires": { + "@isaacs/balanced-match": "^4.0.1" + } + }, "@isaacs/cliui": { "version": "8.0.2", "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@isaacs/cliui/-/cliui-8.0.2.tgz", @@ -25770,35 +25814,41 @@ "integrity": "sha1-okBbsuz3wWIYUYajI5pna28Ru8Q=" }, "vscode-languageclient": { - "version": "10.0.0-next.15", - "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/vscode-languageclient/-/vscode-languageclient-10.0.0-next.15.tgz", - "integrity": "sha1-zVrmrEADwsucCB4HhekpAyJN1lU=", + "version": "10.0.0-next.18", + "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/vscode-languageclient/-/vscode-languageclient-10.0.0-next.18.tgz", + "integrity": "sha1-OTsUfnv4qhjhms74o9y0i4vf+ME=", "requires": { - "minimatch": "^10.0.1", + "minimatch": "^10.0.3", "semver": "^7.7.1", - "vscode-languageserver-protocol": "3.17.6-next.13" + "vscode-languageserver-protocol": "3.17.6-next.15" }, "dependencies": { - "brace-expansion": { - "version": "2.0.2", - "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/brace-expansion/-/brace-expansion-2.0.2.tgz", - "integrity": "sha1-VPxTI3phPYVMe9N0Y6rRffhyFOc=", - "requires": { - "balanced-match": "^1.0.0" - } - }, "minimatch": { - "version": "10.0.1", - "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/minimatch/-/minimatch-10.0.1.tgz", - "integrity": "sha1-zgUhhWtFPIbiXyxMDQPm/33cRAs=", + "version": "10.1.1", + "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/minimatch/-/minimatch-10.1.1.tgz", + "integrity": "sha1-5uYbmwwdyrEWtafRRY6LaunnOlU=", "requires": { - "brace-expansion": "^2.0.1" + "@isaacs/brace-expansion": "^5.0.0" } }, "semver": { "version": "7.7.1", "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/semver/-/semver-7.7.1.tgz", "integrity": "sha1-q9UJjYKxjGyB9gdP8mR/0+ciDJ8=" + }, + "vscode-jsonrpc": { + "version": "9.0.0-next.10", + "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/vscode-jsonrpc/-/vscode-jsonrpc-9.0.0-next.10.tgz", + "integrity": "sha1-piEsWE8lY4TPa07dhpZiF2ORi6Y=" + }, + "vscode-languageserver-protocol": { + "version": "3.17.6-next.15", + "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.6-next.15.tgz", + "integrity": "sha1-9QqUda6tacDpDgMPHt6XFL83GYc=", + "requires": { + "vscode-jsonrpc": "9.0.0-next.10", + "vscode-languageserver-types": "3.17.6-next.6" + } } } }, diff --git a/package.json b/package.json index 8e8db010e2..dae3c2a6cf 100644 --- a/package.json +++ b/package.json @@ -111,7 +111,7 @@ "semver": "7.5.4", "vscode-html-languageservice": "^5.3.1", "vscode-jsonrpc": "9.0.0-next.8", - "vscode-languageclient": "10.0.0-next.15", + "vscode-languageclient": "10.0.0-next.18", "vscode-languageserver-protocol": "3.17.6-next.13", "vscode-languageserver-textdocument": "1.0.12", "vscode-languageserver-types": "3.17.6-next.6", @@ -688,7 +688,7 @@ } ], "engines": { - "vscode": "^1.98.0" + "vscode": "^1.106.0" }, "activationEvents": [ "onDebugInitialConfigurations", From 5c10edfaffe8ffe0d548fec3edb1e99c226b743c Mon Sep 17 00:00:00 2001 From: David Barbet Date: Fri, 14 Nov 2025 12:47:41 -0800 Subject: [PATCH 2/3] Ensure jsonrpc version matches client --- package-lock.json | 44 +++++++++++++++++++++++--------------------- package.json | 2 +- 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0de9817a4f..cb6543c571 100644 --- a/package-lock.json +++ b/package-lock.json @@ -27,7 +27,7 @@ "rxjs": "6.6.7", "semver": "7.5.4", "vscode-html-languageservice": "^5.3.1", - "vscode-jsonrpc": "9.0.0-next.8", + "vscode-jsonrpc": "9.0.0-next.10", "vscode-languageclient": "10.0.0-next.18", "vscode-languageserver-protocol": "3.17.6-next.13", "vscode-languageserver-textdocument": "1.0.12", @@ -14628,9 +14628,9 @@ "license": "MIT" }, "node_modules/vscode-jsonrpc": { - "version": "9.0.0-next.8", - "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/vscode-jsonrpc/-/vscode-jsonrpc-9.0.0-next.8.tgz", - "integrity": "sha1-okBbsuz3wWIYUYajI5pna28Ru8Q=", + "version": "9.0.0-next.10", + "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/vscode-jsonrpc/-/vscode-jsonrpc-9.0.0-next.10.tgz", + "integrity": "sha1-piEsWE8lY4TPa07dhpZiF2ORi6Y=", "license": "MIT", "engines": { "node": ">=14.0.0" @@ -14677,15 +14677,6 @@ "node": ">=10" } }, - "node_modules/vscode-languageclient/node_modules/vscode-jsonrpc": { - "version": "9.0.0-next.10", - "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/vscode-jsonrpc/-/vscode-jsonrpc-9.0.0-next.10.tgz", - "integrity": "sha1-piEsWE8lY4TPa07dhpZiF2ORi6Y=", - "license": "MIT", - "engines": { - "node": ">=14.0.0" - } - }, "node_modules/vscode-languageclient/node_modules/vscode-languageserver-protocol": { "version": "3.17.6-next.15", "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.6-next.15.tgz", @@ -14706,6 +14697,15 @@ "vscode-languageserver-types": "3.17.6-next.6" } }, + "node_modules/vscode-languageserver-protocol/node_modules/vscode-jsonrpc": { + "version": "9.0.0-next.8", + "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/vscode-jsonrpc/-/vscode-jsonrpc-9.0.0-next.8.tgz", + "integrity": "sha1-okBbsuz3wWIYUYajI5pna28Ru8Q=", + "license": "MIT", + "engines": { + "node": ">=14.0.0" + } + }, "node_modules/vscode-languageserver-textdocument": { "version": "1.0.12", "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.12.tgz", @@ -25809,9 +25809,9 @@ } }, "vscode-jsonrpc": { - "version": "9.0.0-next.8", - "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/vscode-jsonrpc/-/vscode-jsonrpc-9.0.0-next.8.tgz", - "integrity": "sha1-okBbsuz3wWIYUYajI5pna28Ru8Q=" + "version": "9.0.0-next.10", + "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/vscode-jsonrpc/-/vscode-jsonrpc-9.0.0-next.10.tgz", + "integrity": "sha1-piEsWE8lY4TPa07dhpZiF2ORi6Y=" }, "vscode-languageclient": { "version": "10.0.0-next.18", @@ -25836,11 +25836,6 @@ "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/semver/-/semver-7.7.1.tgz", "integrity": "sha1-q9UJjYKxjGyB9gdP8mR/0+ciDJ8=" }, - "vscode-jsonrpc": { - "version": "9.0.0-next.10", - "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/vscode-jsonrpc/-/vscode-jsonrpc-9.0.0-next.10.tgz", - "integrity": "sha1-piEsWE8lY4TPa07dhpZiF2ORi6Y=" - }, "vscode-languageserver-protocol": { "version": "3.17.6-next.15", "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.6-next.15.tgz", @@ -25859,6 +25854,13 @@ "requires": { "vscode-jsonrpc": "9.0.0-next.8", "vscode-languageserver-types": "3.17.6-next.6" + }, + "dependencies": { + "vscode-jsonrpc": { + "version": "9.0.0-next.8", + "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/vscode-jsonrpc/-/vscode-jsonrpc-9.0.0-next.8.tgz", + "integrity": "sha1-okBbsuz3wWIYUYajI5pna28Ru8Q=" + } } }, "vscode-languageserver-textdocument": { diff --git a/package.json b/package.json index dae3c2a6cf..2cc2657d01 100644 --- a/package.json +++ b/package.json @@ -110,7 +110,7 @@ "rxjs": "6.6.7", "semver": "7.5.4", "vscode-html-languageservice": "^5.3.1", - "vscode-jsonrpc": "9.0.0-next.8", + "vscode-jsonrpc": "9.0.0-next.10", "vscode-languageclient": "10.0.0-next.18", "vscode-languageserver-protocol": "3.17.6-next.13", "vscode-languageserver-textdocument": "1.0.12", From dc87e35e85c5735d4a7ba61448f32a4fa0eced4f Mon Sep 17 00:00:00 2001 From: David Barbet Date: Fri, 14 Nov 2025 13:02:42 -0800 Subject: [PATCH 3/3] Update additional packages --- package-lock.json | 47 ++++++----------------------------------------- package.json | 2 +- 2 files changed, 7 insertions(+), 42 deletions(-) diff --git a/package-lock.json b/package-lock.json index cb6543c571..af8edbd727 100644 --- a/package-lock.json +++ b/package-lock.json @@ -29,7 +29,7 @@ "vscode-html-languageservice": "^5.3.1", "vscode-jsonrpc": "9.0.0-next.10", "vscode-languageclient": "10.0.0-next.18", - "vscode-languageserver-protocol": "3.17.6-next.13", + "vscode-languageserver-protocol": "3.17.6-next.15", "vscode-languageserver-textdocument": "1.0.12", "vscode-languageserver-types": "3.17.6-next.6", "vscode-nls": "5.0.1", @@ -14677,7 +14677,7 @@ "node": ">=10" } }, - "node_modules/vscode-languageclient/node_modules/vscode-languageserver-protocol": { + "node_modules/vscode-languageserver-protocol": { "version": "3.17.6-next.15", "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.6-next.15.tgz", "integrity": "sha1-9QqUda6tacDpDgMPHt6XFL83GYc=", @@ -14687,25 +14687,6 @@ "vscode-languageserver-types": "3.17.6-next.6" } }, - "node_modules/vscode-languageserver-protocol": { - "version": "3.17.6-next.13", - "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.6-next.13.tgz", - "integrity": "sha1-mUfAq8krvmfuoQ0EUtGV9xD6WqQ=", - "license": "MIT", - "dependencies": { - "vscode-jsonrpc": "9.0.0-next.8", - "vscode-languageserver-types": "3.17.6-next.6" - } - }, - "node_modules/vscode-languageserver-protocol/node_modules/vscode-jsonrpc": { - "version": "9.0.0-next.8", - "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/vscode-jsonrpc/-/vscode-jsonrpc-9.0.0-next.8.tgz", - "integrity": "sha1-okBbsuz3wWIYUYajI5pna28Ru8Q=", - "license": "MIT", - "engines": { - "node": ">=14.0.0" - } - }, "node_modules/vscode-languageserver-textdocument": { "version": "1.0.12", "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.12.tgz", @@ -25835,32 +25816,16 @@ "version": "7.7.1", "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/semver/-/semver-7.7.1.tgz", "integrity": "sha1-q9UJjYKxjGyB9gdP8mR/0+ciDJ8=" - }, - "vscode-languageserver-protocol": { - "version": "3.17.6-next.15", - "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.6-next.15.tgz", - "integrity": "sha1-9QqUda6tacDpDgMPHt6XFL83GYc=", - "requires": { - "vscode-jsonrpc": "9.0.0-next.10", - "vscode-languageserver-types": "3.17.6-next.6" - } } } }, "vscode-languageserver-protocol": { - "version": "3.17.6-next.13", - "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.6-next.13.tgz", - "integrity": "sha1-mUfAq8krvmfuoQ0EUtGV9xD6WqQ=", + "version": "3.17.6-next.15", + "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.6-next.15.tgz", + "integrity": "sha1-9QqUda6tacDpDgMPHt6XFL83GYc=", "requires": { - "vscode-jsonrpc": "9.0.0-next.8", + "vscode-jsonrpc": "9.0.0-next.10", "vscode-languageserver-types": "3.17.6-next.6" - }, - "dependencies": { - "vscode-jsonrpc": { - "version": "9.0.0-next.8", - "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/vscode-jsonrpc/-/vscode-jsonrpc-9.0.0-next.8.tgz", - "integrity": "sha1-okBbsuz3wWIYUYajI5pna28Ru8Q=" - } } }, "vscode-languageserver-textdocument": { diff --git a/package.json b/package.json index 2cc2657d01..4551d67822 100644 --- a/package.json +++ b/package.json @@ -112,7 +112,7 @@ "vscode-html-languageservice": "^5.3.1", "vscode-jsonrpc": "9.0.0-next.10", "vscode-languageclient": "10.0.0-next.18", - "vscode-languageserver-protocol": "3.17.6-next.13", + "vscode-languageserver-protocol": "3.17.6-next.15", "vscode-languageserver-textdocument": "1.0.12", "vscode-languageserver-types": "3.17.6-next.6", "vscode-nls": "5.0.1",