Skip to content

Commit ae4af35

Browse files
authored
fix(amazonq): cherry-pick changes to support aws/chat/chatOptionsUpdate from model selection pr (#5779)
lots of warnings because not currently handled ``` WARN - org.eclipse.lsp4j.jsonrpc.services.GenericEndpoint - Unsupported notification method: aws/chat/chatOptionsUpdate ```
1 parent 44c37a0 commit ae4af35

File tree

3 files changed

+16
-0
lines changed

3 files changed

+16
-0
lines changed

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLanguageClient.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import org.eclipse.lsp4j.jsonrpc.services.JsonRequest
88
import org.eclipse.lsp4j.services.LanguageClient
99
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.LSPAny
1010
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_OPEN_TAB
11+
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_OPTIONS_UPDATE_NOTIFICATION
1112
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_SEND_CONTEXT_COMMANDS
1213
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_SEND_UPDATE
1314
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CopyFileParams
@@ -67,4 +68,7 @@ interface AmazonQLanguageClient : LanguageClient {
6768

6869
@JsonNotification(DID_CREATE_DIRECTORY)
6970
fun createDirectory(params: FileParams)
71+
72+
@JsonNotification(CHAT_OPTIONS_UPDATE_NOTIFICATION)
73+
fun sendChatOptionsUpdate(params: LSPAny)
7074
}

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLanguageClientImpl.kt

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ import software.aws.toolkits.jetbrains.services.amazonq.lsp.flareChat.ChatCommun
4141
import software.aws.toolkits.jetbrains.services.amazonq.lsp.flareChat.FlareUiMessage
4242
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.LSPAny
4343
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_OPEN_TAB
44+
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_OPTIONS_UPDATE_NOTIFICATION
4445
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_SEND_CONTEXT_COMMANDS
4546
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_SEND_UPDATE
4647
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CopyFileParams
@@ -413,6 +414,16 @@ class AmazonQLanguageClientImpl(private val project: Project) : AmazonQLanguageC
413414
return refreshVfs(params.newPath)
414415
}
415416

417+
override fun sendChatOptionsUpdate(params: LSPAny) {
418+
val chatManager = ChatCommunicationManager.getInstance(project)
419+
chatManager.notifyUi(
420+
FlareUiMessage(
421+
command = CHAT_OPTIONS_UPDATE_NOTIFICATION,
422+
params = params,
423+
)
424+
)
425+
}
426+
416427
private fun refreshVfs(path: String) {
417428
val currPath = Paths.get(path)
418429
if (currPath.startsWith(localHistoryPath)) return

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ const val CHAT_INSERT_TO_CURSOR_NOTIFICATION = "aws/chat/insertToCursorPosition"
2020
const val CHAT_LINK_CLICK = "aws/chat/linkClick"
2121
const val CHAT_LIST_CONVERSATIONS = "aws/chat/listConversations"
2222
const val CHAT_OPEN_TAB = "aws/chat/openTab"
23+
const val CHAT_OPTIONS_UPDATE_NOTIFICATION = "aws/chat/chatOptionsUpdate"
2324
const val CHAT_PROMPT_OPTION_ACKNOWLEDGED = "chatPromptOptionAcknowledged"
2425
const val CHAT_QUICK_ACTION = "aws/chat/sendChatQuickAction"
2526
const val CHAT_READY = "aws/chat/ready"

0 commit comments

Comments
 (0)