chore(amazonq): Update autobuild setting strings

Author: neilk-aws

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/controller/FeatureDevController.kt

@@ -727,7 +727,7 @@ class FeatureDevController(
                 return
             }
 
-            val codeWhispererSettings = CodeWhispererSettings.getInstance().getAutoBuildFeatureConfiguration()
+            val codeWhispererSettings = CodeWhispererSettings.getInstance().getAutoBuildSetting()
             val hasDevFile = session.context.checkForDevFile()
             val isPromptedForAutoBuildFeature = codeWhispererSettings.containsKey(session.context.getWorkspaceRoot())
 

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

@@ -125,29 +125,6 @@ class CodeWhispererConfigurable(private val project: Project) :
             }
         }
 
-        group(message("aws.settings.codewhisperer.allow_q_dev_build_test_commands")) {
-            row {
-                val settings = codeWhispererSettings.getAutoBuildFeatureConfiguration()
-                for ((key) in settings) {
-                    checkBox(key).apply {
-                        connect.subscribe(
-                            ToolkitConnectionManagerListener.TOPIC,
-                            object : ToolkitConnectionManagerListener {
-                                override fun activeConnectionChanged(newConnection: ToolkitConnection?) {
-                                    enabled(isCodeWhispererEnabled(project))
-                                }
-                            }
-                        )
-
-                        bindSelected(
-                            getter = { codeWhispererSettings.isAutoBuildFeatureEnabled(key) },
-                            setter = { newValue -> codeWhispererSettings.toggleAutoBuildFeature(key, newValue) }
-                        )
-                    }
-                }
-            }
-        }
-
         group(message("aws.settings.codewhisperer.group.q_chat")) {
             row {
                 checkBox(message("aws.settings.codewhisperer.project_context")).apply {
@@ -214,6 +191,35 @@ class CodeWhispererConfigurable(private val project: Project) :
             }
         }
 
+        val autoBuildSetting = codeWhispererSettings.getAutoBuildSetting()
+        if (autoBuildSetting.isNotEmpty()) {
+            group(message("aws.settings.codewhisperer.feature_development")) {
+                row {
+                    text(message("aws.settings.codewhisperer.feature_development.allow_running_code_and_test_commands"))
+                }
+                row {
+                    val settings = codeWhispererSettings.getAutoBuildSetting()
+                    for ((key) in settings) {
+                        checkBox(key).apply {
+                            connect.subscribe(
+                                ToolkitConnectionManagerListener.TOPIC,
+                                object : ToolkitConnectionManagerListener {
+                                    override fun activeConnectionChanged(newConnection: ToolkitConnection?) {
+                                        enabled(isCodeWhispererEnabled(project))
+                                    }
+                                }
+                            )
+
+                            bindSelected(
+                                getter = { codeWhispererSettings.isAutoBuildFeatureEnabled(key) },
+                                setter = { newValue -> codeWhispererSettings.toggleAutoBuildFeature(key, newValue) }
+                            )
+                        }
+                    }
+                }
+            }
+        }
+
         group(message("aws.settings.codewhisperer.code_review")) {
             row {
                 ExpandableTextField(ParametersListUtil.COLON_LINE_PARSER, ParametersListUtil.COLON_LINE_JOINER).also {

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/settings/CodeWhispererSettings.kt

@@ -25,15 +25,15 @@ class CodeWhispererSettings : PersistentStateComponent<CodeWhispererConfiguratio
         false
     )
 
-    fun getAutoBuildFeatureConfiguration() = state.projectAutoBuildConfigurationMap
+    fun getAutoBuildSetting() = state.autoBuildSetting
 
     fun toggleAutoBuildFeature(project: String?, value: Boolean) {
         if (project == null) return
 
-        state.projectAutoBuildConfigurationMap[project] = value
+        state.autoBuildSetting[project] = value
     }
 
-    fun isAutoBuildFeatureEnabled(project: String?) = state.projectAutoBuildConfigurationMap.getOrDefault(project, false)
+    fun isAutoBuildFeatureEnabled(project: String?) = state.autoBuildSetting.getOrDefault(project, false)
 
     fun toggleImportAdder(value: Boolean) {
         state.value[CodeWhispererConfigurationType.IsImportAdderEnabled] = value
@@ -153,7 +153,7 @@ class CodeWhispererConfiguration : BaseState() {
     @get:Property
     val stringValue by map<CodeWhispererStringConfigurationType, String>()
 
-    val projectAutoBuildConfigurationMap by map<String, Boolean>()
+    val autoBuildSetting by map<String, Boolean>()
 }
 
 enum class CodeWhispererConfigurationType {

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

@@ -266,7 +266,8 @@ aws.settings.auto_update.notification_enable.tooltip=If unchecked, updates will
 aws.settings.auto_update.progress.message=Updating AWS plugins
 aws.settings.auto_update.text=Automatically install plugin updates when available
 aws.settings.aws_cli_settings=AWS CLI Settings
-aws.settings.codewhisperer.allow_q_dev_build_test_commands=Amazon Q: Allow Q /dev to run code and test commands
+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.automatic_import_adder=Imports recommendation
 aws.settings.codewhisperer.automatic_import_adder.tooltip=Amazon Q will add import statements with code suggestions when necessary
 aws.settings.codewhisperer.code_review=Code Review