diff --git a/package-lock.json b/package-lock.json index 36ba1619..cedba2d0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,7 +13,7 @@ "@cucumber/language-service": "^1.7.0", "fast-glob": "3.3.3", "source-map-support": "0.5.21", - "vscode-languageserver": "8.0.2", + "vscode-languageserver": "10.1.0", "vscode-languageserver-textdocument": "1.0.13", "vscode-languageserver-types": "3.18.0" }, @@ -5522,11 +5522,12 @@ } }, "node_modules/vscode-languageserver": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-8.0.2.tgz", - "integrity": "sha512-bpEt2ggPxKzsAOZlXmCJ50bV7VrxwCS5BI4+egUmure/oI/t4OlFzi/YNtVvY24A2UDOZAgwFGgnZPwqSJubkA==", + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-10.1.0.tgz", + "integrity": "sha512-9gEWpXkYGXoqG7pBnE8O8hx/yP7+Aabn4+peQ3KDicQv6qunHSWyLTud3OF0w4S2+HfDD+5HqYKiXQW9HAU6mA==", + "license": "MIT", "dependencies": { - "vscode-languageserver-protocol": "3.17.2" + "vscode-languageserver-protocol": "3.18.2" }, "bin": { "installServerIntoExtension": "bin/installServerIntoExtension" @@ -5536,6 +5537,7 @@ "version": "3.17.2", "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.2.tgz", "integrity": "sha512-8kYisQ3z/SQ2kyjlNeQxbkkTNmVFoQCqkmGrzLH6A9ecPlgTbp3wDTnUNqaUxYr4vlAcloxx8zwy7G5WdguYNg==", + "dev": true, "dependencies": { "vscode-jsonrpc": "8.0.2", "vscode-languageserver-types": "3.17.2" @@ -5545,6 +5547,7 @@ "version": "8.0.2", "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.0.2.tgz", "integrity": "sha512-RY7HwI/ydoC1Wwg4gJ3y6LpU9FJRZAUnTYMXthqhFXXu77ErDd/xkREpGuk4MyYkk4a+XDWAMqe0S3KkelYQEQ==", + "dev": true, "engines": { "node": ">=14.0.0" } @@ -5552,7 +5555,8 @@ "node_modules/vscode-languageserver-protocol/node_modules/vscode-languageserver-types": { "version": "3.17.2", "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.2.tgz", - "integrity": "sha512-zHhCWatviizPIq9B7Vh9uvrH6x3sK8itC84HkamnBWoDFJtzBf7SWlpLCZUit72b3os45h6RWQNC9xHRDF8dRA==" + "integrity": "sha512-zHhCWatviizPIq9B7Vh9uvrH6x3sK8itC84HkamnBWoDFJtzBf7SWlpLCZUit72b3os45h6RWQNC9xHRDF8dRA==", + "dev": true }, "node_modules/vscode-languageserver-textdocument": { "version": "1.0.13", @@ -5565,6 +5569,25 @@ "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.18.0.tgz", "integrity": "sha512-8TsGPNMIMiiBdkORgRSvLjuiEIiAFtO+KssmYWxQ+uSVvlf7RjK8YKCOjPzZ+YA04jXEV7+7LvkSmHkhpNS99g==" }, + "node_modules/vscode-languageserver/node_modules/vscode-jsonrpc": { + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-9.0.1.tgz", + "integrity": "sha512-rfuA6T75H6m5EkbhtEPzre9pT0HPcDI2MMy4+nPFIBks5J8JBAUHD4tRYSgaBOijIEC7SRkC1kKyXTLqbmh9jw==", + "license": "MIT", + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/vscode-languageserver/node_modules/vscode-languageserver-protocol": { + "version": "3.18.2", + "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.18.2.tgz", + "integrity": "sha512-XRyDbT0Pp3sSNti3JmxVEUMySWCSi1hhM+/KUlCy1hV1zmrqpM1OwO12EAki8blhmLuIMpaJrYbo0OzGVfK2Qg==", + "license": "MIT", + "dependencies": { + "vscode-jsonrpc": "9.0.1", + "vscode-languageserver-types": "3.18.0" + } + }, "node_modules/web-tree-sitter": { "version": "0.24.6", "resolved": "https://registry.npmjs.org/web-tree-sitter/-/web-tree-sitter-0.24.6.tgz", @@ -9665,17 +9688,34 @@ "dev": true }, "vscode-languageserver": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-8.0.2.tgz", - "integrity": "sha512-bpEt2ggPxKzsAOZlXmCJ50bV7VrxwCS5BI4+egUmure/oI/t4OlFzi/YNtVvY24A2UDOZAgwFGgnZPwqSJubkA==", + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-10.1.0.tgz", + "integrity": "sha512-9gEWpXkYGXoqG7pBnE8O8hx/yP7+Aabn4+peQ3KDicQv6qunHSWyLTud3OF0w4S2+HfDD+5HqYKiXQW9HAU6mA==", "requires": { - "vscode-languageserver-protocol": "3.17.2" + "vscode-languageserver-protocol": "3.18.2" + }, + "dependencies": { + "vscode-jsonrpc": { + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-9.0.1.tgz", + "integrity": "sha512-rfuA6T75H6m5EkbhtEPzre9pT0HPcDI2MMy4+nPFIBks5J8JBAUHD4tRYSgaBOijIEC7SRkC1kKyXTLqbmh9jw==" + }, + "vscode-languageserver-protocol": { + "version": "3.18.2", + "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.18.2.tgz", + "integrity": "sha512-XRyDbT0Pp3sSNti3JmxVEUMySWCSi1hhM+/KUlCy1hV1zmrqpM1OwO12EAki8blhmLuIMpaJrYbo0OzGVfK2Qg==", + "requires": { + "vscode-jsonrpc": "9.0.1", + "vscode-languageserver-types": "3.18.0" + } + } } }, "vscode-languageserver-protocol": { "version": "3.17.2", "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.2.tgz", "integrity": "sha512-8kYisQ3z/SQ2kyjlNeQxbkkTNmVFoQCqkmGrzLH6A9ecPlgTbp3wDTnUNqaUxYr4vlAcloxx8zwy7G5WdguYNg==", + "dev": true, "requires": { "vscode-jsonrpc": "8.0.2", "vscode-languageserver-types": "3.17.2" @@ -9684,12 +9724,14 @@ "vscode-jsonrpc": { "version": "8.0.2", "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.0.2.tgz", - "integrity": "sha512-RY7HwI/ydoC1Wwg4gJ3y6LpU9FJRZAUnTYMXthqhFXXu77ErDd/xkREpGuk4MyYkk4a+XDWAMqe0S3KkelYQEQ==" + "integrity": "sha512-RY7HwI/ydoC1Wwg4gJ3y6LpU9FJRZAUnTYMXthqhFXXu77ErDd/xkREpGuk4MyYkk4a+XDWAMqe0S3KkelYQEQ==", + "dev": true }, "vscode-languageserver-types": { "version": "3.17.2", "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.2.tgz", - "integrity": "sha512-zHhCWatviizPIq9B7Vh9uvrH6x3sK8itC84HkamnBWoDFJtzBf7SWlpLCZUit72b3os45h6RWQNC9xHRDF8dRA==" + "integrity": "sha512-zHhCWatviizPIq9B7Vh9uvrH6x3sK8itC84HkamnBWoDFJtzBf7SWlpLCZUit72b3os45h6RWQNC9xHRDF8dRA==", + "dev": true } } }, diff --git a/package.json b/package.json index 08e455c9..0f6e2e40 100644 --- a/package.json +++ b/package.json @@ -97,7 +97,7 @@ "@cucumber/language-service": "^1.7.0", "fast-glob": "3.3.3", "source-map-support": "0.5.21", - "vscode-languageserver": "8.0.2", + "vscode-languageserver": "10.1.0", "vscode-languageserver-textdocument": "1.0.13", "vscode-languageserver-types": "3.18.0" } diff --git a/test/CucumberLanguageServer.test.ts b/test/CucumberLanguageServer.test.ts index 1ebe0307..2c70de2c 100644 --- a/test/CucumberLanguageServer.test.ts +++ b/test/CucumberLanguageServer.test.ts @@ -1,8 +1,9 @@ import { WasmParserAdapter } from '@cucumber/language-service/wasm' import assert from 'assert' import { Duplex } from 'stream' -import { NullLogger, StreamMessageReader, StreamMessageWriter } from 'vscode-jsonrpc/node' import { + CompletionParams, + CompletionRequest, Connection, createProtocolConnection, DidChangeConfigurationNotification, @@ -14,11 +15,12 @@ import { ProtocolConnection, TextDocuments, } from 'vscode-languageserver' -import { createConnection } from 'vscode-languageserver/node' import { - CompletionParams, - CompletionRequest, -} from 'vscode-languageserver-protocol/lib/common/protocol' + createConnection, + NullLogger, + StreamMessageReader, + StreamMessageWriter, +} from 'vscode-languageserver/node' import { TextDocument } from 'vscode-languageserver-textdocument' import { CompletionItem, CompletionItemKind } from 'vscode-languageserver-types' diff --git a/test/standalone.test.ts b/test/standalone.test.ts index 2475b9a1..e4ff41f1 100644 --- a/test/standalone.test.ts +++ b/test/standalone.test.ts @@ -1,7 +1,6 @@ import assert from 'assert' import { ChildProcess, fork } from 'child_process' import { Duplex } from 'stream' -import { NullLogger, StreamMessageReader, StreamMessageWriter } from 'vscode-jsonrpc/node' import { createProtocolConnection, DidChangeConfigurationNotification, @@ -12,6 +11,7 @@ import { LogMessageParams, ProtocolConnection, } from 'vscode-languageserver' +import { NullLogger, StreamMessageReader, StreamMessageWriter } from 'vscode-languageserver/node' import { Settings } from '../src/types.js' diff --git a/tsconfig.json b/tsconfig.json index 005c7efa..846b61c1 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -16,6 +16,10 @@ "target": "ES6", "moduleResolution": "node", "allowSyntheticDefaultImports": true, - "noEmit": true + "noEmit": true, + "paths": { + "vscode-languageserver": ["node_modules/vscode-languageserver/lib/common/api"], + "vscode-languageserver/node": ["node_modules/vscode-languageserver/lib/node/main"] + } } }