Skip to content

fix(amazonq): incorrect path for diff on windows #6740

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 3 commits into from
Mar 12, 2025
Merged

fix(amazonq): incorrect path for diff on windows #6740

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eecb31a
fix(amazonq): incorrect path for diff on windows
ctlai95 Mar 6, 2025
e9531b6
add changelog
ctlai95 Mar 6, 2025
d00704a
use pathUtils normalize
ctlai95 Mar 12, 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-f80cc751-cb9d-45b6-a03a-3aec945a4565.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: Invalid file path characters caused some detections to be skipped on Windows"
}
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 @@ -24,6 +24,7 @@ import { FeatureUseCase } from '../models/constants'
import { ChildProcess, ChildProcessOptions } from '../../shared/utilities/processUtils'
import { ProjectZipError } from '../../amazonqTest/error'
import { removeAnsi } from '../../shared/utilities/textUtilities'
import { normalize } from '../../shared/utilities/pathUtils'

export interface ZipMetadata {
rootDir: string
Expand Down Expand Up @@ -122,7 +123,7 @@ export class ZipUtil {
zip.addFile(zipEntryPath, Buffer.from(content, 'utf-8'))

if (scope === CodeWhispererConstants.CodeAnalysisScope.FILE_ON_DEMAND) {
const gitDiffContent = `+++ b/${path.normalize(zipEntryPath)}` // Sending file path in payload for LLM code review
const gitDiffContent = `+++ b/${normalize(zipEntryPath)}` // Sending file path in payload for LLM code review
zip.addFile(ZipConstants.codeDiffFilePath, Buffer.from(gitDiffContent, 'utf-8'))
}
} else {
Expand Down
Loading