Skip to content

fix(amazonq): Normalize generated file paths in feature dev. #5130

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
Nov 26, 2024
Merged

fix(amazonq): Normalize generated file paths in feature dev. #5130

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 .changes/next-release/bugfix-fd7f4f61-241e-40a6-b92a-3e4fe7e832db.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"type" : "bugfix",
"description" : "Amazon Q /dev: Fix error when accepting changes if leading slash is present."
}
6 changes: 4 additions & 2 deletions ...software/aws/toolkits/jetbrains/services/amazonqFeatureDev/session/CodeGenerationState.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,8 @@ private suspend fun CodeGenerationState.generateCode(
fun registerNewFiles(newFileContents: Map<String, String>): List<NewFileZipInfo> =
newFileContents.map {
NewFileZipInfo(
zipFilePath = it.key,
// Note: When managing file state, we normalize file paths returned from the agent in order to ensure they are handled as relative paths.
zipFilePath = it.key.removePrefix("/"),
fileContent = it.value,
rejected = false,
changeApplied = false
Expand All @@ -268,7 +269,8 @@ fun registerNewFiles(newFileContents: Map<String, String>): List<NewFileZipInfo>
fun registerDeletedFiles(deletedFiles: List<String>): List<DeletedFileInfo> =
deletedFiles.map {
DeletedFileInfo(
zipFilePath = it,
// Note: When managing file state, we normalize file paths returned from the agent in order to ensure they are handled as relative paths.
zipFilePath = it.removePrefix("/"),
rejected = false,
changeApplied = false
)
Expand Down
Loading