Skip to content

Commit f1d4fc4

Browse files
committed
configure param deserialization
1 parent 8bdb1bc commit f1d4fc4

File tree

2 files changed

+15
-12
lines changed
  • plugins/amazonq
    • chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview
    • shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/model/aws/chat

2 files changed

+15
-12
lines changed

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/BrowserConnector.kt

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import kotlinx.coroutines.flow.distinctUntilChanged
1717
import kotlinx.coroutines.flow.launchIn
1818
import kotlinx.coroutines.flow.merge
1919
import kotlinx.coroutines.flow.onEach
20-
import kotlinx.coroutines.future.await
2120
import kotlinx.coroutines.launch
2221
import org.cef.browser.CefBrowser
2322
import org.eclipse.lsp4j.Position
@@ -29,9 +28,9 @@ import software.aws.toolkits.jetbrains.services.amazonq.lsp.encryption.JwtEncryp
2928
import software.aws.toolkits.jetbrains.services.amazonq.lsp.flareChat.ChatCommunicationManager
3029
import software.aws.toolkits.jetbrains.services.amazonq.lsp.flareChat.getTextDocumentIdentifier
3130
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_QUICK_ACTION
32-
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_TAB_REMOVE
3331
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_TAB_ADD
3432
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_TAB_CHANGE
33+
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_TAB_REMOVE
3534
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.ChatParams
3635
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.ChatPrompt
3736
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CursorState
@@ -40,7 +39,7 @@ import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.Encry
4039
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.QuickChatActionRequest
4140
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.SEND_CHAT_COMMAND_PROMPT
4241
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.SendChatPromptRequest
43-
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.TabEventParams
42+
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.TabEventRequest
4443
import software.aws.toolkits.jetbrains.services.amazonq.util.command
4544
import software.aws.toolkits.jetbrains.services.amazonq.util.tabType
4645
import software.aws.toolkits.jetbrains.services.amazonq.webview.theme.AmazonQTheme
@@ -210,23 +209,22 @@ class BrowserConnector(
210209
showResult(result, partialResultToken, tabId, encryptionManager, browser)
211210
}
212211
CHAT_TAB_ADD -> {
213-
val requestFromUi = serializer.deserializeChatMessages(node, TabEventParams::class.java)
212+
val requestFromUi = serializer.deserializeChatMessages(node, TabEventRequest::class.java)
214213
AmazonQLspService.executeIfRunning(project) { server ->
215-
server.tabAdd(requestFromUi)
214+
server.tabAdd(requestFromUi.params)
216215
} ?: CompletableFuture.failedFuture<Unit>(IllegalStateException("LSP Server not running"))
217216
}
218217
CHAT_TAB_REMOVE -> {
219-
val requestFromUi = serializer.deserializeChatMessages(node, TabEventParams::class.java)
218+
val requestFromUi = serializer.deserializeChatMessages(node, TabEventRequest::class.java)
220219
AmazonQLspService.executeIfRunning(project) { server ->
221-
server.tabRemove(requestFromUi).thenRun {
222-
chatCommunicationManager.removePartialChatMessage(requestFromUi.tabId)
223-
}
220+
server.tabRemove(requestFromUi.params)
221+
chatCommunicationManager.removePartialChatMessage(requestFromUi.params.tabId)
224222
} ?: CompletableFuture.failedFuture<Unit>(IllegalStateException("LSP Server not running"))
225223
}
226224
CHAT_TAB_CHANGE -> {
227-
val requestFromUi = serializer.deserializeChatMessages(node, TabEventParams::class.java)
225+
val requestFromUi = serializer.deserializeChatMessages(node, TabEventRequest::class.java)
228226
AmazonQLspService.executeIfRunning(project) { server ->
229-
server.tabChange(requestFromUi)
227+
server.tabChange(requestFromUi.params)
230228
} ?: CompletableFuture.failedFuture<Unit>(IllegalStateException("LSP Server not running"))
231229
}
232230
}
Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@
33

44
package software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat
55

6+
data class TabEventRequest(
7+
val command: String,
8+
val params: TabEventParams,
9+
)
10+
611
data class TabEventParams(
7-
val tabId: String
12+
val tabId: String,
813
)

0 commit comments

Comments
 (0)