fix(Amazon Q): fix for test generation target file missing from payload.

.changes/next-release/bugfix-f47212d1-8e2b-4c82-9e0d-450ce896e9bc.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Amazon Q /test: Fix for test generation payload creation to not filter out target file."
+}

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatController.kt

@@ -277,7 +277,7 @@ class CodeTestChatController(
 
             val requestData = ChatRequestData(
                 tabId = session.tabId,
-                message = "Generate unit tests for the following part of my code: ${message.prompt}",
+                message = "Generate unit tests for the following part of my code: ${message.prompt.ifBlank { fileInfo.fileName }}",
                 activeFileContext = activeFileContext,
                 userIntent = UserIntent.GENERATE_UNIT_TESTS,
                 triggerType = TriggerType.ContextMenu,

plugins/amazonq/chat/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/FeatureDevSessionContextTest.kt

@@ -3,6 +3,7 @@
 
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.testFramework.RuleChain
+import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertTrue
 import org.junit.Before
@@ -75,6 +76,7 @@ class FeatureDevSessionContextTest : FeatureDevTestBase(HeavyJavaCodeInsightTest
     @Test
     fun testZipProject() {
         addFilesToProjectModule(
+            ".gitignore",
             ".gradle/cached.jar",
             "src/MyClass.java",
             "gradlew",
@@ -83,6 +85,19 @@ class FeatureDevSessionContextTest : FeatureDevTestBase(HeavyJavaCodeInsightTest
             "settings.gradle",
             "build.gradle",
             "gradle/wrapper/gradle-wrapper.properties",
+            "builder/GetTestBuilder.java", // check for false positives
+            ".aws-sam/build/function1",
+            ".gem/specs.rb",
+            "archive.zip",
+            "output.bin",
+            "images/logo.png",
+            "assets/header.jpg",
+            "icons/menu.svg",
+            "license.txt",
+            "License.md",
+            "node_modules/express",
+            "build/outputs",
+            "dist/bundle.js"
         )
 
         val zipResult = featureDevSessionContext.getProjectZip()
@@ -102,11 +117,73 @@ class FeatureDevSessionContextTest : FeatureDevTestBase(HeavyJavaCodeInsightTest
             "gradlew",
             "gradlew.bat",
             "README.md",
-            "settings.gradle",
-            "build.gradle",
             "gradle/wrapper/gradle-wrapper.properties",
+            "builder/GetTestBuilder.java"
         )
 
         assertTrue(zippedFiles == expectedFiles)
     }
+
+    @Test
+    fun `test basic pattern conversion`() {
+        val input = "*.txt"
+        val expected = "(?:^|.*/?)[^/]*[^/]\\.txt(?:/.*)?\$"
+        assertEquals(expected, featureDevSessionContext.convertGitIgnorePatternToRegex(input))
+    }
+
+    @Test
+    fun `test pattern with special characters`() {
+        val input = "test[abc].txt"
+        val expected = "(?:^|.*/?)test\\[abc\\]\\.txt(?:/.*)?$"
+        assertEquals(expected, featureDevSessionContext.convertGitIgnorePatternToRegex(input))
+    }
+
+    @Test
+    fun `test pattern with double asterisk`() {
+        val input = "**/build"
+        val expected = "(?:^|.*/?).[^/]*[^/][^/]/build(?:/.*)?\$"
+        assertEquals(expected, featureDevSessionContext.convertGitIgnorePatternToRegex(input))
+    }
+
+    @Test
+    fun `test pattern starting with slash`() {
+        val input = "/root/file.txt"
+        val expected = "^root/file\\.txt(?:/.*)?$"
+        assertEquals(expected, featureDevSessionContext.convertGitIgnorePatternToRegex(input))
+    }
+
+    @Test
+    fun `test pattern ending with slash`() {
+        val input = "build/"
+        val expected = "(?:^|.*/?)build/.*"
+        assertEquals(expected, featureDevSessionContext.convertGitIgnorePatternToRegex(input))
+    }
+
+    @Test
+    fun `test pattern with question mark`() {
+        val input = "file?.txt"
+        val expected = "(?:^|.*/?)file[^/]\\.txt(?:/.*)?$"
+        assertEquals(expected, featureDevSessionContext.convertGitIgnorePatternToRegex(input))
+    }
+
+    @Test
+    fun `test complex pattern with multiple special characters`() {
+        val input = "**/test-[0-9]*.{java,kt}"
+        val expected = "(?:^|.*/?).[^/]*[^/][^/]/test-\\[0-9\\][^/]*[^/]\\.\\{java\\,kt\\}(?:/.*)?\$"
+        assertEquals(expected, featureDevSessionContext.convertGitIgnorePatternToRegex(input))
+    }
+
+    @Test
+    fun `test empty pattern`() {
+        val input = ""
+        val expected = "(?:^|.*/?)(?:/.*)?$"
+        assertEquals(expected, featureDevSessionContext.convertGitIgnorePatternToRegex(input))
+    }
+
+    @Test
+    fun `test pattern with all special regex characters`() {
+        val input = ".$+()[]{}^|"
+        val expected = "(?:^|.*/?)\\.\\\$\\+\\(\\)\\[\\]\\{\\}\\^\\|(?:/.*)?$"
+        assertEquals(expected, featureDevSessionContext.convertGitIgnorePatternToRegex(input))
+    }
 }

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codetest/sessionconfig/CodeTestSessionConfig.kt

@@ -141,7 +141,7 @@ class CodeTestSessionConfig(
         }
 
         // 2. Add the "utgRequiredArtifactsDir" directory
-        val utgDir = "utgRequiredArtifactsDir"
+        val utgDir = "utgRequiredArtifactsDir/" // Note the trailing slash which adds it as a directory and not a file
         LOG.debug { "Adding directory to ZIP: $utgDir" }
         val utgEntry = ZipEntry(utgDir)
         it.putNextEntry(utgEntry)
@@ -150,7 +150,7 @@ class CodeTestSessionConfig(
         val buildAndExecuteLogDir = "buildAndExecuteLogDir"
         val subDirs = listOf(buildAndExecuteLogDir, "repoMapData", "testCoverageDir")
         subDirs.forEach { subDir ->
-            val subDirPathString = Path.of(utgDir, subDir).name
+            val subDirPathString = Path.of(utgDir, subDir).toString() + "/" // Added trailing slash similar to utgRequiredArtifactsDir
             LOG.debug { "Adding empty directory to ZIP: $subDirPathString" }
             val zipEntry = ZipEntry(subDirPathString)
             it.putNextEntry(zipEntry)
@@ -168,6 +168,18 @@ class CodeTestSessionConfig(
         var currentTotalLines = 0L
         val languageCounts = mutableMapOf<CodeWhispererProgrammingLanguage, Int>()
 
+        // Adding Target File to make sure target file doesn't get filtered out.
+        selectedFile?.let { selected ->
+            files.add(selected.path)
+            currentTotalFileSize += selected.length
+            currentTotalLines += countLinesInVirtualFile(selected)
+            selected.programmingLanguage().let { language ->
+                if (language !is CodeWhispererUnknownLanguage) {
+                    languageCounts[language] = (languageCounts[language] ?: 0) + 1
+                }
+            }
+        }
+
         moduleLoop@ for (module in project.modules) {
             val changeListManager = ChangeListManager.getInstance(module.project)
             if (module.guessModuleDir() != null) {
@@ -176,7 +188,8 @@ class CodeTestSessionConfig(
                     val current = stack.pop()
 
                     if (!current.isDirectory) {
-                        if (current.isFile && !changeListManager.isIgnoredFile(current) &&
+                        if (current.isFile && current.path != selectedFile?.path &&
+                            !changeListManager.isIgnoredFile(current) &&
                             runBlocking { !featureDevSessionContext.ignoreFile(current) } &&
                             runReadAction { !fileIndex.isInLibrarySource(current) }
                         ) {

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

@@ -15,6 +15,7 @@ import kotlinx.coroutines.flow.channelFlow
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
+import kotlinx.coroutines.withTimeout
 import org.apache.commons.codec.digest.DigestUtils
 import org.apache.commons.io.FileUtils
 import software.aws.toolkits.jetbrains.core.coroutines.getCoroutineBgContext
@@ -97,7 +98,7 @@ class FeatureDevSessionContext(val project: Project, val maxProjectSizeBytes: Lo
                 addAll(additionalGitIgnoreRules.map { convertGitIgnorePatternToRegex(it) })
                 addAll(parseGitIgnore())
             }.mapNotNull { pattern ->
-                runCatching { Regex(pattern) }.getOrNull()
+                runCatching { pattern?.let { Regex(it) } }.getOrNull()
             }
         } catch (e: Exception) {
             emptyList()
@@ -136,7 +137,13 @@ class FeatureDevSessionContext(val project: Project, val maxProjectSizeBytes: Lo
                 // entries against them by adding a trailing /.
                 // TODO: Add unit tests for gitignore matching
                 val relative = if (path.startsWith(projectRootPath.toString())) Paths.get(path).relativeTo(projectRootPath) else path
-                async { pattern.matches("$relative/") }
+                async {
+                    try {
+                        withTimeout(REGEX_TIMEOUT_MS) { pattern.matches("$relative/") }
+                    } catch (e: Exception) {
+                        false
+                    }
+                }
             }
         }
 
@@ -240,7 +247,7 @@ class FeatureDevSessionContext(val project: Project, val maxProjectSizeBytes: Lo
         tempFilePath
     }
 
-    private fun parseGitIgnore(): Set<String> {
+    private fun parseGitIgnore(): Set<String?> {
         if (!gitIgnoreFile.exists()) {
             return emptySet()
         }
@@ -252,16 +259,59 @@ class FeatureDevSessionContext(val project: Project, val maxProjectSizeBytes: Lo
     }
 
     // gitignore patterns are not regex, method update needed.
-    private fun convertGitIgnorePatternToRegex(pattern: String): String = pattern
-        .replace(".", "\\.")
-        .replace("*", ".*")
-        .let { if (it.endsWith("/")) "$it.*" else "$it/.*" } // Add a trailing /* to all patterns. (we add a trailing / to all files when matching)
+    fun convertGitIgnorePatternToRegex(pattern: String): String? {
+        // Skip invalid patterns for length check
+        if (pattern.length > MAX_PATTERN_LENGTH) {
+            return null
+        }
+
+        // Escape special regex characters except * and ?
+        var result = pattern
+            .replace(".", "\\.")
+            .replace("+", "\\+")
+            .replace("(", "\\(")
+            .replace(")", "\\)")
+            .replace("[", "\\[")
+            .replace("]", "\\]")
+            .replace("{", "\\{")
+            .replace("}", "\\}")
+            .replace(",", "\\,")
+            .replace("^", "\\^")
+            .replace("$", "\\$")
+            .replace("|", "\\|")
+
+        // Convert gitignore glob patterns to regex
+        result = result
+            .replace("**", ".*?") // Match any directory depth
+            .replace("*", "[^/]*?") // Match any character except path separator
+            .replace("?", "[^/]") // Match single character except path separator
+
+        // Handle start of pattern
+        result = if (result.startsWith("/")) {
+            "^${result.substring(1)}"
+        } else {
+            "(?:^|.*/?)$result"
+        }
+
+        // Handle end of pattern
+        result = if (result.endsWith("/")) {
+            "$result.*"
+        } else {
+            "$result(?:/.*)?$"
+        }
 
+        return result
+    }
     var selectedSourceFolder: VirtualFile
         set(newRoot) {
             _selectedSourceFolder = newRoot
         }
         get() = _selectedSourceFolder
+
+    companion object {
+        private const val MAX_PATTERN_LENGTH = 256 // Maximum allowed pattern length
+        private const val REGEX_TIMEOUT_MS = 100L // Timeout for regex operations in milliseconds
+    }
 }
 
 data class ZipCreationResult(val payload: File, val checksum: String, val contentLength: Long)