Rebase on main

sourcegraph · Oct 4, 2024 · 73065dd · 73065dd
1 parent 83ec0e5
commit 73065dd
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 45 deletions.
diff --git a/...gs/kotlin/lib/src/main/kotlin/com/sourcegraph/cody/agent/protocol_generated/AuthStatus.kt b/...gs/kotlin/lib/src/main/kotlin/com/sourcegraph/cody/agent/protocol_generated/AuthStatus.kt
@@ -1,13 +1,3 @@
-/*
- * Generated file - DO NOT EDIT MANUALLY
- * They are copied from the cody agent project using the copyProtocol gradle task.
- * This is only a temporary solution before we fully migrate to generated protocol messages.
- */
-/*
- * Generated file - DO NOT EDIT MANUALLY
- * They are copied from the cody agent project using the copyProtocol gradle task.
- * This is only a temporary solution before we fully migrate to generated protocol messages.
- */
 @file:Suppress("FunctionName", "ClassName", "unused", "EnumEntryName", "UnusedImport")
 package com.sourcegraph.cody.agent.protocol_generated;
 
@@ -18,42 +8,43 @@ import com.google.gson.JsonDeserializer;
 import com.google.gson.JsonElement;
 import java.lang.reflect.Type;
 
-// TODO (CODY-3089 ): This was edited manually due to deficiencies in the codegen.
-// Please re-generate after CODY-3809 is done
 sealed class AuthStatus {
-    companion object {
-        val deserializer: JsonDeserializer<AuthStatus> =
-            JsonDeserializer { element: JsonElement, _: Type, context: JsonDeserializationContext ->
-                if (element.getAsJsonObject().get("username") == null) {
-                    context.deserialize<UnauthenticatedAuthStatus>(element, UnauthenticatedAuthStatus::class.java)
-                } else {
-                    context.deserialize<AuthenticatedAuthStatus>(element, AuthenticatedAuthStatus::class.java)
-                }
-            }
-    }
+  companion object {
+    val deserializer: JsonDeserializer<AuthStatus> =
+      JsonDeserializer { element: JsonElement, _: Type, context: JsonDeserializationContext ->
+          if (element.getAsJsonObject().get("username") == null) {
+              context.deserialize<UnauthenticatedAuthStatus>(element, UnauthenticatedAuthStatus::class.java)
+          } else {
+              context.deserialize<AuthenticatedAuthStatus>(element, AuthenticatedAuthStatus::class.java)
+          }
+      }
+  }
 }
 
 data class UnauthenticatedAuthStatus(
-    val endpoint: String, // Oneof: https://example.com
-    val authenticated: Boolean,
-    val showNetworkError: Boolean? = null,
-    val showInvalidAccessTokenError: Boolean? = null,
-    val pendingValidation: Boolean,
-) : AuthStatus() {}
+  val endpoint: String,
+  val authenticated: Boolean,
+  val showNetworkError: Boolean? = null,
+  val showInvalidAccessTokenError: Boolean? = null,
+  val pendingValidation: Boolean,
+) : AuthStatus() {
+}
 
 data class AuthenticatedAuthStatus(
-    val endpoint: String, // Oneof: https://example.com
-    val authenticated: Boolean,
-    val username: String,
-    val isFireworksTracingEnabled: Boolean? = null,
-    val hasVerifiedEmail: Boolean? = null,
-    val requiresVerifiedEmail: Boolean? = null,
-    val siteVersion: String,
-    val codyApiVersion: Long,
-    val configOverwrites: CodyLLMSiteConfiguration? = null,
-    val primaryEmail: String? = null,
-    val displayName: String? = null,
-    val avatarURL: String? = null,
-    val userCanUpgrade: Boolean? = null,
-    val pendingValidation: Boolean,
-) : AuthStatus() {}
+  val endpoint: String,
+  val authenticated: Boolean,
+  val username: String,
+  val isFireworksTracingEnabled: Boolean? = null,
+  val hasVerifiedEmail: Boolean? = null,
+  val requiresVerifiedEmail: Boolean? = null,
+  val siteVersion: String,
+  val codyApiVersion: Long,
+  val configOverwrites: CodyLLMSiteConfiguration? = null,
+  val primaryEmail: String? = null,
+  val displayName: String? = null,
+  val avatarURL: String? = null,
+  val userCanUpgrade: Boolean? = null,
+  val pendingValidation: Boolean,
+) : AuthStatus() {
+}
+
diff --git a/...indings/kotlin/lib/src/main/kotlin/com/sourcegraph/cody/agent/protocol_generated/Range.kt b/...indings/kotlin/lib/src/main/kotlin/com/sourcegraph/cody/agent/protocol_generated/Range.kt
@@ -2,7 +2,7 @@
 package com.sourcegraph.cody.agent.protocol_generated;
 
 data class Range(
-  val start: Location,
-  val end: Location,
+  val start: Position,
+  val end: Position,
 )