fix(amazonq): Fix for File Review payload and payload generation error for test and review (#5166)

* Fix for code diff for file review to include only file path and gitignore regex pattern error handling.

* Addition of changelog

* Fix to simplify try and catch block.

---------

Co-authored-by: Laxman Reddy <[email protected]>

Author: ashishrp-aws

.changes/next-release/bugfix-64bb518a-0010-4d02-aef8-90487f096b15.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Fix for File Review payload and Regex error for payload generation"
+}

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/sessionconfig/CodeScanSessionConfig.kt

@@ -25,7 +25,6 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.codescan.cannotFin
 import software.aws.toolkits.jetbrains.services.codewhisperer.codescan.fileTooLarge
 import software.aws.toolkits.jetbrains.services.codewhisperer.codescan.noFileOpenError
 import software.aws.toolkits.jetbrains.services.codewhisperer.codescan.noSupportedFilesError
-import software.aws.toolkits.jetbrains.services.codewhisperer.codescan.utils.AmazonQCodeReviewGitUtils.getGitRepositoryRoot
 import software.aws.toolkits.jetbrains.services.codewhisperer.codescan.utils.AmazonQCodeReviewGitUtils.getUnstagedFiles
 import software.aws.toolkits.jetbrains.services.codewhisperer.codescan.utils.AmazonQCodeReviewGitUtils.isGitRoot
 import software.aws.toolkits.jetbrains.services.codewhisperer.codescan.utils.AmazonQCodeReviewGitUtils.runGitDiffHead
@@ -163,40 +162,17 @@ class CodeScanSessionConfig(
             return ""
         }
         try {
-            getGitRepositoryRoot(file)?.let { root ->
-                // If it's a git repo, use git logic
-                val relativePath = runCatching {
-                    file.toNioPath().relativeTo(root.toNioPath()).pathString
-                }.getOrElse {
-                    LOG.debug { "Failed to calculate relative path: ${it.message}" }
-                    return ""
-                }
-
-                return runGitDiffHead(
-                    projectName = project.name,
-                    root = root,
-                    relativeFilePath = relativePath,
-                    newFile = true
-                )
-            } ?: run {
-                // For non-git repos, use project root as base
-                val projectRootPath = projectRoot.toNioPath()
-                val relativePath = runCatching {
-                    file.toNioPath().relativeTo(projectRootPath).pathString
-                }.getOrElse {
-                    LOG.debug { "Failed to calculate relative path from project root: ${it.message}" }
-                    return ""
-                }
-
-                return runGitDiffHead(
-                    projectName = project.name,
-                    root = projectRoot,
-                    relativeFilePath = relativePath,
-                    newFile = true // Always treat as new file for non-git repos
-                )
+            val projectRootNio = projectRoot.toNioPath()
+            val fileNio = file.toNioPath()
+
+            return buildString {
+                append("+++ b/")
+                append(project.name)
+                append('/')
+                append(fileNio.relativeTo(projectRootNio).pathString)
             }
         } catch (e: Exception) {
-            LOG.debug { "Failed to create git diff: ${e.message}" }
+            LOG.debug(e) { "Failed to create git diff" }
             return ""
         }
     }

plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/FeatureDevSessionContext.kt

@@ -83,7 +83,16 @@ class FeatureDevSessionContext(val project: Project, val maxProjectSizeBytes: Lo
     private val gitIgnoreFile = File(selectedSourceFolder.path, ".gitignore")
 
     init {
-        ignorePatternsWithGitIgnore = (ignorePatterns + parseGitIgnore().map { Regex(it) }).toList()
+        ignorePatternsWithGitIgnore = try {
+            buildList {
+                addAll(ignorePatterns)
+                parseGitIgnore().mapNotNull { pattern ->
+                    runCatching { Regex(pattern) }.getOrNull()
+                }.let { addAll(it) }
+            }
+        } catch (e: Exception) {
+            emptyList()
+        }
     }
 
     fun getProjectZip(): ZipCreationResult {