Skip to content

fix(amazonq): Prevent adding same file twice for /doc and /dev #6568

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
jpinkney-aws merged 3 commits into from
Feb 18, 2025
Merged

fix(amazonq): Prevent adding same file twice for /doc and /dev #6568

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bf9c855
fix(amazonq): Prevent adding same file twice for /doc and /dev
avi-alpert Feb 12, 2025
f140e1a
fix(test): add unit test for prepareRepoData on multi-root workspace
avi-alpert Feb 13, 2025
c36c84f
fix(amazonq): Update changelog
avi-alpert Feb 18, 2025
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-037e19bd-95f5-4cdf-8408-6eb273ff7ebd.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"type": "Bug Fix",
"description": "Stuck on `Uploading code...` for /dev and /doc in some multi-root workspaces"
}
6 changes: 6 additions & 0 deletions packages/core/src/amazonq/util/files.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,14 @@ export async function prepareRepoData(

let totalBytes = 0
const ignoredExtensionMap = new Map<string, number>()
const addedFilePaths = new Set()

for (const file of files) {
if (addedFilePaths.has(file.zipFilePath)) {
Copy link
Contributor

@vikshe vikshe Feb 12, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

does collectFiles returns same file path if sourcePaths/repoRootPaths > 1 ?

Copy link
Contributor Author

@avi-alpert avi-alpert Feb 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we have a file that shows up in a multi root workspace more than once, then collectFiles will output it multiple times, all with the same zipFilePath

continue
}
addedFilePaths.add(file.zipFilePath)

let fileSize
try {
fileSize = (await fs.stat(file.fileUri)).size
Expand Down
Loading