add more tests

Author: 0xda157

compiler-core/src/parse/tests.rs

@@ -405,6 +405,23 @@ fn merge_conflict_lt() {
     );
 }
 
+#[test]
+fn merge_conflict_lt_with_head() {
+    assert_error!(
+        "let wobble: Int = 32
+        <<<<<<< HEAD",
+        ParseError {
+            error: ParseErrorType::LexError {
+                error: LexicalError {
+                    error: LexicalErrorType::MergeConflictIndicator,
+                    location: SrcSpan { start: 29, end: 36 },
+                }
+            },
+            location: SrcSpan { start: 29, end: 36 },
+        }
+    );
+}
+
 #[test]
 fn four_lt_not_merge_conflict() {
     assert_error!(
@@ -462,6 +479,23 @@ fn merge_conflict_gt() {
     );
 }
 
+#[test]
+fn merge_conflict_gt_with_branch_name() {
+    assert_error!(
+        "let wobble: Int = 32
+        >>>>>>> main",
+        ParseError {
+            error: ParseErrorType::LexError {
+                error: LexicalError {
+                    error: LexicalErrorType::MergeConflictIndicator,
+                    location: SrcSpan { start: 29, end: 36 },
+                }
+            },
+            location: SrcSpan { start: 29, end: 36 },
+        }
+    );
+}
+
 #[test]
 fn four_gt_not_merge_conflict() {
     assert_error!(