Merge master into feature/q-transform-staging

aws-toolkit-automation · web-flow · commit 14ab1160dc4a · 2024-05-02T16:22:20.000-07:00
diff --git a/packages/amazonq/.changes/next-release/Bug Fix-12271e0b-126f-4112-936d-a94ad0566aee.json b/packages/amazonq/.changes/next-release/Bug Fix-12271e0b-126f-4112-936d-a94ad0566aee.json
@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Fix bug when Amazon Q chat sends code selection while user has no selection"
+}
diff --git a/packages/core/src/codewhispererChat/editor/context/focusArea/focusAreaExtractor.ts b/packages/core/src/codewhispererChat/editor/context/focusArea/focusAreaExtractor.ts
@@ -57,7 +57,7 @@ export class FocusAreaContextExtractor {
             extendedCodeBlock: this.getRangeText(editor.document, extendedCodeBlockRange),
             codeBlock: codeBlock,
             selectionInsideExtendedCodeBlock: this.getSelectionInsideExtendedCodeBlock(
-                importantRange as Selection,
+                editor.selection,
                 extendedCodeBlockRange
             ),
             names:

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +	"type": "Bug Fix",
 +	"description": "Fix bug when Amazon Q chat sends code selection while user has no selection"
 +}