Skip to content

fix(amazonq): can't remove document listener #5885

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 9, 2025
Merged

fix(amazonq): can't remove document listener #5885

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5f455f5
fix(amazonq): can't remove document listener
rli Jul 8, 2025
8e4d3bc
Merge branch 'main' into rli-patch-11
samgst-amazon Jul 9, 2025
448b3b2
Merge branch 'main' into rli-patch-11
rli Jul 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions ...re/aws/toolkits/jetbrains/services/amazonq/lsp/textdocument/TextDocumentServiceHandler.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import org.eclipse.lsp4j.TextDocumentContentChangeEvent
import org.eclipse.lsp4j.TextDocumentIdentifier
import org.eclipse.lsp4j.TextDocumentItem
import org.eclipse.lsp4j.VersionedTextDocumentIdentifier
import software.aws.toolkits.core.utils.tryOrNull
import software.aws.toolkits.jetbrains.services.amazonq.lsp.AmazonQLspService
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.ACTIVE_EDITOR_CHANGED_NOTIFICATION
import software.aws.toolkits.jetbrains.services.amazonq.lsp.util.LspEditorUtil.getCursorState
Expand Down Expand Up @@ -91,7 +92,7 @@ class TextDocumentServiceHandler(
ApplicationManager.getApplication().runReadAction {
val existingListener = file.getUserData(KEY_REAL_TIME_EDIT_LISTENER)
if (existingListener != null) {
FileDocumentManager.getInstance().getDocument(file)?.removeDocumentListener(existingListener)
tryOrNull { FileDocumentManager.getInstance().getDocument(file)?.removeDocumentListener(existingListener) }
file.putUserData(KEY_REAL_TIME_EDIT_LISTENER, null)
}
}
Expand Down Expand Up @@ -175,7 +176,7 @@ class TextDocumentServiceHandler(
) {
val listener = file.getUserData(KEY_REAL_TIME_EDIT_LISTENER)
if (listener != null) {
FileDocumentManager.getInstance().getDocument(file)?.removeDocumentListener(listener)
tryOrNull { FileDocumentManager.getInstance().getDocument(file)?.removeDocumentListener(listener) }
file.putUserData(KEY_REAL_TIME_EDIT_LISTENER, null)

cs.launch {
Expand Down
Loading