Check for conflict marker when trying to parse JSX child

Kanchalai Tanglertsampan · Kanchalai Tanglertsampan · commit ea01ad4cbdd8 · 2017-02-16T14:03:41.000-08:00
diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
@@ -3862,6 +3862,9 @@ namespace ts {
                     parseErrorAtPosition(openingTagName.pos, openingTagName.end - openingTagName.pos, Diagnostics.JSX_element_0_has_no_corresponding_closing_tag, getTextOfNodeFromSourceText(sourceText, openingTagName));
                     break;
                 }
+                else if (token() === SyntaxKind.ConflictMarkerTrivia) {
+                    break;
+                }
                 result.push(parseJsxChild());
             }
 
diff --git a/src/compiler/scanner.ts b/src/compiler/scanner.ts
@@ -1716,9 +1716,18 @@ namespace ts {
             while (pos < end) {
                 pos++;
                 char = text.charCodeAt(pos);
-                if ((char === CharacterCodes.openBrace) || (char === CharacterCodes.lessThan)) {
+                if (char === CharacterCodes.openBrace) {
                     break;
                 }
+                if (char === CharacterCodes.lessThan) {
+                    if (isConflictMarkerTrivia(text, pos)) {
+                        pos = scanConflictMarkerTrivia(text, pos, error);
+                        return token = SyntaxKind.ConflictMarkerTrivia;
+                    }
+                    else {
+                        break;
+                    }
+                }
             }
             return token = SyntaxKind.JsxText;
         }

Original file line number	Diff line number	Diff line change
`@@ -3862,6 +3862,9 @@ namespace ts {`
`3862`	`3862`	`parseErrorAtPosition(openingTagName.pos, openingTagName.end - openingTagName.pos, Diagnostics.JSX_element_0_has_no_corresponding_closing_tag, getTextOfNodeFromSourceText(sourceText, openingTagName));`
`3863`	`3863`	`break;`
`3864`	`3864`	`}`
	`3865`	`+ else if (token() === SyntaxKind.ConflictMarkerTrivia) {`
	`3866`	`+ break;`
	`3867`	`+ }`
`3865`	`3868`	`result.push(parseJsxChild());`
`3866`	`3869`	`}`
`3867`	`3870`