Add tests and update baselines

Author: Kanchalai Tanglertsampan

src/compiler/scanner.ts

@@ -1,4 +1,4 @@
-/// <reference path="core.ts"/>
+/// <reference path="core.ts"/>
 /// <reference path="diagnosticInformationMap.generated.ts"/>
 
 namespace ts {

tests/baselines/reference/checkJsxChildrenProperty2.errors.txt

@@ -2,33 +2,34 @@ tests/cases/conformance/jsx/file.tsx(14,15): error TS2322: Type '{ a: 10; b: "hi
   Type '{ a: 10; b: "hi"; }' is not assignable to type 'Prop'.
     Property 'children' is missing in type '{ a: 10; b: "hi"; }'.
 tests/cases/conformance/jsx/file.tsx(17,11): error TS2708: props.children are specified twice. The attribute named 'children' will be overwritten.
-tests/cases/conformance/jsx/file.tsx(23,11): error TS2322: Type '{ a: 10; b: "hi"; children: (Element | ((name: string) => Element))[]; }' is not assignable to type 'IntrinsicAttributes & Prop'.
+tests/cases/conformance/jsx/file.tsx(25,11): error TS2708: props.children are specified twice. The attribute named 'children' will be overwritten.
+tests/cases/conformance/jsx/file.tsx(31,11): error TS2322: Type '{ a: 10; b: "hi"; children: (Element | ((name: string) => Element))[]; }' is not assignable to type 'IntrinsicAttributes & Prop'.
   Type '{ a: 10; b: "hi"; children: (Element | ((name: string) => Element))[]; }' is not assignable to type 'Prop'.
     Types of property 'children' are incompatible.
       Type '(Element | ((name: string) => Element))[]' is not assignable to type 'string | Element'.
         Type '(Element | ((name: string) => Element))[]' is not assignable to type 'Element'.
           Property 'type' is missing in type '(Element | ((name: string) => Element))[]'.
-tests/cases/conformance/jsx/file.tsx(29,11): error TS2322: Type '{ a: 10; b: "hi"; children: (Element | 1000000)[]; }' is not assignable to type 'IntrinsicAttributes & Prop'.
+tests/cases/conformance/jsx/file.tsx(37,11): error TS2322: Type '{ a: 10; b: "hi"; children: (Element | 1000000)[]; }' is not assignable to type 'IntrinsicAttributes & Prop'.
   Type '{ a: 10; b: "hi"; children: (Element | 1000000)[]; }' is not assignable to type 'Prop'.
     Types of property 'children' are incompatible.
       Type '(Element | 1000000)[]' is not assignable to type 'string | Element'.
         Type '(Element | 1000000)[]' is not assignable to type 'Element'.
           Property 'type' is missing in type '(Element | 1000000)[]'.
-tests/cases/conformance/jsx/file.tsx(35,11): error TS2322: Type '{ a: 10; b: "hi"; children: (string | Element)[]; }' is not assignable to type 'IntrinsicAttributes & Prop'.
+tests/cases/conformance/jsx/file.tsx(43,11): error TS2322: Type '{ a: 10; b: "hi"; children: (string | Element)[]; }' is not assignable to type 'IntrinsicAttributes & Prop'.
   Type '{ a: 10; b: "hi"; children: (string | Element)[]; }' is not assignable to type 'Prop'.
     Types of property 'children' are incompatible.
       Type '(string | Element)[]' is not assignable to type 'string | Element'.
         Type '(string | Element)[]' is not assignable to type 'Element'.
           Property 'type' is missing in type '(string | Element)[]'.
-tests/cases/conformance/jsx/file.tsx(41,11): error TS2322: Type '{ a: 10; b: "hi"; children: Element[]; }' is not assignable to type 'IntrinsicAttributes & Prop'.
+tests/cases/conformance/jsx/file.tsx(49,11): error TS2322: Type '{ a: 10; b: "hi"; children: Element[]; }' is not assignable to type 'IntrinsicAttributes & Prop'.
   Type '{ a: 10; b: "hi"; children: Element[]; }' is not assignable to type 'Prop'.
     Types of property 'children' are incompatible.
       Type 'Element[]' is not assignable to type 'string | Element'.
         Type 'Element[]' is not assignable to type 'Element'.
           Property 'type' is missing in type 'Element[]'.
 
 
-==== tests/cases/conformance/jsx/file.tsx (6 errors) ====
+==== tests/cases/conformance/jsx/file.tsx (7 errors) ====
     import React = require('react');
 
     interface Prop {
@@ -48,13 +49,23 @@ tests/cases/conformance/jsx/file.tsx(41,11): error TS2322: Type '{ a: 10; b: "hi
 !!! error TS2322:   Type '{ a: 10; b: "hi"; }' is not assignable to type 'Prop'.
 !!! error TS2322:     Property 'children' is missing in type '{ a: 10; b: "hi"; }'.
 
-    let k1 =
+    let k0 =
         <Comp a={10} b="hi" children="Random" >
               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS2708: props.children are specified twice. The attribute named 'children' will be overwritten.
             hi hi hi!
         </Comp>;
 
+    let o = {
+         children:"Random"
+    }
+    let k1 =
+        <Comp a={10} b="hi" {...o} >
+              ~~~~~~~~~~~~~~~~~~~~
+!!! error TS2708: props.children are specified twice. The attribute named 'children' will be overwritten.
+            hi hi hi!
+        </Comp>;
+    
     // Error: incorrect type
     let k2 =
         <Comp a={10} b="hi">

tests/baselines/reference/checkJsxChildrenProperty2.js

@@ -14,11 +14,19 @@ function Comp(p: Prop) {
 // Error: missing children
 let k = <Comp a={10} b="hi" />;
 
-let k1 =
+let k0 =
     <Comp a={10} b="hi" children="Random" >
         hi hi hi!
     </Comp>;
 
+let o = {
+     children:"Random"
+}
+let k1 =
+    <Comp a={10} b="hi" {...o} >
+        hi hi hi!
+    </Comp>;
+
 // Error: incorrect type
 let k2 =
     <Comp a={10} b="hi">
@@ -53,7 +61,13 @@ function Comp(p) {
 }
 // Error: missing children
 var k = <Comp a={10} b="hi"/>;
-var k1 = <Comp a={10} b="hi" children="Random">
+var k0 = <Comp a={10} b="hi" children="Random">
+        hi hi hi!
+    </Comp>;
+var o = {
+    children: "Random"
+};
+var k1 = <Comp a={10} b="hi" {...o}>
         hi hi hi!
     </Comp>;
 // Error: incorrect type

tests/baselines/reference/tsxStatelessFunctionComponentOverload1.js

@@ -2,6 +2,7 @@
 import React = require('react')
 
 declare function OneThing(k: {yxx: string}): JSX.Element;
+declare function OneThing(k: {yxx1: string, children: string}): JSX.Element;
 declare function OneThing(l: {yy: number, yy1: string}): JSX.Element;
 declare function OneThing(l: {yy: number, yy1: string, yy2: boolean}): JSX.Element;
 declare function OneThing(l1: {data: string, "data-prop": boolean}): JSX.Element;
@@ -11,6 +12,8 @@ const c1 = <OneThing yxx='ok' />
 const c2 = <OneThing yy={100}  yy1="hello"/>
 const c3 = <OneThing yxx="hello" ignore-prop />
 const c4 = <OneThing data="hello" data-prop />
+const c5 = <OneThing yxx1='ok'>Hello</OneThing>
+
 
 declare function TestingOneThing({y1: string}): JSX.Element;
 declare function TestingOneThing(j: {"extra-data": string, yy?: string}): JSX.Element;
@@ -48,6 +51,7 @@ define(["require", "exports", "react"], function (require, exports, React) {
     var c2 = <OneThing yy={100} yy1="hello"/>;
     var c3 = <OneThing yxx="hello" ignore-prop/>;
     var c4 = <OneThing data="hello" data-prop/>;
+    var c5 = <OneThing yxx1='ok'>Hello</OneThing>;
     // OK
     var d1 = <TestingOneThing y1 extra-data/>;
     var d2 = <TestingOneThing extra-data="hello"/>;