Fixes

sourcegraph · Nov 13, 2024 · 63afb4c · 63afb4c
1 parent c0a2082
commit 63afb4c
Show file tree

Hide file tree

Showing 16 changed files with 249 additions and 270 deletions.
diff --git a/src/main/kotlin/com/sourcegraph/cody/agent/CodyAgent.kt b/src/main/kotlin/com/sourcegraph/cody/agent/CodyAgent.kt
@@ -9,6 +9,7 @@ import com.intellij.openapi.util.SystemInfoRt
 import com.intellij.util.net.HttpConfigurable
 import com.intellij.util.system.CpuArch
 import com.sourcegraph.cody.agent.protocol.*
+import com.sourcegraph.cody.agent.protocol_extensions.normalizeUriOrPath
 import com.sourcegraph.cody.agent.protocol_generated.ClientCapabilities
 import com.sourcegraph.cody.agent.protocol_generated.ClientInfo
 import com.sourcegraph.cody.agent.protocol_generated.ProtocolTypeAdapters
@@ -115,7 +116,7 @@ private constructor(
                       version = ConfigUtil.getPluginVersion(),
                       ideVersion = ApplicationInfo.getInstance().build.toString(),
                       workspaceRootUri =
-                          ProtocolTextDocumentUtil.normalizeUriOrPath(
+                          normalizeUriOrPath(
                               ConfigUtil.getWorkspaceRootPath(project).toUri().toString()),
                       extensionConfiguration = ConfigUtil.getAgentConfiguration(project),
                       capabilities =

diff --git a/src/main/kotlin/com/sourcegraph/cody/agent/CodyAgentClient.kt b/src/main/kotlin/com/sourcegraph/cody/agent/CodyAgentClient.kt
@@ -11,8 +11,8 @@ import com.intellij.openapi.vfs.VfsUtil
 import com.intellij.openapi.vfs.VirtualFile
 import com.jetbrains.rd.util.firstOrNull
 import com.sourcegraph.cody.CodyToolWindowContent
-import com.sourcegraph.cody.agent.protocol.ProtocolTextDocumentUtil
 import com.sourcegraph.cody.agent.protocol.WebviewCreateWebviewPanelParams
+import com.sourcegraph.cody.agent.protocol_extensions.fromVirtualFile
 import com.sourcegraph.cody.agent.protocol_generated.DebugMessage
 import com.sourcegraph.cody.agent.protocol_generated.DisplayCodeLensParams
 import com.sourcegraph.cody.agent.protocol_generated.Env_OpenExternalParams
@@ -124,7 +124,7 @@ class CodyAgentClient(private val project: Project, private val webview: NativeW
   ): CompletableFuture<ProtocolTextDocument?> {
     return acceptOnEventThreadAndGet {
       val vf = CodyEditorUtil.createFileOrScratchFromUntitled(project, params.uri, params.content)
-      vf?.let { ProtocolTextDocumentUtil.fromVirtualFile(it) }
+      vf?.let { fromVirtualFile(it) }
     }
   }
 

diff --git a/src/main/kotlin/com/sourcegraph/cody/agent/protocol/ProtocolTextDocumentUtil.kt b/src/main/kotlin/com/sourcegraph/cody/agent/protocol/ProtocolTextDocumentUtil.kt
diff --git a/src/main/kotlin/com/sourcegraph/cody/agent/protocol/TestingParamsUtil.kt b/src/main/kotlin/com/sourcegraph/cody/agent/protocol/TestingParamsUtil.kt