detekt

Author: leigaol

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

@@ -1,6 +1,6 @@
 // Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-
+@file:Suppress("BannedImports")
 package software.aws.toolkits.jetbrains.services.cwc.commands
 
 import com.google.gson.Gson
@@ -10,6 +10,7 @@ import kotlinx.coroutines.flow.asSharedFlow
 import kotlinx.coroutines.runBlocking
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.flareChat.AsyncChatUiListener
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.GenericCommandParams
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.SendToPromptParams
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.TriggerType
 import software.aws.toolkits.jetbrains.services.amazonq.messages.AmazonQMessage
 import software.aws.toolkits.jetbrains.services.cwc.editor.context.ActiveFileContextExtractor
@@ -25,26 +26,33 @@ class ActionRegistrar {
         if (command == EditorContextCommand.GenerateUnitTests) {
             // pre-existing old chat code path
             _messages.tryEmit(ContextMenuActionMessage(command, project))
-        }
-        else {
+        } else {
             // new agentic chat route
             runBlocking {
                 val contextExtractor = ActiveFileContextExtractor.create(fqnWebviewAdapter = null, project = project)
                 val fileContext = contextExtractor.extractContextForTrigger(ExtractionTriggerType.ContextMenu)
                 val codeSelection = "\n```\n${fileContext.focusAreaContext?.codeSelection?.trimIndent()?.trim()}\n```\n"
-
-                val params = GenericCommandParams(selection = codeSelection, triggerType = TriggerType.CONTEXT_MENU, genericCommand = command.name)
-
-                val uiMessage = """
+                var uiMessage = ""
+                if (command.verb != "sendToPrompt") {
+                    val params = GenericCommandParams(selection = codeSelection, triggerType = TriggerType.CONTEXT_MENU, genericCommand = command.name)
+                    uiMessage = """
                         {
                             "command": "genericCommand",
                             "params": ${Gson().toJson(params)}
                         }
                     """.trimIndent()
+                } else {
+                    val params = SendToPromptParams(selection = codeSelection, triggerType = TriggerType.CONTEXT_MENU)
+                    uiMessage = """
+                        {
+                            "command": "sendToPrompt",
+                            "params": ${Gson().toJson(params)}
+                        }
+                    """.trimIndent()
+                }
                 AsyncChatUiListener.notifyPartialMessageUpdate(uiMessage)
             }
         }
-
     }
 
     fun reportMessageClick(command: EditorContextCommand, issue: MutableMap<String, String>, project: Project) {
@@ -54,13 +62,5 @@ class ActionRegistrar {
     // provide singleton access
     companion object {
         val instance = ActionRegistrar()
-        
-        /**
-         * Computes the product of 10 * 10
-         * @return The result of 10 * 10
-         */
-        fun computeTenTimesTen(): Int {
-            return 10 * 10
-        }
     }
 }

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

@@ -31,7 +31,7 @@ enum class EditorContextCommand(
         actionId = "aws.amazonq.generateUnitTests",
     ),
     SendToPrompt(
-        verb = "SendToPrompt",
+        verb = "sendToPrompt",
         actionId = "aws.amazonq.sendToPrompt",
     ),
     ExplainCodeScanIssue(

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/model/aws/chat/GenericCommandParams.kt

@@ -3,16 +3,20 @@
 
 package software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat
 
-
-//https://github.com/aws/language-server-runtimes/blob/main/chat-client-ui-types/src/uiContracts.ts#L27
+// https://github.com/aws/language-server-runtimes/blob/main/chat-client-ui-types/src/uiContracts.ts#L27
 enum class TriggerType(val value: String) {
     HOTKEYS("hotkeys"),
     CLICK("click"),
-    CONTEXT_MENU("contextMenu")
+    CONTEXT_MENU("contextMenu"),
 }
 
 data class GenericCommandParams(
     val selection: String,
     val triggerType: TriggerType,
-    val genericCommand: String
+    val genericCommand: String,
+)
+
+data class SendToPromptParams(
+    val selection: String,
+    val triggerType: TriggerType,
 )