Skip to content

Commit d8c8617

Browse files
committed
fix(chat): fix incorrect file uris being sent to langauge server
paths should be absolute for this case, not relative
1 parent 4a548d9 commit d8c8617

File tree

1 file changed

+9
-9
lines changed
  • plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview

1 file changed

+9
-9
lines changed

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import com.intellij.openapi.fileEditor.FileEditorManager
1717
import com.intellij.openapi.options.ShowSettingsUtil
1818
import com.intellij.openapi.project.Project
1919
import com.intellij.openapi.vfs.LocalFileSystem
20-
import com.intellij.openapi.vfs.VfsUtilCore
2120
import com.intellij.openapi.vfs.VirtualFile
2221
import com.intellij.ui.jcef.JBCefJSQuery.Response
2322
import kotlinx.coroutines.CancellationException
@@ -104,6 +103,7 @@ import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.SendC
104103
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.StopResponseMessage
105104
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.TELEMETRY_EVENT
106105
import software.aws.toolkits.jetbrains.services.amazonq.lsp.util.LspEditorUtil
106+
import software.aws.toolkits.jetbrains.services.amazonq.lsp.util.LspEditorUtil.toUriString
107107
import software.aws.toolkits.jetbrains.services.amazonq.util.command
108108
import software.aws.toolkits.jetbrains.services.amazonq.util.tabType
109109
import software.aws.toolkits.jetbrains.services.amazonq.webview.theme.AmazonQTheme
@@ -232,10 +232,10 @@ class BrowserConnector(
232232
SEND_CHAT_COMMAND_PROMPT -> {
233233
val requestFromUi = serializer.deserializeChatMessages<SendChatPromptRequest>(node)
234234
val editor = FileEditorManager.getInstance(project).selectedTextEditor
235-
val textDocumentIdentifier = editor?.virtualFile?.let { virtualFile ->
236-
val relativePath = VfsUtilCore.getRelativePath(virtualFile, project.baseDir)
237-
?: virtualFile.path
238-
TextDocumentIdentifier(relativePath)
235+
val textDocumentIdentifier = editor?.let { editor ->
236+
editor.virtualFile?.let {
237+
TextDocumentIdentifier(toUriString(it))
238+
}
239239
}
240240
val cursorState = editor?.let { LspEditorUtil.getCursorState(it) }
241241

@@ -366,10 +366,10 @@ class BrowserConnector(
366366

367367
CHAT_INSERT_TO_CURSOR -> {
368368
val editor = FileEditorManager.getInstance(project).selectedTextEditor
369-
val textDocumentIdentifier = editor?.virtualFile?.let { virtualFile ->
370-
val relativePath = VfsUtilCore.getRelativePath(virtualFile, project.baseDir)
371-
?: virtualFile.path
372-
TextDocumentIdentifier(relativePath)
369+
val textDocumentIdentifier = editor?.let { editor ->
370+
editor.virtualFile?.let {
371+
TextDocumentIdentifier(toUriString(it))
372+
}
373373
}
374374
val cursorPosition = editor?.let { LspEditorUtil.getCursorPosition(it) }
375375

0 commit comments

Comments
 (0)