diff --git a/CHANGELOG.md b/CHANGELOG.md index 51fd3395..28ab86d9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +### Version 3.0.13 - pre-release + +- move to latest LSP libraries + ### Version 3.0.11 - pre-release - Enforcement of the validate setting. If the `eslint.validate` setting is specified only files in that list will be validated. For example, a setting of the form diff --git a/README.md b/README.md index 77162123..4c4cf443 100644 --- a/README.md +++ b/README.md @@ -23,6 +23,10 @@ This section describes major releases and their improvements. For a detailed lis From version 2.2.3 on forward odd minor or patch version numbers indicate an insider or pre-release. So versions `2.2.3`, `2.2.5` and `2.3.1` will all be pre-release versions. `2.2.10`, `2.4.10` and `3.0.0` will all be regular release versions. +### Version 3.0.13 - pre-release + +- move to latest LSP libraries + ### Version 3.0.11 - pre-release - Enforcement of the validate setting. If the `eslint.validate` setting is specified only files in that list will be validated. For example, a setting of the form diff --git a/client/package-lock.json b/client/package-lock.json index 0c2378c4..bc66517e 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -9,7 +9,7 @@ "version": "3.0.10", "license": "MIT", "dependencies": { - "vscode-languageclient": "10.0.0-next.9" + "vscode-languageclient": "10.0.0-next.12" }, "devDependencies": { "@types/vscode": "1.91.0" @@ -87,33 +87,33 @@ } }, "node_modules/vscode-languageclient": { - "version": "10.0.0-next.9", - "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-10.0.0-next.9.tgz", - "integrity": "sha512-DHEpX7EOCnI2DI5MzE3WknHIcJ29f1mUf058KjFY5PTqfV7HFpBIFPp35LipQ6zYTZN4oAgXUoitfmzvmBqVpQ==", + "version": "10.0.0-next.12", + "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-10.0.0-next.12.tgz", + "integrity": "sha512-q7cVYCcYiv+a+fJYCbjMMScOGBnX162IBeUMFg31mvnN7RHKx5/CwKaCz+r+RciJrRXMqS8y8qpEVGgeIPnbxg==", "license": "MIT", "dependencies": { "minimatch": "^9.0.3", "semver": "^7.6.0", - "vscode-languageserver-protocol": "3.17.6-next.7" + "vscode-languageserver-protocol": "3.17.6-next.10" }, "engines": { "vscode": "^1.91.0" } }, "node_modules/vscode-languageserver-protocol": { - "version": "3.17.6-next.7", - "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.6-next.7.tgz", - "integrity": "sha512-lx8BQ94x6jl6ZzZOrsN4RxwA1Xh0Ovpus+pWA9TXYF5A9EAAL+pTgYFRra3byucdjw3GDC6zbj7wviyfkMgYuA==", + "version": "3.17.6-next.10", + "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.6-next.10.tgz", + "integrity": "sha512-KOrrWn4NVC5jnFC5N6y/fyNKtx8rVYr67lhL/Z0P4ZBAN27aBsCnLBWAMIkYyJ1K8EZaE5r7gqdxrS9JPB6LIg==", "license": "MIT", "dependencies": { "vscode-jsonrpc": "9.0.0-next.5", - "vscode-languageserver-types": "3.17.6-next.4" + "vscode-languageserver-types": "3.17.6-next.5" } }, "node_modules/vscode-languageserver-types": { - "version": "3.17.6-next.4", - "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.6-next.4.tgz", - "integrity": "sha512-SeJTpH/S14EbxOAVaOUoGVqPToqpRTld5QO5Ghig3AlbFJTFF9Wu7srHMfa85L0SX1RYAuuCSFKJVVCxDIk1/Q==", + "version": "3.17.6-next.5", + "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.6-next.5.tgz", + "integrity": "sha512-QFmf3Yl1tCgUQfA77N9Me/LXldJXkIVypQbty2rJ1DNHQkC+iwvm4Z2tXg9czSwlhvv0pD4pbF5mT7WhAglolw==", "license": "MIT" }, "node_modules/yallist": { @@ -172,28 +172,28 @@ "integrity": "sha512-Sl/8RAJtfF/2x/TPBVRuhzRAcqYR/QDjEjNqMcoKFfqsxfVUPzikupRDQYB77Gkbt1RrW43sSuZ5uLtNAcikQQ==" }, "vscode-languageclient": { - "version": "10.0.0-next.9", - "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-10.0.0-next.9.tgz", - "integrity": "sha512-DHEpX7EOCnI2DI5MzE3WknHIcJ29f1mUf058KjFY5PTqfV7HFpBIFPp35LipQ6zYTZN4oAgXUoitfmzvmBqVpQ==", + "version": "10.0.0-next.12", + "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-10.0.0-next.12.tgz", + "integrity": "sha512-q7cVYCcYiv+a+fJYCbjMMScOGBnX162IBeUMFg31mvnN7RHKx5/CwKaCz+r+RciJrRXMqS8y8qpEVGgeIPnbxg==", "requires": { "minimatch": "^9.0.3", "semver": "^7.6.0", - "vscode-languageserver-protocol": "3.17.6-next.7" + "vscode-languageserver-protocol": "3.17.6-next.10" } }, "vscode-languageserver-protocol": { - "version": "3.17.6-next.7", - "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.6-next.7.tgz", - "integrity": "sha512-lx8BQ94x6jl6ZzZOrsN4RxwA1Xh0Ovpus+pWA9TXYF5A9EAAL+pTgYFRra3byucdjw3GDC6zbj7wviyfkMgYuA==", + "version": "3.17.6-next.10", + "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.6-next.10.tgz", + "integrity": "sha512-KOrrWn4NVC5jnFC5N6y/fyNKtx8rVYr67lhL/Z0P4ZBAN27aBsCnLBWAMIkYyJ1K8EZaE5r7gqdxrS9JPB6LIg==", "requires": { "vscode-jsonrpc": "9.0.0-next.5", - "vscode-languageserver-types": "3.17.6-next.4" + "vscode-languageserver-types": "3.17.6-next.5" } }, "vscode-languageserver-types": { - "version": "3.17.6-next.4", - "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.6-next.4.tgz", - "integrity": "sha512-SeJTpH/S14EbxOAVaOUoGVqPToqpRTld5QO5Ghig3AlbFJTFF9Wu7srHMfa85L0SX1RYAuuCSFKJVVCxDIk1/Q==" + "version": "3.17.6-next.5", + "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.6-next.5.tgz", + "integrity": "sha512-QFmf3Yl1tCgUQfA77N9Me/LXldJXkIVypQbty2rJ1DNHQkC+iwvm4Z2tXg9czSwlhvv0pD4pbF5mT7WhAglolw==" }, "yallist": { "version": "4.0.0", diff --git a/client/package.json b/client/package.json index 8eb54a88..ed583c74 100644 --- a/client/package.json +++ b/client/package.json @@ -20,7 +20,7 @@ "@types/vscode": "1.91.0" }, "dependencies": { - "vscode-languageclient": "10.0.0-next.9" + "vscode-languageclient": "10.0.0-next.12" }, "scripts": { "test": "node ../node_modules/mocha/bin/_mocha", diff --git a/client/src/client.ts b/client/src/client.ts index a29345d5..0c5bf92e 100644 --- a/client/src/client.ts +++ b/client/src/client.ts @@ -13,7 +13,7 @@ import { } from 'vscode'; import { - LanguageClient, LanguageClientOptions, TransportKind, ErrorHandler, CloseAction, RevealOutputChannelOn, ServerOptions, DocumentFilter, + LanguageClient, LanguageClientOptions, TransportKind, ErrorHandler, CloseAction, RevealOutputChannelOn, ServerOptions, DidCloseTextDocumentNotification, DidOpenTextDocumentNotification, State, VersionedTextDocumentIdentifier, ExecuteCommandParams, ExecuteCommandRequest, ConfigurationParams, NotebookDocumentSyncRegistrationType, DiagnosticPullMode, DocumentDiagnosticRequest } from 'vscode-languageclient/node'; @@ -137,8 +137,8 @@ export namespace ESLintClient { export function create(context: ExtensionContext, validator: Validator): [LanguageClient, () => void] { // Filters for client options - const packageJsonFilter: DocumentFilter = { scheme: 'file', pattern: '**/package.json' }; - const configFileFilter: DocumentFilter = { scheme: 'file', pattern: '**/{.eslintr{c.js,c.yaml,c.yml,c,c.json},eslint.confi{g.js,g.mjs,g.cjs}}' }; + const packageJsonFilter: VDocumentFilter = { scheme: 'file', pattern: '**/package.json' }; + const configFileFilter: VDocumentFilter = { scheme: 'file', pattern: '**/{.eslintr{c.js,c.yaml,c.yml,c,c.json},eslint.confi{g.js,g.mjs,g.cjs}}' }; const supportedQuickFixKinds: Set = new Set([CodeActionKind.Source.value, CodeActionKind.SourceFixAll.value, `${CodeActionKind.SourceFixAll.value}.eslint`, CodeActionKind.QuickFix.value]); // A map of documents synced to the server diff --git a/package-lock.json b/package-lock.json index ea8e5088..4b9bec36 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "vscode-eslint", - "version": "3.0.10", + "version": "3.0.11", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "vscode-eslint", - "version": "3.0.10", + "version": "3.0.11", "hasInstallScript": true, "license": "MIT", "devDependencies": { diff --git a/package.json b/package.json index 9e5ba6a0..b23af18a 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "vscode-eslint", "displayName": "ESLint", "description": "Integrates ESLint JavaScript into VS Code.", - "version": "3.0.11", + "version": "3.0.13", "author": "Microsoft Corporation", "license": "MIT", "repository": { diff --git a/server/package-lock.json b/server/package-lock.json index ba24ecd0..d39898fa 100644 --- a/server/package-lock.json +++ b/server/package-lock.json @@ -10,7 +10,7 @@ "license": "MIT", "dependencies": { "semver": "^7.6.0", - "vscode-languageserver": "10.0.0-next.7", + "vscode-languageserver": "10.0.0-next.10", "vscode-languageserver-textdocument": "1.0.11", "vscode-uri": "^3.0.8" }, @@ -62,25 +62,25 @@ } }, "node_modules/vscode-languageserver": { - "version": "10.0.0-next.7", - "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-10.0.0-next.7.tgz", - "integrity": "sha512-z7x3alNgWful9KLz/IXBVqv2HwHCE1IQeuUEvmSInJTGH9RxFztxk9WDpY1PRQzGO78NG0qR/yuS/VscIpx39Q==", + "version": "10.0.0-next.10", + "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-10.0.0-next.10.tgz", + "integrity": "sha512-8jTQxGpdGqceFNJMBE8dNVvzwwF1TuIA/XkgdrDDDwBJog/guAPButDfl7UzhXS7dCMKE4/uQqJ26u9X+0EdnA==", "license": "MIT", "dependencies": { - "vscode-languageserver-protocol": "3.17.6-next.7" + "vscode-languageserver-protocol": "3.17.6-next.10" }, "bin": { "installServerIntoExtension": "bin/installServerIntoExtension" } }, "node_modules/vscode-languageserver-protocol": { - "version": "3.17.6-next.7", - "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.6-next.7.tgz", - "integrity": "sha512-lx8BQ94x6jl6ZzZOrsN4RxwA1Xh0Ovpus+pWA9TXYF5A9EAAL+pTgYFRra3byucdjw3GDC6zbj7wviyfkMgYuA==", + "version": "3.17.6-next.10", + "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.6-next.10.tgz", + "integrity": "sha512-KOrrWn4NVC5jnFC5N6y/fyNKtx8rVYr67lhL/Z0P4ZBAN27aBsCnLBWAMIkYyJ1K8EZaE5r7gqdxrS9JPB6LIg==", "license": "MIT", "dependencies": { "vscode-jsonrpc": "9.0.0-next.5", - "vscode-languageserver-types": "3.17.6-next.4" + "vscode-languageserver-types": "3.17.6-next.5" } }, "node_modules/vscode-languageserver-textdocument": { @@ -89,9 +89,9 @@ "integrity": "sha512-X+8T3GoiwTVlJbicx/sIAF+yuJAqz8VvwJyoMVhwEMoEKE/fkDmrqUgDMyBECcM2A2frVZIUj5HI/ErRXCfOeA==" }, "node_modules/vscode-languageserver-types": { - "version": "3.17.6-next.4", - "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.6-next.4.tgz", - "integrity": "sha512-SeJTpH/S14EbxOAVaOUoGVqPToqpRTld5QO5Ghig3AlbFJTFF9Wu7srHMfa85L0SX1RYAuuCSFKJVVCxDIk1/Q==", + "version": "3.17.6-next.5", + "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.6-next.5.tgz", + "integrity": "sha512-QFmf3Yl1tCgUQfA77N9Me/LXldJXkIVypQbty2rJ1DNHQkC+iwvm4Z2tXg9czSwlhvv0pD4pbF5mT7WhAglolw==", "license": "MIT" }, "node_modules/vscode-uri": { diff --git a/server/package.json b/server/package.json index 7d885445..87490a09 100644 --- a/server/package.json +++ b/server/package.json @@ -18,7 +18,7 @@ "@types/semver": "^7.5.8" }, "dependencies": { - "vscode-languageserver": "10.0.0-next.7", + "vscode-languageserver": "10.0.0-next.10", "vscode-languageserver-textdocument": "1.0.11", "vscode-uri": "^3.0.8", "semver": "^7.6.0"