Fix Typo

sourcegraph · Jul 17, 2024 · 4549dd9 · 4549dd9
1 parent caaeec9
commit 4549dd9
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 547 deletions.
diff --git a/src/integrationTest/kotlin/com/sourcegraph/cody/edit/DocumentCodeTest.kt b/src/integrationTest/kotlin/com/sourcegraph/cody/edit/DocumentCodeTest.kt
@@ -10,6 +10,7 @@ import com.sourcegraph.cody.edit.CodyInlineEditActionNotifier.Companion.TOPIC_PE
 import com.sourcegraph.cody.edit.CodyInlineEditActionNotifier.Companion.TOPIC_TASK_FINISHED
 import com.sourcegraph.cody.edit.actions.DocumentCodeAction
 import com.sourcegraph.cody.edit.sessions.FixupSession
+import com.sourcegraph.cody.edit.sessions.FixupSessionV1
 import com.sourcegraph.cody.edit.widget.LensAction
 import com.sourcegraph.cody.edit.widget.LensGroupFactory
 import com.sourcegraph.cody.edit.widget.LensHotkey
@@ -30,7 +31,7 @@ class DocumentCodeTest : CodyIntegrationTextFixture() {
   fun testGetsFoldingRanges() {
     runAndWaitForNotifications(DocumentCodeAction.ID, TOPIC_FOLDING_RANGES)
 
-    val selection = activeSession().selectionRange
+    val selection = (activeSession() as FixupSessionV1).selectionRange
     assertNotNull("Selection should have been set", selection)
     // We set the selection range to whatever the protocol returns.
     // If a 0-width selection turns out to be reasonable we can adjust or remove this test.

diff --git a/src/main/kotlin/com/sourcegraph/cody/agent/CodyAgent.kt b/src/main/kotlin/com/sourcegraph/cody/agent/CodyAgent.kt
@@ -10,8 +10,6 @@ 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.ClientCapabilitiesFactory
-import com.sourcegraph.cody.agent.protocol_extensions.ClientInfoFactory
 import com.sourcegraph.cody.agent.protocol_generated.ProtocolTypeAdapters
 import com.sourcegraph.cody.vscode.CancellationToken
 import com.sourcegraph.config.ConfigUtil
@@ -113,20 +111,23 @@ private constructor(
         try {
           return server
               .initialize(
-                  ClientInfoFactory.build(
+                  ClientInfo(
+                      name = "JetBrains",
                       version = ConfigUtil.getPluginVersion(),
                       ideVersion = ApplicationInfo.getInstance().build.toString(),
                       workspaceRootUri =
                           ConfigUtil.getWorkspaceRootPath(project).toUri().toString(),
                       extensionConfiguration = ConfigUtil.getAgentConfiguration(project),
                       capabilities =
-                          ClientCapabilitiesFactory.build(
-                              edit = "enabled",
-                              editWorkspace = "enabled",
-                              codeLenses = "enabled",
-                              showDocument = "enabled",
-                              ignore = "enabled",
-                              untitledDocuments = "enabled")))
+                          ClientCapabilities(
+                              edit = ClientCapabilities.EditEnum.Enabled,
+                              editWorkspace = ClientCapabilities.EditWorkspaceEnum.Enabled,
+                              codeLenses = ClientCapabilities.CodeLensesEnum.Enabled,
+                              showDocument = ClientCapabilities.ShowDocumentEnum.Enabled,
+                              ignore = ClientCapabilities.IgnoreEnum.Enabled,
+                              untitledDocuments = ClientCapabilities.UntitledDocumentsEnum.Enabled,
+                              codeActions = ClientCapabilities.CodeActionsEnum.Enabled),
+                  ))
               .thenApply { info ->
                 logger.warn("Connected to Cody agent " + info.name)
                 server.initialized()

diff --git a/src/main/kotlin/com/sourcegraph/cody/agent/CodyAgentServer.kt b/src/main/kotlin/com/sourcegraph/cody/agent/CodyAgentServer.kt
@@ -13,7 +13,6 @@ import com.sourcegraph.cody.agent.protocol.ChatRestoreParams
 import com.sourcegraph.cody.agent.protocol.ChatSubmitMessageParams
 import com.sourcegraph.cody.agent.protocol.CompletionItemParams
 import com.sourcegraph.cody.agent.protocol.CurrentUserCodySubscription
-import com.sourcegraph.cody.agent.protocol.EditTask
 import com.sourcegraph.cody.agent.protocol.Event
 import com.sourcegraph.cody.agent.protocol.GetFeatureFlag
 import com.sourcegraph.cody.agent.protocol.GetFoldingRangeParams

diff --git a/src/main/kotlin/com/sourcegraph/cody/agent/protocol/EditTask.kt b/src/main/kotlin/com/sourcegraph/cody/agent/protocol/EditTask.kt
diff --git a/src/main/kotlin/com/sourcegraph/cody/agent/protocol/ProtocolTextDocument.kt b/src/main/kotlin/com/sourcegraph/cody/agent/protocol/ProtocolTextDocument.kt
@@ -11,6 +11,8 @@ import com.intellij.openapi.editor.event.SelectionEvent
 import com.intellij.openapi.fileEditor.FileDocumentManager
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.util.concurrency.annotations.RequiresEdt
+import com.sourcegraph.cody.agent.intellij_extensions.codyPosition
+import com.sourcegraph.cody.agent.intellij_extensions.codyRange
 import com.sourcegraph.cody.agent.protocol_generated.Position
 import com.sourcegraph.cody.agent.protocol_generated.Range
 import java.awt.Point

diff --git a/src/main/kotlin/com/sourcegraph/cody/agent/protocol_extensions/ClientCapabilities.kt b/src/main/kotlin/com/sourcegraph/cody/agent/protocol_extensions/ClientCapabilities.kt
diff --git a/src/main/kotlin/com/sourcegraph/cody/agent/protocol_extensions/ClientInfo.kt b/src/main/kotlin/com/sourcegraph/cody/agent/protocol_extensions/ClientInfo.kt