Skip to content

Commit a99df55

Browse files
authored
fix(amazonq): can't remove document listener (#5885)
the handler may potentially be already disposed
1 parent 83ac4f5 commit a99df55

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ import org.eclipse.lsp4j.TextDocumentContentChangeEvent
3333
import org.eclipse.lsp4j.TextDocumentIdentifier
3434
import org.eclipse.lsp4j.TextDocumentItem
3535
import org.eclipse.lsp4j.VersionedTextDocumentIdentifier
36+
import software.aws.toolkits.core.utils.tryOrNull
3637
import software.aws.toolkits.jetbrains.services.amazonq.lsp.AmazonQLspService
3738
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.ACTIVE_EDITOR_CHANGED_NOTIFICATION
3839
import software.aws.toolkits.jetbrains.services.amazonq.lsp.util.LspEditorUtil.getCursorState
@@ -91,7 +92,7 @@ class TextDocumentServiceHandler(
9192
ApplicationManager.getApplication().runReadAction {
9293
val existingListener = file.getUserData(KEY_REAL_TIME_EDIT_LISTENER)
9394
if (existingListener != null) {
94-
FileDocumentManager.getInstance().getDocument(file)?.removeDocumentListener(existingListener)
95+
tryOrNull { FileDocumentManager.getInstance().getDocument(file)?.removeDocumentListener(existingListener) }
9596
file.putUserData(KEY_REAL_TIME_EDIT_LISTENER, null)
9697
}
9798
}
@@ -175,7 +176,7 @@ class TextDocumentServiceHandler(
175176
) {
176177
val listener = file.getUserData(KEY_REAL_TIME_EDIT_LISTENER)
177178
if (listener != null) {
178-
FileDocumentManager.getInstance().getDocument(file)?.removeDocumentListener(listener)
179+
tryOrNull { FileDocumentManager.getInstance().getDocument(file)?.removeDocumentListener(listener) }
179180
file.putUserData(KEY_REAL_TIME_EDIT_LISTENER, null)
180181

181182
cs.launch {

0 commit comments

Comments
 (0)