From e3a50705ffe5da9f3bf736e68ea2da9ae0fca735 Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Fri, 12 Apr 2024 14:08:17 -0700
Subject: [PATCH] Fix tests

---
 .../browser/actions/chatExecuteActions.ts     |  4 ---
 .../ChatService_can_deserialize.0.snap        | 26 +++++++++++--------
 .../ChatService_can_serialize.1.snap          | 26 +++++++++++--------
 .../chat/test/common/chatService.test.ts      |  2 +-
 4 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts
index f7dc34c947e..65f81218005 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts
@@ -157,10 +157,6 @@ export class CancelAction extends Action2 {
 				id: MenuId.ChatExecute,
 				when: CONTEXT_CHAT_REQUEST_IN_PROGRESS,
 				group: 'navigation',
-			},
-			keybinding: {
-				weight: KeybindingWeight.WorkbenchContrib,
-				primary: KeyMod.CtrlCmd | KeyCode.Escape,
 			}
 		});
 	}
diff --git a/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatService_can_deserialize.0.snap b/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatService_can_deserialize.0.snap
index d4140a40acf..7a2281d5b24 100644
--- a/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatService_can_deserialize.0.snap
+++ b/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatService_can_deserialize.0.snap
@@ -11,7 +11,6 @@
         text: "@ChatProviderWithUsedContext test request",
         parts: [
           {
-            kind: "agent",
             range: {
               start: 0,
               endExclusive: 28
@@ -23,11 +22,18 @@
               endColumn: 29
             },
             agent: {
-              id: "ChatProviderWithUsedContext",
               name: "ChatProviderWithUsedContext",
-              description: undefined,
-              metadata: {  }
-            }
+              id: "ChatProviderWithUsedContext",
+              extensionId: {
+                value: "nullExtensionDescription",
+                _lower: "nullextensiondescription"
+              },
+              extensionPublisher: "",
+              locations: [ "panel" ],
+              metadata: {  },
+              slashCommands: [  ]
+            },
+            kind: "agent"
           },
           {
             range: {
@@ -52,18 +58,16 @@
       isCanceled: false,
       vote: undefined,
       agent: {
-        id: "ChatProviderWithUsedContext",
         name: "ChatProviderWithUsedContext",
-        description: undefined,
+        id: "ChatProviderWithUsedContext",
         extensionId: {
           value: "nullExtensionDescription",
           _lower: "nullextensiondescription"
         },
-        metadata: {  },
-        slashCommands: [  ],
+        extensionPublisher: "",
         locations: [ "panel" ],
-        isDefault: undefined,
-        extensionPublisher: ""
+        metadata: {  },
+        slashCommands: [  ]
       },
       slashCommand: undefined,
       usedContext: {
diff --git a/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatService_can_serialize.1.snap b/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatService_can_serialize.1.snap
index f90048cac64..2d43470fa28 100644
--- a/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatService_can_serialize.1.snap
+++ b/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatService_can_serialize.1.snap
@@ -10,7 +10,6 @@
       message: {
         parts: [
           {
-            kind: "agent",
             range: {
               start: 0,
               endExclusive: 28
@@ -22,14 +21,21 @@
               endColumn: 29
             },
             agent: {
-              id: "ChatProviderWithUsedContext",
               name: "ChatProviderWithUsedContext",
-              description: undefined,
+              id: "ChatProviderWithUsedContext",
+              extensionId: {
+                value: "nullExtensionDescription",
+                _lower: "nullextensiondescription"
+              },
+              extensionPublisher: "",
+              locations: [ "panel" ],
               metadata: {
                 requester: { name: "test" },
                 fullName: "test"
-              }
-            }
+              },
+              slashCommands: [  ]
+            },
+            kind: "agent"
           },
           {
             range: {
@@ -55,21 +61,19 @@
       isCanceled: false,
       vote: undefined,
       agent: {
-        id: "ChatProviderWithUsedContext",
         name: "ChatProviderWithUsedContext",
-        description: undefined,
+        id: "ChatProviderWithUsedContext",
         extensionId: {
           value: "nullExtensionDescription",
           _lower: "nullextensiondescription"
         },
+        extensionPublisher: "",
+        locations: [ "panel" ],
         metadata: {
           requester: { name: "test" },
           fullName: "test"
         },
-        slashCommands: [  ],
-        locations: [ "panel" ],
-        isDefault: undefined,
-        extensionPublisher: ""
+        slashCommands: [  ]
       },
       slashCommand: undefined,
       usedContext: {
diff --git a/src/vs/workbench/contrib/chat/test/common/chatService.test.ts b/src/vs/workbench/contrib/chat/test/common/chatService.test.ts
index 48701f493c2..37e6f0b2b5c 100644
--- a/src/vs/workbench/contrib/chat/test/common/chatService.test.ts
+++ b/src/vs/workbench/contrib/chat/test/common/chatService.test.ts
@@ -163,7 +163,7 @@ suite('ChatService', () => {
 
 			await response.responseCompletePromise;
 
-			serializedChatData = chatModel1.toJSON();
+			serializedChatData = JSON.parse(JSON.stringify(chatModel1));
 		}
 
 		// try deserializing the state into a new service