Refactor to use more specific command for UTG

Author: bweedop

plugins/amazonq/chat/jetbrains-community/resources/META-INF/plugin-chat.xml

@@ -70,8 +70,8 @@
                 <keyboard-shortcut keymap="$default" first-keystroke="meta alt A" />
             </action>
 
-            <action id="aws.toolkit.jetbrains.core.services.cwc.commands.GenerateUnitTestAction"
-                    class="software.aws.toolkits.jetbrains.services.cwc.commands.GenerateUnitTestAction">
+            <action id="aws.toolkit.jetbrains.core.services.cwc.commands.GenerateUnitTestsAction"
+                    class="software.aws.toolkits.jetbrains.services.cwc.commands.GenerateUnitTestsAction">
                 <keyboard-shortcut keymap="$default" first-keystroke="meta alt T" />
             </action>
 

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/commands/EditorContextCommand.kt

@@ -26,9 +26,9 @@ enum class EditorContextCommand(
         verb = "Optimize",
         actionId = "aws.amazonq.optimizeCode",
     ),
-    Test(
+    GenerateUnitTests(
         verb = "Generate unit tests for",
-        actionId = "aws.amazonq.testCode",
+        actionId = "aws.amazonq.generateUnitTests",
     ),
     SendToPrompt(
         verb = "SendToPrompt",

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/commands/GenerateUnitTestAction.kt

@@ -334,7 +334,7 @@ class ChatController private constructor(
         }
 
         // Create prompt
-        val prompt = if (EditorContextCommand.GenerateUnitTest == message.command)
+        val prompt = if (EditorContextCommand.GenerateUnitTests == message.command)
             "${message.command.verb} the following part of my code for me: $codeSelection" else
             "${message.command} the following part of my code for me: $codeSelection";
 

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/controller/ChatController.kt

@@ -10,6 +10,8 @@ import kotlinx.coroutines.flow.onCompletion
 import kotlinx.coroutines.flow.onStart
 import software.amazon.awssdk.awscore.exception.AwsServiceException
 import software.amazon.awssdk.services.codewhispererstreaming.model.CodeWhispererStreamingException
+import software.amazon.awssdk.services.codewhispererstreaming.model.UserIntent
+import software.amazon.awssdk.services.codewhispererstreaming.model.ValidationException
 import software.aws.toolkits.core.utils.convertMarkdownToHTML
 import software.aws.toolkits.jetbrains.services.cwc.clients.chat.exceptions.ChatApiException
 import software.aws.toolkits.jetbrains.services.cwc.clients.chat.model.ChatRequestData

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/controller/chat/messenger/ChatPromptHandler.kt

@@ -20,7 +20,7 @@ class UserIntentRecognizer {
         EditorContextCommand.Fix -> UserIntent.APPLY_COMMON_BEST_PRACTICES
         EditorContextCommand.Optimize -> UserIntent.IMPROVE_CODE
         EditorContextCommand.ExplainCodeScanIssue -> UserIntent.EXPLAIN_CODE_SELECTION
-        EditorContextCommand.GenerateUnitTest -> UserIntent.GENERATE_UNIT_TESTS
+        EditorContextCommand.GenerateUnitTests -> UserIntent.GENERATE_UNIT_TESTS
         EditorContextCommand.SendToPrompt -> null
     }
 

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/controller/chat/userIntent/UserIntentRecognizer.kt

@@ -25,8 +25,8 @@ action.aws.toolkit.jetbrains.core.services.cwc.commands.OptimizeCodeAction.descr
 action.aws.toolkit.jetbrains.core.services.cwc.commands.OptimizeCodeAction.text = Optimize Code
 action.aws.toolkit.jetbrains.core.services.cwc.commands.RefactorCodeAction.description = Refactors the selected code
 action.aws.toolkit.jetbrains.core.services.cwc.commands.RefactorCodeAction.text = Refactor Code
-action.aws.toolkit.jetbrains.core.services.cwc.commands.GenerateUnitTestAction.description = Generates unit tests for the selected code
-action.aws.toolkit.jetbrains.core.services.cwc.commands.GenerateUnitTestAction.text = Generate Tests (Beta)
+action.aws.toolkit.jetbrains.core.services.cwc.commands.GenerateUnitTestsAction.description = Generates unit tests for the selected code
+action.aws.toolkit.jetbrains.core.services.cwc.commands.GenerateUnitTestsAction.text = Generate Tests (Beta)
 action.aws.toolkit.jetbrains.core.services.cwc.commands.SendToPromptAction.description = Sends selected code to chat
 action.aws.toolkit.jetbrains.core.services.cwc.commands.SendToPromptAction.text = Send to Prompt
 action.aws.toolkit.open.arn.browser.text=Open ARN in AWS Console