Add cursor position to chat request #5562
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| // Copyright 2025 Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| package software.aws.toolkits.jetbrains.services.amazonq.lsp.util | ||
|
|
||
| import com.intellij.openapi.application.runReadAction | ||
| import com.intellij.openapi.editor.Editor | ||
| import com.intellij.openapi.vfs.VfsUtilCore | ||
| import com.intellij.openapi.vfs.VirtualFile | ||
| import org.eclipse.lsp4j.Position | ||
| import org.eclipse.lsp4j.Range | ||
| 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 | ||
| import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CursorRange | ||
| import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CursorState | ||
| import java.io.File | ||
| import java.net.URI | ||
| import java.net.URISyntaxException | ||
|
|
||
| object LspEditorUtil { | ||
|
|
||
| fun toUriString(virtualFile: VirtualFile): String? { | ||
| val protocol = virtualFile.fileSystem.protocol | ||
|
Check warning on line 24 in plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/util/LspEditorUtil.kt
|
||
| val uri = when (protocol) { | ||
| "jar" -> VfsUtilCore.convertToURL(virtualFile.url)?.toExternalForm() | ||
| "jrt" -> virtualFile.url | ||
| else -> toUri(VfsUtilCore.virtualToIoFile(virtualFile)).toASCIIString() | ||
| } ?: return null | ||
|
Check warning on line 29 in plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/util/LspEditorUtil.kt
|
||
|
|
||
| return if (virtualFile.isDirectory) { | ||
| uri.trimEnd('/', '\\') | ||
|
Check warning on line 32 in plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/util/LspEditorUtil.kt
|
||
| } else { | ||
| uri | ||
|
Check warning on line 34 in plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/util/LspEditorUtil.kt
|
||
| } | ||
| } | ||
|
|
||
| private fun toUri(file: File): URI { | ||
| try { | ||
|
Check warning on line 39 in plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/util/LspEditorUtil.kt
|
||
| // URI scheme specified by language server protocol | ||
| return URI("file", "", file.absoluteFile.toURI().path, null) | ||
| } catch (e: URISyntaxException) { | ||
| LOG.warn { "${e.localizedMessage}: $e" } | ||
| return file.absoluteFile.toURI() | ||
|
Check warning on line 44 in plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/util/LspEditorUtil.kt
|
||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Works but is divergent from [FocusAreaContextExtrator] | ||
|
Check warning on line 49 in plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/util/LspEditorUtil.kt
|
||
| */ | ||
| fun getCursorState(editor: Editor): CursorState = | ||
| runReadAction { | ||
| val selectionModel = editor.selectionModel | ||
|
Check warning on line 53 in plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/util/LspEditorUtil.kt
|
||
| if (selectionModel.hasSelection()) { | ||
| val selectedStartPos = editor.offsetToLogicalPosition(selectionModel.selectionStart) | ||
| val selectedEndPos = editor.offsetToLogicalPosition(selectionModel.selectionEnd) | ||
|
Check warning on line 56 in plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/util/LspEditorUtil.kt
|
||
|
|
||
| return@runReadAction CursorRange( | ||
| Range( | ||
| Position(selectedStartPos.line, selectedStartPos.column), | ||
| Position(selectedEndPos.line, selectedEndPos.column) | ||
|
Check warning on line 61 in plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/util/LspEditorUtil.kt
|
||
| ) | ||
| ) | ||
| } else { | ||
| return@runReadAction CursorPosition( | ||
| Position( | ||
| editor.caretModel.primaryCaret.logicalPosition.line, | ||
| editor.caretModel.primaryCaret.logicalPosition.column | ||
|
Check warning on line 68 in plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/util/LspEditorUtil.kt
|
||
| ) | ||
| ) | ||
| } | ||
| } | ||
|
Check warning on line 72 in plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/util/LspEditorUtil.kt
|
||
|
|
||
| private val LOG = getLogger<LspEditorUtil>() | ||
|
Check warning on line 74 in plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/util/LspEditorUtil.kt
|
||
| } | ||
Check warning
Code scanning / QDJVMC
Unresolved reference in KDoc Warning