From 2e6f5e04abf9e8de466d8bfef21747f4e91a9da8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 10 Jul 2025 09:30:10 +0000 Subject: [PATCH 1/5] Bump version to v1.17.5 --- extensions/ql-vscode/CHANGELOG.md | 2 ++ extensions/ql-vscode/package-lock.json | 4 ++-- extensions/ql-vscode/package.json | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/extensions/ql-vscode/CHANGELOG.md b/extensions/ql-vscode/CHANGELOG.md index a98b9bb959f..85ae4da32e9 100644 --- a/extensions/ql-vscode/CHANGELOG.md +++ b/extensions/ql-vscode/CHANGELOG.md @@ -1,5 +1,7 @@ # CodeQL for Visual Studio Code: Changelog +## [UNRELEASED] + ## 1.17.4 - 10 July 2025 - Fix variant analysis pack creation on some Windows systems [#4068](https://github.com/github/vscode-codeql/pull/4068) diff --git a/extensions/ql-vscode/package-lock.json b/extensions/ql-vscode/package-lock.json index 24c2c94bcec..6c1288ea76c 100644 --- a/extensions/ql-vscode/package-lock.json +++ b/extensions/ql-vscode/package-lock.json @@ -1,12 +1,12 @@ { "name": "vscode-codeql", - "version": "1.17.4", + "version": "1.17.5", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "vscode-codeql", - "version": "1.17.4", + "version": "1.17.5", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/extensions/ql-vscode/package.json b/extensions/ql-vscode/package.json index fdc50d26f8c..61362977bf6 100644 --- a/extensions/ql-vscode/package.json +++ b/extensions/ql-vscode/package.json @@ -4,7 +4,7 @@ "description": "CodeQL for Visual Studio Code", "author": "GitHub", "private": true, - "version": "1.17.4", + "version": "1.17.5", "publisher": "GitHub", "license": "MIT", "icon": "media/VS-marketplace-CodeQL-icon.png", From b08d3ffd18c93bb89c26026519e9265f98b7538c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 10 Jul 2025 13:46:33 +0000 Subject: [PATCH 2/5] Bump the typescript-eslint group in /extensions/ql-vscode with 2 updates Bumps the typescript-eslint group in /extensions/ql-vscode with 2 updates: [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) and [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser). Updates `@typescript-eslint/eslint-plugin` from 8.35.1 to 8.36.0 - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v8.36.0/packages/eslint-plugin) Updates `@typescript-eslint/parser` from 8.35.1 to 8.36.0 - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v8.36.0/packages/parser) --- updated-dependencies: - dependency-name: "@typescript-eslint/eslint-plugin" dependency-version: 8.36.0 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: typescript-eslint - dependency-name: "@typescript-eslint/parser" dependency-version: 8.36.0 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: typescript-eslint ... Signed-off-by: dependabot[bot] --- extensions/ql-vscode/package-lock.json | 204 ++++++++++++------------- extensions/ql-vscode/package.json | 4 +- 2 files changed, 104 insertions(+), 104 deletions(-) diff --git a/extensions/ql-vscode/package-lock.json b/extensions/ql-vscode/package-lock.json index 6c1288ea76c..78b2dc5ef01 100644 --- a/extensions/ql-vscode/package-lock.json +++ b/extensions/ql-vscode/package-lock.json @@ -96,8 +96,8 @@ "@types/tmp": "^0.2.6", "@types/vscode": "1.90.0", "@types/yauzl": "^2.10.3", - "@typescript-eslint/eslint-plugin": "^8.35.1", - "@typescript-eslint/parser": "^8.35.1", + "@typescript-eslint/eslint-plugin": "^8.36.0", + "@typescript-eslint/parser": "^8.36.0", "@vscode/test-electron": "^2.3.9", "@vscode/vsce": "^3.2.1", "ansi-colors": "^4.1.1", @@ -7978,17 +7978,17 @@ } }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "8.35.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.35.1.tgz", - "integrity": "sha512-9XNTlo7P7RJxbVeICaIIIEipqxLKguyh+3UbXuT2XQuFp6d8VOeDEGuz5IiX0dgZo8CiI6aOFLg4e8cF71SFVg==", + "version": "8.36.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.36.0.tgz", + "integrity": "sha512-lZNihHUVB6ZZiPBNgOQGSxUASI7UJWhT8nHyUGCnaQ28XFCw98IfrMCG3rUl1uwUWoAvodJQby2KTs79UTcrAg==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/regexpp": "^4.10.0", - "@typescript-eslint/scope-manager": "8.35.1", - "@typescript-eslint/type-utils": "8.35.1", - "@typescript-eslint/utils": "8.35.1", - "@typescript-eslint/visitor-keys": "8.35.1", + "@typescript-eslint/scope-manager": "8.36.0", + "@typescript-eslint/type-utils": "8.36.0", + "@typescript-eslint/utils": "8.36.0", + "@typescript-eslint/visitor-keys": "8.36.0", "graphemer": "^1.4.0", "ignore": "^7.0.0", "natural-compare": "^1.4.0", @@ -8002,20 +8002,20 @@ "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "@typescript-eslint/parser": "^8.35.1", + "@typescript-eslint/parser": "^8.36.0", "eslint": "^8.57.0 || ^9.0.0", "typescript": ">=4.8.4 <5.9.0" } }, "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/scope-manager": { - "version": "8.35.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.35.1.tgz", - "integrity": "sha512-s/Bpd4i7ht2934nG+UoSPlYXd08KYz3bmjLEb7Ye1UVob0d1ENiT3lY8bsCmik4RqfSbPw9xJJHbugpPpP5JUg==", + "version": "8.36.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.36.0.tgz", + "integrity": "sha512-wCnapIKnDkN62fYtTGv2+RY8FlnBYA3tNm0fm91kc2BjPhV2vIjwwozJ7LToaLAyb1ca8BxrS7vT+Pvvf7RvqA==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.35.1", - "@typescript-eslint/visitor-keys": "8.35.1" + "@typescript-eslint/types": "8.36.0", + "@typescript-eslint/visitor-keys": "8.36.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -8026,9 +8026,9 @@ } }, "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/types": { - "version": "8.35.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.35.1.tgz", - "integrity": "sha512-q/O04vVnKHfrrhNAscndAn1tuQhIkwqnaW+eu5waD5IPts2eX1dgJxgqcPx5BX109/qAz7IG6VrEPTOYKCNfRQ==", + "version": "8.36.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.36.0.tgz", + "integrity": "sha512-xGms6l5cTJKQPZOKM75Dl9yBfNdGeLRsIyufewnxT4vZTrjC0ImQT4fj8QmtJK84F58uSh5HVBSANwcfiXxABQ==", "dev": true, "license": "MIT", "engines": { @@ -8040,16 +8040,16 @@ } }, "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/typescript-estree": { - "version": "8.35.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.35.1.tgz", - "integrity": "sha512-Vvpuvj4tBxIka7cPs6Y1uvM7gJgdF5Uu9F+mBJBPY4MhvjrjWGK4H0lVgLJd/8PWZ23FTqsaJaLEkBCFUk8Y9g==", + "version": "8.36.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.36.0.tgz", + "integrity": "sha512-JaS8bDVrfVJX4av0jLpe4ye0BpAaUW7+tnS4Y4ETa3q7NoZgzYbN9zDQTJ8kPb5fQ4n0hliAt9tA4Pfs2zA2Hg==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/project-service": "8.35.1", - "@typescript-eslint/tsconfig-utils": "8.35.1", - "@typescript-eslint/types": "8.35.1", - "@typescript-eslint/visitor-keys": "8.35.1", + "@typescript-eslint/project-service": "8.36.0", + "@typescript-eslint/tsconfig-utils": "8.36.0", + "@typescript-eslint/types": "8.36.0", + "@typescript-eslint/visitor-keys": "8.36.0", "debug": "^4.3.4", "fast-glob": "^3.3.2", "is-glob": "^4.0.3", @@ -8069,16 +8069,16 @@ } }, "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/utils": { - "version": "8.35.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.35.1.tgz", - "integrity": "sha512-lhnwatFmOFcazAsUm3ZnZFpXSxiwoa1Lj50HphnDe1Et01NF4+hrdXONSUHIcbVu2eFb1bAf+5yjXkGVkXBKAQ==", + "version": "8.36.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.36.0.tgz", + "integrity": "sha512-VOqmHu42aEMT+P2qYjylw6zP/3E/HvptRwdn/PZxyV27KhZg2IOszXod4NcXisWzPAGSS4trE/g4moNj6XmH2g==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.7.0", - "@typescript-eslint/scope-manager": "8.35.1", - "@typescript-eslint/types": "8.35.1", - "@typescript-eslint/typescript-estree": "8.35.1" + "@typescript-eslint/scope-manager": "8.36.0", + "@typescript-eslint/types": "8.36.0", + "@typescript-eslint/typescript-estree": "8.36.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -8093,13 +8093,13 @@ } }, "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/visitor-keys": { - "version": "8.35.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.35.1.tgz", - "integrity": "sha512-VRwixir4zBWCSTP/ljEo091lbpypz57PoeAQ9imjG+vbeof9LplljsL1mos4ccG6H9IjfrVGM359RozUnuFhpw==", + "version": "8.36.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.36.0.tgz", + "integrity": "sha512-vZrhV2lRPWDuGoxcmrzRZyxAggPL+qp3WzUrlZD+slFueDiYHxeBa34dUXPuC0RmGKzl4lS5kFJYvKCq9cnNDA==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.35.1", + "@typescript-eslint/types": "8.36.0", "eslint-visitor-keys": "^4.2.1" }, "engines": { @@ -8314,16 +8314,16 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "8.35.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.35.1.tgz", - "integrity": "sha512-3MyiDfrfLeK06bi/g9DqJxP5pV74LNv4rFTyvGDmT3x2p1yp1lOd+qYZfiRPIOf/oON+WRZR5wxxuF85qOar+w==", + "version": "8.36.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.36.0.tgz", + "integrity": "sha512-FuYgkHwZLuPbZjQHzJXrtXreJdFMKl16BFYyRrLxDhWr6Qr7Kbcu2s1Yhu8tsiMXw1S0W1pjfFfYEt+R604s+Q==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/scope-manager": "8.35.1", - "@typescript-eslint/types": "8.35.1", - "@typescript-eslint/typescript-estree": "8.35.1", - "@typescript-eslint/visitor-keys": "8.35.1", + "@typescript-eslint/scope-manager": "8.36.0", + "@typescript-eslint/types": "8.36.0", + "@typescript-eslint/typescript-estree": "8.36.0", + "@typescript-eslint/visitor-keys": "8.36.0", "debug": "^4.3.4" }, "engines": { @@ -8339,14 +8339,14 @@ } }, "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/scope-manager": { - "version": "8.35.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.35.1.tgz", - "integrity": "sha512-s/Bpd4i7ht2934nG+UoSPlYXd08KYz3bmjLEb7Ye1UVob0d1ENiT3lY8bsCmik4RqfSbPw9xJJHbugpPpP5JUg==", + "version": "8.36.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.36.0.tgz", + "integrity": "sha512-wCnapIKnDkN62fYtTGv2+RY8FlnBYA3tNm0fm91kc2BjPhV2vIjwwozJ7LToaLAyb1ca8BxrS7vT+Pvvf7RvqA==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.35.1", - "@typescript-eslint/visitor-keys": "8.35.1" + "@typescript-eslint/types": "8.36.0", + "@typescript-eslint/visitor-keys": "8.36.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -8357,9 +8357,9 @@ } }, "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types": { - "version": "8.35.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.35.1.tgz", - "integrity": "sha512-q/O04vVnKHfrrhNAscndAn1tuQhIkwqnaW+eu5waD5IPts2eX1dgJxgqcPx5BX109/qAz7IG6VrEPTOYKCNfRQ==", + "version": "8.36.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.36.0.tgz", + "integrity": "sha512-xGms6l5cTJKQPZOKM75Dl9yBfNdGeLRsIyufewnxT4vZTrjC0ImQT4fj8QmtJK84F58uSh5HVBSANwcfiXxABQ==", "dev": true, "license": "MIT", "engines": { @@ -8371,16 +8371,16 @@ } }, "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/typescript-estree": { - "version": "8.35.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.35.1.tgz", - "integrity": "sha512-Vvpuvj4tBxIka7cPs6Y1uvM7gJgdF5Uu9F+mBJBPY4MhvjrjWGK4H0lVgLJd/8PWZ23FTqsaJaLEkBCFUk8Y9g==", + "version": "8.36.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.36.0.tgz", + "integrity": "sha512-JaS8bDVrfVJX4av0jLpe4ye0BpAaUW7+tnS4Y4ETa3q7NoZgzYbN9zDQTJ8kPb5fQ4n0hliAt9tA4Pfs2zA2Hg==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/project-service": "8.35.1", - "@typescript-eslint/tsconfig-utils": "8.35.1", - "@typescript-eslint/types": "8.35.1", - "@typescript-eslint/visitor-keys": "8.35.1", + "@typescript-eslint/project-service": "8.36.0", + "@typescript-eslint/tsconfig-utils": "8.36.0", + "@typescript-eslint/types": "8.36.0", + "@typescript-eslint/visitor-keys": "8.36.0", "debug": "^4.3.4", "fast-glob": "^3.3.2", "is-glob": "^4.0.3", @@ -8400,13 +8400,13 @@ } }, "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/visitor-keys": { - "version": "8.35.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.35.1.tgz", - "integrity": "sha512-VRwixir4zBWCSTP/ljEo091lbpypz57PoeAQ9imjG+vbeof9LplljsL1mos4ccG6H9IjfrVGM359RozUnuFhpw==", + "version": "8.36.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.36.0.tgz", + "integrity": "sha512-vZrhV2lRPWDuGoxcmrzRZyxAggPL+qp3WzUrlZD+slFueDiYHxeBa34dUXPuC0RmGKzl4lS5kFJYvKCq9cnNDA==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.35.1", + "@typescript-eslint/types": "8.36.0", "eslint-visitor-keys": "^4.2.1" }, "engines": { @@ -8470,14 +8470,14 @@ } }, "node_modules/@typescript-eslint/project-service": { - "version": "8.35.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.35.1.tgz", - "integrity": "sha512-VYxn/5LOpVxADAuP3NrnxxHYfzVtQzLKeldIhDhzC8UHaiQvYlXvKuVho1qLduFbJjjy5U5bkGwa3rUGUb1Q6Q==", + "version": "8.36.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.36.0.tgz", + "integrity": "sha512-JAhQFIABkWccQYeLMrHadu/fhpzmSQ1F1KXkpzqiVxA/iYI6UnRt2trqXHt1sYEcw1mxLnB9rKMsOxXPxowN/g==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/tsconfig-utils": "^8.35.1", - "@typescript-eslint/types": "^8.35.1", + "@typescript-eslint/tsconfig-utils": "^8.36.0", + "@typescript-eslint/types": "^8.36.0", "debug": "^4.3.4" }, "engines": { @@ -8492,9 +8492,9 @@ } }, "node_modules/@typescript-eslint/project-service/node_modules/@typescript-eslint/types": { - "version": "8.35.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.35.1.tgz", - "integrity": "sha512-q/O04vVnKHfrrhNAscndAn1tuQhIkwqnaW+eu5waD5IPts2eX1dgJxgqcPx5BX109/qAz7IG6VrEPTOYKCNfRQ==", + "version": "8.36.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.36.0.tgz", + "integrity": "sha512-xGms6l5cTJKQPZOKM75Dl9yBfNdGeLRsIyufewnxT4vZTrjC0ImQT4fj8QmtJK84F58uSh5HVBSANwcfiXxABQ==", "dev": true, "license": "MIT", "engines": { @@ -8523,9 +8523,9 @@ } }, "node_modules/@typescript-eslint/tsconfig-utils": { - "version": "8.35.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.35.1.tgz", - "integrity": "sha512-K5/U9VmT9dTHoNowWZpz+/TObS3xqC5h0xAIjXPw+MNcKV9qg6eSatEnmeAwkjHijhACH0/N7bkhKvbt1+DXWQ==", + "version": "8.36.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.36.0.tgz", + "integrity": "sha512-Nhh3TIEgN18mNbdXpd5Q8mSCBnrZQeY9V7Ca3dqYvNDStNIGRmJA6dmrIPMJ0kow3C7gcQbpsG2rPzy1Ks/AnA==", "dev": true, "license": "MIT", "engines": { @@ -8540,14 +8540,14 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "8.35.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.35.1.tgz", - "integrity": "sha512-HOrUBlfVRz5W2LIKpXzZoy6VTZzMu2n8q9C2V/cFngIC5U1nStJgv0tMV4sZPzdf4wQm9/ToWUFPMN9Vq9VJQQ==", + "version": "8.36.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.36.0.tgz", + "integrity": "sha512-5aaGYG8cVDd6cxfk/ynpYzxBRZJk7w/ymto6uiyUFtdCozQIsQWh7M28/6r57Fwkbweng8qAzoMCPwSJfWlmsg==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/typescript-estree": "8.35.1", - "@typescript-eslint/utils": "8.35.1", + "@typescript-eslint/typescript-estree": "8.36.0", + "@typescript-eslint/utils": "8.36.0", "debug": "^4.3.4", "ts-api-utils": "^2.1.0" }, @@ -8564,14 +8564,14 @@ } }, "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/scope-manager": { - "version": "8.35.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.35.1.tgz", - "integrity": "sha512-s/Bpd4i7ht2934nG+UoSPlYXd08KYz3bmjLEb7Ye1UVob0d1ENiT3lY8bsCmik4RqfSbPw9xJJHbugpPpP5JUg==", + "version": "8.36.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.36.0.tgz", + "integrity": "sha512-wCnapIKnDkN62fYtTGv2+RY8FlnBYA3tNm0fm91kc2BjPhV2vIjwwozJ7LToaLAyb1ca8BxrS7vT+Pvvf7RvqA==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.35.1", - "@typescript-eslint/visitor-keys": "8.35.1" + "@typescript-eslint/types": "8.36.0", + "@typescript-eslint/visitor-keys": "8.36.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -8582,9 +8582,9 @@ } }, "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/types": { - "version": "8.35.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.35.1.tgz", - "integrity": "sha512-q/O04vVnKHfrrhNAscndAn1tuQhIkwqnaW+eu5waD5IPts2eX1dgJxgqcPx5BX109/qAz7IG6VrEPTOYKCNfRQ==", + "version": "8.36.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.36.0.tgz", + "integrity": "sha512-xGms6l5cTJKQPZOKM75Dl9yBfNdGeLRsIyufewnxT4vZTrjC0ImQT4fj8QmtJK84F58uSh5HVBSANwcfiXxABQ==", "dev": true, "license": "MIT", "engines": { @@ -8596,16 +8596,16 @@ } }, "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/typescript-estree": { - "version": "8.35.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.35.1.tgz", - "integrity": "sha512-Vvpuvj4tBxIka7cPs6Y1uvM7gJgdF5Uu9F+mBJBPY4MhvjrjWGK4H0lVgLJd/8PWZ23FTqsaJaLEkBCFUk8Y9g==", + "version": "8.36.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.36.0.tgz", + "integrity": "sha512-JaS8bDVrfVJX4av0jLpe4ye0BpAaUW7+tnS4Y4ETa3q7NoZgzYbN9zDQTJ8kPb5fQ4n0hliAt9tA4Pfs2zA2Hg==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/project-service": "8.35.1", - "@typescript-eslint/tsconfig-utils": "8.35.1", - "@typescript-eslint/types": "8.35.1", - "@typescript-eslint/visitor-keys": "8.35.1", + "@typescript-eslint/project-service": "8.36.0", + "@typescript-eslint/tsconfig-utils": "8.36.0", + "@typescript-eslint/types": "8.36.0", + "@typescript-eslint/visitor-keys": "8.36.0", "debug": "^4.3.4", "fast-glob": "^3.3.2", "is-glob": "^4.0.3", @@ -8625,16 +8625,16 @@ } }, "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/utils": { - "version": "8.35.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.35.1.tgz", - "integrity": "sha512-lhnwatFmOFcazAsUm3ZnZFpXSxiwoa1Lj50HphnDe1Et01NF4+hrdXONSUHIcbVu2eFb1bAf+5yjXkGVkXBKAQ==", + "version": "8.36.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.36.0.tgz", + "integrity": "sha512-VOqmHu42aEMT+P2qYjylw6zP/3E/HvptRwdn/PZxyV27KhZg2IOszXod4NcXisWzPAGSS4trE/g4moNj6XmH2g==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.7.0", - "@typescript-eslint/scope-manager": "8.35.1", - "@typescript-eslint/types": "8.35.1", - "@typescript-eslint/typescript-estree": "8.35.1" + "@typescript-eslint/scope-manager": "8.36.0", + "@typescript-eslint/types": "8.36.0", + "@typescript-eslint/typescript-estree": "8.36.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -8649,13 +8649,13 @@ } }, "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/visitor-keys": { - "version": "8.35.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.35.1.tgz", - "integrity": "sha512-VRwixir4zBWCSTP/ljEo091lbpypz57PoeAQ9imjG+vbeof9LplljsL1mos4ccG6H9IjfrVGM359RozUnuFhpw==", + "version": "8.36.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.36.0.tgz", + "integrity": "sha512-vZrhV2lRPWDuGoxcmrzRZyxAggPL+qp3WzUrlZD+slFueDiYHxeBa34dUXPuC0RmGKzl4lS5kFJYvKCq9cnNDA==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.35.1", + "@typescript-eslint/types": "8.36.0", "eslint-visitor-keys": "^4.2.1" }, "engines": { diff --git a/extensions/ql-vscode/package.json b/extensions/ql-vscode/package.json index 61362977bf6..8a1fc7ce5d1 100644 --- a/extensions/ql-vscode/package.json +++ b/extensions/ql-vscode/package.json @@ -2080,8 +2080,8 @@ "@types/tmp": "^0.2.6", "@types/vscode": "1.90.0", "@types/yauzl": "^2.10.3", - "@typescript-eslint/eslint-plugin": "^8.35.1", - "@typescript-eslint/parser": "^8.35.1", + "@typescript-eslint/eslint-plugin": "^8.36.0", + "@typescript-eslint/parser": "^8.36.0", "@vscode/test-electron": "^2.3.9", "@vscode/vsce": "^3.2.1", "ansi-colors": "^4.1.1", From 9c8d331731fb522c4162e95316ce5b1a657c65c9 Mon Sep 17 00:00:00 2001 From: Koen Vlaswinkel Date: Fri, 11 Jul 2025 16:33:41 +0200 Subject: [PATCH 3/5] Remove check for mrvaPackCreate CLI feature --- .../ql-vscode/src/codeql-cli/cli-version.ts | 1 - extensions/ql-vscode/src/codeql-cli/cli.ts | 4 - .../src/variant-analysis/run-remote-query.ts | 194 ++---------------- 3 files changed, 16 insertions(+), 183 deletions(-) diff --git a/extensions/ql-vscode/src/codeql-cli/cli-version.ts b/extensions/ql-vscode/src/codeql-cli/cli-version.ts index 5d3f7305688..043fe9e472a 100644 --- a/extensions/ql-vscode/src/codeql-cli/cli-version.ts +++ b/extensions/ql-vscode/src/codeql-cli/cli-version.ts @@ -11,7 +11,6 @@ interface VersionResult { export interface CliFeatures { featuresInVersionResult?: boolean; - mrvaPackCreate?: boolean; generateSummarySymbolMap?: boolean; queryServerRunQueries?: boolean; } diff --git a/extensions/ql-vscode/src/codeql-cli/cli.ts b/extensions/ql-vscode/src/codeql-cli/cli.ts index a34b6a351ea..4c15b364f06 100644 --- a/extensions/ql-vscode/src/codeql-cli/cli.ts +++ b/extensions/ql-vscode/src/codeql-cli/cli.ts @@ -1910,10 +1910,6 @@ export class CliVersionConstraint { /**/ } - async supportsMrvaPackCreate(): Promise { - return (await this.cli.getFeatures()).mrvaPackCreate === true; - } - async supportsGenerateSummarySymbolMap(): Promise { return (await this.cli.getFeatures()).generateSummarySymbolMap === true; } diff --git a/extensions/ql-vscode/src/variant-analysis/run-remote-query.ts b/extensions/ql-vscode/src/variant-analysis/run-remote-query.ts index e7e67a0df6c..5b29eed8fd0 100644 --- a/extensions/ql-vscode/src/variant-analysis/run-remote-query.ts +++ b/extensions/ql-vscode/src/variant-analysis/run-remote-query.ts @@ -1,7 +1,7 @@ import type { CancellationToken } from "vscode"; -import { Uri, window } from "vscode"; -import { join, sep, basename, relative } from "path"; -import { dump, load } from "js-yaml"; +import { window } from "vscode"; +import { join, basename, relative } from "path"; +import { dump } from "js-yaml"; import { copy, writeFile, readFile, mkdirp, remove } from "fs-extra"; import { nanoid } from "nanoid"; import { tmpDir } from "../tmp-dir"; @@ -27,13 +27,7 @@ import { } from "./repository-selection"; import type { Repository } from "./shared/repository"; import type { DbManager } from "../databases/db-manager"; -import { - getQlPackFilePath, - FALLBACK_QLPACK_FILENAME, - QLPACK_FILENAMES, - QLPACK_LOCK_FILENAMES, -} from "../common/ql"; -import type { QlPackFile } from "../packaging/qlpack-file"; +import { FALLBACK_QLPACK_FILENAME } from "../common/ql"; import { expandShortPaths } from "../common/short-paths"; import type { QlPackDetails } from "./ql-pack-details"; import type { ModelPackDetails } from "../common/model-pack-details"; @@ -68,8 +62,6 @@ async function generateQueryPack( ); const mustSynthesizePack = qlPackDetails.qlPackFilePath === undefined; - const cliSupportsMrvaPackCreate = - await cliServer.cliConstraints.supportsMrvaPackCreate(); let targetPackPath: string; let needsInstall: boolean; @@ -87,15 +79,6 @@ async function generateQueryPack( // Install packs, since we just synthesized a dependency on the language's standard library. needsInstall = true; - } else if (!cliSupportsMrvaPackCreate) { - // We need to copy the query pack to a temporary directory and then fix it up to work with MRVA. - targetPackPath = tmpDir.queryPackDir; - await copyExistingQueryPack(cliServer, qlPackDetails, targetPackPath); - - // We should already have all the dependencies available, but these older versions of the CLI - // have a bug where they will not search `--additional-packs` during validation in `codeql pack bundle`. - // Installing the packs will ensure that any extension packs get put in the right place. - needsInstall = true; } else { // The CLI supports creating a MRVA query pack directly from the source pack. targetPackPath = qlPackDetails.qlPackRootPath; @@ -113,27 +96,18 @@ async function generateQueryPack( await cliServer.clearCache(); } - let precompilationOpts: string[]; - if (cliSupportsMrvaPackCreate) { - const queryOpts = qlPackDetails.queryFiles.flatMap((q) => [ - "--query", - join(targetPackPath, relative(qlPackDetails.qlPackRootPath, q)), - ]); - - precompilationOpts = [ - "--mrva", - ...queryOpts, - // We need to specify the extension packs as dependencies so that they are included in the MRVA pack. - // The version range doesn't matter, since they'll always be found by source lookup. - ...extensionPacks.map((p) => `--extension-pack=${p.name}@*`), - ]; - } else { - precompilationOpts = ["--qlx"]; - - if (extensionPacks.length > 0) { - await addExtensionPacksAsDependencies(targetPackPath, extensionPacks); - } - } + const queryOpts = qlPackDetails.queryFiles.flatMap((q) => [ + "--query", + join(targetPackPath, relative(qlPackDetails.qlPackRootPath, q)), + ]); + + const precompilationOpts = [ + "--mrva", + ...queryOpts, + // We need to specify the extension packs as dependencies so that they are included in the MRVA pack. + // The version range doesn't matter, since they'll always be found by source lookup. + ...extensionPacks.map((p) => `--extension-pack=${p.name}@*`), + ]; const bundlePath = tmpDir.bundleFile; void extLogger.log( @@ -181,59 +155,6 @@ async function createNewQueryPack( ); } -async function copyExistingQueryPack( - cliServer: CodeQLCliServer, - qlPackDetails: QlPackDetails, - targetPackPath: string, -) { - const toCopy = await cliServer.packPacklist( - qlPackDetails.qlPackRootPath, - false, - ); - - // Also include query files that contain extensible predicates. These query files are not - // needed for the query to run, but they are needed for the query pack to pass deep validation - // of data extensions. - const metadata = await cliServer.generateExtensiblePredicateMetadata( - qlPackDetails.qlPackRootPath, - ); - metadata.extensible_predicates.forEach((predicate) => { - if (predicate.path.endsWith(".ql")) { - toCopy.push(join(qlPackDetails.qlPackRootPath, predicate.path)); - } - }); - - [ - // also copy the lock file (either new name or old name) and the query file itself. These are not included in the packlist. - ...QLPACK_LOCK_FILENAMES.map((f) => join(qlPackDetails.qlPackRootPath, f)), - ...qlPackDetails.queryFiles, - ].forEach((absolutePath) => { - if (absolutePath) { - toCopy.push(absolutePath); - } - }); - - let copiedCount = 0; - await copy(qlPackDetails.qlPackRootPath, targetPackPath, { - filter: (file: string) => - // copy file if it is in the packlist, or it is a parent directory of a file in the packlist - !!toCopy.find((f) => { - // Normalized paths ensure that Windows drive letters are capitalized consistently. - const normalizedPath = Uri.file(f).fsPath; - const matches = - normalizedPath === file || normalizedPath.startsWith(file + sep); - if (matches) { - copiedCount++; - } - return matches; - }), - }); - - void extLogger.log(`Copied ${copiedCount} files to ${targetPackPath}`); - - await fixPackFile(targetPackPath, qlPackDetails); -} - interface RemoteQueryTempDir { remoteQueryDir: string; queryPackDir: string; @@ -351,42 +272,6 @@ export async function prepareRemoteQueryRun( }; } -/** - * Fixes the qlpack.yml or codeql-pack.yml file to be correct in the context of the MRVA request. - * - * Performs the following fixes: - * - * - Updates the default suite of the query pack. This is used to ensure - * only the specified query is run. - * - Ensures the query pack name is set to the name expected by the server. - * - Removes any `${workspace}` version references from the qlpack.yml or codeql-pack.yml file. Converts them - * to `*` versions. - * - * @param targetPackPath The path to the directory containing the target pack - * @param qlPackDetails The details of the original QL pack - */ -async function fixPackFile( - targetPackPath: string, - qlPackDetails: QlPackDetails, -): Promise { - const packPath = await getQlPackFilePath(targetPackPath); - - // This should not happen since we create the pack ourselves. - if (!packPath) { - throw new Error( - `Could not find ${QLPACK_FILENAMES.join( - " or ", - )} file in '${targetPackPath}'`, - ); - } - const qlpack = load(await readFile(packPath, "utf8")) as QlPackFile; - - updateDefaultSuite(qlpack, qlPackDetails); - removeWorkspaceRefs(qlpack); - - await writeFile(packPath, dump(qlpack)); -} - async function getExtensionPacksToInject( cliServer: CodeQLCliServer, workspaceFolders: string[], @@ -415,41 +300,6 @@ async function getExtensionPacksToInject( return result; } -async function addExtensionPacksAsDependencies( - queryPackDir: string, - extensionPacks: ModelPackDetails[], -): Promise { - const qlpackFile = await getQlPackFilePath(queryPackDir); - if (!qlpackFile) { - throw new Error( - `Could not find ${QLPACK_FILENAMES.join( - " or ", - )} file in '${queryPackDir}'`, - ); - } - - const syntheticQueryPack = load( - await readFile(qlpackFile, "utf8"), - ) as QlPackFile; - - const dependencies = syntheticQueryPack.dependencies ?? {}; - extensionPacks.forEach(({ name }) => { - // Add this extension pack as a dependency. It doesn't matter which - // version we specify, since we are guaranteed that the extension pack - // is resolved from source at the given path. - dependencies[name] = "*"; - }); - - syntheticQueryPack.dependencies = dependencies; - - await writeFile(qlpackFile, dump(syntheticQueryPack)); -} - -function updateDefaultSuite(qlpack: QlPackFile, qlPackDetails: QlPackDetails) { - delete qlpack.defaultSuiteFile; - qlpack.defaultSuite = generateDefaultSuite(qlPackDetails); -} - function generateDefaultSuite(qlPackDetails: QlPackDetails) { const queries = qlPackDetails.queryFiles.map((query) => { const relativePath = relative(qlPackDetails.qlPackRootPath, query); @@ -550,15 +400,3 @@ async function getControllerRepoFromApi( } } } - -function removeWorkspaceRefs(qlpack: QlPackFile) { - if (!qlpack.dependencies) { - return; - } - - for (const [key, value] of Object.entries(qlpack.dependencies)) { - if (value === "${workspace}") { - qlpack.dependencies[key] = "*"; - } - } -} From eb9d12b8993263a0cac5f991bdcc902bb9990c7a Mon Sep 17 00:00:00 2001 From: Koen Vlaswinkel Date: Fri, 11 Jul 2025 16:40:44 +0200 Subject: [PATCH 4/5] Remove check for generateSummarySymbolMap CLI feature --- .../ql-vscode/src/codeql-cli/cli-version.ts | 1 - extensions/ql-vscode/src/codeql-cli/cli.ts | 17 +-- .../src/log-insights/summary-parser.ts | 103 ------------------ .../ql-vscode/src/run-queries-shared.ts | 10 -- 4 files changed, 3 insertions(+), 128 deletions(-) diff --git a/extensions/ql-vscode/src/codeql-cli/cli-version.ts b/extensions/ql-vscode/src/codeql-cli/cli-version.ts index 043fe9e472a..72ca8e9447d 100644 --- a/extensions/ql-vscode/src/codeql-cli/cli-version.ts +++ b/extensions/ql-vscode/src/codeql-cli/cli-version.ts @@ -11,7 +11,6 @@ interface VersionResult { export interface CliFeatures { featuresInVersionResult?: boolean; - generateSummarySymbolMap?: boolean; queryServerRunQueries?: boolean; } diff --git a/extensions/ql-vscode/src/codeql-cli/cli.ts b/extensions/ql-vscode/src/codeql-cli/cli.ts index 4c15b364f06..12869518ae3 100644 --- a/extensions/ql-vscode/src/codeql-cli/cli.ts +++ b/extensions/ql-vscode/src/codeql-cli/cli.ts @@ -269,7 +269,7 @@ export class CodeQLCliServer implements Disposable { /** Path to current codeQL executable, or undefined if not running yet. */ codeQlPath: string | undefined; - cliConstraints = new CliVersionConstraint(this); + cliConstraints = new CliVersionConstraint(); /** * When set to true, ignore some modal popups and assume user has clicked "yes". @@ -1191,15 +1191,12 @@ export class CodeQLCliServer implements Disposable { outputPath: string, endSummaryPath: string, ): Promise { - const supportsGenerateSummarySymbolMap = - await this.cliConstraints.supportsGenerateSummarySymbolMap(); const subcommandArgs = [ "--format=text", `--end-summary=${endSummaryPath}`, "--sourcemap", - ...(supportsGenerateSummarySymbolMap - ? ["--summary-symbol-map", "--minify-output"] - : []), + "--summary-symbol-map", + "--minify-output", inputPath, outputPath, ]; @@ -1905,12 +1902,4 @@ export class CliVersionConstraint { // The oldest version of the CLI that we support. This is used to determine // whether to show a warning about the CLI being too old on startup. public static OLDEST_SUPPORTED_CLI_VERSION = new SemVer("2.18.4"); - - constructor(private readonly cli: CodeQLCliServer) { - /**/ - } - - async supportsGenerateSummarySymbolMap(): Promise { - return (await this.cli.getFeatures()).generateSummarySymbolMap === true; - } } diff --git a/extensions/ql-vscode/src/log-insights/summary-parser.ts b/extensions/ql-vscode/src/log-insights/summary-parser.ts index f00923e53ea..61a3a8af250 100644 --- a/extensions/ql-vscode/src/log-insights/summary-parser.ts +++ b/extensions/ql-vscode/src/log-insights/summary-parser.ts @@ -1,6 +1,3 @@ -import { createReadStream, writeFile } from "fs-extra"; -import { LINE_ENDINGS, splitStreamAtSeparators } from "../common/split-stream"; - /** * Location information for a single pipeline invocation in the RA. */ @@ -32,103 +29,3 @@ interface PredicateSymbol { export interface SummarySymbols { predicates: Record; } - -// Tuple counts for Expr::Expr::getParent#dispred#f0820431#ff@76d6745o: -const NON_RECURSIVE_TUPLE_COUNT_REGEXP = - /^Evaluated relational algebra for predicate (?\S+) with tuple counts:$/; -// Tuple counts for Expr::Expr::getEnclosingStmt#f0820431#bf@923ddwj9 on iteration 0 running pipeline base: -const RECURSIVE_TUPLE_COUNT_REGEXP = - /^Evaluated relational algebra for predicate (?\S+) on iteration (?\d+) running pipeline (?\S+) with tuple counts:$/; -const RETURN_REGEXP = /^\s*return /; - -/** - * Parse a human-readable evaluation log summary to find the location of the RA for each pipeline - * run. - * - * TODO: Once we're more certain about the symbol format, we should have the CLI generate this as it - * generates the human-readabe summary to avoid having to rely on regular expression matching of the - * human-readable text. - * - * @param summaryPath The path to the summary file. - * @param symbolsPath The path to the symbols file to generate. - */ -export async function generateSummarySymbolsFile( - summaryPath: string, - symbolsPath: string, -): Promise { - const symbols = await generateSummarySymbols(summaryPath); - await writeFile(symbolsPath, JSON.stringify(symbols)); -} - -/** - * Parse a human-readable evaluation log summary to find the location of the RA for each pipeline - * run. - * - * @param fileLocation The path to the summary file. - * @returns Symbol information for the summary file. - */ -async function generateSummarySymbols( - summaryPath: string, -): Promise { - const stream = createReadStream(summaryPath, { - encoding: "utf-8", - }); - try { - const lines = splitStreamAtSeparators(stream, LINE_ENDINGS); - - const symbols: SummarySymbols = { - predicates: {}, - }; - - let lineNumber = 0; - let raStartLine = 0; - let iteration = 0; - let predicateName: string | undefined = undefined; - let startLine = 0; - for await (const line of lines) { - if (predicateName === undefined) { - // Looking for the start of the predicate. - const nonRecursiveMatch = line.match(NON_RECURSIVE_TUPLE_COUNT_REGEXP); - if (nonRecursiveMatch) { - iteration = 0; - predicateName = nonRecursiveMatch.groups!.predicateName; - } else { - const recursiveMatch = line.match(RECURSIVE_TUPLE_COUNT_REGEXP); - if (recursiveMatch?.groups) { - predicateName = recursiveMatch.groups.predicateName; - iteration = parseInt(recursiveMatch.groups.iteration); - } - } - if (predicateName !== undefined) { - startLine = lineNumber; - raStartLine = lineNumber + 1; - } - } else { - const returnMatch = line.match(RETURN_REGEXP); - if (returnMatch) { - let symbol = symbols.predicates[predicateName]; - if (symbol === undefined) { - symbol = { - iterations: {}, - recursionSummaries: {}, - }; - symbols.predicates[predicateName] = symbol; - } - symbol.iterations[iteration] = { - startLine, - raStartLine, - raEndLine: lineNumber, - }; - - predicateName = undefined; - } - } - - lineNumber++; - } - - return symbols; - } finally { - stream.close(); - } -} diff --git a/extensions/ql-vscode/src/run-queries-shared.ts b/extensions/ql-vscode/src/run-queries-shared.ts index 990d3d8293d..4e463812cb0 100644 --- a/extensions/ql-vscode/src/run-queries-shared.ts +++ b/extensions/ql-vscode/src/run-queries-shared.ts @@ -27,7 +27,6 @@ import type { import type { BaseLogger } from "./common/logging"; import { showAndLogWarningMessage } from "./common/logging"; import { extLogger } from "./common/logging/vscode"; -import { generateSummarySymbolsFile } from "./log-insights/summary-parser"; import { getErrorMessage } from "./common/helpers-pure"; import { createHash } from "crypto"; import { QueryOutputDir } from "./local-queries/query-output-dir"; @@ -570,15 +569,6 @@ export async function generateEvalLogSummaries( if (humanReadableSummary !== undefined) { summarySymbols = outputDir.evalLogSummarySymbolsPath; - if ( - !(await cliServer.cliConstraints.supportsGenerateSummarySymbolMap()) - ) { - // We're using an old CLI that cannot generate the summary symbols file while generating the - // human-readable log summary. As a fallback, create it by parsing the human-readable - // summary. - progress(progressUpdate(3, 3, "Generating summary symbols file")); - await generateSummarySymbolsFile(humanReadableSummary, summarySymbols); - } } } From adb7072cabe3e3694b3e12b2583c09e8b8f4223d Mon Sep 17 00:00:00 2001 From: Koen Vlaswinkel Date: Fri, 11 Jul 2025 16:42:18 +0200 Subject: [PATCH 5/5] Use CliConstraints consistently --- extensions/ql-vscode/src/codeql-cli/cli-version.ts | 1 - extensions/ql-vscode/src/codeql-cli/cli.ts | 10 +++++++++- .../ql-vscode/src/query-server/query-server-client.ts | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/extensions/ql-vscode/src/codeql-cli/cli-version.ts b/extensions/ql-vscode/src/codeql-cli/cli-version.ts index 72ca8e9447d..ebd30cbdb62 100644 --- a/extensions/ql-vscode/src/codeql-cli/cli-version.ts +++ b/extensions/ql-vscode/src/codeql-cli/cli-version.ts @@ -10,7 +10,6 @@ interface VersionResult { } export interface CliFeatures { - featuresInVersionResult?: boolean; queryServerRunQueries?: boolean; } diff --git a/extensions/ql-vscode/src/codeql-cli/cli.ts b/extensions/ql-vscode/src/codeql-cli/cli.ts index 12869518ae3..f32c4a2555b 100644 --- a/extensions/ql-vscode/src/codeql-cli/cli.ts +++ b/extensions/ql-vscode/src/codeql-cli/cli.ts @@ -269,7 +269,7 @@ export class CodeQLCliServer implements Disposable { /** Path to current codeQL executable, or undefined if not running yet. */ codeQlPath: string | undefined; - cliConstraints = new CliVersionConstraint(); + cliConstraints = new CliVersionConstraint(this); /** * When set to true, ignore some modal popups and assume user has clicked "yes". @@ -1902,4 +1902,12 @@ export class CliVersionConstraint { // The oldest version of the CLI that we support. This is used to determine // whether to show a warning about the CLI being too old on startup. public static OLDEST_SUPPORTED_CLI_VERSION = new SemVer("2.18.4"); + + constructor(private readonly cli: CodeQLCliServer) { + /**/ + } + + async supportsQueryServerRunQueries(): Promise { + return (await this.cli.getFeatures()).queryServerRunQueries === true; + } } diff --git a/extensions/ql-vscode/src/query-server/query-server-client.ts b/extensions/ql-vscode/src/query-server/query-server-client.ts index d52af580dea..8087686992f 100644 --- a/extensions/ql-vscode/src/query-server/query-server-client.ts +++ b/extensions/ql-vscode/src/query-server/query-server-client.ts @@ -100,7 +100,7 @@ export class QueryServerClient extends DisposableObject { * queries at once. */ async supportsRunQueriesMethod(): Promise { - return (await this.cliServer.getFeatures()).queryServerRunQueries === true; + return await this.cliServer.cliConstraints.supportsQueryServerRunQueries(); } /** Stops the query server by disposing of the current server process. */ pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy