Skip to content

Commit

Permalink
Migrate textDocument/* (#2633)
Browse files Browse the repository at this point in the history
This PR is a part of the protocol migration. Some endpoints are written
by hand. We are switching to the protocol generated from Cody. In this
PR:
- [Migrate
textDocument/*](c0a2082)

<!-- start git-machete generated -->

# Based on PR #2632

## Full chain of PRs as of 2024-11-13

* PR #2633:
`mkondratek/chore/migrate-api-part-2` ➔
`mkondratek/chore/migrate-api-part-1`
* PR #2632:
  `mkondratek/chore/migrate-api-part-1` ➔ `mkondratek/chore/update-deps`
* PR #2630:
  `mkondratek/chore/update-deps` ➔ `main`

<!-- end git-machete generated -->



## Test plan
- Verified with debugger - the proper values are sent
- Tested with current selection in chat, tested with autocompletion,
tested with inline edits - works
  • Loading branch information
mkondratek authored Nov 13, 2024
1 parent 113c2c1 commit 29514fe
Show file tree
Hide file tree
Showing 18 changed files with 275 additions and 304 deletions.
3 changes: 2 additions & 1 deletion src/main/kotlin/com/sourcegraph/cody/agent/CodyAgent.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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.ProtocolTextDocumentExt
import com.sourcegraph.cody.agent.protocol_generated.ClientCapabilities
import com.sourcegraph.cody.agent.protocol_generated.ClientInfo
import com.sourcegraph.cody.agent.protocol_generated.ProtocolTypeAdapters
Expand Down Expand Up @@ -115,7 +116,7 @@ private constructor(
version = ConfigUtil.getPluginVersion(),
ideVersion = ApplicationInfo.getInstance().build.toString(),
workspaceRootUri =
ProtocolTextDocument.normalizeUriOrPath(
ProtocolTextDocumentExt.normalizeUriOrPath(
ConfigUtil.getWorkspaceRootPath(project).toUri().toString()),
extensionConfiguration = ConfigUtil.getAgentConfiguration(project),
capabilities =
Expand Down
5 changes: 3 additions & 2 deletions src/main/kotlin/com/sourcegraph/cody/agent/CodyAgentClient.kt
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,13 @@ 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.ProtocolTextDocument
import com.sourcegraph.cody.agent.protocol.WebviewCreateWebviewPanelParams
import com.sourcegraph.cody.agent.protocol_extensions.ProtocolTextDocumentExt
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
import com.sourcegraph.cody.agent.protocol_generated.Null
import com.sourcegraph.cody.agent.protocol_generated.ProtocolTextDocument
import com.sourcegraph.cody.agent.protocol_generated.SaveDialogOptionsParams
import com.sourcegraph.cody.agent.protocol_generated.TextDocumentEditParams
import com.sourcegraph.cody.agent.protocol_generated.TextDocument_ShowParams
Expand Down Expand Up @@ -123,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 { ProtocolTextDocument.fromVirtualFile(it) }
vf?.let { ProtocolTextDocumentExt.fromVirtualFile(it) }
}
}

Expand Down
24 changes: 12 additions & 12 deletions src/main/kotlin/com/sourcegraph/cody/agent/CodyAgentServer.kt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import com.sourcegraph.cody.agent.protocol.IgnoreTestParams
import com.sourcegraph.cody.agent.protocol.IgnoreTestResponse
import com.sourcegraph.cody.agent.protocol.InlineEditParams
import com.sourcegraph.cody.agent.protocol.NetworkRequest
import com.sourcegraph.cody.agent.protocol.ProtocolTextDocument
import com.sourcegraph.cody.agent.protocol.TelemetryEvent
import com.sourcegraph.cody.agent.protocol_generated.AutocompleteParams
import com.sourcegraph.cody.agent.protocol_generated.AutocompleteResult
Expand All @@ -33,7 +32,9 @@ import com.sourcegraph.cody.agent.protocol_generated.ExtensionConfiguration
import com.sourcegraph.cody.agent.protocol_generated.FeatureFlags_GetFeatureFlagParams
import com.sourcegraph.cody.agent.protocol_generated.Null
import com.sourcegraph.cody.agent.protocol_generated.ProtocolAuthStatus
import com.sourcegraph.cody.agent.protocol_generated.ProtocolTextDocument
import com.sourcegraph.cody.agent.protocol_generated.ServerInfo
import com.sourcegraph.cody.agent.protocol_generated.TextDocument_DidFocusParams
import com.sourcegraph.cody.agent.protocol_generated.Window_DidChangeFocusParams
import java.util.concurrent.CompletableFuture
import org.eclipse.lsp4j.jsonrpc.services.JsonNotification
Expand Down Expand Up @@ -122,6 +123,16 @@ interface _SubsetGeneratedCodyAgentServer {
params: com.sourcegraph.cody.agent.protocol_generated.CompletionItemParams
)

@JsonNotification("textDocument/didOpen") fun textDocument_didOpen(params: ProtocolTextDocument)

@JsonNotification("textDocument/didChange")
fun textDocument_didChange(params: ProtocolTextDocument)

@JsonNotification("textDocument/didFocus")
fun textDocument_didFocus(params: TextDocument_DidFocusParams)

@JsonNotification("textDocument/didClose") fun textDocument_didClose(params: ProtocolTextDocument)

@JsonNotification("window/didChangeFocus")
fun window_didChangeFocus(params: Window_DidChangeFocusParams)
}
Expand All @@ -139,17 +150,6 @@ interface _LegacyAgentServer {
@JsonRequest("telemetry/recordEvent")
fun recordEvent(event: TelemetryEvent): CompletableFuture<Void?>

@JsonNotification("textDocument/didFocus")
fun textDocumentDidFocus(document: ProtocolTextDocument)

@JsonNotification("textDocument/didOpen") fun textDocumentDidOpen(document: ProtocolTextDocument)

@JsonNotification("textDocument/didChange")
fun textDocumentDidChange(document: ProtocolTextDocument)

@JsonNotification("textDocument/didClose")
fun textDocumentDidClose(document: ProtocolTextDocument)

@JsonRequest("editTask/accept")
fun acceptEditTask(params: EditTask_AcceptParams): CompletableFuture<Void?>

Expand Down

This file was deleted.

This file was deleted.

Loading

0 comments on commit 29514fe

Please sign in to comment.