From 8f79f9529f73cb34c75a39649650093ef34230e1 Mon Sep 17 00:00:00 2001
From: Kanchalai Tanglertsampan <yuisu@microsoft.com>
Date: Thu, 16 Feb 2017 14:03:59 -0800
Subject: [PATCH] Add tests and baselines

---
 .../reference/conflictMarkerTrivia3.errors.txt    | 15 +++++++++++++++
 .../baselines/reference/conflictMarkerTrivia3.js  |  6 ++++++
 .../reference/conflictMarkerTrivia4.errors.txt    | 14 ++++++++++++++
 .../baselines/reference/conflictMarkerTrivia4.js  |  6 ++++++
 tests/cases/compiler/conflictMarkerTrivia3.tsx    |  2 ++
 tests/cases/compiler/conflictMarkerTrivia4.ts     |  2 ++
 6 files changed, 45 insertions(+)
 create mode 100644 tests/baselines/reference/conflictMarkerTrivia3.errors.txt
 create mode 100644 tests/baselines/reference/conflictMarkerTrivia3.js
 create mode 100644 tests/baselines/reference/conflictMarkerTrivia4.errors.txt
 create mode 100644 tests/baselines/reference/conflictMarkerTrivia4.js
 create mode 100644 tests/cases/compiler/conflictMarkerTrivia3.tsx
 create mode 100644 tests/cases/compiler/conflictMarkerTrivia4.ts

diff --git a/tests/baselines/reference/conflictMarkerTrivia3.errors.txt b/tests/baselines/reference/conflictMarkerTrivia3.errors.txt
new file mode 100644
index 0000000000..124201ce0b
--- /dev/null
+++ b/tests/baselines/reference/conflictMarkerTrivia3.errors.txt
@@ -0,0 +1,15 @@
+tests/cases/compiler/conflictMarkerTrivia3.tsx(1,11): error TS17004: Cannot use JSX unless the '--jsx' flag is provided.
+tests/cases/compiler/conflictMarkerTrivia3.tsx(1,16): error TS1005: '</' expected.
+tests/cases/compiler/conflictMarkerTrivia3.tsx(2,1): error TS1185: Merge conflict marker encountered.
+
+
+==== tests/cases/compiler/conflictMarkerTrivia3.tsx (3 errors) ====
+    const x = <div>
+              ~~~~~
+!!! error TS17004: Cannot use JSX unless the '--jsx' flag is provided.
+                   
+    <<<<<<< HEAD
+    ~~~~~~~~~~~~
+!!! error TS1005: '</' expected.
+    ~~~~~~~
+!!! error TS1185: Merge conflict marker encountered.
\ No newline at end of file
diff --git a/tests/baselines/reference/conflictMarkerTrivia3.js b/tests/baselines/reference/conflictMarkerTrivia3.js
new file mode 100644
index 0000000000..804030522e
--- /dev/null
+++ b/tests/baselines/reference/conflictMarkerTrivia3.js
@@ -0,0 +1,6 @@
+//// [conflictMarkerTrivia3.tsx]
+const x = <div>
+<<<<<<< HEAD
+
+//// [conflictMarkerTrivia3.js]
+var x = <div></>;
diff --git a/tests/baselines/reference/conflictMarkerTrivia4.errors.txt b/tests/baselines/reference/conflictMarkerTrivia4.errors.txt
new file mode 100644
index 0000000000..476dbbce6c
--- /dev/null
+++ b/tests/baselines/reference/conflictMarkerTrivia4.errors.txt
@@ -0,0 +1,14 @@
+tests/cases/compiler/conflictMarkerTrivia4.ts(1,12): error TS2304: Cannot find name 'div'.
+tests/cases/compiler/conflictMarkerTrivia4.ts(2,1): error TS1185: Merge conflict marker encountered.
+tests/cases/compiler/conflictMarkerTrivia4.ts(2,13): error TS1109: Expression expected.
+
+
+==== tests/cases/compiler/conflictMarkerTrivia4.ts (3 errors) ====
+    const x = <div>
+               ~~~
+!!! error TS2304: Cannot find name 'div'.
+    <<<<<<< HEAD
+    ~~~~~~~
+!!! error TS1185: Merge conflict marker encountered.
+                
+!!! error TS1109: Expression expected.
\ No newline at end of file
diff --git a/tests/baselines/reference/conflictMarkerTrivia4.js b/tests/baselines/reference/conflictMarkerTrivia4.js
new file mode 100644
index 0000000000..945e82b2f2
--- /dev/null
+++ b/tests/baselines/reference/conflictMarkerTrivia4.js
@@ -0,0 +1,6 @@
+//// [conflictMarkerTrivia4.ts]
+const x = <div>
+<<<<<<< HEAD
+
+//// [conflictMarkerTrivia4.js]
+var x = ;
diff --git a/tests/cases/compiler/conflictMarkerTrivia3.tsx b/tests/cases/compiler/conflictMarkerTrivia3.tsx
new file mode 100644
index 0000000000..21f83715ad
--- /dev/null
+++ b/tests/cases/compiler/conflictMarkerTrivia3.tsx
@@ -0,0 +1,2 @@
+const x = <div>
+<<<<<<< HEAD
\ No newline at end of file
diff --git a/tests/cases/compiler/conflictMarkerTrivia4.ts b/tests/cases/compiler/conflictMarkerTrivia4.ts
new file mode 100644
index 0000000000..21f83715ad
--- /dev/null
+++ b/tests/cases/compiler/conflictMarkerTrivia4.ts
@@ -0,0 +1,2 @@
+const x = <div>
+<<<<<<< HEAD
\ No newline at end of file