fix(amazonq): fix for /test project payload collection filter #5305
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| { | ||
| "type" : "bugfix", | ||
| "description" : "fix(amazonq): fix for /test project payload collection filter" | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,106 @@ | ||
| // Copyright 2025 Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| package software.aws.toolkits.jetbrains.services.codewhisperer.util | ||
|
|
||
| import com.intellij.openapi.vfs.VfsUtil | ||
| import com.intellij.openapi.vfs.VirtualFile | ||
| import kotlinx.coroutines.async | ||
| import kotlinx.coroutines.withContext | ||
| import java.nio.file.Paths | ||
| import kotlin.coroutines.coroutineContext | ||
| import kotlin.io.path.relativeTo | ||
|
|
||
| class GitIgnoreFilteringUtil(private val moduleDir: VirtualFile) { | ||
ashishrp-aws marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| private var ignorePatternsWithGitIgnore = emptyList<Regex>() | ||
| private val additionalGitIgnoreRules = setOf( | ||
| ".aws-sam", | ||
| ".gem", | ||
| ".git", | ||
| ".gitignore", | ||
| ".gradle", | ||
| ".hg", | ||
| ".idea", | ||
| ".project", | ||
| ".rvm", | ||
| ".svn", | ||
| "*.zip", | ||
| "*.bin", | ||
| "*.png", | ||
| "*.jpg", | ||
| "*.svg", | ||
| "*.pyc", | ||
| "license.txt", | ||
| "License.txt", | ||
| "LICENSE.txt", | ||
| "license.md", | ||
| "License.md", | ||
| "LICENSE.md", | ||
| "node_modules", | ||
| "build", | ||
| "dist", | ||
| "annotation-generated-src", | ||
| "annotation-generated-tst" | ||
| ) | ||
|
|
||
| init { | ||
| ignorePatternsWithGitIgnore = try { | ||
| buildList { | ||
| addAll(additionalGitIgnoreRules.map { convertGitIgnorePatternToRegex(it) }) | ||
| addAll(parseGitIgnore()) | ||
| }.mapNotNull { pattern -> | ||
| runCatching { Regex(pattern) }.getOrNull() | ||
| } | ||
| } catch (e: Exception) { | ||
| emptyList() | ||
| } | ||
| } | ||
|
|
||
| private fun parseGitIgnore(): Set<String> { | ||
| val gitignoreFile = moduleDir.findChild(".gitignore") | ||
| return gitignoreFile?.let { | ||
| if (it.isValid && it.exists()) { | ||
| it.inputStream.bufferedReader().readLines() | ||
| .filter { line -> | ||
| line.isNotBlank() && !line.startsWith("#") | ||
| } | ||
| .map { pattern -> | ||
| convertGitIgnorePatternToRegex(pattern.trim()) | ||
| } | ||
| .toSet() | ||
| } else { | ||
| emptySet() | ||
| } | ||
| } ?: emptySet() | ||
| } | ||
|
|
||
| // 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) | ||
|
|
||
| suspend fun ignoreFile(file: VirtualFile): Boolean = ignoreFile(file.presentableUrl) | ||
|
|
||
| suspend fun ignoreFile(path: String): Boolean { | ||
|
Check notice on line 85 in plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/util/GitIgnoreFilteringUtil.kt
|
||
|
||
| // this method reads like something a JS dev would write and doesn't do what the author thinks | ||
| val deferredResults = ignorePatternsWithGitIgnore.map { pattern -> | ||
| withContext(coroutineContext) { | ||
| // avoid partial match (pattern.containsMatchIn) since it causes us matching files | ||
| // against folder patterns. (e.g. settings.gradle ignored by .gradle rule!) | ||
| // we convert the glob rules to regex, add a trailing /* to all rules and then match | ||
| // entries against them by adding a trailing /. | ||
| // TODO: Add unit tests for gitignore matching | ||
| val relative = if (path.startsWith(moduleDir.presentableUrl)) Paths.get(path).relativeTo(moduleDir.toNioPath()) else path | ||
| async { pattern.matches("$relative/") } | ||
| } | ||
| } | ||
|
|
||
| // this will serially iterate over and block | ||
| // ideally we race the results https://github.com/Kotlin/kotlinx.coroutines/issues/2867 | ||
| // i.e. Promise.any(...) | ||
| return deferredResults.any { it.await() } | ||
| } | ||
|
|
||
| private fun getRelativePath(file: VirtualFile): String = VfsUtil.getRelativePath(file, moduleDir) ?: "" | ||
|
||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.