Merge branch 'main' into express-scan-timeout

ctlai95 · web-flow · commit 35f96b7ecf31 · 2025-01-17T15:26:32.000-08:00
diff --git a/.changes/3.49.json b/.changes/3.49.json
@@ -0,0 +1,8 @@
+{
+  "date" : "2025-01-17",
+  "version" : "3.49",
+  "entries" : [ {
+    "type" : "bugfix",
+    "description" : "/review: Improved success rate of code reviews for certain workspace configurations"
+  } ]
+}
diff --git a/.changes/next-release/bugfix-02a84512-83ae-4fbe-a527-292ba072e3e0.json b/.changes/next-release/bugfix-02a84512-83ae-4fbe-a527-292ba072e3e0.json
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# _3.49_ (2025-01-17)
+- **(Bug Fix)** /review: Improved success rate of code reviews for certain workspace configurations
+
 # _3.48_ (2025-01-16)
 - **(Feature)** Enhance Q inline completion context fetching for better suggestion quality
 - **(Feature)** /doc: Add error message if updated README is too large
diff --git a/gradle.properties b/gradle.properties
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # Toolkit Version
-toolkitVersion=3.49-SNAPSHOT
+toolkitVersion=3.50-SNAPSHOT
 
 # Publish Settings
 publishToken=
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/editor/context/focusArea/FocusAreaContextExtractor.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/editor/context/focusArea/FocusAreaContextExtractor.kt
@@ -180,7 +180,7 @@ class FocusAreaContextExtractor(private val fqnWebviewAdapter: FqnWebviewAdapter
         val startOffset = 0.coerceAtLeast(offset - halfMaxCharacters)
         val endOffset = fileText.length.coerceAtMost(offset + halfMaxCharacters)
 
-        // Adjust the start and end offsets if necessary to ensure a total of 40k characters
+        // Adjust the start and end offsets if necessary to ensure a total of 10k characters
         val excessCharacters = maxCharacters - (endOffset - startOffset)
         val adjustedStartOffset = 0.coerceAtLeast(startOffset - excessCharacters)
         val adjustedEndOffset = fileText.length.coerceAtMost(endOffset + excessCharacters)
@@ -198,7 +198,7 @@ class FocusAreaContextExtractor(private val fqnWebviewAdapter: FqnWebviewAdapter
     }
 
     companion object {
-        const val MAX_LENGTH = 40000
+        const val MAX_LENGTH = 10000
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,7 @@ class FocusAreaContextExtractor(private val fqnWebviewAdapter: FqnWebviewAdapter`
`180`	`180`	`val startOffset = 0.coerceAtLeast(offset - halfMaxCharacters)`
`181`	`181`	`val endOffset = fileText.length.coerceAtMost(offset + halfMaxCharacters)`
`182`	`182`
`183`		`- // Adjust the start and end offsets if necessary to ensure a total of 40k characters`
	`183`	`+ // Adjust the start and end offsets if necessary to ensure a total of 10k characters`
`184`	`184`	`val excessCharacters = maxCharacters - (endOffset - startOffset)`
`185`	`185`	`val adjustedStartOffset = 0.coerceAtLeast(startOffset - excessCharacters)`
`186`	`186`	`val adjustedEndOffset = fileText.length.coerceAtMost(endOffset + excessCharacters)`
`@@ -198,7 +198,7 @@ class FocusAreaContextExtractor(private val fqnWebviewAdapter: FqnWebviewAdapter`
`198`	`198`	`}`
`199`	`199`
`200`	`200`	`companion object {`
`201`		`- const val MAX_LENGTH = 40000`
	`201`	`+ const val MAX_LENGTH = 10000`
`202`	`202`	`}`
`203`	`203`	`}`
`204`	`204`