Skip to content

fix(amazonq): incorrect zip entry path for file scans #6741

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 10, 2025
Merged

fix(amazonq): incorrect zip entry path for file scans #6741

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions packages/amazonq/.changes/next-release/Bug Fix-b89574ec-9f50-4b4c-b548-30bfce5d0999.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"type": "Bug Fix",
"description": "/review: Zip files are created with the wrong file path for file scans in multifolder workspaces."
}
3 changes: 2 additions & 1 deletion packages/core/src/codewhisperer/util/zipUtil.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,8 @@ export class ZipUtil {
// Note: workspaceFolder.name is not the same as the file system folder name,
// use the fsPath value instead
const projectName = path.basename(workspaceFolder.uri.fsPath)
const relativePath = vscode.workspace.asRelativePath(uri)
// Set includeWorkspaceFolder to false because we are already manually prepending the projectName
const relativePath = vscode.workspace.asRelativePath(uri, false)
const zipEntryPath = this.getZipEntryPath(projectName, relativePath)
zip.addFile(zipEntryPath, Buffer.from(content, 'utf-8'))

Expand Down
Loading