Skip to content

fix(amazonq): always send latest document on any document change #5804

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 2 commits into from
Jun 10, 2025
Merged

fix(amazonq): always send latest document on any document change #5804

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7524cd8
fix(amazonq): always send latest document on any document change
andrewyuq Jun 10, 2025
d11d00e
Merge branch 'main' into q-lsp-chat
andrewyuq Jun 10, 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
40 changes: 21 additions & 19 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 @@ -13,6 +13,7 @@ import com.intellij.openapi.fileEditor.FileDocumentManagerListener
import com.intellij.openapi.fileEditor.FileEditorManager
import com.intellij.openapi.fileEditor.FileEditorManagerListener
import com.intellij.openapi.project.Project
import com.intellij.openapi.util.Key
import com.intellij.openapi.vfs.VirtualFile
import com.intellij.openapi.vfs.VirtualFileManager
import com.intellij.openapi.vfs.newvfs.BulkFileListener
Expand All @@ -22,8 +23,6 @@ import org.eclipse.lsp4j.DidChangeTextDocumentParams
import org.eclipse.lsp4j.DidCloseTextDocumentParams
import org.eclipse.lsp4j.DidOpenTextDocumentParams
import org.eclipse.lsp4j.DidSaveTextDocumentParams
import org.eclipse.lsp4j.Position
import org.eclipse.lsp4j.Range
import org.eclipse.lsp4j.TextDocumentContentChangeEvent
import org.eclipse.lsp4j.TextDocumentIdentifier
import org.eclipse.lsp4j.TextDocumentItem
Expand Down Expand Up @@ -66,15 +65,16 @@ class TextDocumentServiceHandler(
}

private fun handleFileOpened(file: VirtualFile) {
ApplicationManager.getApplication().runReadAction {
FileDocumentManager.getInstance().getDocument(file)?.addDocumentListener(
object : DocumentListener {
override fun documentChanged(event: DocumentEvent) {
realTimeEdit(event)
}
},
this
)
if (file.getUserData(KEY_REAL_TIME_EDIT_LISTENER) == null) {
val listener = object : DocumentListener {
override fun documentChanged(event: DocumentEvent) {
realTimeEdit(event)
}
}
file.putUserData(KEY_REAL_TIME_EDIT_LISTENER, listener)
ApplicationManager.getApplication().runReadAction {
FileDocumentManager.getInstance().getDocument(file)?.addDocumentListener(listener, this)
}
}
AmazonQLspService.executeIfRunning(project) { languageServer ->
toUriString(file)?.let { uri ->
Expand Down Expand Up @@ -148,6 +148,11 @@ class TextDocumentServiceHandler(
source: FileEditorManager,
file: VirtualFile,
) {
val listener = file.getUserData(KEY_REAL_TIME_EDIT_LISTENER)
if (listener != null) {
FileDocumentManager.getInstance().getDocument(file)?.removeDocumentListener(listener)
file.putUserData(KEY_REAL_TIME_EDIT_LISTENER, null)
}
AmazonQLspService.executeIfRunning(project) { languageServer ->
toUriString(file)?.let { uri ->
languageServer.textDocumentService.didClose(
Expand All @@ -166,9 +171,6 @@ class TextDocumentServiceHandler(
pluginAwareExecuteOnPooledThread {
val vFile = FileDocumentManager.getInstance().getFile(event.document) ?: return@pluginAwareExecuteOnPooledThread
toUriString(vFile)?.let { uri ->
val editor = FileEditorManager.getInstance(project).selectedTextEditor ?: return@pluginAwareExecuteOnPooledThread
val logicalPosition = editor.offsetToLogicalPosition(event.offset)
val newLogicalPosition = editor.offsetToLogicalPosition(event.offset + event.newLength)
languageServer.textDocumentService.didChange(
DidChangeTextDocumentParams().apply {
textDocument = VersionedTextDocumentIdentifier().apply {
Expand All @@ -177,11 +179,7 @@ class TextDocumentServiceHandler(
}
contentChanges = listOf(
TextDocumentContentChangeEvent().apply {
text = event.newFragment.toString()
range = Range(
Position(logicalPosition.line, logicalPosition.column),
Position(newLogicalPosition.line, newLogicalPosition.column)
)
text = event.document.text
}
)
}
Expand All @@ -194,4 +192,8 @@ class TextDocumentServiceHandler(

override fun dispose() {
}

companion object {
private val KEY_REAL_TIME_EDIT_LISTENER = Key.create<DocumentListener>("amazonq.textdocument.realtimeedit.listener")
}
}
Loading