Merge branch 'main' into bugfix-5167

rickardsundin · web-flow · commit 1dd620223a7e · 2024-12-06T18:12:28.000+01:00
diff --git a/.changes/next-release/bugfix-48a5cdf7-da5b-4b77-b7b6-a0996d3cf7ff.json b/.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"
+}
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/sessionconfig/CodeScanSessionConfig.kt b/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" }

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +  "type" : "bugfix",
 +  "description" : "Fix for /review LLM based code issues for file review on windows"
 +}
Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ class CodeScanSessionConfig(`
`169`	`169`	`append("+++ b/")`
`170`	`170`	`append(project.name)`
`171`	`171`	`append('/')`
`172`		`- append(fileNio.relativeTo(projectRootNio).pathString)`
	`172`	`+ append(fileNio.relativeTo(projectRootNio).toString().replace(File.separator, "/"))`
`173`	`173`	`}`
`174`	`174`	`} catch (e: Exception) {`
`175`	`175`	`LOG.debug(e) { "Failed to create git diff" }`