Merge branch 'main' into samgst/NotificationResourceResolver

Author: samgst-amazon

.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"
+}

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

@@ -169,7 +169,7 @@ class CodeScanSessionConfig(
                 append("+++ b/")
                 append(project.name)
                 append('/')
-                append(fileNio.relativeTo(projectRootNio).pathString)
+                append(fileNio.relativeTo(projectRootNio).toString().replace(File.separator, "/"))
             }
         } catch (e: Exception) {
             LOG.debug(e) { "Failed to create git diff" }