From 5f74297576cf277016958cf1838d613bd32c1419 Mon Sep 17 00:00:00 2001
From: Agus Zubiaga <agus@zed.dev>
Date: Wed, 12 Mar 2025 12:52:51 -0300
Subject: [PATCH] Fix edit tool tests on windows (#26552)

Assertions on the parsed system prompt should use CRLF on Windows. I
didn't see it before because I was testing on my Windows VM from a
shared folder I cloned on macOS.

Release Notes:

- N/A
---
 .../src/edit_files_tool/edit_action.rs        | 48 ++++++++++++++++---
 1 file changed, 41 insertions(+), 7 deletions(-)

diff --git a/crates/assistant_tools/src/edit_files_tool/edit_action.rs b/crates/assistant_tools/src/edit_files_tool/edit_action.rs
index d118ca1a7f345d9072311b88ba8e1c4dec0e151b..9e9a58737bec439bc5816f7f961ee32adb8afbad 100644
--- a/crates/assistant_tools/src/edit_files_tool/edit_action.rs
+++ b/crates/assistant_tools/src/edit_files_tool/edit_action.rs
@@ -800,16 +800,18 @@ fn new_utils_func() {}
                 old: "from flask import Flask".to_string(),
                 new: "import math\nfrom flask import Flask".to_string(),
             }
+            .fix_lf(),
         );
 
         assert_eq!(
-                    actions[1],
-                    EditAction::Replace {
-                        file_path: PathBuf::from("mathweb/flask/app.py"),
-                        old: "def factorial(n):\n    \"compute factorial\"\n\n    if n == 0:\n        return 1\n    else:\n        return n * factorial(n-1)\n".to_string(),
-                        new: "".to_string(),
-                    }
-                );
+            actions[1],
+            EditAction::Replace {
+                file_path: PathBuf::from("mathweb/flask/app.py"),
+                old: "def factorial(n):\n    \"compute factorial\"\n\n    if n == 0:\n        return 1\n    else:\n        return n * factorial(n-1)\n".to_string(),
+                new: "".to_string(),
+            }
+            .fix_lf()
+        );
 
         assert_eq!(
             actions[2],
@@ -818,6 +820,7 @@ fn new_utils_func() {}
                 old: "    return str(factorial(n))".to_string(),
                 new: "    return str(math.factorial(n))".to_string(),
             }
+            .fix_lf(),
         );
 
         assert_eq!(
@@ -827,6 +830,7 @@ fn new_utils_func() {}
                 content: "def hello():\n    \"print a greeting\"\n\n    print(\"hello\")"
                     .to_string(),
             }
+            .fix_lf(),
         );
 
         assert_eq!(
@@ -836,6 +840,7 @@ fn new_utils_func() {}
                 old: "def hello():\n    \"print a greeting\"\n\n    print(\"hello\")".to_string(),
                 new: "from hello import hello".to_string(),
             }
+            .fix_lf(),
         );
 
         // The system prompt includes some text that would produce errors
@@ -843,10 +848,39 @@ fn new_utils_func() {}
             errors[0].to_string(),
             "input:102:1: Expected marker \"<<<<<<< SEARCH\", found '3'"
         );
+        #[cfg(not(windows))]
         assert_eq!(
             errors[1].to_string(),
             "input:109:0: Expected marker \"<<<<<<< SEARCH\", found '\\n'"
         );
+        #[cfg(windows)]
+        assert_eq!(
+            errors[1].to_string(),
+            "input:108:1: Expected marker \"<<<<<<< SEARCH\", found '\\r'"
+        );
+    }
+
+    impl EditAction {
+        fn fix_lf(self: EditAction) -> EditAction {
+            #[cfg(windows)]
+            match self {
+                EditAction::Replace {
+                    file_path,
+                    old,
+                    new,
+                } => EditAction::Replace {
+                    file_path: file_path.clone(),
+                    old: old.replace("\n", "\r\n"),
+                    new: new.replace("\n", "\r\n"),
+                },
+                EditAction::Write { file_path, content } => EditAction::Write {
+                    file_path: file_path.clone(),
+                    content: content.replace("\n", "\r\n"),
+                },
+            }
+            #[cfg(not(windows))]
+            self
+        }
     }
 
     #[test]