Merge branch 'main' into samgst/updateNotifEndpoint

Author: samgst-amazon

.changes/next-release/bugfix-1507b9a1-02ba-426c-b08d-e8ac8ca1e83d.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : " Chosing cancel on sign out confirmation now cancels the sign out and does not delete profiles from ~/.aws/config (#5167)"
+}

.changes/next-release/bugfix-48a5cdf7-da5b-4b77-b7b6-a0996d3cf7ff.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Fix for /review LLM based code issues for file review on windows"
+}

.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/resources/META-INF/plugin-codewhisperer.xml

@@ -114,9 +114,10 @@
 
 
         <group id="aws.toolkit.codewhisperer.toolbar.security">
-            <group id="codewhisperer.toolbar.security.filter" icon="com.intellij.icons.ExpUiIcons.General.Filter" text="Filter" popup="true" >
+            <group id="codewhisperer.toolbar.security.filter" icon="AllIcons.General.Filter" text="Filter" popup="true">
                 <separator text="Severity"/>
-                <action class="software.aws.toolkits.jetbrains.services.codewhisperer.codescan.actions.CodeWhispererCodeScanFilterGroup" text="Severity"/>
+                <group id="CodeWhispererCodeScanFilterGroup"
+                       class="software.aws.toolkits.jetbrains.services.codewhisperer.codescan.actions.CodeWhispererCodeScanFilterGroup" text="Severity"/>
             </group>
         </group>
 

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).toString().replace(File.separator, "/"))
             }
         } 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/core/credentials/actions/SsoLogoutAction.kt

@@ -10,7 +10,6 @@ import com.intellij.openapi.ui.MessageDialogBuilder
 import software.aws.toolkits.jetbrains.core.credentials.AwsBearerTokenConnection
 import software.aws.toolkits.jetbrains.core.credentials.ProfileSsoManagedBearerSsoConnection
 import software.aws.toolkits.jetbrains.core.credentials.ToolkitConnectionManagerListener
-import software.aws.toolkits.jetbrains.core.credentials.deleteSsoConnection
 import software.aws.toolkits.jetbrains.core.credentials.logoutFromSsoConnection
 import software.aws.toolkits.resources.AwsCoreBundle
 import software.aws.toolkits.telemetry.UiTelemetry
@@ -23,8 +22,8 @@ class SsoLogoutAction(private val value: AwsBearerTokenConnection) : DumbAwareAc
                 AwsCoreBundle.message("gettingstarted.auth.idc.sign.out.confirmation.title"),
                 AwsCoreBundle.message("gettingstarted.auth.idc.sign.out.confirmation")
             ).yesText(AwsCoreBundle.message("general.confirm")).ask(e.project)
-            if (confirmDeletion) {
-                deleteSsoConnection(value)
+            if (!confirmDeletion) {
+                return
             }
         }
         logoutFromSsoConnection(e.project, value)

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 {