From 17904296870460d2e0a613e2e9fc035630d162f9 Mon Sep 17 00:00:00 2001
From: magic-akari <akari.ccino@gmail.com>
Date: Fri, 12 Jan 2024 13:04:41 +0800
Subject: [PATCH] chore: add test case

---
 src/swc.rs | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/src/swc.rs b/src/swc.rs
index 6e3d12a6..00f91b15 100644
--- a/src/swc.rs
+++ b/src/swc.rs
@@ -227,6 +227,35 @@ mod tests {
     );
   }
 
+  #[test]
+  fn it_should_error_for_merge_conflict_marker() {
+    run_non_fatal_diagnostic_test(
+      "./test.ts",
+      r#"class Test {
+<<<<<<< HEAD
+    v = 1;
+=======
+    v = 2;
+>>>>>>> Branch-a
+}
+"#,
+      r#"Merge conflict marker encountered. at ./test.ts:2:1
+
+  <<<<<<< HEAD
+  ~~~~~~~
+
+Merge conflict marker encountered. at ./test.ts:4:1
+
+  =======
+  ~~~~~~~
+
+Merge conflict marker encountered. at ./test.ts:6:1
+
+  >>>>>>> Branch-a
+  ~~~~~~~"#,
+    );
+  }
+
   fn run_non_fatal_diagnostic_test(file_path: &str, text: &str, expected: &str) {
     let file_path = PathBuf::from(file_path);
     assert_eq!(format!("{}", parse_swc_ast(&file_path, text).err().unwrap()), expected);