maxmustermann/TypeScript
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Add tests and baselines

Browse source
This commit is contained in:
Kanchalai Tanglertsampan 2017-02-16 14:03:59 -08:00
parent ea01ad4cbd
commit 8f79f9529f
6 changed files with 45 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
tests/baselines/reference/conflictMarkerTrivia3.errors.txt Normal file
View file

@ -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.

6
tests/baselines/reference/conflictMarkerTrivia3.js Normal file
View file

@ -0,0 +1,6 @@
//// [conflictMarkerTrivia3.tsx]
const x = <div>
<<<<<<< HEAD
//// [conflictMarkerTrivia3.js]
var x = <div></>;

14
tests/baselines/reference/conflictMarkerTrivia4.errors.txt Normal file
View file

@ -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.

6
tests/baselines/reference/conflictMarkerTrivia4.js Normal file
View file

@ -0,0 +1,6 @@
//// [conflictMarkerTrivia4.ts]
const x = <div>
<<<<<<< HEAD
//// [conflictMarkerTrivia4.js]
var x = ;

2
tests/cases/compiler/conflictMarkerTrivia3.tsx Normal file
View file

@ -0,0 +1,2 @@
const x = <div>
<<<<<<< HEAD

2
tests/cases/compiler/conflictMarkerTrivia4.ts Normal file
View file

@ -0,0 +1,2 @@
const x = <div>
<<<<<<< HEAD