diff --git a/.changeset/upgrade-lsp.md b/.changeset/upgrade-lsp.md new file mode 100644 index 00000000..a0916ee8 --- /dev/null +++ b/.changeset/upgrade-lsp.md @@ -0,0 +1,5 @@ +--- +"sql-language-server": minor +--- + +Upgrade `vscode-languageserver` from the `8.0.0-next.8` pre-release to 10.x (LSP 3.18) and stop importing its internal `lib/` paths. diff --git a/package.json b/package.json index 9ff35b28..8219b705 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "publisher": "joe-re", "scripts": { "lint": "eslint .", - "typecheck": "pnpm --filter sqlint --filter sql-language-server typecheck", + "typecheck": "pnpm --filter sqlint --filter sql-language-server --filter sql-language-server_vsc typecheck", "vsc-compile": "pnpm vsc-compile:client && pnpm vsc-compile:server", "vsc-compile:client": "pnpm --filter sql-language-server_vsc compile", "vsc-compile:server": "pnpm build:sqlint && pnpm --filter sql-language-server prepare-vsc-extension", @@ -48,7 +48,7 @@ }, "engines": { "node": "^22.13.0 || >=24", - "vscode": "^1.45.1" + "vscode": "^1.91.0" }, "activationEvents": [ "onLanguage:sql", diff --git a/packages/client/extension.ts b/packages/client/extension.ts index 6f0e7e13..65b7be51 100644 --- a/packages/client/extension.ts +++ b/packages/client/extension.ts @@ -12,12 +12,12 @@ import { CompletionList, } from 'vscode' import { + ExecuteCommandParams, LanguageClient, LanguageClientOptions, ServerOptions, TransportKind, } from 'vscode-languageclient/node' -import { ExecuteCommandParams } from 'vscode-languageserver-protocol' import { rebuild } from './rebuild' const NOTEBOOK_CELL_SCHEME = 'vscode-notebook-cell' @@ -114,6 +114,8 @@ export function getNotebookDocument( ) } +let client: LanguageClient | undefined + export function activate(context: ExtensionContext) { // console.log("sql-language-server extension activated") monitorJupyterCells() @@ -184,14 +186,24 @@ export function activate(context: ExtensionContext) { }, } - const client = new LanguageClient( + client = new LanguageClient( 'sqlLanguageServer', 'SQL Language Server', serverOptions, clientOptions ) client.registerProposedFeatures() - const disposable = client.start() + // Register notification handlers before start() so that notifications sent + // right after initialization (e.g. finishSetup) are not missed. + client.onNotification('sqlLanguageServer.finishSetup', (params) => { + connectionNames = params.personalConfig?.connections + ?.map((v: { name: string }) => v.name) + .filter((v: string) => !!v) + connectedConnectionName = params.config?.name || '' + }) + client.onNotification('sqlLanguageServer.error', (params) => { + Window.showErrorMessage(params.message) + }) const switchConnection = commands.registerCommand( 'extension.switchDatabaseConnection', @@ -257,16 +269,9 @@ export function activate(context: ExtensionContext) { context.subscriptions.push(switchConnection) context.subscriptions.push(fixAllFixableProblem) context.subscriptions.push(rebuildSqlite3) - context.subscriptions.push(disposable) - client.onReady().then(() => { - client.onNotification('sqlLanguageServer.finishSetup', (params) => { - connectionNames = params.personalConfig?.connections - ?.map((v: { name: string }) => v.name) - .filter((v: string) => !!v) - connectedConnectionName = params.config?.name || '' - }) - client.onNotification('sqlLanguageServer.error', (params) => { - Window.showErrorMessage(params.message) - }) - }) + return client.start() +} + +export function deactivate(): Thenable | undefined { + return client?.stop() } diff --git a/packages/client/package.json b/packages/client/package.json index 43f9c6cb..77a7f85e 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -8,10 +8,11 @@ "publisher": "joe-re", "scripts": { "compile": "esbuild ./extension.ts --bundle --platform=node --external:vscode --outfile=out/extension.js", - "watch": "pnpm compile --watch" + "watch": "pnpm compile --watch", + "typecheck": "tsc -p ." }, "engines": { - "vscode": "^1.52.0" + "vscode": "^1.91.0" }, "activationEvents": [ "onLanguage:sql", @@ -19,13 +20,11 @@ "onNotebook:jupyter-notebook" ], "dependencies": { - "vscode-languageclient": "^7.0.0", - "vscode-languageserver-protocol": "3.16.0", - "vscode-test": "^1.3.0" + "vscode-languageclient": "^10.1.1" }, "devDependencies": { "@types/node": "^22.18.0", - "@types/vscode": "^1.76.0", + "@types/vscode": "~1.91.0", "esbuild": "^0.28.2", "tslib": "^2.0.0", "typescript": "~6.0.3" diff --git a/packages/client/tsconfig.json b/packages/client/tsconfig.json index 1dd33fbd..a9600304 100644 --- a/packages/client/tsconfig.json +++ b/packages/client/tsconfig.json @@ -9,7 +9,12 @@ "moduleResolution": "bundler", "esModuleInterop": true, "sourceMap": true, - "outDir": "out" + "outDir": "out", + "types": [ + "node", + "vscode" + ], + "noEmit": true }, "exclude": [ "node_modules" diff --git a/packages/server/package.json b/packages/server/package.json index 075d3d66..d9f3dd52 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -54,12 +54,9 @@ "pg": "~8.10.0", "sqlint": "workspace:^", "sqlite3": "^5.0.3", - "vscode-jsonrpc": "8.0.0-next.6", - "vscode-languageclient": "^6.1.3", - "vscode-languageserver": "8.0.0-next.8", - "vscode-languageserver-protocol": "~3.16.0", - "vscode-languageserver-textdocument": "^1.0.1", - "vscode-languageserver-types": "3.17.0-next.7", + "vscode-languageserver": "^10.1.1", + "vscode-languageserver-textdocument": "^1.0.12", + "vscode-languageserver-types": "^3.18.3", "yargs": "^17.3.1" }, "devDependencies": { diff --git a/packages/server/src/createConnection.ts b/packages/server/src/createConnection.ts index 5fbafb93..feafca21 100644 --- a/packages/server/src/createConnection.ts +++ b/packages/server/src/createConnection.ts @@ -1,11 +1,9 @@ import { createConnection as _createConnection, Connection, -} from 'vscode-languageserver/lib/node/main' -import { IPCMessageReader, IPCMessageWriter, -} from 'vscode-jsonrpc/lib/node/main' +} from 'vscode-languageserver/node' import log4js from 'log4js' import { ConnectionMethod } from './createServer' const logger = log4js.getLogger() diff --git a/packages/server/src/createServer.ts b/packages/server/src/createServer.ts index a497a798..9042fc95 100644 --- a/packages/server/src/createServer.ts +++ b/packages/server/src/createServer.ts @@ -6,9 +6,9 @@ import { InitializeResult, CompletionItem, CompletionParams, + CompletionTriggerKind, + TextDocuments, } from 'vscode-languageserver/node' -import { TextDocuments } from 'vscode-languageserver' -import { CompletionTriggerKind } from 'vscode-languageserver-protocol/lib/common/protocol' import { TextDocument } from 'vscode-languageserver-textdocument' import { CodeAction, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 50c9f5ae..719f1c39 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -152,21 +152,15 @@ importers: packages/client: dependencies: vscode-languageclient: - specifier: ^7.0.0 - version: 7.0.0 - vscode-languageserver-protocol: - specifier: 3.16.0 - version: 3.16.0 - vscode-test: - specifier: ^1.3.0 - version: 1.6.1 + specifier: ^10.1.1 + version: 10.1.1 devDependencies: '@types/node': specifier: ^22.18.0 version: 22.20.4 '@types/vscode': - specifier: ^1.76.0 - version: 1.138.0 + specifier: ~1.91.0 + version: 1.91.0 esbuild: specifier: ^0.28.2 version: 0.28.2 @@ -212,24 +206,15 @@ importers: sqlite3: specifier: ^5.0.3 version: 5.1.7 - vscode-jsonrpc: - specifier: 8.0.0-next.6 - version: 8.0.0-next.6 - vscode-languageclient: - specifier: ^6.1.3 - version: 6.1.4 vscode-languageserver: - specifier: 8.0.0-next.8 - version: 8.0.0-next.8 - vscode-languageserver-protocol: - specifier: ~3.16.0 - version: 3.16.0 + specifier: ^10.1.1 + version: 10.1.1 vscode-languageserver-textdocument: - specifier: ^1.0.1 + specifier: ^1.0.12 version: 1.0.14 vscode-languageserver-types: - specifier: 3.17.0-next.7 - version: 3.17.0-next.7 + specifier: ^3.18.3 + version: 3.18.3 yargs: specifier: ^17.3.1 version: 17.7.3 @@ -886,8 +871,8 @@ packages: '@types/validator@13.15.10': resolution: {integrity: sha512-T8L6i7wCuyoK8A/ZeLYt1+q0ty3Zb9+qbSSvrIVitzT3YjZqkTZ40IbRsPanlB4h1QB3JVL1SYCdR6ngtFYcuA==} - '@types/vscode@1.138.0': - resolution: {integrity: sha512-DhlvrucJa8n6EHst7qQcXOcjLKs/VRTQy55plLO+RN74jonYsr/t9dd66zBnAyz1tpDig0okQAxuoPHpVNje2g==} + '@types/vscode@1.91.0': + resolution: {integrity: sha512-PgPr+bUODjG3y+ozWUCyzttqR9EHny9sPAfJagddQjDwdtf66y2sDKJMnFZRuzBA2YtBGASqJGPil8VDUPvO6A==} '@types/ws@7.4.7': resolution: {integrity: sha512-JQbbmxZTZehdc2iszGKs5oC3NFnjeay7mtAWrdt7qNtAVK0g19muApzAy4bm9byz79xa2ZnO/BOBC2R8RC5Lww==} @@ -1219,10 +1204,6 @@ packages: bcrypt-pbkdf@1.0.2: resolution: {integrity: sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==} - big-integer@1.6.52: - resolution: {integrity: sha512-QxD8cf2eVqJOOz63z6JIN9BzvVs/dlySa5HGSBH5xtR8dPteIRQnBxxKqkNTiT6jbDTF6jAfrd4oMcND9RGbQg==} - engines: {node: '>=0.6'} - big.js@5.2.2: resolution: {integrity: sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==} @@ -1236,18 +1217,12 @@ packages: resolution: {integrity: sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==} engines: {node: '>=8'} - binary@0.3.0: - resolution: {integrity: sha512-D4H1y5KYwpJgK8wk1Cue5LLPgmwHKYSChkbspQg5JtVuR5ulGckxfR62H3AE9UDkdMC8yyXlqYihuz3Aqg2XZg==} - bindings@1.5.0: resolution: {integrity: sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==} bl@4.1.0: resolution: {integrity: sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==} - bluebird@3.4.7: - resolution: {integrity: sha512-iD3898SR7sWVRHbiQv+sHUtHnMvC1o3nW5rAcqnq3uOn07DSAppZYUkIGslDz6gXC7HfunPe7YVBgoEJASPcHA==} - bluebird@3.7.2: resolution: {integrity: sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==} @@ -1280,10 +1255,6 @@ packages: buffer-from@1.1.2: resolution: {integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==} - buffer-indexof-polyfill@1.0.2: - resolution: {integrity: sha512-I7wzHwA3t1/lwXQh+A5PbNvJxgfo5r3xulgpYDB5zckTu/Z9oUK9biouBKQUjEqzaz3HnAT6TYoovmE+GqSf7A==} - engines: {node: '>=0.10'} - buffer-writer@2.0.0: resolution: {integrity: sha512-a7ZpuTZU1TRtnwyCNW3I5dc0wWNC3VR9S++Ewyk2HHZdrO3CQJqSpd+95Us590V6AL7JqUAH2IwZ/398PmNFgw==} engines: {node: '>=4'} @@ -1291,10 +1262,6 @@ packages: buffer@5.7.1: resolution: {integrity: sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==} - buffers@0.1.1: - resolution: {integrity: sha512-9q/rDEGSb/Qsvv2qvzIzdluL5k7AaJOTrw23z9reQthrbF7is4CtlT0DXyO1oei2DCp4uojjzQ7igaSHp1kAEQ==} - engines: {node: '>=0.2.0'} - bytes@3.1.2: resolution: {integrity: sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==} engines: {node: '>= 0.8'} @@ -1338,9 +1305,6 @@ packages: resolution: {integrity: sha512-NUPRluOfOiTKBKvWPtSD4PhFvWCqOi0BGStNWs57X9js7XGTprSmFoz5F0tWhR4WPjNeR9jXqdC7/UpSJTnlRg==} engines: {node: '>=18'} - chainsaw@0.1.0: - resolution: {integrity: sha512-75kWfWt6MEKNC8xYXIdRpDehRYY/tNSgwKaJq+dbbDcxORuVrrQ+SEHoWsniVn9XPYfP4gmdWIeDk/4YNp1rNQ==} - chalk@2.4.2: resolution: {integrity: sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==} engines: {node: '>=4'} @@ -1558,9 +1522,6 @@ packages: resolution: {integrity: sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==} engines: {node: '>= 0.4'} - duplexer2@0.1.4: - resolution: {integrity: sha512-asLFVfWWtJ90ZyOUHMqk7/S2w2guQKxUI2itj3d92ADHhxUSbCMGi1f1cBcJ7xM1To+pE/Khbwo1yuNbMEPKeA==} - duplexify@4.1.3: resolution: {integrity: sha512-M3BmBhwJRZsSx38lZyhE53Csddgzl5R7xGJNk7CVddZD6CcmwMCH8J+7AprIrQKH7TonKxaCjcv27Qmf+sQ+oA==} @@ -1979,11 +1940,6 @@ packages: engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0} os: [darwin] - fstream@1.0.12: - resolution: {integrity: sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==} - engines: {node: '>=0.6'} - deprecated: This package is no longer supported. - function-bind@1.1.2: resolution: {integrity: sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==} @@ -2536,9 +2492,6 @@ packages: resolution: {integrity: sha512-WkUDrojuJs0xkgGf2udWxa3yGBRxPtxUkB79i6aCZLRgc7PM8fZe9TosfPDcvEpQZbuFASnHYmRLBLUbmLOIIA==} engines: {node: '>= 12.0.0'} - listenercount@1.0.1: - resolution: {integrity: sha512-3mk/Zag0+IJxeDrxSgaDPy4zZ3w05PRZeJNnlWhzFz5OkX49J4krc+A8X2d2M69vGMBEX0uyl8M+W+8gH+kBqQ==} - load-json-file@4.0.0: resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==} engines: {node: '>=4'} @@ -2752,10 +2705,6 @@ packages: mkdirp-classic@0.5.3: resolution: {integrity: sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==} - mkdirp@0.5.6: - resolution: {integrity: sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==} - hasBin: true - mkdirp@1.0.4: resolution: {integrity: sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==} engines: {node: '>=10'} @@ -3413,9 +3362,6 @@ packages: resolution: {integrity: sha512-RJRdvCo6IAnPdsvP/7m6bsQqNnn1FCBX5ZNtFL98MmFF/4xAIJTIg1YbHW5DC2W5SKZanrC6i4HsJqlajw/dZw==} engines: {node: '>= 0.4'} - setimmediate@1.0.5: - resolution: {integrity: sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==} - setprototypeof@1.2.0: resolution: {integrity: sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==} @@ -3720,9 +3666,6 @@ packages: tr46@0.0.3: resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==} - traverse@0.3.9: - resolution: {integrity: sha512-iawgk0hLP3SxGKDfnDJf8wTz4p2qImnyihM5Hh/sGvQ3K37dPi/w8sRhdNIxYA1TwFwc5mDhIJq+O0RsvXBKdQ==} - tree-kill@1.2.2: resolution: {integrity: sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==} hasBin: true @@ -3845,9 +3788,6 @@ packages: resolution: {integrity: sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==} engines: {node: '>= 0.8'} - unzipper@0.10.14: - resolution: {integrity: sha512-ti4wZj+0bQTiX2KmKWuwj7lhV+2n//uXEotUmGuQqrbVZSEGFMbI68+c6JCQ8aAmUWYvtHEz2A8K6wXvueR/6g==} - update-browserslist-db@1.3.3: resolution: {integrity: sha512-pJ2sYawQS0R/WI928Gj5GlPhTGzbMelq0+4INtSYNDV9ErKJcX6xjGWkoG/VnB3dpUm00zALaqkrUD77pO5TDQ==} hasBin: true @@ -3976,44 +3916,47 @@ packages: resolution: {integrity: sha512-6Ld3RYjygn5Ih7CkAtcAwiDQC+rakj2O+PnASfNyYv3sLmm44eJpEKzuPUN30Iy2UB09AZg8T6LBKWTJTEJDVw==} engines: {node: '>=14.0.0'} - vscode-languageclient@6.1.4: - resolution: {integrity: sha512-EUOU+bJu6axmt0RFNo3nrglQLPXMfanbYViJee3Fbn2VuQoX0ZOI4uTYhSRvYLP2vfwTP/juV62P/mksCdTZMA==} - engines: {vscode: ^1.41.0} + vscode-jsonrpc@9.0.2: + resolution: {integrity: sha512-SbQSV9yRemARxeXw6LU5sS6Zq0e9/DgCCX5yelH263ZQWukbTk8EF8fjTrr1dziasf4GwlJbvTwFnTrnQFWZXQ==} + engines: {node: '>=14.0.0'} + + vscode-languageclient@10.1.1: + resolution: {integrity: sha512-EbwIF+KUbwxD5jumQNpiBCv7BJM3Rierv4hcbw/p5jdsnwFFpR/B2VmwqfH4p5XsK46nkH3ugA3WtwJekHHJEw==} + engines: {vscode: ^1.91.0} vscode-languageclient@7.0.0: resolution: {integrity: sha512-P9AXdAPlsCgslpP9pRxYPqkNYV7Xq8300/aZDpO35j1fJm/ncize8iGswzYlcvFw5DQUx4eVk+KvfXdL0rehNg==} engines: {vscode: ^1.52.0} - vscode-languageserver-protocol@3.15.3: - resolution: {integrity: sha512-zrMuwHOAQRhjDSnflWdJG+O2ztMWss8GqUUB8dXLR/FPenwkiBNkMIJJYfSN6sgskvsF0rHAoBowNQfbyZnnvw==} - vscode-languageserver-protocol@3.16.0: resolution: {integrity: sha512-sdeUoAawceQdgIfTI+sdcwkiK2KU+2cbEYA0agzM2uqaUy2UpnnGHtWTHVEtS0ES4zHU0eMFRGN+oQgDxlD66A==} vscode-languageserver-protocol@3.17.0-next.14: resolution: {integrity: sha512-iangobY8dL6sFZkOx4OhRPJM9gN0I1caUsOVR+MnPozsqQUtwMXmbIcfaIf0Akp0pd3KhJDPf/tdwRX68QGeeA==} + vscode-languageserver-protocol@3.18.3: + resolution: {integrity: sha512-DF49+WeV5py4zO5hhobp60jjsDSK0lAqA0OuKBLBvp423HPWQcCbhZz3JgyfIewsEz2f8U+X75xNIFHdiXZm2w==} + vscode-languageserver-textdocument@1.0.14: resolution: {integrity: sha512-EQyqJMi552E4ZTf46izQ4Fj6XquqxCySR3J5ZSD1SisMf6RfpeOWHxGBE8Gr6V0/3GHIGdAzDn8F8+1nTGCnoQ==} - vscode-languageserver-types@3.15.1: - resolution: {integrity: sha512-+a9MPUQrNGRrGU630OGbYVQ+11iOIovjCkqxajPa9w57Sd5ruK8WQNsslzpa0x/QJqC8kRc2DUxWjIFwoNm4ZQ==} - vscode-languageserver-types@3.16.0: resolution: {integrity: sha512-k8luDIWJWyenLc5ToFQQMaSrqCHiLwyKPHKPQZ5zz21vM+vIVUSvsRpcbiECH4WR88K2XZqc4ScRcZ7nk/jbeA==} vscode-languageserver-types@3.17.0-next.7: resolution: {integrity: sha512-KH4zdG1qBXxoso61ChgpeoZYyHGJo8bV7Jv4I+fwQ1Ryy59JAxoZ9GAbhR5TeeafHctLcg6RFvY3m8Jqfu17cg==} + vscode-languageserver-types@3.18.3: + resolution: {integrity: sha512-XIlzJ7Qp/jzSI1ds7/FwPAWrPeTZA7pAtlW4hdJ1J6xXWJL6dR9QYnDhJOdLzdKhUQ5Mm6mvUMw+3DcOQQasPw==} + + vscode-languageserver@10.1.1: + resolution: {integrity: sha512-/cG04Fiq99rEtoDrfPpv0k6NyUFlck5GNtZLQZv1rxkBkc/4FrJNvEKTN5k1Si3O1hRguP++ciYlX9cdjdYxFQ==} + hasBin: true + vscode-languageserver@8.0.0-next.8: resolution: {integrity: sha512-Gq0uqKbOgw7YNwPxMoNCeh7mHKMhG5j6EuoSh+w5pnKd7Eu9a74cagqf9aZDVFWW6GRpqR/Z+1o6EXqDK+g2Tg==} hasBin: true - vscode-test@1.6.1: - resolution: {integrity: sha512-086q88T2ca1k95mUzffvbzb7esqQNvJgiwY4h29ukPhFo8u+vXOOmelUoU5EQUHs3Of8+JuQ3oGdbVCqaxuTXA==} - engines: {node: '>=8.9.3'} - deprecated: This package has been renamed to @vscode/test-electron, please update to the new name - vscode-uri@3.2.0: resolution: {integrity: sha512-m2gXo3bn0G1kT9InzMf07fTbqMbGtyckj3bH5ktLO+1Ssv+yiATZ4dhwaQv9UZWxJh6E9IFGnQyjgWVDWVBDrg==} @@ -4624,7 +4567,8 @@ snapshots: '@sideway/pinpoint@2.0.0': {} - '@tootallnate/once@1.1.2': {} + '@tootallnate/once@1.1.2': + optional: true '@tootallnate/once@2.0.1': {} @@ -4721,7 +4665,7 @@ snapshots: '@types/validator@13.15.10': {} - '@types/vscode@1.138.0': {} + '@types/vscode@1.91.0': {} '@types/ws@7.4.7': dependencies: @@ -5115,8 +5059,6 @@ snapshots: dependencies: tweetnacl: 0.14.5 - big-integer@1.6.52: {} - big.js@5.2.2: {} big.js@6.2.2: {} @@ -5125,11 +5067,6 @@ snapshots: binary-extensions@2.3.0: {} - binary@0.3.0: - dependencies: - buffers: 0.1.1 - chainsaw: 0.1.0 - bindings@1.5.0: dependencies: file-uri-to-path: 1.0.0 @@ -5140,8 +5077,6 @@ snapshots: inherits: 2.0.4 readable-stream: 3.6.2 - bluebird@3.4.7: {} - bluebird@3.7.2: {} body-parser@1.20.8: @@ -5190,8 +5125,6 @@ snapshots: buffer-from@1.1.2: {} - buffer-indexof-polyfill@1.0.2: {} - buffer-writer@2.0.0: {} buffer@5.7.1: @@ -5199,8 +5132,6 @@ snapshots: base64-js: 1.5.1 ieee754: 1.2.1 - buffers@0.1.1: {} - bytes@3.1.2: {} cac@7.0.0: {} @@ -5259,10 +5190,6 @@ snapshots: chai@6.2.2: {} - chainsaw@0.1.0: - dependencies: - traverse: 0.3.9 - chalk@2.4.2: dependencies: ansi-styles: 3.2.1 @@ -5472,10 +5399,6 @@ snapshots: es-errors: 1.3.0 gopd: 1.2.0 - duplexer2@0.1.4: - dependencies: - readable-stream: 2.3.8 - duplexify@4.1.3: dependencies: end-of-stream: 1.4.5 @@ -6008,13 +5931,6 @@ snapshots: fsevents@2.3.3: optional: true - fstream@1.0.12: - dependencies: - graceful-fs: 4.2.11 - inherits: 2.0.4 - mkdirp: 0.5.6 - rimraf: 2.7.1 - function-bind@1.1.2: {} function.prototype.name@1.2.0: @@ -6220,6 +6136,7 @@ snapshots: debug: 4.4.3 transitivePeerDependencies: - supports-color + optional: true http-proxy-agent@5.0.0: dependencies: @@ -6590,8 +6507,6 @@ snapshots: lightningcss-win32-arm64-msvc: 1.33.0 lightningcss-win32-x64-msvc: 1.33.0 - listenercount@1.0.1: {} - load-json-file@4.0.0: dependencies: graceful-fs: 4.2.11 @@ -6772,10 +6687,6 @@ snapshots: mkdirp-classic@0.5.3: {} - mkdirp@0.5.6: - dependencies: - minimist: 1.2.8 - mkdirp@1.0.4: {} moment-timezone@0.5.48: @@ -7331,6 +7242,7 @@ snapshots: rimraf@3.0.2: dependencies: glob: 7.2.3 + optional: true rolldown@1.2.11: dependencies: @@ -7503,8 +7415,6 @@ snapshots: es-errors: 1.3.0 es-object-atoms: 1.1.2 - setimmediate@1.0.5: {} - setprototypeof@1.2.0: {} shallow-clone@3.0.1: @@ -7847,8 +7757,6 @@ snapshots: tr46@0.0.3: {} - traverse@0.3.9: {} - tree-kill@1.2.2: {} ts-api-utils@2.5.0(typescript@6.0.3): @@ -7997,19 +7905,6 @@ snapshots: unpipe@1.0.0: {} - unzipper@0.10.14: - dependencies: - big-integer: 1.6.52 - binary: 0.3.0 - bluebird: 3.4.7 - buffer-indexof-polyfill: 1.0.2 - duplexer2: 0.1.4 - fstream: 1.0.12 - graceful-fs: 4.2.11 - listenercount: 1.0.1 - readable-stream: 2.3.8 - setimmediate: 1.0.5 - update-browserslist-db@1.3.3(browserslist@4.29.1): dependencies: browserslist: 4.29.1 @@ -8076,10 +7971,14 @@ snapshots: vscode-jsonrpc@8.0.0-next.6: {} - vscode-languageclient@6.1.4: + vscode-jsonrpc@9.0.2: {} + + vscode-languageclient@10.1.1: dependencies: - semver: 6.3.1 - vscode-languageserver-protocol: 3.15.3 + minimatch: 10.2.6 + semver: 7.8.5 + vscode-languageserver-protocol: 3.18.3 + vscode-languageserver-textdocument: 1.0.14 vscode-languageclient@7.0.0: dependencies: @@ -8087,11 +7986,6 @@ snapshots: semver: 7.8.5 vscode-languageserver-protocol: 3.16.0 - vscode-languageserver-protocol@3.15.3: - dependencies: - vscode-jsonrpc: 5.0.1 - vscode-languageserver-types: 3.15.1 - vscode-languageserver-protocol@3.16.0: dependencies: vscode-jsonrpc: 6.0.0 @@ -8102,26 +7996,26 @@ snapshots: vscode-jsonrpc: 8.0.0-next.6 vscode-languageserver-types: 3.17.0-next.7 - vscode-languageserver-textdocument@1.0.14: {} + vscode-languageserver-protocol@3.18.3: + dependencies: + vscode-jsonrpc: 9.0.2 + vscode-languageserver-types: 3.18.3 - vscode-languageserver-types@3.15.1: {} + vscode-languageserver-textdocument@1.0.14: {} vscode-languageserver-types@3.16.0: {} vscode-languageserver-types@3.17.0-next.7: {} - vscode-languageserver@8.0.0-next.8: + vscode-languageserver-types@3.18.3: {} + + vscode-languageserver@10.1.1: dependencies: - vscode-languageserver-protocol: 3.17.0-next.14 + vscode-languageserver-protocol: 3.18.3 - vscode-test@1.6.1: + vscode-languageserver@8.0.0-next.8: dependencies: - http-proxy-agent: 4.0.1 - https-proxy-agent: 5.0.1 - rimraf: 3.0.2 - unzipper: 0.10.14 - transitivePeerDependencies: - - supports-color + vscode-languageserver-protocol: 3.17.0-next.14 vscode-uri@3.2.0: {}