From d76ff3c9b11efd2ca8c957090b8d0b8caba8201f Mon Sep 17 00:00:00 2001 From: David Barbet Date: Wed, 30 Oct 2024 14:22:27 -0700 Subject: [PATCH] test upgrading --- package-lock.json | 128 ++++++++++-------- package.json | 6 +- src/lsptoolshost/onAutoInsertFeature.ts | 3 + .../codeactions.integration.test.ts | 1 - tsconfig.json | 4 +- 5 files changed, 83 insertions(+), 59 deletions(-) diff --git a/package-lock.json b/package-lock.json index 105bc1546b..00f887081a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -35,9 +35,9 @@ "tmp": "0.0.33", "uuid": "^9.0.0", "vscode-html-languageservice": "^5.0.1", - "vscode-jsonrpc": "8.2.0-next.0", - "vscode-languageclient": "8.2.0-next.1", - "vscode-languageserver-protocol": "3.17.4-next.1", + "vscode-jsonrpc": "8.2.1", + "vscode-languageclient": "9.0.1", + "vscode-languageserver-protocol": "3.17.5", "vscode-languageserver-textdocument": "^1.0.5", "vscode-nls": "5.0.1", "yauzl": "2.10.0" @@ -2222,14 +2222,6 @@ "vscode-jsonrpc": "^8.0.2" } }, - "node_modules/@microsoft/servicehub-framework/node_modules/vscode-jsonrpc": { - "version": "8.1.0", - "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/vscode-jsonrpc/-/vscode-jsonrpc-8.1.0.tgz", - "integrity": "sha512-6TDy/abTQk+zDGYazgbIPc+4JoXdwC8NHU9Pbn4UJP1fehUyZmM4RHp5IthX7A6L5KS30PRui+j+tbbMMMafdw==", - "engines": { - "node": ">=14.0.0" - } - }, "node_modules/@nevware21/ts-async": { "version": "0.3.0", "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/@nevware21/ts-async/-/ts-async-0.3.0.tgz", @@ -15135,30 +15127,33 @@ "integrity": "sha512-ukOMWnCg1tCvT7WnDfsUKQOFDQGsyR5tNgRpwmqi+5/vzU3ghdDXzvIM4IOPdSb3OeSsBNvmSL8nxIVOqi2WXA==" }, "node_modules/vscode-jsonrpc": { - "version": "8.2.0-next.0", - "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/vscode-jsonrpc/-/vscode-jsonrpc-8.2.0-next.0.tgz", - "integrity": "sha512-13jYzaFQpTz5qQ2P+l5c/iTVsj1wUpflP0CR/v4XaEpM0oToLEXZBTcuuox1WaGIbu3Av3xxmGNU4Hydl1iNKg==", + "version": "8.2.1", + "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/vscode-jsonrpc/-/vscode-jsonrpc-8.2.1.tgz", + "integrity": "sha1-oyLMDx2X95T/2cTNKomKC94JfzQ=", + "license": "MIT", "engines": { "node": ">=14.0.0" } }, "node_modules/vscode-languageclient": { - "version": "8.2.0-next.1", - "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/vscode-languageclient/-/vscode-languageclient-8.2.0-next.1.tgz", - "integrity": "sha512-oITaqHQ10PM3zXCUu/104wriMeDutXMkQXMaRBWh1jKihcNcUBLC/os7RhqiVGypY0nl+F0pwStAf4Koc8inaw==", + "version": "9.0.1", + "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/vscode-languageclient/-/vscode-languageclient-9.0.1.tgz", + "integrity": "sha1-zf4gJncmyNTbg53B6dGBbhKW6FQ=", + "license": "MIT", "dependencies": { "minimatch": "^5.1.0", "semver": "^7.3.7", - "vscode-languageserver-protocol": "3.17.4-next.1" + "vscode-languageserver-protocol": "3.17.5" }, "engines": { - "vscode": "^1.77.0" + "vscode": "^1.82.0" } }, "node_modules/vscode-languageclient/node_modules/brace-expansion": { "version": "2.0.1", "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "integrity": "sha1-HtxFng8MVISG7Pn8mfIiE2S5oK4=", + "license": "MIT", "dependencies": { "balanced-match": "^1.0.0" } @@ -15166,7 +15161,8 @@ "node_modules/vscode-languageclient/node_modules/minimatch": { "version": "5.1.6", "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/minimatch/-/minimatch-5.1.6.tgz", - "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "integrity": "sha1-HPy4z1Ui6mmVLNKvla4JR38SKpY=", + "license": "ISC", "dependencies": { "brace-expansion": "^2.0.1" }, @@ -15174,19 +15170,42 @@ "node": ">=10" } }, + "node_modules/vscode-languageclient/node_modules/semver": { + "version": "7.6.3", + "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/semver/-/semver-7.6.3.tgz", + "integrity": "sha1-mA97VVC8F1+03AlAMIVif56zMUM=", + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/vscode-languageserver-protocol": { - "version": "3.17.4-next.1", - "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.4-next.1.tgz", - "integrity": "sha512-qrK4BycgPR/+nkRN9PRVTblkLp+kUPUmAgF6rDhFzZIPXW4/MqWwFUT8uswIMGdlTPPgCEkFO/AYEZK1fDXODg==", + "version": "3.17.5", + "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.5.tgz", + "integrity": "sha1-hkqLjzkINVcvThO9n4MT0OOsS+o=", + "license": "MIT", "dependencies": { - "vscode-jsonrpc": "8.2.0-next.0", - "vscode-languageserver-types": "3.17.4-next.0" + "vscode-jsonrpc": "8.2.0", + "vscode-languageserver-types": "3.17.5" + } + }, + "node_modules/vscode-languageserver-protocol/node_modules/vscode-jsonrpc": { + "version": "8.2.0", + "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/vscode-jsonrpc/-/vscode-jsonrpc-8.2.0.tgz", + "integrity": "sha1-9D36NftR52PRfNlNzKDJRY81q/k=", + "license": "MIT", + "engines": { + "node": ">=14.0.0" } }, "node_modules/vscode-languageserver-protocol/node_modules/vscode-languageserver-types": { - "version": "3.17.4-next.0", - "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/vscode-languageserver-types/-/vscode-languageserver-types-3.17.4-next.0.tgz", - "integrity": "sha512-2FPKboHnT04xYjfM8JpJVBz4a/tryMw58jmzucaabZMZN5hzoFBrhc97jNG4n6edr9JUb9+QSwwcAcYpDTAoag==" + "version": "3.17.5", + "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/vscode-languageserver-types/-/vscode-languageserver-types-3.17.5.tgz", + "integrity": "sha1-MnNnbwzy6rQLP0TQhay7fwijnYo=", + "license": "MIT" }, "node_modules/vscode-languageserver-textdocument": { "version": "1.0.8", @@ -17448,13 +17467,6 @@ "string-hash": "^1.1.3", "uuid": "^9.0.0", "vscode-jsonrpc": "^8.0.2" - }, - "dependencies": { - "vscode-jsonrpc": { - "version": "8.1.0", - "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/vscode-jsonrpc/-/vscode-jsonrpc-8.1.0.tgz", - "integrity": "sha512-6TDy/abTQk+zDGYazgbIPc+4JoXdwC8NHU9Pbn4UJP1fehUyZmM4RHp5IthX7A6L5KS30PRui+j+tbbMMMafdw==" - } } }, "@nevware21/ts-async": { @@ -27070,24 +27082,24 @@ } }, "vscode-jsonrpc": { - "version": "8.2.0-next.0", - "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/vscode-jsonrpc/-/vscode-jsonrpc-8.2.0-next.0.tgz", - "integrity": "sha512-13jYzaFQpTz5qQ2P+l5c/iTVsj1wUpflP0CR/v4XaEpM0oToLEXZBTcuuox1WaGIbu3Av3xxmGNU4Hydl1iNKg==" + "version": "8.2.1", + "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/vscode-jsonrpc/-/vscode-jsonrpc-8.2.1.tgz", + "integrity": "sha1-oyLMDx2X95T/2cTNKomKC94JfzQ=" }, "vscode-languageclient": { - "version": "8.2.0-next.1", - "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/vscode-languageclient/-/vscode-languageclient-8.2.0-next.1.tgz", - "integrity": "sha512-oITaqHQ10PM3zXCUu/104wriMeDutXMkQXMaRBWh1jKihcNcUBLC/os7RhqiVGypY0nl+F0pwStAf4Koc8inaw==", + "version": "9.0.1", + "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/vscode-languageclient/-/vscode-languageclient-9.0.1.tgz", + "integrity": "sha1-zf4gJncmyNTbg53B6dGBbhKW6FQ=", "requires": { "minimatch": "^5.1.0", "semver": "^7.3.7", - "vscode-languageserver-protocol": "3.17.4-next.1" + "vscode-languageserver-protocol": "3.17.5" }, "dependencies": { "brace-expansion": { "version": "2.0.1", "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "integrity": "sha1-HtxFng8MVISG7Pn8mfIiE2S5oK4=", "requires": { "balanced-match": "^1.0.0" } @@ -27095,26 +27107,36 @@ "minimatch": { "version": "5.1.6", "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/minimatch/-/minimatch-5.1.6.tgz", - "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "integrity": "sha1-HPy4z1Ui6mmVLNKvla4JR38SKpY=", "requires": { "brace-expansion": "^2.0.1" } + }, + "semver": { + "version": "7.6.3", + "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/semver/-/semver-7.6.3.tgz", + "integrity": "sha1-mA97VVC8F1+03AlAMIVif56zMUM=" } } }, "vscode-languageserver-protocol": { - "version": "3.17.4-next.1", - "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.4-next.1.tgz", - "integrity": "sha512-qrK4BycgPR/+nkRN9PRVTblkLp+kUPUmAgF6rDhFzZIPXW4/MqWwFUT8uswIMGdlTPPgCEkFO/AYEZK1fDXODg==", + "version": "3.17.5", + "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.5.tgz", + "integrity": "sha1-hkqLjzkINVcvThO9n4MT0OOsS+o=", "requires": { - "vscode-jsonrpc": "8.2.0-next.0", - "vscode-languageserver-types": "3.17.4-next.0" + "vscode-jsonrpc": "8.2.0", + "vscode-languageserver-types": "3.17.5" }, "dependencies": { + "vscode-jsonrpc": { + "version": "8.2.0", + "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/vscode-jsonrpc/-/vscode-jsonrpc-8.2.0.tgz", + "integrity": "sha1-9D36NftR52PRfNlNzKDJRY81q/k=" + }, "vscode-languageserver-types": { - "version": "3.17.4-next.0", - "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/vscode-languageserver-types/-/vscode-languageserver-types-3.17.4-next.0.tgz", - "integrity": "sha512-2FPKboHnT04xYjfM8JpJVBz4a/tryMw58jmzucaabZMZN5hzoFBrhc97jNG4n6edr9JUb9+QSwwcAcYpDTAoag==" + "version": "3.17.5", + "resolved": "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/vscode-languageserver-types/-/vscode-languageserver-types-3.17.5.tgz", + "integrity": "sha1-MnNnbwzy6rQLP0TQhay7fwijnYo=" } } }, diff --git a/package.json b/package.json index 4c867f4f6c..5ee81361d2 100644 --- a/package.json +++ b/package.json @@ -113,9 +113,9 @@ "tmp": "0.0.33", "uuid": "^9.0.0", "vscode-html-languageservice": "^5.0.1", - "vscode-jsonrpc": "8.2.0-next.0", - "vscode-languageclient": "8.2.0-next.1", - "vscode-languageserver-protocol": "3.17.4-next.1", + "vscode-jsonrpc": "8.2.1", + "vscode-languageclient": "9.0.1", + "vscode-languageserver-protocol": "3.17.5", "vscode-languageserver-textdocument": "^1.0.5", "vscode-nls": "5.0.1", "yauzl": "2.10.0" diff --git a/src/lsptoolshost/onAutoInsertFeature.ts b/src/lsptoolshost/onAutoInsertFeature.ts index 0c3e03f210..9d1b8fe581 100644 --- a/src/lsptoolshost/onAutoInsertFeature.ts +++ b/src/lsptoolshost/onAutoInsertFeature.ts @@ -39,6 +39,9 @@ export class OnAutoInsertFeature implements DynamicFeature(RoslynProtocol.OnAutoInsertRequest.method); } + clear(): void { + this._registrations.clear(); + } fillInitializeParams?: ((params: InitializeParams) => void) | undefined; preInitialize?: | ((capabilities: ServerCapabilities, documentSelector: DocumentSelector | undefined) => void) diff --git a/test/lsptoolshost/integrationTests/codeactions.integration.test.ts b/test/lsptoolshost/integrationTests/codeactions.integration.test.ts index fc4b350296..b8d6698c77 100644 --- a/test/lsptoolshost/integrationTests/codeactions.integration.test.ts +++ b/test/lsptoolshost/integrationTests/codeactions.integration.test.ts @@ -322,7 +322,6 @@ async function getCodeActions( ): Promise { const uri = vscode.window.activeTextEditor!.document.uri; console.log(`Getting actions for ${uri.toString()}`); - await new Promise((r) => setTimeout(r, 5000)); const codeActions = await vscode.commands.executeCommand( 'vscode.executeCodeActionProvider', uri, diff --git a/tsconfig.json b/tsconfig.json index b999e03418..04e8945fb8 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,13 +1,13 @@ { "compilerOptions": { "target": "es6", - "module": "commonjs", + "module": "Node16", "outDir": "out", "lib": [ "ES2021" ], "sourceMap": true, - "moduleResolution": "node", + "moduleResolution": "Node16", "moduleDetection": "force", "strict": true, "forceConsistentCasingInFileNames": true,