Amazon Q: Moved "Include suggestions with code references" setting to General (#5499)

...

Author: atonaamz

.changes/next-release/feature-45f6e6a7-fc5b-4b14-89e2-0d9a2b138c65.json

@@ -0,0 +1,4 @@
+{
+  "type" : "feature",
+  "description" : "Amazon Q: Moved \"Include suggestions with code references\" setting to General"
+}

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/settings/CodeWhispererConfigurable.kt

@@ -61,7 +61,7 @@ class CodeWhispererConfigurable(private val project: Project) :
             }
         }
 
-        group(message("aws.settings.codewhisperer.group.inline_suggestions")) {
+        group(message("aws.settings.codewhisperer.group.general")) {
             row {
                 checkBox(message("aws.settings.codewhisperer.include_code_with_reference")).apply {
                     connect.subscribe(
@@ -81,7 +81,9 @@ class CodeWhispererConfigurable(private val project: Project) :
                     }.enabled(false)
                 }
             }
+        }
 
+        group(message("aws.settings.codewhisperer.group.inline_suggestions")) {
             row {
                 checkBox(message("aws.settings.codewhisperer.automatic_import_adder")).apply {
                     connect.subscribe(

plugins/amazonq/codewhisperer/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererProjectCodeScanTest.kt

@@ -112,12 +112,14 @@ class CodeWhispererProjectCodeScanTest : CodeWhispererCodeScanTestBase(PythonCod
 
     @Test
     fun `test getNormalizedRelativePath()`() {
-        assertThat(
-            listOf("projectName\\src\\PackageName", "projectName/src/PackageName")
-        ).contains(getNormalizedRelativePath("projectName", Paths.get("src/PackageName")))
-        assertThat(
-            listOf("projectName\\src\\Package2", "projectName/src/Package2")
-        ).contains(getNormalizedRelativePath("projectName", Paths.get("src/./Package1/../Package2")))
+        assertThat(getNormalizedRelativePath("projectName", Paths.get("src/PackageName"))).satisfiesAnyOf(
+            { assertThat(it).isEqualTo("projectName\\src\\PackageName") },
+            { assertThat(it).isEqualTo("projectName/src/PackageName") },
+        )
+        assertThat(getNormalizedRelativePath("projectName", Paths.get("src/./Package1/../Package2"))).satisfiesAnyOf(
+            { assertThat(it).isEqualTo("projectName\\src\\Package2") },
+            { assertThat(it).isEqualTo("projectName/src/Package2") },
+        )
     }
 
     private fun setupCsharpProject() {

plugins/core/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties

@@ -279,6 +279,7 @@ aws.settings.codewhisperer.configurable.title=Amazon Q
 aws.settings.codewhisperer.feature_development=Feature Development
 aws.settings.codewhisperer.feature_development.allow_running_code_and_test_commands=Allow /dev to run code and test commands
 aws.settings.codewhisperer.group.data_sharing=Data Sharing
+aws.settings.codewhisperer.group.general=General
 aws.settings.codewhisperer.group.inline_suggestions=Inline Suggestions
 aws.settings.codewhisperer.group.plugin_settings=Plugin Settings
 aws.settings.codewhisperer.group.q_chat=Chat