Merge main into feature/remote-chat-lsp

aws-toolkit-automation · web-flow · commit dc5cd9154d8a · 2025-06-11T17:27:43.000-04:00
diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/textdocument/TextDocumentServiceHandler.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/textdocument/TextDocumentServiceHandler.kt
@@ -71,9 +71,9 @@ class TextDocumentServiceHandler(
                     realTimeEdit(event)
                 }
             }
-            file.putUserData(KEY_REAL_TIME_EDIT_LISTENER, listener)
             ApplicationManager.getApplication().runReadAction {
-                FileDocumentManager.getInstance().getDocument(file)?.addDocumentListener(listener, this)
+                FileDocumentManager.getInstance().getDocument(file)?.addDocumentListener(listener)
+                file.putUserData(KEY_REAL_TIME_EDIT_LISTENER, listener)
             }
         }
         AmazonQLspService.executeIfRunning(project) { languageServer ->

Original file line number	Diff line number	Diff line change
`@@ -71,9 +71,9 @@ class TextDocumentServiceHandler(`
`71`	`71`	`realTimeEdit(event)`
`72`	`72`	`}`
`73`	`73`	`}`
`74`		`- file.putUserData(KEY_REAL_TIME_EDIT_LISTENER, listener)`
`75`	`74`	`ApplicationManager.getApplication().runReadAction {`
`76`		`- FileDocumentManager.getInstance().getDocument(file)?.addDocumentListener(listener, this)`
	`75`	`+ FileDocumentManager.getInstance().getDocument(file)?.addDocumentListener(listener)`
	`76`	`+ file.putUserData(KEY_REAL_TIME_EDIT_LISTENER, listener)`
`77`	`77`	`}`
`78`	`78`	`}`
`79`	`79`	`AmazonQLspService.executeIfRunning(project) { languageServer ->`