diff --git a/CHANGELOG.md b/CHANGELOG.md index 707e75a1..b7924ffe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,7 @@ ### ⚡️ Optimizations - [#431](https://github.com/estruyf/vscode-front-matter/issues/431): Performance improvements for the content dashboard +- [#448](https://github.com/estruyf/vscode-front-matter/issues/448): Retrieving files fails when content folder name and workspace folder name are the same ### 🐞 Fixes diff --git a/src/commands/Folders.ts b/src/commands/Folders.ts index 84b77fbd..789b2660 100644 --- a/src/commands/Folders.ts +++ b/src/commands/Folders.ts @@ -250,7 +250,10 @@ export class Folders { for (const folder of folders) { try { const projectName = Folders.getProjectFolderName(); - let projectStart = folder.path.split(projectName).pop(); + const slashSplit = parseWinPath(folder.path).split(`/`); + const idx = slashSplit.findIndex(f => f === projectName); + + let projectStart = `/${slashSplit.slice(idx + 1).join(`/`)}`; if (projectStart) { projectStart = projectStart.replace(/\\/g, '/');