From f2bdee343a82186496eb2565d8615d1f44063f1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Kondratek?= <mik.kondratek@gmail.com>
Date: Wed, 13 Nov 2024 21:48:04 +0100
Subject: [PATCH] Migrate testing/ignore/overridePolicy

---
 .../kotlin/com/sourcegraph/cody/agent/CodyAgentServer.kt  | 8 ++++----
 .../kotlin/com/sourcegraph/cody/agent/protocol/Ignore.kt  | 8 --------
 .../sourcegraph/cody/internals/IgnoreOverrideAction.kt    | 8 ++++----
 3 files changed, 8 insertions(+), 16 deletions(-)
 delete mode 100644 src/main/kotlin/com/sourcegraph/cody/agent/protocol/Ignore.kt

diff --git a/src/main/kotlin/com/sourcegraph/cody/agent/CodyAgentServer.kt b/src/main/kotlin/com/sourcegraph/cody/agent/CodyAgentServer.kt
index 901a466797..4da3eac0b9 100644
--- a/src/main/kotlin/com/sourcegraph/cody/agent/CodyAgentServer.kt
+++ b/src/main/kotlin/com/sourcegraph/cody/agent/CodyAgentServer.kt
@@ -2,7 +2,6 @@
 
 package com.sourcegraph.cody.agent
 
-import com.sourcegraph.cody.agent.protocol.IgnorePolicySpec
 import com.sourcegraph.cody.agent.protocol.NetworkRequest
 import com.sourcegraph.cody.agent.protocol.TelemetryEvent
 import com.sourcegraph.cody.agent.protocol_generated.AutocompleteParams
@@ -16,6 +15,7 @@ import com.sourcegraph.cody.agent.protocol_generated.CodeActions_ProvideParams
 import com.sourcegraph.cody.agent.protocol_generated.CodeActions_ProvideResult
 import com.sourcegraph.cody.agent.protocol_generated.CodeActions_TriggerParams
 import com.sourcegraph.cody.agent.protocol_generated.Commands_CustomParams
+import com.sourcegraph.cody.agent.protocol_generated.ContextFilters
 import com.sourcegraph.cody.agent.protocol_generated.CurrentUserCodySubscription
 import com.sourcegraph.cody.agent.protocol_generated.CustomCommandResult
 import com.sourcegraph.cody.agent.protocol_generated.Diagnostics_PublishParams
@@ -132,6 +132,9 @@ interface _SubsetGeneratedCodyAgentServer {
   @JsonRequest("ignore/test")
   fun ignore_test(params: Ignore_TestParams): CompletableFuture<Ignore_TestResult>
 
+  @JsonRequest("testing/ignore/overridePolicy")
+  fun testing_ignore_overridePolicy(params: ContextFilters?): CompletableFuture<Null?>
+
   //  // =============
   //  // Notifications
   //  // =============
@@ -183,9 +186,6 @@ interface _LegacyAgentServer {
   @JsonRequest("telemetry/recordEvent")
   fun recordEvent(event: TelemetryEvent): CompletableFuture<Void?>
 
-  @JsonRequest("testing/ignore/overridePolicy")
-  fun testingIgnoreOverridePolicy(params: IgnorePolicySpec?): CompletableFuture<Unit>
-
   @JsonRequest("testing/requestErrors")
   fun testingRequestErrors(): CompletableFuture<List<NetworkRequest>>
 }
diff --git a/src/main/kotlin/com/sourcegraph/cody/agent/protocol/Ignore.kt b/src/main/kotlin/com/sourcegraph/cody/agent/protocol/Ignore.kt
deleted file mode 100644
index 23a57026a9..0000000000
--- a/src/main/kotlin/com/sourcegraph/cody/agent/protocol/Ignore.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.sourcegraph.cody.agent.protocol
-
-data class IgnorePolicyPattern(val repoNamePattern: String, val filePathPatterns: List<String>?)
-
-data class IgnorePolicySpec(
-    val exclude: List<IgnorePolicyPattern>?,
-    val include: List<IgnorePolicyPattern>?,
-)
diff --git a/src/main/kotlin/com/sourcegraph/cody/internals/IgnoreOverrideAction.kt b/src/main/kotlin/com/sourcegraph/cody/internals/IgnoreOverrideAction.kt
index 609d444783..518a5fa9f1 100644
--- a/src/main/kotlin/com/sourcegraph/cody/internals/IgnoreOverrideAction.kt
+++ b/src/main/kotlin/com/sourcegraph/cody/internals/IgnoreOverrideAction.kt
@@ -16,7 +16,7 @@ import com.intellij.ui.dsl.builder.panel
 import com.intellij.ui.dsl.builder.rows
 import com.intellij.ui.dsl.builder.selected
 import com.sourcegraph.cody.agent.CodyAgentService
-import com.sourcegraph.cody.agent.protocol.IgnorePolicySpec
+import com.sourcegraph.cody.agent.protocol_generated.ContextFilters
 import javax.swing.JComponent
 
 data object IgnoreOverrideModel {
@@ -50,7 +50,7 @@ class IgnoreOverrideDialog(val project: Project) : DialogWrapper(project) {
             .bindText(IgnoreOverrideModel::policy)
             .validationOnInput { textArea ->
               try {
-                Gson().fromJson(textArea.text, IgnorePolicySpec::class.java)
+                Gson().fromJson(textArea.text, ContextFilters::class.java)
                 null
               } catch (e: JsonSyntaxException) {
                 ValidationInfo("JSON error: ${e.message}", textArea)
@@ -64,9 +64,9 @@ class IgnoreOverrideDialog(val project: Project) : DialogWrapper(project) {
   override fun doOKAction() {
     super.doOKAction()
     CodyAgentService.withAgent(project) { agent ->
-      agent.server.testingIgnoreOverridePolicy(
+      agent.server.testing_ignore_overridePolicy(
           if (IgnoreOverrideModel.enabled) {
-            Gson().fromJson(IgnoreOverrideModel.policy, IgnorePolicySpec::class.java)
+            Gson().fromJson(IgnoreOverrideModel.policy, ContextFilters::class.java)
           } else {
             null
           })