Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import com.intellij.openapi.fileEditor.FileEditorManager
import com.intellij.openapi.options.ShowSettingsUtil
import com.intellij.openapi.project.Project
import com.intellij.openapi.vfs.LocalFileSystem
import com.intellij.openapi.vfs.VfsUtilCore
import com.intellij.openapi.vfs.VirtualFile
import com.intellij.ui.jcef.JBCefJSQuery.Response
import kotlinx.coroutines.CancellationException
Expand Down Expand Up @@ -104,6 +103,7 @@ import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.SendC
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.StopResponseMessage
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.TELEMETRY_EVENT
import software.aws.toolkits.jetbrains.services.amazonq.lsp.util.LspEditorUtil
import software.aws.toolkits.jetbrains.services.amazonq.lsp.util.LspEditorUtil.toUriString
import software.aws.toolkits.jetbrains.services.amazonq.util.command
import software.aws.toolkits.jetbrains.services.amazonq.util.tabType
import software.aws.toolkits.jetbrains.services.amazonq.webview.theme.AmazonQTheme
Expand Down Expand Up @@ -232,10 +232,10 @@ class BrowserConnector(
SEND_CHAT_COMMAND_PROMPT -> {
val requestFromUi = serializer.deserializeChatMessages<SendChatPromptRequest>(node)
val editor = FileEditorManager.getInstance(project).selectedTextEditor
val textDocumentIdentifier = editor?.virtualFile?.let { virtualFile ->
val relativePath = VfsUtilCore.getRelativePath(virtualFile, project.baseDir)
?: virtualFile.path
TextDocumentIdentifier(relativePath)
val textDocumentIdentifier = editor?.let { editor ->
editor.virtualFile?.let {
TextDocumentIdentifier(toUriString(it))
}
}
val cursorState = editor?.let { LspEditorUtil.getCursorState(it) }

Expand Down Expand Up @@ -366,10 +366,10 @@ class BrowserConnector(

CHAT_INSERT_TO_CURSOR -> {
val editor = FileEditorManager.getInstance(project).selectedTextEditor
val textDocumentIdentifier = editor?.virtualFile?.let { virtualFile ->
val relativePath = VfsUtilCore.getRelativePath(virtualFile, project.baseDir)
?: virtualFile.path
TextDocumentIdentifier(relativePath)
val textDocumentIdentifier = editor?.let { editor ->
editor.virtualFile?.let {
TextDocumentIdentifier(toUriString(it))
}
}
val cursorPosition = editor?.let { LspEditorUtil.getCursorPosition(it) }

Expand Down

This file was deleted.

Loading