Reverting the FeatureDevSessionContext pattern matching chnages.

Author: ashishrp-aws

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

@@ -3,7 +3,6 @@
 
 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
@@ -118,72 +117,11 @@ class FeatureDevSessionContextTest : FeatureDevTestBase(HeavyJavaCodeInsightTest
             "gradlew.bat",
             "README.md",
             "gradle/wrapper/gradle-wrapper.properties",
-            "builder/GetTestBuilder.java"
+            "builder/GetTestBuilder.java",
+            "settings.gradle",
+            "build.gradle",
         )
 
         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/core/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/FeatureDevSessionContext.kt

@@ -15,7 +15,6 @@ 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
@@ -137,13 +136,7 @@ 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 {
-                    try {
-                        withTimeout(REGEX_TIMEOUT_MS) { pattern.matches("$relative/") }
-                    } catch (e: Exception) {
-                        false
-                    }
-                }
+                async { pattern.matches("$relative/") }
             }
         }
 
@@ -247,7 +240,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()
         }
@@ -259,59 +252,14 @@ class FeatureDevSessionContext(val project: Project, val maxProjectSizeBytes: Lo
     }
 
     // gitignore patterns are not regex, method update needed.
-    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
-    }
+    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)
     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)