fix(amazonq): Skip including deleted files for FeatureDev context. (#…

…5228) Co-authored-by: C Tidd <[email protected]>
aws · Jan 7, 2025 · 05d7054 · 05d7054
1 parent ba6ab38
commit 05d7054
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/.changes/next-release/bugfix-6a2d9629-1cc1-4143-8950-cfd117fcabe3.json b/.changes/next-release/bugfix-6a2d9629-1cc1-4143-8950-cfd117fcabe3.json
@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Amazon Q /dev: Fix issue when files are deleted while preparing context"
+}
diff --git a/...ommunity/src/software/aws/toolkits/jetbrains/services/amazonq/FeatureDevSessionContext.kt b/...ommunity/src/software/aws/toolkits/jetbrains/services/amazonq/FeatureDevSessionContext.kt
@@ -189,8 +189,12 @@ class FeatureDevSessionContext(val project: Project, val maxProjectSizeBytes: Lo
 
         createTemporaryZipFileAsync { zipOutput ->
             filesToIncludeFlow.collect { file ->
-                val relativePath = Path(file.path).relativeTo(projectRoot.toNioPath())
-                zipOutput.putNextEntry(relativePath.toString(), Path(file.path))
+                try {
+                    val relativePath = Path(file.path).relativeTo(projectRoot.toNioPath())
+                    zipOutput.putNextEntry(relativePath.toString(), Path(file.path))
+                } catch (e: NoSuchFileException) {
+                    // Noop: Skip if file was deleted
+                }
             }
         }
     }.toFile()