Merge main into feature/q-mega

aws · Nov 26, 2024 · a4a02d4 · a4a02d4
2 parents 9e7fa03 + cc476dd
commit a4a02d4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/.changes/next-release/bugfix-fd7f4f61-241e-40a6-b92a-3e4fe7e832db.json b/.changes/next-release/bugfix-fd7f4f61-241e-40a6-b92a-3e4fe7e832db.json
@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Amazon Q /dev: Fix error when accepting changes if leading slash is present."
+}
diff --git a/...software/aws/toolkits/jetbrains/services/amazonqFeatureDev/session/CodeGenerationState.kt b/...software/aws/toolkits/jetbrains/services/amazonqFeatureDev/session/CodeGenerationState.kt
@@ -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
@@ -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
         )