rename type Context{File => Item}, remove existing redundant ContextI…

…tem type, (#3269) Co-authored-by: Beatrix <[email protected]>
sourcegraph · Mar 2, 2024 · fa74675 · fa74675
1 parent 3ae2b3e
commit fa74675
Show file tree

Hide file tree

Showing 79 changed files with 1,080 additions and 1,124 deletions.
diff --git a/...gs/kotlin/lib/src/main/kotlin/com/sourcegraph/cody/protocol_generated/ChatInputHistory.kt b/...gs/kotlin/lib/src/main/kotlin/com/sourcegraph/cody/protocol_generated/ChatInputHistory.kt
@@ -3,6 +3,6 @@ package com.sourcegraph.cody.protocol_generated
 
 data class ChatInputHistory(
   val inputText: String? = null,
-  val inputContextFiles: List<ContextFile>? = null,
+  val inputContextFiles: List<ContextItem>? = null,
 )
 
diff --git a/...indings/kotlin/lib/src/main/kotlin/com/sourcegraph/cody/protocol_generated/ChatMessage.kt b/...indings/kotlin/lib/src/main/kotlin/com/sourcegraph/cody/protocol_generated/ChatMessage.kt
@@ -7,7 +7,7 @@ data class ChatMessage(
   val speaker: SpeakerEnum? = null, // Oneof: human, assistant
   val text: String? = null,
   val displayText: String? = null,
-  val contextFiles: List<ContextFile>? = null,
+  val contextFiles: List<ContextItem>? = null,
   val preciseContext: List<PreciseContext>? = null,
   val buttons: List<ChatButton>? = null,
   val data: Any? = null,

diff --git a/...ph/cody/protocol_generated/ContextFile.kt → ...ph/cody/protocol_generated/ContextItem.kt b/...ph/cody/protocol_generated/ContextFile.kt → ...ph/cody/protocol_generated/ContextItem.kt
@@ -8,38 +8,38 @@ import com.google.gson.JsonDeserializer
 import com.google.gson.JsonElement
 import java.lang.reflect.Type
 
-sealed class ContextFile {
+sealed class ContextItem {
   companion object {
-    val deserializer: JsonDeserializer<ContextFile> =
+    val deserializer: JsonDeserializer<ContextItem> =
       JsonDeserializer { element: JsonElement, _: Type, context: JsonDeserializationContext ->
         when (element.asJsonObject.get("type").asString) {
-          "file" -> context.deserialize<ContextFileFile>(element, ContextFileFile::class.java)
-          "symbol" -> context.deserialize<ContextFileSymbol>(element, ContextFileSymbol::class.java)
+          "file" -> context.deserialize<ContextItemFile>(element, ContextItemFile::class.java)
+          "symbol" -> context.deserialize<ContextItemSymbol>(element, ContextItemSymbol::class.java)
           else -> throw Exception("Unknown discriminator ${element}")
         }
       }
   }
 }
 
-data class ContextFileFile(
+data class ContextItemFile(
   val uri: Uri? = null,
-  val range: ActiveTextEditorSelectionRange? = null,
+  val range: RangeData? = null,
   val repoName: String? = null,
   val revision: String? = null,
   val title: String? = null,
   val source: ContextFileSource? = null, // Oneof: embeddings, user, keyword, editor, filename, search, unified, selection, terminal
   val content: String? = null,
   val type: TypeEnum? = null, // Oneof: file
-) : ContextFile() {
+) : ContextItem() {
 
   enum class TypeEnum {
     @SerializedName("file") File,
   }
 }
 
-data class ContextFileSymbol(
+data class ContextItemSymbol(
   val uri: Uri? = null,
-  val range: ActiveTextEditorSelectionRange? = null,
+  val range: RangeData? = null,
   val repoName: String? = null,
   val revision: String? = null,
   val title: String? = null,
@@ -48,7 +48,7 @@ data class ContextFileSymbol(
   val type: TypeEnum? = null, // Oneof: symbol
   val symbolName: String? = null,
   val kind: SymbolKind? = null, // Oneof: class, function, method
-) : ContextFile() {
+) : ContextItem() {
 
   enum class TypeEnum {
     @SerializedName("symbol") Symbol,

diff --git a/...gs/kotlin/lib/src/main/kotlin/com/sourcegraph/cody/protocol_generated/ExtensionMessage.kt b/...gs/kotlin/lib/src/main/kotlin/com/sourcegraph/cody/protocol_generated/ExtensionMessage.kt
@@ -123,7 +123,7 @@ data class `transcript-errorsExtensionMessage`(
 
 data class UserContextFilesExtensionMessage(
   val type: TypeEnum? = null, // Oneof: userContextFiles
-  val userContextFiles: List<ContextFile>? = null,
+  val userContextFiles: List<ContextItem>? = null,
 ) : ExtensionMessage() {
 
   enum class TypeEnum {

diff --git a/...otlin/lib/src/main/kotlin/com/sourcegraph/cody/protocol_generated/ProtocolTypeAdapters.kt b/...otlin/lib/src/main/kotlin/com/sourcegraph/cody/protocol_generated/ProtocolTypeAdapters.kt
@@ -5,7 +5,7 @@ object ProtocolTypeAdapters {
   fun register(gson: com.google.gson.GsonBuilder) {
     gson.registerTypeAdapter(ExtensionMessage::class.java, ExtensionMessage.deserializer)
     gson.registerTypeAdapter(CustomCommandResult::class.java, CustomCommandResult.deserializer)
-    gson.registerTypeAdapter(ContextFile::class.java, ContextFile.deserializer)
+    gson.registerTypeAdapter(ContextItem::class.java, ContextItem.deserializer)
     gson.registerTypeAdapter(ContextProvider::class.java, ContextProvider.deserializer)
     gson.registerTypeAdapter(WorkspaceEditOperation::class.java, WorkspaceEditOperation.deserializer)
     gson.registerTypeAdapter(TextEdit::class.java, TextEdit.deserializer)

diff --git a/...nerated/ActiveTextEditorSelectionRange.kt → ...raph/cody/protocol_generated/RangeData.kt b/...nerated/ActiveTextEditorSelectionRange.kt → ...raph/cody/protocol_generated/RangeData.kt
@@ -1,7 +1,7 @@
 @file:Suppress("FunctionName", "ClassName", "unused", "EnumEntryName", "UnusedImport")
 package com.sourcegraph.cody.protocol_generated
 
-data class ActiveTextEditorSelectionRange(
+data class RangeData(
   val start: StartParams? = null,
   val end: EndParams? = null,
 )

diff --git a/...ings/kotlin/lib/src/main/kotlin/com/sourcegraph/cody/protocol_generated/WebviewMessage.kt b/...ings/kotlin/lib/src/main/kotlin/com/sourcegraph/cody/protocol_generated/WebviewMessage.kt
@@ -82,7 +82,7 @@ data class EventWebviewMessage(
 data class SubmitWebviewMessage(
   val command: CommandEnum? = null, // Oneof: submit
   val addEnhancedContext: Boolean? = null,
-  val contextFiles: List<ContextFile>? = null,
+  val contextFiles: List<ContextItem>? = null,
   val text: String? = null,
   val submitType: ChatSubmitType? = null, // Oneof: user, user-newchat
 ) : WebviewMessage() {
@@ -169,7 +169,7 @@ data class `get-chat-modelsWebviewMessage`(
 data class OpenFileWebviewMessage(
   val command: CommandEnum? = null, // Oneof: openFile
   val uri: Uri? = null,
-  val range: ActiveTextEditorSelectionRange? = null,
+  val range: RangeData? = null,
 ) : WebviewMessage() {
 
   enum class CommandEnum {
@@ -180,7 +180,7 @@ data class OpenFileWebviewMessage(
 data class OpenLocalFileWithRangeWebviewMessage(
   val command: CommandEnum? = null, // Oneof: openLocalFileWithRange
   val filePath: String? = null,
-  val range: ActiveTextEditorSelectionRange? = null,
+  val range: RangeData? = null,
 ) : WebviewMessage() {
 
   enum class CommandEnum {
@@ -191,7 +191,7 @@ data class OpenLocalFileWithRangeWebviewMessage(
 data class EditWebviewMessage(
   val command: CommandEnum? = null, // Oneof: edit
   val addEnhancedContext: Boolean? = null,
-  val contextFiles: List<ContextFile>? = null,
+  val contextFiles: List<ContextItem>? = null,
   val text: String? = null,
   val index: Int? = null,
 ) : WebviewMessage() {
@@ -364,7 +364,7 @@ data class SearchWebviewMessage(
 data class `show-search-resultWebviewMessage`(
   val command: CommandEnum? = null, // Oneof: show-search-result
   val uri: Uri? = null,
-  val range: ActiveTextEditorSelectionRange? = null,
+  val range: RangeData? = null,
 ) : WebviewMessage() {
 
   enum class CommandEnum {