Merge main into feature/q-mega

aws-toolkit-automation · web-flow · commit b4cbda23e243 · 2024-11-26T22:18:52.000+01:00
diff --git a/.changes/next-release/bugfix-9e0be536-a758-466e-8b65-ab2f50331ecd.json b/.changes/next-release/bugfix-9e0be536-a758-466e-8b65-ab2f50331ecd.json
@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Correct search text for Amazon Q inline suggestion keybindings"
+}
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/settings/CodeWhispererConfigurable.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/settings/CodeWhispererConfigurable.kt
@@ -209,6 +209,6 @@ class CodeWhispererConfigurable(private val project: Project) :
     }
 
     companion object {
-        private const val Q_INLINE_KEYBINDING_SEARCH_TEXT = "inline suggestion"
+        private const val Q_INLINE_KEYBINDING_SEARCH_TEXT = "Amazon Q inline suggestion"
     }
 }

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +  "type" : "bugfix",
 +  "description" : "Correct search text for Amazon Q inline suggestion keybindings"
 +}
Original file line number	Diff line number	Diff line change
`@@ -209,6 +209,6 @@ class CodeWhispererConfigurable(private val project: Project) :`
`209`	`209`	`}`
`210`	`210`
`211`	`211`	`companion object {`
`212`		`- private const val Q_INLINE_KEYBINDING_SEARCH_TEXT = "inline suggestion"`
	`212`	`+ private const val Q_INLINE_KEYBINDING_SEARCH_TEXT = "Amazon Q inline suggestion"`
`213`	`213`	`}`
`214`	`214`	`}`