Skip to content

Commit 7681a56

Browse files
committed
Fix location of removing dots
1 parent bbc09f3 commit 7681a56

2 files changed

Lines changed: 10 additions & 4 deletions

File tree

extensions/ql-vscode/src/common/filenames.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,15 @@ export function createFilenameFromString(
3030
// Remove any leading or trailing hyphens or dots
3131
fileName = fileName.replaceAll(/^[.-]+|[.-]+$/g, "");
3232

33+
// Replace dots by hyphens if dots are not allowed
34+
if (removeDots) {
35+
fileName = fileName.replaceAll(/\./g, "-");
36+
}
37+
3338
// Remove any duplicate hyphens
3439
fileName = fileName.replaceAll(/-{2,}/g, "-");
3540
// Remove any duplicate dots
3641
fileName = fileName.replaceAll(/\.{2,}/g, ".");
3742

38-
if (removeDots) {
39-
fileName = fileName.replaceAll(/\./g, "-");
40-
}
41-
4243
return fileName;
4344
}

extensions/ql-vscode/test/unit-tests/common/filenames.test.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,11 @@ describe("createFilenameFromString", () => {
5858
filename: "unetworking-uwebsockets.js",
5959
filenameWithoutDots: "unetworking-uwebsockets-js",
6060
},
61+
{
62+
input: "github/.vscode-codeql",
63+
filename: "github-.vscode-codeql",
64+
filenameWithoutDots: "github-vscode-codeql",
65+
},
6166
];
6267

6368
test.each(testCases)(

0 commit comments

Comments
 (0)