Skip to content

Commit c72abfb

Browse files
committed
fix: reuse ChatCommunicationManager instance
1 parent e8f69ed commit c72abfb

File tree

1 file changed

+2
-10
lines changed

1 file changed

+2
-10
lines changed

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

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ import java.util.concurrent.TimeUnit
7979
* Concrete implementation of [AmazonQLanguageClient] to handle messages sent from server
8080
*/
8181
class AmazonQLanguageClientImpl(private val project: Project) : AmazonQLanguageClient {
82+
private val chatManager = ChatCommunicationManager.getInstance(project)
8283

8384
private fun handleTelemetryMap(telemetryMap: Map<*, *>) {
8485
try {
@@ -206,7 +207,6 @@ class AmazonQLanguageClientImpl(private val project: Project) : AmazonQLanguageC
206207
override fun openTab(params: LSPAny): CompletableFuture<LSPAny> {
207208
val requestId = UUID.randomUUID().toString()
208209
val result = CompletableFuture<LSPAny>()
209-
val chatManager = ChatCommunicationManager.getInstance(project)
210210
chatManager.addTabOpenRequest(requestId, result)
211211

212212
chatManager.notifyUi(
@@ -257,7 +257,6 @@ class AmazonQLanguageClientImpl(private val project: Project) : AmazonQLanguageC
257257
override fun getSerializedChat(params: LSPAny): CompletableFuture<GetSerializedChatResult> {
258258
val requestId = UUID.randomUUID().toString()
259259
val result = CompletableFuture<GetSerializedChatResult>()
260-
val chatManager = ChatCommunicationManager.getInstance(project)
261260
chatManager.addSerializedChatRequest(requestId, result)
262261

263262
chatManager.notifyUi(
@@ -322,9 +321,8 @@ class AmazonQLanguageClientImpl(private val project: Project) : AmazonQLanguageC
322321

323322
override fun notifyProgress(params: ProgressParams?) {
324323
if (params == null) return
325-
val chatCommunicationManager = ChatCommunicationManager.getInstance(project)
326324
try {
327-
chatCommunicationManager.handlePartialResultProgressNotification(project, params)
325+
chatManager.handlePartialResultProgressNotification(project, params)
328326
} catch (e: Exception) {
329327
LOG.error(e) { "Cannot handle partial chat" }
330328
}
@@ -420,7 +418,6 @@ class AmazonQLanguageClientImpl(private val project: Project) : AmazonQLanguageC
420418
)
421419

422420
override fun sendContextCommands(params: LSPAny): CompletableFuture<Unit> {
423-
val chatManager = ChatCommunicationManager.getInstance(project)
424421
chatManager.notifyUi(
425422
FlareUiMessage(
426423
command = CHAT_SEND_CONTEXT_COMMANDS,
@@ -431,8 +428,6 @@ class AmazonQLanguageClientImpl(private val project: Project) : AmazonQLanguageC
431428
}
432429

433430
override fun sendPinnedContext(params: LSPAny): CompletableFuture<Unit> {
434-
val chatManager = ChatCommunicationManager.getInstance(project)
435-
436431
// Send the active text file path with pinned context
437432
val editor = FileEditorManager.getInstance(project).selectedTextEditor
438433
val textDocument = editor?.let {
@@ -465,7 +460,6 @@ class AmazonQLanguageClientImpl(private val project: Project) : AmazonQLanguageC
465460
}
466461

467462
override fun pinnedContextAdd(params: LSPAny): CompletableFuture<Unit> {
468-
val chatManager = ChatCommunicationManager.getInstance(project)
469463
chatManager.notifyUi(
470464
FlareUiMessage(
471465
command = CHAT_PINNED_CONTEXT_ADD,
@@ -476,7 +470,6 @@ class AmazonQLanguageClientImpl(private val project: Project) : AmazonQLanguageC
476470
}
477471

478472
override fun pinnedContextRemove(params: LSPAny): CompletableFuture<Unit> {
479-
val chatManager = ChatCommunicationManager.getInstance(project)
480473
chatManager.notifyUi(
481474
FlareUiMessage(
482475
command = CHAT_PINNED_CONTEXT_REMOVE,
@@ -500,7 +493,6 @@ class AmazonQLanguageClientImpl(private val project: Project) : AmazonQLanguageC
500493
}
501494

502495
override fun sendChatOptionsUpdate(params: LSPAny) {
503-
val chatManager = ChatCommunicationManager.getInstance(project)
504496
chatManager.notifyUi(
505497
FlareUiMessage(
506498
command = CHAT_OPTIONS_UPDATE_NOTIFICATION,

0 commit comments

Comments
 (0)