Skip to content

Commit 239fad3

Browse files
committed
Fix regex for CodeQL CLI dist discovery
1 parent 945fdbd commit 239fad3

4 files changed

Lines changed: 8 additions & 8 deletions

File tree

extensions/vscode/src/codeql/cli-resolver.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,10 +185,10 @@ export class CliResolver extends DisposableObject {
185185
const entries = await readdir(storagePath, { withFileTypes: true });
186186

187187
const distDirs = entries
188-
.filter(e => e.isDirectory() && /^distribution\d*$/.test(e.name))
188+
.filter(e => e.isDirectory() && /^distribution\d+$/.test(e.name))
189189
.map(e => ({
190190
name: e.name,
191-
num: parseInt(e.name.replace('distribution', '') || '0', 10),
191+
num: parseInt(e.name.replace('distribution', ''), 10),
192192
}))
193193
.sort((a, b) => b.num - a.num);
194194

server/dist/codeql-development-mcp-server.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38248,9 +38248,9 @@ function discoverFromDistributionJson(codeqlStorage) {
3824838248
function discoverFromDistributionScan(codeqlStorage) {
3824938249
try {
3825038250
const entries = readdirSync(codeqlStorage, { withFileTypes: true });
38251-
const distDirs = entries.filter((e) => e.isDirectory() && /^distribution\d*$/.test(e.name)).map((e) => ({
38251+
const distDirs = entries.filter((e) => e.isDirectory() && /^distribution\d+$/.test(e.name)).map((e) => ({
3825238252
name: e.name,
38253-
num: parseInt(e.name.replace("distribution", "") || "0", 10)
38253+
num: parseInt(e.name.replace("distribution", ""), 10)
3825438254
})).sort((a, b) => b.num - a.num);
3825538255
for (const dir of distDirs) {
3825638256
const binaryPath = join4(

0 commit comments

Comments
 (0)