@@ -17,7 +17,6 @@ import kotlinx.coroutines.flow.distinctUntilChanged
17
17
import kotlinx.coroutines.flow.launchIn
18
18
import kotlinx.coroutines.flow.merge
19
19
import kotlinx.coroutines.flow.onEach
20
- import kotlinx.coroutines.future.await
21
20
import kotlinx.coroutines.launch
22
21
import org.cef.browser.CefBrowser
23
22
import org.eclipse.lsp4j.Position
@@ -29,9 +28,9 @@ import software.aws.toolkits.jetbrains.services.amazonq.lsp.encryption.JwtEncryp
29
28
import software.aws.toolkits.jetbrains.services.amazonq.lsp.flareChat.ChatCommunicationManager
30
29
import software.aws.toolkits.jetbrains.services.amazonq.lsp.flareChat.getTextDocumentIdentifier
31
30
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
33
31
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_TAB_ADD
34
32
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
35
34
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.ChatParams
36
35
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.ChatPrompt
37
36
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
40
39
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.QuickChatActionRequest
41
40
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.SEND_CHAT_COMMAND_PROMPT
42
41
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
44
43
import software.aws.toolkits.jetbrains.services.amazonq.util.command
45
44
import software.aws.toolkits.jetbrains.services.amazonq.util.tabType
46
45
import software.aws.toolkits.jetbrains.services.amazonq.webview.theme.AmazonQTheme
@@ -210,23 +209,22 @@ class BrowserConnector(
210
209
showResult(result, partialResultToken, tabId, encryptionManager, browser)
211
210
}
212
211
CHAT_TAB_ADD -> {
213
- val requestFromUi = serializer.deserializeChatMessages(node, TabEventParams ::class .java)
212
+ val requestFromUi = serializer.deserializeChatMessages(node, TabEventRequest ::class .java)
214
213
AmazonQLspService .executeIfRunning(project) { server ->
215
- server.tabAdd(requestFromUi)
214
+ server.tabAdd(requestFromUi.params )
216
215
} ? : CompletableFuture .failedFuture<Unit >(IllegalStateException (" LSP Server not running" ))
217
216
}
218
217
CHAT_TAB_REMOVE -> {
219
- val requestFromUi = serializer.deserializeChatMessages(node, TabEventParams ::class .java)
218
+ val requestFromUi = serializer.deserializeChatMessages(node, TabEventRequest ::class .java)
220
219
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)
224
222
} ? : CompletableFuture .failedFuture<Unit >(IllegalStateException (" LSP Server not running" ))
225
223
}
226
224
CHAT_TAB_CHANGE -> {
227
- val requestFromUi = serializer.deserializeChatMessages(node, TabEventParams ::class .java)
225
+ val requestFromUi = serializer.deserializeChatMessages(node, TabEventRequest ::class .java)
228
226
AmazonQLspService .executeIfRunning(project) { server ->
229
- server.tabChange(requestFromUi)
227
+ server.tabChange(requestFromUi.params )
230
228
} ? : CompletableFuture .failedFuture<Unit >(IllegalStateException (" LSP Server not running" ))
231
229
}
232
230
}
0 commit comments