fix(amazonq): insert to cursor button in chat applies edit to active file

.changes/next-release/bugfix-d5bbb805-aa36-4e2b-9bc2-7377c184c716.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "- Fixed \"Insert to Cursor\" button to correctly insert code blocks at the current cursor position in the active file"
+}

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/BrowserConnector.kt

@@ -353,7 +353,18 @@
             }
 
             CHAT_INSERT_TO_CURSOR -> {
-                handleChat(AmazonQChatServer.insertToCursorPosition, node)
+                val editor = FileEditorManager.getInstance(project).selectedTextEditor
+                val textDocument = editor?.let { TextDocumentIdentifier(toUriString(it.virtualFile)) }
+                val cursorPosition = editor?.let { LspEditorUtil.getCursorPosition(it) }
+                val enrichedParams = (node.params as? ObjectNode)?.apply {
+                    set<JsonNode>("cursorPosition", serializer.objectMapper.valueToTree(cursorPosition))
+                    set<JsonNode>("textDocument", serializer.objectMapper.valueToTree(textDocument))
+                } ?: node.params
+
+                val enrichedNode = (node as ObjectNode).apply {
+                    set<JsonNode>("params", enrichedParams)
+                }
+                handleChat(AmazonQChatServer.insertToCursorPosition, enrichedNode)
             }
 
             CHAT_LINK_CLICK -> {

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

@@ -21,6 +21,8 @@
 import com.intellij.openapi.vfs.VfsUtilCore
 import com.intellij.openapi.vfs.VirtualFileManager
 import migration.software.aws.toolkits.jetbrains.settings.AwsSettings
+import org.eclipse.lsp4j.ApplyWorkspaceEditParams
+import org.eclipse.lsp4j.ApplyWorkspaceEditResponse
 import org.eclipse.lsp4j.ConfigurationParams
 import org.eclipse.lsp4j.MessageActionItem
 import org.eclipse.lsp4j.MessageParams
@@ -62,6 +64,7 @@
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.ShowSaveFileDialogParams
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.ShowSaveFileDialogResult
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.credentials.ConnectionMetadata
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.util.LspEditorUtil
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.util.TelemetryParsingUtil
 import software.aws.toolkits.jetbrains.services.codewhisperer.customization.CodeWhispererModelConfigurator
 import software.aws.toolkits.jetbrains.services.telemetry.TelemetryService
@@ -567,6 +570,20 @@
         )
     }
 
+    override fun applyEdit(params: ApplyWorkspaceEditParams): CompletableFuture<ApplyWorkspaceEditResponse> =
+        CompletableFuture.supplyAsync(
+            {
+                try {
+                    LspEditorUtil.applyWorkspaceEdit(project, params.edit)
+                    ApplyWorkspaceEditResponse(true)
+                } catch (e: Exception) {
+                    LOG.warn(e) { "Failed to apply workspace edit" }
+                    ApplyWorkspaceEditResponse(false)
+                }
+            },
+            ApplicationManager.getApplication()::invokeLater
+        )
+
     private fun refreshVfs(path: String) {
         val currPath = Paths.get(path)
         if (currPath.startsWith(localHistoryPath)) return

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/util/LspEditorUtil.kt

@@ -4,11 +4,20 @@
 package software.aws.toolkits.jetbrains.services.amazonq.lsp.util
 
 import com.intellij.openapi.application.runReadAction
+import com.intellij.openapi.command.WriteCommandAction
+import com.intellij.openapi.editor.Document
 import com.intellij.openapi.editor.Editor
+import com.intellij.openapi.editor.LogicalPosition
+import com.intellij.openapi.fileEditor.FileDocumentManager
+import com.intellij.openapi.fileEditor.FileEditorManager
+import com.intellij.openapi.project.Project
 import com.intellij.openapi.vfs.VfsUtilCore
 import com.intellij.openapi.vfs.VirtualFile
+import com.intellij.openapi.vfs.VirtualFileManager
 import org.eclipse.lsp4j.Position
 import org.eclipse.lsp4j.Range
+import org.eclipse.lsp4j.TextEdit
+import org.eclipse.lsp4j.WorkspaceEdit
 import software.aws.toolkits.core.utils.getLogger
 import software.aws.toolkits.core.utils.warn
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CursorPosition
@@ -63,13 +72,54 @@
                 )
             } else {
                 return@runReadAction CursorPosition(
-                    Position(
-                        editor.caretModel.primaryCaret.logicalPosition.line,
-                        editor.caretModel.primaryCaret.logicalPosition.column
-                    )
+                    getCursorPosition(editor)
                 )
             }
         }
 
+    fun getCursorPosition(editor: Editor): Position =
+        runReadAction {
+            Position(
+                editor.caretModel.primaryCaret.logicalPosition.line,
+                editor.caretModel.primaryCaret.logicalPosition.column
+            )
+        }
+
+    fun applyWorkspaceEdit(project: Project, edit: WorkspaceEdit) {
+        WriteCommandAction.runWriteCommandAction(project) {
+            edit.documentChanges?.forEach { change ->
+                if (change.isLeft) {
+                    val textDocumentEdit = change.left
+                    applyEditsToFile(project, textDocumentEdit.textDocument.uri, textDocumentEdit.edits)
+                }
+            }
+
+            edit.changes?.forEach { (uri, textEdits) ->
+                applyEditsToFile(project, uri, textEdits)
+            }
+        }
+    }
+
+    private fun applyEditsToFile(project: Project, uri: String, textEdits: List<TextEdit>) {
+        val file = VirtualFileManager.getInstance().findFileByUrl(uri) ?: return
+        val document = FileDocumentManager.getInstance().getDocument(file) ?: return
+        val editor = FileEditorManager.getInstance(project).getSelectedEditor(file)?.let {
+            if (it is com.intellij.openapi.fileEditor.TextEditor) it.editor else null
+        }
+
+        textEdits.forEach { textEdit ->
+            val startOffset = calculateOffset(editor, document, textEdit.range.start)
+            val endOffset = calculateOffset(editor, document, textEdit.range.end)
+            document.replaceString(startOffset, endOffset, textEdit.newText)
+        }
+    }
+
+    private fun calculateOffset(editor: Editor?, document: Document, position: Position): Int =
+        if (editor != null) {
+            editor.logicalPositionToOffset(LogicalPosition(position.line, position.character))
+        } else {
+            document.getLineStartOffset(position.line) + position.character
+        }
+
     private val LOG = getLogger<LspEditorUtil>()
 }