Skip to content

fix(amazonq): suppress IDE error when editor does not actually contain text #5908

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 21, 2025
Merged

fix(amazonq): suppress IDE error when editor does not actually contain text #5908

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3743202
fix(amazonq): suppress IDE error when editor does not actually contai…
rli Jul 16, 2025
6db468c
Merge remote-tracking branch 'origin/main' into rli/editor-error
rli Jul 18, 2025
0151d71
lint
rli Jul 18, 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
4 changes: 4 additions & 0 deletions .changes/next-release/bugfix-846e7004-5426-4f6b-970f-2b9437314b98.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"type" : "bugfix",
"description" : "Suppress IDE error when current editor context is not valid for Amazon Q"
}
144 changes: 75 additions & 69 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,7 +33,10 @@ 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.getLogger
import software.aws.toolkits.core.utils.tryOrNull
import software.aws.toolkits.core.utils.warn
import software.aws.toolkits.jetbrains.services.amazonq.lsp.AmazonQLanguageServer
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 @@ -98,40 +101,36 @@ class TextDocumentServiceHandler(
}
}

cs.launch {
AmazonQLspService.executeAsyncIfRunning(project) { languageServer ->
toUriString(file)?.let { uri ->
languageServer.textDocumentService.didOpen(
DidOpenTextDocumentParams().apply {
textDocument = TextDocumentItem().apply {
this.uri = uri
text = file.inputStream.readAllBytes().decodeToString()
languageId = file.fileType.name.lowercase()
version = file.modificationStamp.toInt()
}
trySendIfValid { languageServer ->
toUriString(file)?.let { uri ->
languageServer.textDocumentService.didOpen(
DidOpenTextDocumentParams().apply {
textDocument = TextDocumentItem().apply {
this.uri = uri
text = file.inputStream.readAllBytes().decodeToString()
languageId = file.fileType.name.lowercase()
version = file.modificationStamp.toInt()
}
)
}
}
)
}
}
}
}

override fun beforeDocumentSaving(document: Document) {
cs.launch {
AmazonQLspService.executeAsyncIfRunning(project) { languageServer ->
val file = FileDocumentManager.getInstance().getFile(document) ?: return@executeAsyncIfRunning
toUriString(file)?.let { uri ->
languageServer.textDocumentService.didSave(
DidSaveTextDocumentParams().apply {
textDocument = TextDocumentIdentifier().apply {
this.uri = uri
}
// TODO: should respect `textDocumentSync.save.includeText` server capability config
text = document.text
trySendIfValid { languageServer ->
val file = FileDocumentManager.getInstance().getFile(document) ?: return@trySendIfValid
toUriString(file)?.let { uri ->
languageServer.textDocumentService.didSave(
DidSaveTextDocumentParams().apply {
textDocument = TextDocumentIdentifier().apply {
this.uri = uri
}
)
}
// TODO: should respect `textDocumentSync.save.includeText` server capability config
text = document.text
}
)
}
}
}
Expand All @@ -141,23 +140,21 @@ class TextDocumentServiceHandler(
val document = FileDocumentManager.getInstance().getCachedDocument(event.file) ?: return@forEach

handleFileOpened(event.file)
cs.launch {
AmazonQLspService.executeAsyncIfRunning(project) { languageServer ->
toUriString(event.file)?.let { uri ->
languageServer.textDocumentService.didChange(
DidChangeTextDocumentParams().apply {
textDocument = VersionedTextDocumentIdentifier().apply {
this.uri = uri
version = document.modificationStamp.toInt()
}
contentChanges = listOf(
TextDocumentContentChangeEvent().apply {
text = document.text
}
)
trySendIfValid { languageServer ->
toUriString(event.file)?.let { uri ->
languageServer.textDocumentService.didChange(
DidChangeTextDocumentParams().apply {
textDocument = VersionedTextDocumentIdentifier().apply {
this.uri = uri
version = document.modificationStamp.toInt()
}
)
}
contentChanges = listOf(
TextDocumentContentChangeEvent().apply {
text = document.text
}
)
}
)
}
}
}
Expand All @@ -179,17 +176,15 @@ class TextDocumentServiceHandler(
tryOrNull { FileDocumentManager.getInstance().getDocument(file)?.removeDocumentListener(listener) }
file.putUserData(KEY_REAL_TIME_EDIT_LISTENER, null)

cs.launch {
AmazonQLspService.executeAsyncIfRunning(project) { languageServer ->
toUriString(file)?.let { uri ->
languageServer.textDocumentService.didClose(
DidCloseTextDocumentParams().apply {
textDocument = TextDocumentIdentifier().apply {
this.uri = uri
}
trySendIfValid { languageServer ->
toUriString(file)?.let { uri ->
languageServer.textDocumentService.didClose(
DidCloseTextDocumentParams().apply {
textDocument = TextDocumentIdentifier().apply {
this.uri = uri
}
)
}
}
)
}
}
}
Expand Down Expand Up @@ -221,24 +216,22 @@ class TextDocumentServiceHandler(
}

private fun realTimeEdit(event: DocumentEvent) {
cs.launch {
AmazonQLspService.executeAsyncIfRunning(project) { languageServer ->
val vFile = FileDocumentManager.getInstance().getFile(event.document) ?: return@executeAsyncIfRunning
toUriString(vFile)?.let { uri ->
languageServer.textDocumentService.didChange(
DidChangeTextDocumentParams().apply {
textDocument = VersionedTextDocumentIdentifier().apply {
this.uri = uri
version = event.document.modificationStamp.toInt()
}
contentChanges = listOf(
TextDocumentContentChangeEvent().apply {
text = event.document.text
}
)
trySendIfValid { languageServer ->
val vFile = FileDocumentManager.getInstance().getFile(event.document) ?: return@trySendIfValid
toUriString(vFile)?.let { uri ->
languageServer.textDocumentService.didChange(
DidChangeTextDocumentParams().apply {
textDocument = VersionedTextDocumentIdentifier().apply {
this.uri = uri
version = event.document.modificationStamp.toInt()
}
)
}
contentChanges = listOf(
TextDocumentContentChangeEvent().apply {
text = event.document.text
}
)
}
)
}
}
// Process document changes here
Expand All @@ -247,7 +240,20 @@ class TextDocumentServiceHandler(
override fun dispose() {
}

private fun trySendIfValid(runnable: (AmazonQLanguageServer) -> Unit) {
cs.launch {
AmazonQLspService.executeAsyncIfRunning(project) { languageServer ->
try {
runnable(languageServer)
} catch (e: Exception) {
LOG.warn { "Invalid document: $e" }
}
}
}
}

companion object {
private val KEY_REAL_TIME_EDIT_LISTENER = Key.create<DocumentListener>("amazonq.textdocument.realtimeedit.listener")
private val LOG = getLogger<TextDocumentServiceHandler>()
}
}
16 changes: 16 additions & 0 deletions ...ws/toolkits/jetbrains/services/amazonq/lsp/textdocument/TextDocumentServiceHandlerTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,22 @@ class TextDocumentServiceHandlerTest {
}
}

@Test
fun `fileOpened suppreses document read failure`() = runTest {
sut = TextDocumentServiceHandler(projectRule.project, this)
advanceUntilIdle()

val file = mockk<VirtualFile> {
every { inputStream } throws RuntimeException("read failure")
every { getUserData<Any>(any()) } returns null
every { putUserData<Any>(any(), any()) } returns Unit
every { isValid } returns false
}
sut.fileOpened(mockk(), file)

verify(exactly = 0) { mockTextDocumentService.didOpen(any()) }
}

@Test
fun `didClose runs on fileClosed`() = runTest {
sut = TextDocumentServiceHandler(projectRule.project, this)
Expand Down
Loading