format

Author: leigaol

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

@@ -9,6 +9,7 @@ import kotlinx.coroutines.flow.MutableSharedFlow
 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.flareChat.FlareUiMessage
 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
@@ -32,23 +33,13 @@ class ActionRegistrar {
                 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"
-                var uiMessage = ""
+                var uiMessage: FlareUiMessage? = null
                 if (command.verb != "sendToPrompt") {
                     val params = GenericCommandParams(selection = codeSelection, triggerType = TriggerType.CONTEXT_MENU, genericCommand = command.name)
-                    uiMessage = """
-                        {
-                            "command": "genericCommand",
-                            "params": ${Gson().toJson(params)}
-                        }
-                    """.trimIndent()
+                    uiMessage = FlareUiMessage(command = "genericCommand", params = params)
                 } else {
                     val params = SendToPromptParams(selection = codeSelection, triggerType = TriggerType.CONTEXT_MENU)
-                    uiMessage = """
-                        {
-                            "command": "sendToPrompt",
-                            "params": ${Gson().toJson(params)}
-                        }
-                    """.trimIndent()
+                    uiMessage = FlareUiMessage(command = "sendToPrompt", params = params)
                 }
                 AsyncChatUiListener.notifyPartialMessageUpdate(uiMessage)
             }

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

@@ -11,12 +11,16 @@ enum class TriggerType(val value: String) {
 }
 
 data class GenericCommandParams(
+    val tabId: String? = null,
     val selection: String,
     val triggerType: TriggerType,
     val genericCommand: String,
 )
 
+// https://github.com/aws/language-server-runtimes/blob/b7c4718b9bd84e08e72b992da5d699549af9f115/chat-client-ui-types/src/uiContracts.ts#L67
 data class SendToPromptParams(
     val selection: String,
     val triggerType: TriggerType,
+    val prompt: ChatPrompt? = null,
+    val autoSubmit: Boolean? = null
 )