Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ashishrp-aws merged 5 commits into from
Dec 5, 2024
Merged

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

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7dcd1ce
Fix for code diff for file review to include only file path and gitig…
ashishrp-aws Dec 5, 2024
ba62f8c
Addition of changelog
ashishrp-aws Dec 5, 2024
bdb7bd7
Merge branch 'main' into riv
laileni-aws Dec 5, 2024
41e8e5c
Fix to simplify try and catch block.
ashishrp-aws Dec 5, 2024
6d80cd4
Merge branch 'main' into riv
ashishrp-aws Dec 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .changes/next-release/bugfix-64bb518a-0010-4d02-aef8-90487f096b15.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"type" : "bugfix",
"description" : "Fix for File Review payload and Regex error for payload generation"
}
42 changes: 9 additions & 33 deletions ...toolkits/jetbrains/services/codewhisperer/codescan/sessionconfig/CodeScanSessionConfig.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 ""
}
}
Expand Down
11 changes: 10 additions & 1 deletion ...ommunity/src/software/aws/toolkits/jetbrains/services/amazonq/FeatureDevSessionContext.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) }
Comment on lines +89 to +91
Copy link
Contributor

@rli rli Dec 5, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can be simplified more but sure

}
} catch (e: Exception) {
emptyList()
}
}

fun getProjectZip(): ZipCreationResult {
Expand Down
Loading