From bc9b53a6fe3ef8f6bcad049ec05270ec35626470 Mon Sep 17 00:00:00 2001
From: Ryan Cavanaugh <RyanCavanaugh@users.noreply.github.com>
Date: Thu, 18 Jun 2015 14:03:43 -0700
Subject: [PATCH] Conformance tests for JSX

---
 .../conformance/jsx/jsxAndTypeAssertion.tsx   |  22 ++++
 .../conformance/jsx/jsxEsprimaFbTestSuite.tsx |  54 ++++++++
 .../jsx/jsxInvalidEsprimaTestSuite.tsx        |  36 ++++++
 .../conformance/jsx/jsxReactTestSuite.tsx     | 117 ++++++++++++++++++
 .../conformance/jsx/tsxAttributeErrors.tsx    |  26 ++++
 .../jsx/tsxAttributeInvalidNames.tsx          |  12 ++
 .../jsx/tsxAttributeResolution.tsx            |   9 ++
 .../jsx/tsxAttributeResolution1.jsx           |  15 +++
 .../jsx/tsxAttributeResolution1.tsx           |  33 +++++
 .../jsx/tsxAttributeResolution2.jsx           |   5 +
 .../jsx/tsxAttributeResolution2.tsx           |  19 +++
 .../jsx/tsxAttributeResolution3.jsx           |  21 ++++
 .../jsx/tsxAttributeResolution3.tsx           |  41 ++++++
 .../jsx/tsxAttributeResolution4.jsx           |   4 +
 .../jsx/tsxAttributeResolution4.tsx           |  17 +++
 .../jsx/tsxAttributeResolution5.jsx           |  11 ++
 .../jsx/tsxAttributeResolution5.tsx           |  32 +++++
 .../jsx/tsxAttributeResolution6.tsx           |  19 +++
 .../jsx/tsxAttributeResolution7.tsx           |  16 +++
 .../conformance/jsx/tsxElementResolution.tsx  |  25 ++++
 .../conformance/jsx/tsxElementResolution1.jsx |   4 +
 .../conformance/jsx/tsxElementResolution1.tsx |  14 +++
 .../jsx/tsxElementResolution10.tsx            |  21 ++++
 .../jsx/tsxElementResolution11.jsx            |   6 +
 .../jsx/tsxElementResolution11.tsx            |  25 ++++
 .../jsx/tsxElementResolution12.jsx            |   9 ++
 .../jsx/tsxElementResolution12.tsx            |  32 +++++
 .../jsx/tsxElementResolution13.jsx            |   2 +
 .../jsx/tsxElementResolution13.tsx            |  12 ++
 .../jsx/tsxElementResolution14.jsx            |   2 +
 .../jsx/tsxElementResolution14.tsx            |  11 ++
 .../jsx/tsxElementResolution15.jsx            |   2 +
 .../jsx/tsxElementResolution15.tsx            |  13 ++
 .../jsx/tsxElementResolution16.jsx            |   2 +
 .../jsx/tsxElementResolution16.tsx            |  10 ++
 .../jsx/tsxElementResolution17.tsx            |  27 ++++
 .../jsx/tsxElementResolution18.tsx            |   9 ++
 .../conformance/jsx/tsxElementResolution2.tsx |  14 +++
 .../conformance/jsx/tsxElementResolution3.tsx |  14 +++
 .../conformance/jsx/tsxElementResolution4.tsx |  18 +++
 .../conformance/jsx/tsxElementResolution5.tsx |   8 ++
 .../conformance/jsx/tsxElementResolution6.tsx |  10 ++
 .../conformance/jsx/tsxElementResolution7.jsx |  14 +++
 .../conformance/jsx/tsxElementResolution7.tsx |  22 ++++
 .../conformance/jsx/tsxElementResolution8.jsx |  15 +++
 .../conformance/jsx/tsxElementResolution8.tsx |  36 ++++++
 .../conformance/jsx/tsxElementResolution9.jsx |   6 +
 .../conformance/jsx/tsxElementResolution9.tsx |  27 ++++
 tests/cases/conformance/jsx/tsxEmit1.jsx      |  34 +++++
 tests/cases/conformance/jsx/tsxEmit1.tsx      |  41 ++++++
 tests/cases/conformance/jsx/tsxEmit2.tsx      |  15 +++
 tests/cases/conformance/jsx/tsxEmit3.jsx      |  41 ++++++
 tests/cases/conformance/jsx/tsxEmit3.tsx      |  41 ++++++
 .../jsx/tsxGenericArrowFunctionParsing.tsx    |  28 +++++
 tests/cases/conformance/jsx/tsxNoJsx.tsx      |   3 +
 .../cases/conformance/jsx/tsxParseTests1.tsx  |   8 ++
 tests/cases/conformance/jsx/tsxReactEmit1.tsx |  41 ++++++
 tests/cases/conformance/jsx/tsxReactEmit2.tsx |  15 +++
 tests/cases/conformance/jsx/tsxReactEmit3.tsx |   8 ++
 tests/cases/conformance/jsx/tsxReactEmit4.tsx |  15 +++
 .../jsx/tsxReactEmitWhitespace.tsx            |  52 ++++++++
 tests/cases/conformance/jsx/tsxTypeErrors.tsx |  34 +++++
 62 files changed, 1295 insertions(+)
 create mode 100644 tests/cases/conformance/jsx/jsxAndTypeAssertion.tsx
 create mode 100644 tests/cases/conformance/jsx/jsxEsprimaFbTestSuite.tsx
 create mode 100644 tests/cases/conformance/jsx/jsxInvalidEsprimaTestSuite.tsx
 create mode 100644 tests/cases/conformance/jsx/jsxReactTestSuite.tsx
 create mode 100644 tests/cases/conformance/jsx/tsxAttributeErrors.tsx
 create mode 100644 tests/cases/conformance/jsx/tsxAttributeInvalidNames.tsx
 create mode 100644 tests/cases/conformance/jsx/tsxAttributeResolution.tsx
 create mode 100644 tests/cases/conformance/jsx/tsxAttributeResolution1.jsx
 create mode 100644 tests/cases/conformance/jsx/tsxAttributeResolution1.tsx
 create mode 100644 tests/cases/conformance/jsx/tsxAttributeResolution2.jsx
 create mode 100644 tests/cases/conformance/jsx/tsxAttributeResolution2.tsx
 create mode 100644 tests/cases/conformance/jsx/tsxAttributeResolution3.jsx
 create mode 100644 tests/cases/conformance/jsx/tsxAttributeResolution3.tsx
 create mode 100644 tests/cases/conformance/jsx/tsxAttributeResolution4.jsx
 create mode 100644 tests/cases/conformance/jsx/tsxAttributeResolution4.tsx
 create mode 100644 tests/cases/conformance/jsx/tsxAttributeResolution5.jsx
 create mode 100644 tests/cases/conformance/jsx/tsxAttributeResolution5.tsx
 create mode 100644 tests/cases/conformance/jsx/tsxAttributeResolution6.tsx
 create mode 100644 tests/cases/conformance/jsx/tsxAttributeResolution7.tsx
 create mode 100644 tests/cases/conformance/jsx/tsxElementResolution.tsx
 create mode 100644 tests/cases/conformance/jsx/tsxElementResolution1.jsx
 create mode 100644 tests/cases/conformance/jsx/tsxElementResolution1.tsx
 create mode 100644 tests/cases/conformance/jsx/tsxElementResolution10.tsx
 create mode 100644 tests/cases/conformance/jsx/tsxElementResolution11.jsx
 create mode 100644 tests/cases/conformance/jsx/tsxElementResolution11.tsx
 create mode 100644 tests/cases/conformance/jsx/tsxElementResolution12.jsx
 create mode 100644 tests/cases/conformance/jsx/tsxElementResolution12.tsx
 create mode 100644 tests/cases/conformance/jsx/tsxElementResolution13.jsx
 create mode 100644 tests/cases/conformance/jsx/tsxElementResolution13.tsx
 create mode 100644 tests/cases/conformance/jsx/tsxElementResolution14.jsx
 create mode 100644 tests/cases/conformance/jsx/tsxElementResolution14.tsx
 create mode 100644 tests/cases/conformance/jsx/tsxElementResolution15.jsx
 create mode 100644 tests/cases/conformance/jsx/tsxElementResolution15.tsx
 create mode 100644 tests/cases/conformance/jsx/tsxElementResolution16.jsx
 create mode 100644 tests/cases/conformance/jsx/tsxElementResolution16.tsx
 create mode 100644 tests/cases/conformance/jsx/tsxElementResolution17.tsx
 create mode 100644 tests/cases/conformance/jsx/tsxElementResolution18.tsx
 create mode 100644 tests/cases/conformance/jsx/tsxElementResolution2.tsx
 create mode 100644 tests/cases/conformance/jsx/tsxElementResolution3.tsx
 create mode 100644 tests/cases/conformance/jsx/tsxElementResolution4.tsx
 create mode 100644 tests/cases/conformance/jsx/tsxElementResolution5.tsx
 create mode 100644 tests/cases/conformance/jsx/tsxElementResolution6.tsx
 create mode 100644 tests/cases/conformance/jsx/tsxElementResolution7.jsx
 create mode 100644 tests/cases/conformance/jsx/tsxElementResolution7.tsx
 create mode 100644 tests/cases/conformance/jsx/tsxElementResolution8.jsx
 create mode 100644 tests/cases/conformance/jsx/tsxElementResolution8.tsx
 create mode 100644 tests/cases/conformance/jsx/tsxElementResolution9.jsx
 create mode 100644 tests/cases/conformance/jsx/tsxElementResolution9.tsx
 create mode 100644 tests/cases/conformance/jsx/tsxEmit1.jsx
 create mode 100644 tests/cases/conformance/jsx/tsxEmit1.tsx
 create mode 100644 tests/cases/conformance/jsx/tsxEmit2.tsx
 create mode 100644 tests/cases/conformance/jsx/tsxEmit3.jsx
 create mode 100644 tests/cases/conformance/jsx/tsxEmit3.tsx
 create mode 100644 tests/cases/conformance/jsx/tsxGenericArrowFunctionParsing.tsx
 create mode 100644 tests/cases/conformance/jsx/tsxNoJsx.tsx
 create mode 100644 tests/cases/conformance/jsx/tsxParseTests1.tsx
 create mode 100644 tests/cases/conformance/jsx/tsxReactEmit1.tsx
 create mode 100644 tests/cases/conformance/jsx/tsxReactEmit2.tsx
 create mode 100644 tests/cases/conformance/jsx/tsxReactEmit3.tsx
 create mode 100644 tests/cases/conformance/jsx/tsxReactEmit4.tsx
 create mode 100644 tests/cases/conformance/jsx/tsxReactEmitWhitespace.tsx
 create mode 100644 tests/cases/conformance/jsx/tsxTypeErrors.tsx

diff --git a/tests/cases/conformance/jsx/jsxAndTypeAssertion.tsx b/tests/cases/conformance/jsx/jsxAndTypeAssertion.tsx
new file mode 100644
index 00000000000..b20dea210a9
--- /dev/null
+++ b/tests/cases/conformance/jsx/jsxAndTypeAssertion.tsx
@@ -0,0 +1,22 @@
+// @jsx: preserve
+
+declare var createElement: any;
+
+class foo {}
+
+var x: any;
+x = <any> { test: <any></any> };
+
+x = <any><any></any>;
+ 
+x = <foo>hello {<foo>{}} </foo>;
+
+x = <foo test={<foo>{}}>hello</foo>;
+
+x = <foo test={<foo>{}}>hello{<foo>{}}</foo>;
+
+x = <foo>x</foo>, x = <foo/>;
+
+<foo>{<foo><foo>{/foo/.test(x) ? <foo><foo></foo> : <foo><foo></foo>}</foo>}</foo>
+
+    
diff --git a/tests/cases/conformance/jsx/jsxEsprimaFbTestSuite.tsx b/tests/cases/conformance/jsx/jsxEsprimaFbTestSuite.tsx
new file mode 100644
index 00000000000..163357454aa
--- /dev/null
+++ b/tests/cases/conformance/jsx/jsxEsprimaFbTestSuite.tsx
@@ -0,0 +1,54 @@
+// @jsx: preserve
+declare var React: any;
+declare var 日本語;
+declare var AbC_def;
+declare var LeftRight;
+declare var x;
+declare var a;
+declare var props;
+
+<a />;
+
+//<n:a n:v />; Namespace unsuported
+
+//<a n:foo="bar"> {value} <b><c /></b></a>;  Namespace unsuported
+
+<a b={" "} c=" " d="&amp;" e="id=1&group=2" f="&#123456789" g="&#123*;" h="&#x;" />;
+
+<a b="&notanentity;" />;
+<a
+/>;
+
+<日本語></日本語>;
+
+<AbC_def
+  test="&#x0026;&#38;">
+bar
+baz
+</AbC_def>;
+
+<a b={x ? <c /> : <d />} />;
+
+<a>{}</a>;
+
+<a>{/* this is a comment */}</a>;
+
+<div>@test content</div>;
+
+<div><br />7x invalid-js-identifier</div>;
+
+<LeftRight left=<a /> right=<b>monkeys /> gorillas</b> />;
+
+<a.b></a.b>;
+
+<a.b.c></a.b.c>;
+
+(<div />) < x;
+
+<div {...props} />;
+
+<div {...props} post="attribute" />;
+
+<div pre="leading" pre2="attribute" {...props}></div>;
+
+<a>    </a>;
diff --git a/tests/cases/conformance/jsx/jsxInvalidEsprimaTestSuite.tsx b/tests/cases/conformance/jsx/jsxInvalidEsprimaTestSuite.tsx
new file mode 100644
index 00000000000..815cd4abb21
--- /dev/null
+++ b/tests/cases/conformance/jsx/jsxInvalidEsprimaTestSuite.tsx
@@ -0,0 +1,36 @@
+// @jsx: preserve
+declare var React: any;
+
+</>;
+<a: />;
+<:a />;
+<a b=d />;
+<a>;
+<a></b>;
+<a foo="bar;
+<a:b></b>;
+<a:b.c></a:b.c>;
+<a.b:c></a.b:c>;
+<a.b.c></a>;
+<.a></.a>;
+<a.></a.>;
+<a[foo]></a[foo]>;
+<a['foo']></a['foo']>;
+<a><a />;
+<a b={}>;
+var x = <div>one</div><div>two</div>;;
+var x = <div>one</div> /* intervening comment */ <div>two</div>;;
+<a>{"str";}</a>;
+<span className="a", id="b" />;
+<div className"app">;
+<div {props} />;
+
+<div>stuff</div {...props}>;
+<div {...props}>stuff</div {...props}>;
+
+<a>></a>;
+<a> ></a>;
+<a b=}>;
+<a b=<}>;
+<a>}</a>;
+<a .../*hai*/asdf/>;
\ No newline at end of file
diff --git a/tests/cases/conformance/jsx/jsxReactTestSuite.tsx b/tests/cases/conformance/jsx/jsxReactTestSuite.tsx
new file mode 100644
index 00000000000..96b91987cbc
--- /dev/null
+++ b/tests/cases/conformance/jsx/jsxReactTestSuite.tsx
@@ -0,0 +1,117 @@
+// @jsx: preserve
+
+declare var React: any;
+declare var Component:any;
+declare var Composite:any;
+declare var Composite2:any;
+declare var Child:any;
+declare var Namespace:any;
+declare var foo: any;
+declare var bar: any;
+declare var y:any;
+declare var x:any;
+declare var z:any;
+declare var hasOwnProperty:any;
+
+<div>text</div>;
+
+<div>
+  {this.props.children}
+</div>;
+
+<div>
+  <div><br /></div>
+  <Component>{foo}<br />{bar}</Component>
+  <br />
+</div>;
+
+
+<Composite>
+    {this.props.children}
+</Composite>;
+
+<Composite>
+    <Composite2 />
+</Composite>;
+
+var x =
+  <div
+    attr1={
+      "foo" + "bar"
+    }
+    attr2={
+      "foo" + "bar" +
+      
+      "baz" + "bug"
+    }
+    attr3={
+      "foo" + "bar" +
+      "baz" + "bug"
+      // Extra line here.
+    }
+    attr4="baz">
+  </div>;
+
+(
+  <div>
+    {/* A comment at the beginning */}
+    {/* A second comment at the beginning */}
+    <span>
+      {/* A nested comment */}
+    </span>
+    {/* A sandwiched comment */}
+    <br />
+    {/* A comment at the end */}
+    {/* A second comment at the end */}
+  </div>
+);
+
+(
+  <div
+    /* a multi-line
+       comment */
+    attr1="foo">
+    <span // a double-slash comment
+      attr2="bar"
+    />
+  </div>
+);
+
+<div>&nbsp;</div>;
+
+<div>&nbsp; </div>;
+
+<hasOwnProperty>testing</hasOwnProperty>;
+
+<Component constructor="foo" />;
+
+<Namespace.Component />;
+
+<Namespace.DeepNamespace.Component />;
+
+<Component { ... x } y
+={2 } z />;
+
+<Component
+    {...this.props} sound="moo" />;
+
+<font-face />;
+
+<Component x={y} />;
+
+<x-component />;
+
+<Component {...x} />;
+
+<Component { ...x } y={2} />;
+
+<Component { ... x } y={2} z />;
+
+<Component x={1} {...y} />;
+
+
+<Component x={1} y="2" {...z} {...z}><Child /></Component>;
+
+<Component x="1" {...(z = { y: 2 }, z)} z={3}>Text</Component>;
+
+
diff --git a/tests/cases/conformance/jsx/tsxAttributeErrors.tsx b/tests/cases/conformance/jsx/tsxAttributeErrors.tsx
new file mode 100644
index 00000000000..477135e1544
--- /dev/null
+++ b/tests/cases/conformance/jsx/tsxAttributeErrors.tsx
@@ -0,0 +1,26 @@
+// @jsx: preserve
+
+declare namespace JSX {
+	interface Element { }
+	interface IntrinsicElements {
+		div: {
+			text?: string;
+			width?: number;
+		}
+
+		span: any;
+	}
+}
+
+// Error, number is not assignable to string
+<div text={42} />;
+
+// Error, string is not assignable to number
+<div width={'foo'} />;
+
+// Error, number is not assignable to string
+var attribs = { text: 100 };
+<div {...attribs} />;
+
+// No errors here
+<span foo='bar' bar={'foo'} />;
diff --git a/tests/cases/conformance/jsx/tsxAttributeInvalidNames.tsx b/tests/cases/conformance/jsx/tsxAttributeInvalidNames.tsx
new file mode 100644
index 00000000000..a3a8d293535
--- /dev/null
+++ b/tests/cases/conformance/jsx/tsxAttributeInvalidNames.tsx
@@ -0,0 +1,12 @@
+//@filename: file.tsx
+//@jsx: preserve
+declare module JSX {
+	interface Element { }
+	interface IntrinsicElements {
+		test1: { "data-foo"?: string };
+	}
+}
+
+// Invalid names
+<test1 32data={32} />;
+<test1 -data={32} />;
\ No newline at end of file
diff --git a/tests/cases/conformance/jsx/tsxAttributeResolution.tsx b/tests/cases/conformance/jsx/tsxAttributeResolution.tsx
new file mode 100644
index 00000000000..a7519d00c94
--- /dev/null
+++ b/tests/cases/conformance/jsx/tsxAttributeResolution.tsx
@@ -0,0 +1,9 @@
+/// @jsx: preserve
+
+declare namespace JSX {
+	interface IntrinsicElements {
+		x: { y: number; z: string; };
+	}
+}
+
+
diff --git a/tests/cases/conformance/jsx/tsxAttributeResolution1.jsx b/tests/cases/conformance/jsx/tsxAttributeResolution1.jsx
new file mode 100644
index 00000000000..fb54f9d7c82
--- /dev/null
+++ b/tests/cases/conformance/jsx/tsxAttributeResolution1.jsx
@@ -0,0 +1,15 @@
+// OK
+<test1 x={0}/>; // OK
+<test1 />; // OK
+<test1 data-x={true}/>; // OK
+<test2 reqd='true'/>; // OK
+<test2 reqd={'true'}/>; // OK
+// Errors
+<test1 x={'0'}/>; // Error, '0' is not number
+<test1 y={0}/>; // Error, no property "y"
+<test1 y="foo"/>; // Error, no property "y"
+<test1 x="32"/>; // Error, "32" is not number
+// TODO attribute 'var' should be parseable
+// <test1 var="10" />; // Error, no 'var' property
+<test2 />; // Error, missing reqd
+<test2 reqd={10}/>; // Error, reqd is not string
diff --git a/tests/cases/conformance/jsx/tsxAttributeResolution1.tsx b/tests/cases/conformance/jsx/tsxAttributeResolution1.tsx
new file mode 100644
index 00000000000..edb203655ef
--- /dev/null
+++ b/tests/cases/conformance/jsx/tsxAttributeResolution1.tsx
@@ -0,0 +1,33 @@
+//@filename: file.tsx
+//@jsx: preserve
+declare module JSX {
+	interface Element { }
+	interface IntrinsicElements {
+		test1: Attribs1;
+		test2: { reqd: string };
+	}
+}
+interface Attribs1 {
+	x?: number;
+	s?: string;
+}
+
+// OK
+<test1 x={0} />; // OK
+<test1 />; // OK
+<test1 data-x={true} />; // OK
+
+<test2 reqd='true' />; // OK
+<test2 reqd={'true'} />; // OK
+
+// Errors
+<test1 x={'0'} />; // Error, '0' is not number
+<test1 y={0} />; // Error, no property "y"
+<test1 y="foo" />; // Error, no property "y"
+<test1 x="32" />; // Error, "32" is not number
+// TODO attribute 'var' should be parseable
+// <test1 var="10" />; // Error, no 'var' property
+
+<test2 />; // Error, missing reqd
+<test2 reqd={10} />; // Error, reqd is not string
+
diff --git a/tests/cases/conformance/jsx/tsxAttributeResolution2.jsx b/tests/cases/conformance/jsx/tsxAttributeResolution2.jsx
new file mode 100644
index 00000000000..7c47046dcde
--- /dev/null
+++ b/tests/cases/conformance/jsx/tsxAttributeResolution2.jsx
@@ -0,0 +1,5 @@
+// OK
+<test1 c1={function (x) { return x.length; }}/>; // OK
+<test1 data-c1={function (x) { return x.leng; }}/>; // OK
+// Errors
+<test1 c1={function (x) { return x.leng; }}/>; // Error, no leng on 'string'
diff --git a/tests/cases/conformance/jsx/tsxAttributeResolution2.tsx b/tests/cases/conformance/jsx/tsxAttributeResolution2.tsx
new file mode 100644
index 00000000000..c9bc2de978a
--- /dev/null
+++ b/tests/cases/conformance/jsx/tsxAttributeResolution2.tsx
@@ -0,0 +1,19 @@
+//@filename: file.tsx
+//@jsx: preserve
+declare module JSX {
+	interface Element { }
+	interface IntrinsicElements {
+		test1: Attribs1;
+	}
+}
+interface Attribs1 {
+	c1?: (x: string) => void;
+}
+
+// OK
+<test1 c1={(x) => x.length} />; // OK
+<test1 data-c1={(x) => x.leng} />; // OK
+
+
+// Errors
+<test1 c1={(x) => x.leng} />; // Error, no leng on 'string'
diff --git a/tests/cases/conformance/jsx/tsxAttributeResolution3.jsx b/tests/cases/conformance/jsx/tsxAttributeResolution3.jsx
new file mode 100644
index 00000000000..46cb5d8ff69
--- /dev/null
+++ b/tests/cases/conformance/jsx/tsxAttributeResolution3.jsx
@@ -0,0 +1,21 @@
+// OK
+var obj1 = { x: 'foo' };
+<test1 {...obj1}/>;
+// Error, x is not string
+var obj2 = { x: 32 };
+<test1 {...obj2}/>;
+// Error, x is missing
+var obj3 = { y: 32 };
+<test1 {...obj3}/>;
+// OK
+var obj4 = { x: 32, y: 32 };
+<test1 {...obj4} x="ok"/>;
+// Error
+var obj5 = { x: 32, y: 32 };
+<test1 x="ok" {...obj5}/>;
+// OK
+var obj6 = { x: 'ok', y: 32, extra: 100 };
+<test1 {...obj6}/>;
+// Error
+var obj7 = { x: 'foo' };
+<test1 x={32} {...obj7}/>;
diff --git a/tests/cases/conformance/jsx/tsxAttributeResolution3.tsx b/tests/cases/conformance/jsx/tsxAttributeResolution3.tsx
new file mode 100644
index 00000000000..dc0c2fed8d6
--- /dev/null
+++ b/tests/cases/conformance/jsx/tsxAttributeResolution3.tsx
@@ -0,0 +1,41 @@
+//@filename: file.tsx
+//@jsx: preserve
+declare module JSX {
+	interface Element { }
+	interface IntrinsicElements {
+		test1: Attribs1;
+	}
+}
+interface Attribs1 {
+	x: string;
+	y?: number;
+	z?: string;
+}
+
+// OK
+var obj1 = { x: 'foo' };
+<test1 {...obj1} />
+
+// Error, x is not string
+var obj2 = { x: 32 };
+<test1 {...obj2} />
+
+// Error, x is missing
+var obj3 = { y: 32 };
+<test1 {...obj3} />
+
+// OK
+var obj4 = { x: 32, y: 32 };
+<test1 {...obj4} x="ok" />
+
+// Error
+var obj5 = { x: 32, y: 32 };
+<test1 x="ok" {...obj5} />
+
+// OK
+var obj6 = { x: 'ok', y: 32, extra: 100 };
+<test1 {...obj6} />
+
+// Error
+var obj7 = { x: 'foo' };
+<test1 x={32} {...obj7} />
diff --git a/tests/cases/conformance/jsx/tsxAttributeResolution4.jsx b/tests/cases/conformance/jsx/tsxAttributeResolution4.jsx
new file mode 100644
index 00000000000..da2e1d12038
--- /dev/null
+++ b/tests/cases/conformance/jsx/tsxAttributeResolution4.jsx
@@ -0,0 +1,4 @@
+// OK
+<test1 {...{ x: function (n) { return 0; } }}/>;
+// Error, no member 'len' on 'string'
+<test1 {...{ x: function (n) { return n.len; } }}/>;
diff --git a/tests/cases/conformance/jsx/tsxAttributeResolution4.tsx b/tests/cases/conformance/jsx/tsxAttributeResolution4.tsx
new file mode 100644
index 00000000000..caaad3559c3
--- /dev/null
+++ b/tests/cases/conformance/jsx/tsxAttributeResolution4.tsx
@@ -0,0 +1,17 @@
+//@filename: file.tsx
+//@jsx: preserve
+declare module JSX {
+	interface Element { }
+	interface IntrinsicElements {
+		test1: Attribs1;
+	}
+}
+interface Attribs1 {
+	x(n: string): void;
+}
+
+// OK
+<test1 {... {x: (n) => 0} } />;
+
+// Error, no member 'len' on 'string'
+<test1 {... {x: (n) => n.len} } />;
diff --git a/tests/cases/conformance/jsx/tsxAttributeResolution5.jsx b/tests/cases/conformance/jsx/tsxAttributeResolution5.jsx
new file mode 100644
index 00000000000..3e4c89d06fb
--- /dev/null
+++ b/tests/cases/conformance/jsx/tsxAttributeResolution5.jsx
@@ -0,0 +1,11 @@
+function make1(obj) {
+    return <test1 {...obj}/>; // OK
+}
+function make2(obj) {
+    return <test1 {...obj}/>; // Error (x is number, not string)
+}
+function make3(obj) {
+    return <test1 {...obj}/>; // Error, missing x
+}
+<test1 {...{}}/>; // Error, missing x
+<test2 {...{}}/>; // OK
diff --git a/tests/cases/conformance/jsx/tsxAttributeResolution5.tsx b/tests/cases/conformance/jsx/tsxAttributeResolution5.tsx
new file mode 100644
index 00000000000..dd16ade10e3
--- /dev/null
+++ b/tests/cases/conformance/jsx/tsxAttributeResolution5.tsx
@@ -0,0 +1,32 @@
+//@filename: file.tsx
+//@jsx: preserve
+declare module JSX {
+	interface Element { }
+	interface IntrinsicElements {
+		test1: Attribs1;
+		test2: Attribs2;
+	}
+}
+interface Attribs1 {
+	x: string;
+}
+
+interface Attribs2 {
+	toString(): string;
+}
+
+function make1<T extends {x: string}> (obj: T) {
+	return <test1 {...obj} />; // OK
+}
+
+function make2<T extends {x: number}> (obj: T) {
+	return <test1 {...obj} />; // Error (x is number, not string)
+}
+
+function make3<T extends {y: string}> (obj: T) {
+	return <test1 {...obj} />; // Error, missing x
+}
+
+
+<test1 {...{}} />; // Error, missing x
+<test2 {...{}} />; // OK
diff --git a/tests/cases/conformance/jsx/tsxAttributeResolution6.tsx b/tests/cases/conformance/jsx/tsxAttributeResolution6.tsx
new file mode 100644
index 00000000000..b083247ba7a
--- /dev/null
+++ b/tests/cases/conformance/jsx/tsxAttributeResolution6.tsx
@@ -0,0 +1,19 @@
+//@filename: file.tsx
+//@jsx: preserve
+declare module JSX {
+	interface Element { }
+	interface IntrinsicElements {
+		test1: { n?: boolean; s?: string};
+		test2: { n: boolean; };
+	}
+}
+
+// Error
+<test1 s />;
+<test1 n='true' />;
+<test2 />;
+
+// OK
+<test1 n />;
+<test1 n={false} />;
+<test2 n />;
diff --git a/tests/cases/conformance/jsx/tsxAttributeResolution7.tsx b/tests/cases/conformance/jsx/tsxAttributeResolution7.tsx
new file mode 100644
index 00000000000..1fc6a873187
--- /dev/null
+++ b/tests/cases/conformance/jsx/tsxAttributeResolution7.tsx
@@ -0,0 +1,16 @@
+//@filename: file.tsx
+//@jsx: preserve
+declare module JSX {
+	interface Element { }
+	interface IntrinsicElements {
+		test1: { "data-foo"?: string };
+	}
+}
+
+// Error
+<test1 data-foo={32} />;
+
+// OK
+<test1 data-foo={'32'} />;
+<test1 data-bar={'32'} />;
+<test1 data-bar={32} />;
diff --git a/tests/cases/conformance/jsx/tsxElementResolution.tsx b/tests/cases/conformance/jsx/tsxElementResolution.tsx
new file mode 100644
index 00000000000..e5c3c191f05
--- /dev/null
+++ b/tests/cases/conformance/jsx/tsxElementResolution.tsx
@@ -0,0 +1,25 @@
+//@jsx: preserve
+
+declare namespace JSX {
+	interface IntrinsicElements {
+		foundFirst: { x: string };
+		'string_named';
+		'var';
+	}
+}
+
+class foundFirst { }
+class Other {}
+
+module Dotted {
+	export class Name { }
+}
+
+// Should find the intrinsic element, not the class element
+var a = <foundFirst  x="hello" />;
+var b = <string_named />;
+// TODO: This should not be a parse error (should
+//        parse a property name here, not identifier)
+// var c = <var />;
+var d = <Other />;
+var e = <Dotted.Name />;
diff --git a/tests/cases/conformance/jsx/tsxElementResolution1.jsx b/tests/cases/conformance/jsx/tsxElementResolution1.jsx
new file mode 100644
index 00000000000..97357dbba8e
--- /dev/null
+++ b/tests/cases/conformance/jsx/tsxElementResolution1.jsx
@@ -0,0 +1,4 @@
+// OK
+<div />;
+// Fail
+<span />;
diff --git a/tests/cases/conformance/jsx/tsxElementResolution1.tsx b/tests/cases/conformance/jsx/tsxElementResolution1.tsx
new file mode 100644
index 00000000000..b9c1b91d05e
--- /dev/null
+++ b/tests/cases/conformance/jsx/tsxElementResolution1.tsx
@@ -0,0 +1,14 @@
+//@filename: file.tsx
+//@jsx: preserve
+declare module JSX {
+	interface Element { }
+	interface IntrinsicElements {
+		div: any
+	}
+}
+
+// OK
+<div />;
+
+// Fail
+<span />;
\ No newline at end of file
diff --git a/tests/cases/conformance/jsx/tsxElementResolution10.tsx b/tests/cases/conformance/jsx/tsxElementResolution10.tsx
new file mode 100644
index 00000000000..526c0529e1b
--- /dev/null
+++ b/tests/cases/conformance/jsx/tsxElementResolution10.tsx
@@ -0,0 +1,21 @@
+//@filename: file.tsx
+//@jsx: preserve
+declare module JSX {
+	interface Element { }
+	interface ElementClass {
+		render: any;
+	}
+	interface IntrinsicElements { }
+}
+
+interface Obj1type {
+	new(n: string): { x: number };
+}
+var Obj1: Obj1type;
+<Obj1 x={10} />; // Error, no render member
+
+interface Obj2type {
+	(n: string): { x: number; render: any; };
+}
+var Obj2: Obj2type;
+<Obj2 x={32} render={100} />; // OK
diff --git a/tests/cases/conformance/jsx/tsxElementResolution11.jsx b/tests/cases/conformance/jsx/tsxElementResolution11.jsx
new file mode 100644
index 00000000000..6349906508c
--- /dev/null
+++ b/tests/cases/conformance/jsx/tsxElementResolution11.jsx
@@ -0,0 +1,6 @@
+var Obj1;
+<Obj1 x={10}/>; // OK
+var Obj2;
+<Obj2 x={10}/>; // Error
+var Obj3;
+<Obj3 x={10}/>; // OK
diff --git a/tests/cases/conformance/jsx/tsxElementResolution11.tsx b/tests/cases/conformance/jsx/tsxElementResolution11.tsx
new file mode 100644
index 00000000000..0fc74335500
--- /dev/null
+++ b/tests/cases/conformance/jsx/tsxElementResolution11.tsx
@@ -0,0 +1,25 @@
+//@filename: file.tsx
+//@jsx: preserve
+declare module JSX {
+	interface Element { }
+	interface ElementAttributesProperty { }
+	interface IntrinsicElements { }
+}
+
+interface Obj1type {
+	new(n: string): any;
+}
+var Obj1: Obj1type;
+<Obj1 x={10} />; // OK
+
+interface Obj2type {
+	new(n: string): { q?: number };
+}
+var Obj2: Obj2type;
+<Obj2 x={10} />; // Error
+
+interface Obj3type {
+	new(n: string): { x: number; };
+}
+var Obj3: Obj3type;
+<Obj3 x={10} />; // OK
diff --git a/tests/cases/conformance/jsx/tsxElementResolution12.jsx b/tests/cases/conformance/jsx/tsxElementResolution12.jsx
new file mode 100644
index 00000000000..ef137fd0e29
--- /dev/null
+++ b/tests/cases/conformance/jsx/tsxElementResolution12.jsx
@@ -0,0 +1,9 @@
+var obj1;
+<obj1 x={10}/>; // OK
+var obj2;
+<obj2 x={10}/>; // OK
+var obj3;
+<obj3 x={10}/>; // Error
+var obj4;
+<obj4 x={10}/>; // OK
+<obj4 x={'10'}/>; // Error
diff --git a/tests/cases/conformance/jsx/tsxElementResolution12.tsx b/tests/cases/conformance/jsx/tsxElementResolution12.tsx
new file mode 100644
index 00000000000..a5d8f2d812b
--- /dev/null
+++ b/tests/cases/conformance/jsx/tsxElementResolution12.tsx
@@ -0,0 +1,32 @@
+//@filename: file.tsx
+//@jsx: preserve
+declare module JSX {
+	interface Element { }
+	interface ElementAttributesProperty { pr: any; }
+	interface IntrinsicElements { }
+}
+
+interface Obj1type {
+	new(n: string): any;
+}
+var Obj1: Obj1type;
+<Obj1 x={10} />; // OK
+
+interface Obj2type {
+	new(n: string): { q?: number; pr: any };
+}
+var obj2: Obj2type;
+<Obj2 x={10} />; // OK
+
+interface Obj3type {
+	new(n: string): { x: number; };
+}
+var Obj3: Obj3type;
+<Obj3 x={10} />; // Error
+
+interface Obj4type {
+	new(n: string): { x: number; pr: { x: number; } };
+}
+var Obj4: Obj4type;
+<Obj4 x={10} />; // OK
+<Obj4 x={'10'} />; // Error
diff --git a/tests/cases/conformance/jsx/tsxElementResolution13.jsx b/tests/cases/conformance/jsx/tsxElementResolution13.jsx
new file mode 100644
index 00000000000..6a55efa612d
--- /dev/null
+++ b/tests/cases/conformance/jsx/tsxElementResolution13.jsx
@@ -0,0 +1,2 @@
+var obj1;
+<obj1 x={10}/>; // Error
diff --git a/tests/cases/conformance/jsx/tsxElementResolution13.tsx b/tests/cases/conformance/jsx/tsxElementResolution13.tsx
new file mode 100644
index 00000000000..32ee20afbfe
--- /dev/null
+++ b/tests/cases/conformance/jsx/tsxElementResolution13.tsx
@@ -0,0 +1,12 @@
+//@filename: file.tsx
+//@jsx: preserve
+declare module JSX {
+	interface Element { }
+	interface ElementAttributesProperty { pr1: any; pr2: any; }
+}
+
+interface Obj1 {
+	new(n: string): any;
+}
+var obj1: Obj1;
+<obj1 x={10} />; // Error
diff --git a/tests/cases/conformance/jsx/tsxElementResolution14.jsx b/tests/cases/conformance/jsx/tsxElementResolution14.jsx
new file mode 100644
index 00000000000..29df7710af1
--- /dev/null
+++ b/tests/cases/conformance/jsx/tsxElementResolution14.jsx
@@ -0,0 +1,2 @@
+var obj1;
+<obj1 x={10}/>; // OK
diff --git a/tests/cases/conformance/jsx/tsxElementResolution14.tsx b/tests/cases/conformance/jsx/tsxElementResolution14.tsx
new file mode 100644
index 00000000000..f76af00bbeb
--- /dev/null
+++ b/tests/cases/conformance/jsx/tsxElementResolution14.tsx
@@ -0,0 +1,11 @@
+//@filename: file.tsx
+//@jsx: preserve
+declare module JSX {
+	interface Element { }
+}
+
+interface Obj1 {
+	new(n: string): {};
+}
+var obj1: Obj1;
+<obj1 x={10} />; // OK
diff --git a/tests/cases/conformance/jsx/tsxElementResolution15.jsx b/tests/cases/conformance/jsx/tsxElementResolution15.jsx
new file mode 100644
index 00000000000..6a55efa612d
--- /dev/null
+++ b/tests/cases/conformance/jsx/tsxElementResolution15.jsx
@@ -0,0 +1,2 @@
+var obj1;
+<obj1 x={10}/>; // Error
diff --git a/tests/cases/conformance/jsx/tsxElementResolution15.tsx b/tests/cases/conformance/jsx/tsxElementResolution15.tsx
new file mode 100644
index 00000000000..61cea63ce76
--- /dev/null
+++ b/tests/cases/conformance/jsx/tsxElementResolution15.tsx
@@ -0,0 +1,13 @@
+//@filename: file.tsx
+//@jsx: preserve
+declare module JSX {
+	interface Element { }
+	interface ElementAttributesProperty { pr1: any; pr2: any; }
+	interface IntrinsicElements { }
+}
+
+interface Obj1type {
+	new(n: string): {};
+}
+var Obj1: Obj1type;
+<Obj1 x={10} />; // Error
diff --git a/tests/cases/conformance/jsx/tsxElementResolution16.jsx b/tests/cases/conformance/jsx/tsxElementResolution16.jsx
new file mode 100644
index 00000000000..e1987489bbb
--- /dev/null
+++ b/tests/cases/conformance/jsx/tsxElementResolution16.jsx
@@ -0,0 +1,2 @@
+var obj1;
+<obj1 x={10}/>; // Error (JSX.Element is missing)
diff --git a/tests/cases/conformance/jsx/tsxElementResolution16.tsx b/tests/cases/conformance/jsx/tsxElementResolution16.tsx
new file mode 100644
index 00000000000..7d71b5f2b69
--- /dev/null
+++ b/tests/cases/conformance/jsx/tsxElementResolution16.tsx
@@ -0,0 +1,10 @@
+//@filename: file.tsx
+//@jsx: preserve
+declare module JSX {
+}
+
+interface Obj1 {
+	new(n: string): {};
+}
+var obj1: Obj1;
+<obj1 x={10} />; // Error (JSX.Element is missing)
diff --git a/tests/cases/conformance/jsx/tsxElementResolution17.tsx b/tests/cases/conformance/jsx/tsxElementResolution17.tsx
new file mode 100644
index 00000000000..97777d76a58
--- /dev/null
+++ b/tests/cases/conformance/jsx/tsxElementResolution17.tsx
@@ -0,0 +1,27 @@
+//@jsx: preserve
+//@module: amd
+
+//@filename: file.tsx
+declare module JSX {
+	interface Element { }
+	interface IntrinsicElements { }
+}
+
+declare module 'elements1' {
+	class MyElement {
+
+	}
+}
+
+declare module 'elements2' {
+	class MyElement {
+
+	}
+}
+
+//@filename: consumer.tsx
+///<reference path="file.tsx" />
+// Should keep s1 and elide s2
+import s1 = require('elements1');
+import s2 = require('elements2');
+<s1.MyElement />;
diff --git a/tests/cases/conformance/jsx/tsxElementResolution18.tsx b/tests/cases/conformance/jsx/tsxElementResolution18.tsx
new file mode 100644
index 00000000000..89081d7629f
--- /dev/null
+++ b/tests/cases/conformance/jsx/tsxElementResolution18.tsx
@@ -0,0 +1,9 @@
+//@jsx: preserve
+//@filename: file1.tsx
+//@noimplicitany: true
+declare module JSX {
+	interface Element { }
+}
+
+// Error under implicit any
+<div n='x' />;
diff --git a/tests/cases/conformance/jsx/tsxElementResolution2.tsx b/tests/cases/conformance/jsx/tsxElementResolution2.tsx
new file mode 100644
index 00000000000..75e4956e728
--- /dev/null
+++ b/tests/cases/conformance/jsx/tsxElementResolution2.tsx
@@ -0,0 +1,14 @@
+//@filename: file.tsx
+//@jsx: preserve
+declare module JSX {
+	interface Element { }
+	interface IntrinsicElements {
+	    [x: string]: any;
+	}
+}
+
+// OK
+<div />;
+
+// OK
+<span />;
\ No newline at end of file
diff --git a/tests/cases/conformance/jsx/tsxElementResolution3.tsx b/tests/cases/conformance/jsx/tsxElementResolution3.tsx
new file mode 100644
index 00000000000..c3f057c4ff5
--- /dev/null
+++ b/tests/cases/conformance/jsx/tsxElementResolution3.tsx
@@ -0,0 +1,14 @@
+//@filename: file.tsx
+//@jsx: preserve
+declare module JSX {
+	interface Element { }
+	interface IntrinsicElements {
+	    [x: string]: { n: string; };
+	}
+}
+
+// OK
+<div n='x' />;
+
+// Error
+<span w='err' />;
\ No newline at end of file
diff --git a/tests/cases/conformance/jsx/tsxElementResolution4.tsx b/tests/cases/conformance/jsx/tsxElementResolution4.tsx
new file mode 100644
index 00000000000..413ae6d5ed9
--- /dev/null
+++ b/tests/cases/conformance/jsx/tsxElementResolution4.tsx
@@ -0,0 +1,18 @@
+//@filename: file.tsx
+//@jsx: preserve
+declare module JSX {
+	interface Element { }
+	interface IntrinsicElements {
+	    div: { n: string; };
+	    span: { m: string; };
+	}
+}
+
+// OK
+<div n='x' />;
+
+// OK
+<span m='ok' />;
+
+// Error
+<span q='' />;
diff --git a/tests/cases/conformance/jsx/tsxElementResolution5.tsx b/tests/cases/conformance/jsx/tsxElementResolution5.tsx
new file mode 100644
index 00000000000..c12c07d3e60
--- /dev/null
+++ b/tests/cases/conformance/jsx/tsxElementResolution5.tsx
@@ -0,0 +1,8 @@
+//@jsx: preserve
+//@filename: file1.tsx
+declare module JSX {
+	interface Element { }
+}
+
+// OK, but implicit any
+<div n='x' />;
diff --git a/tests/cases/conformance/jsx/tsxElementResolution6.tsx b/tests/cases/conformance/jsx/tsxElementResolution6.tsx
new file mode 100644
index 00000000000..74d3324ea0f
--- /dev/null
+++ b/tests/cases/conformance/jsx/tsxElementResolution6.tsx
@@ -0,0 +1,10 @@
+//@filename: file.tsx
+//@jsx: preserve
+declare module JSX {
+	interface Element { }
+	interface IntrinsicElements { }
+}
+
+var div: any;
+// Still an error
+<div n='x' />;
diff --git a/tests/cases/conformance/jsx/tsxElementResolution7.jsx b/tests/cases/conformance/jsx/tsxElementResolution7.jsx
new file mode 100644
index 00000000000..e95505539ab
--- /dev/null
+++ b/tests/cases/conformance/jsx/tsxElementResolution7.jsx
@@ -0,0 +1,14 @@
+var my;
+(function (my) {
+})(my || (my = {}));
+// OK
+<my.div n='x'/>;
+// Error
+<my.other />;
+var q;
+(function (q) {
+    // OK
+    <mine.div n='x'/>;
+    // Error
+    <mine.non />;
+})(q || (q = {}));
diff --git a/tests/cases/conformance/jsx/tsxElementResolution7.tsx b/tests/cases/conformance/jsx/tsxElementResolution7.tsx
new file mode 100644
index 00000000000..c7ab23e76ea
--- /dev/null
+++ b/tests/cases/conformance/jsx/tsxElementResolution7.tsx
@@ -0,0 +1,22 @@
+//@filename: file.tsx
+//@jsx: preserve
+declare module JSX {
+	interface Element { }
+	interface IntrinsicElements { }
+}
+
+module my {
+    export var div: any;
+}
+// OK
+<my.div n='x' />;
+// Error
+<my.other />;
+
+module q {
+    import mine = my;
+    // OK
+    <mine.div n='x' />;
+    // Error
+    <mine.non />;
+}
diff --git a/tests/cases/conformance/jsx/tsxElementResolution8.jsx b/tests/cases/conformance/jsx/tsxElementResolution8.jsx
new file mode 100644
index 00000000000..e0f95dc6d22
--- /dev/null
+++ b/tests/cases/conformance/jsx/tsxElementResolution8.jsx
@@ -0,0 +1,15 @@
+// Error
+var div = 3;
+<div />;
+// OK
+function fact() { return null; }
+<fact />;
+// Error
+function fnum() { return 42; }
+<fnum />;
+var obj1;
+<obj1 />; // OK, prefer construct signatures
+var obj2;
+<obj2 />; // Error
+var obj3;
+<obj3 />; // Error
diff --git a/tests/cases/conformance/jsx/tsxElementResolution8.tsx b/tests/cases/conformance/jsx/tsxElementResolution8.tsx
new file mode 100644
index 00000000000..624302da062
--- /dev/null
+++ b/tests/cases/conformance/jsx/tsxElementResolution8.tsx
@@ -0,0 +1,36 @@
+//@filename: file.tsx
+//@jsx: preserve
+declare module JSX {
+	interface Element { }
+	interface IntrinsicElements { }
+}
+
+// Error
+var Div = 3;
+<Div />;
+
+// OK
+function Fact(): any { return null; }
+<Fact />
+
+// Error
+function Fnum(): number{ return 42; }
+<Fnum />
+
+interface Obj1 {
+	new(): {};
+	(): number;
+}
+var Obj1: Obj1;
+<Obj1 />; // OK, prefer construct signatures
+
+interface Obj2 {
+	(): number;
+}
+var Obj2: Obj2;
+<Obj2 />; // Error
+
+interface Obj3 {
+}
+var Obj3: Obj3;
+<Obj3 />; // Error
diff --git a/tests/cases/conformance/jsx/tsxElementResolution9.jsx b/tests/cases/conformance/jsx/tsxElementResolution9.jsx
new file mode 100644
index 00000000000..2b62d86eac5
--- /dev/null
+++ b/tests/cases/conformance/jsx/tsxElementResolution9.jsx
@@ -0,0 +1,6 @@
+var obj1;
+<obj1 />; // Error, return type is not an object type
+var obj2;
+<obj2 />; // Error, return type is not an object type
+var obj3;
+<obj3 x={42}/>; // OK
diff --git a/tests/cases/conformance/jsx/tsxElementResolution9.tsx b/tests/cases/conformance/jsx/tsxElementResolution9.tsx
new file mode 100644
index 00000000000..7165f8277b3
--- /dev/null
+++ b/tests/cases/conformance/jsx/tsxElementResolution9.tsx
@@ -0,0 +1,27 @@
+//@filename: file.tsx
+//@jsx: preserve
+declare module JSX {
+	interface Element { }
+	interface IntrinsicElements { }
+}
+
+interface Obj1 {
+	new(n: string): { x: number };
+	new(n: number): { y: string };
+}
+var Obj1: Obj1;
+<Obj1 />; // Error, return type is not an object type
+
+interface Obj2 {
+	(n: string): { x: number };
+	(n: number): { y: string };
+}
+var Obj2: Obj2;
+<Obj2 />; // Error, return type is not an object type
+
+interface Obj3 {
+	(n: string): { x: number };
+	(n: number): { x: number; y: string };
+}
+var Obj3: Obj3;
+<Obj3 x={42} />; // OK
diff --git a/tests/cases/conformance/jsx/tsxEmit1.jsx b/tests/cases/conformance/jsx/tsxEmit1.jsx
new file mode 100644
index 00000000000..45ca6e2469f
--- /dev/null
+++ b/tests/cases/conformance/jsx/tsxEmit1.jsx
@@ -0,0 +1,34 @@
+var p;
+/*
+var selfClosed1 = <div />;
+var selfClosed2 = <div x="1" />;
+var selfClosed3 = <div x='1' />;
+var selfClosed4 = <div x="1" y='0' />;
+var selfClosed5 = <div x={0} y='0' />;
+var selfClosed6 = <div x={"1"} y='0' />;
+var selfClosed7 = <div x={p} y='p' />;
+
+var openClosed1 = <div></div>;
+var openClosed2 = <div n='m'>foo</div>;
+var openClosed3 = <div n='m'>{p}</div>;
+var openClosed4 = <div n='m'>{p < p}</div>;
+var openClosed5 = <div n='m'>{p > p}</div>;
+*/
+var SomeClass = (function () {
+    function SomeClass() {
+    }
+    SomeClass.prototype.f = function () {
+        var _this = this;
+        var rewrites1 = <div>{function () { return _this; }}</div>;
+        var rewrites4 = <div a={function () { return _this; }}></div>;
+    };
+    return SomeClass;
+})();
+/*
+var q = () => this;
+var rewrites2 = <div>{[p, ...p, p]}</div>;
+var rewrites3 = <div>{{p}}</div>;
+
+var rewrites5 = <div a={[p, ...p, p]}></div>;
+var rewrites6 = <div a={{p}}></div>;
+*/
diff --git a/tests/cases/conformance/jsx/tsxEmit1.tsx b/tests/cases/conformance/jsx/tsxEmit1.tsx
new file mode 100644
index 00000000000..9f3d9ca3a5e
--- /dev/null
+++ b/tests/cases/conformance/jsx/tsxEmit1.tsx
@@ -0,0 +1,41 @@
+//@filename: file.tsx
+//@jsx: preserve
+declare module JSX {
+	interface Element { }
+	interface IntrinsicElements {
+		[s: string]: any;
+	}
+}
+
+var p;
+var selfClosed1 = <div />;
+var selfClosed2 = <div x="1" />;
+var selfClosed3 = <div x='1' />;
+var selfClosed4 = <div x="1" y='0' />;
+var selfClosed5 = <div x={0} y='0' />;
+var selfClosed6 = <div x={"1"} y='0' />;
+var selfClosed7 = <div x={p} y='p' />;
+
+var openClosed1 = <div></div>;
+var openClosed2 = <div n='m'>foo</div>;
+var openClosed3 = <div n='m'>{p}</div>;
+var openClosed4 = <div n='m'>{p < p}</div>;
+var openClosed5 = <div n='m'>{p > p}</div>;
+
+class SomeClass {
+	f() {
+		var rewrites1 = <div>{() => this}</div>;
+		var rewrites2 = <div>{[p, ...p, p]}</div>;
+		var rewrites3 = <div>{{p}}</div>;
+
+		var rewrites4 = <div a={() => this}></div>;
+		var rewrites5 = <div a={[p, ...p, p]}></div>;
+		var rewrites6 = <div a={{p}}></div>;
+	}
+}
+
+var whitespace1 = <div>      </div>;
+var whitespace2 = <div>  {p}    </div>;
+var whitespace3 = <div>  
+      {p}    
+      </div>;
diff --git a/tests/cases/conformance/jsx/tsxEmit2.tsx b/tests/cases/conformance/jsx/tsxEmit2.tsx
new file mode 100644
index 00000000000..24f51a4583d
--- /dev/null
+++ b/tests/cases/conformance/jsx/tsxEmit2.tsx
@@ -0,0 +1,15 @@
+//@filename: file.tsx
+//@jsx: preserve
+declare module JSX {
+	interface Element { }
+	interface IntrinsicElements {
+		[s: string]: any;
+	}
+}
+
+var p1, p2, p3;
+var spreads1 = <div {...p1}>{p2}</div>;
+var spreads2 = <div {...p1}>{p2}</div>;
+var spreads3 = <div x={p3} {...p1}>{p2}</div>;
+var spreads4 = <div {...p1} x={p3} >{p2}</div>;
+var spreads5 = <div x={p2} {...p1} y={p3}>{p2}</div>;
diff --git a/tests/cases/conformance/jsx/tsxEmit3.jsx b/tests/cases/conformance/jsx/tsxEmit3.jsx
new file mode 100644
index 00000000000..7c979051d00
--- /dev/null
+++ b/tests/cases/conformance/jsx/tsxEmit3.jsx
@@ -0,0 +1,41 @@
+var M;
+(function (M) {
+    var Foo = (function () {
+        function Foo() {
+        }
+        return Foo;
+    })();
+    M.Foo = Foo;
+    var S;
+    (function (S) {
+        var Bar = (function () {
+            function Bar() {
+            }
+            return Bar;
+        })();
+        S.Bar = Bar;
+    })(S = M.S || (M.S = {}));
+})(M || (M = {}));
+var M;
+(function (M) {
+    // Emit M.Foo
+    M.Foo, <M.Foo />;
+    var S;
+    (function (S) {
+        // Emit M.Foo
+        M.Foo, <M.Foo />;
+        // Emit S.Bar
+        S.Bar, <S.Bar />;
+    })(S = M.S || (M.S = {}));
+})(M || (M = {}));
+var M;
+(function (M) {
+    // Emit M.S.Bar
+    M.S.Bar, <M.S.Bar />;
+})(M || (M = {}));
+var M;
+(function (M_1) {
+    var M = 100;
+    // Emit M_1.Foo
+    M_1.Foo, <M_1.Foo />;
+})(M || (M = {}));
diff --git a/tests/cases/conformance/jsx/tsxEmit3.tsx b/tests/cases/conformance/jsx/tsxEmit3.tsx
new file mode 100644
index 00000000000..b3c3350dd11
--- /dev/null
+++ b/tests/cases/conformance/jsx/tsxEmit3.tsx
@@ -0,0 +1,41 @@
+//@filename: file.tsx
+//@jsx: preserve
+declare module JSX {
+	interface Element { }
+	interface IntrinsicElements { }
+}
+
+module M {
+	export class Foo { constructor() { } }
+	export module S {
+		export class Bar { }
+
+		// Emit Foo
+		// Foo, <Foo />;
+	}
+}
+
+module M {
+	// Emit M.Foo
+	Foo, <Foo />;
+
+	export module S {
+		// Emit M.Foo
+		Foo, <Foo />;
+
+		// Emit S.Bar
+		Bar, <Bar />;
+	}
+
+}
+
+module M {
+	// Emit M.S.Bar
+	S.Bar, <S.Bar />;
+}
+
+module M {
+	var M = 100;
+	// Emit M_1.Foo
+	Foo, <Foo />;
+}
diff --git a/tests/cases/conformance/jsx/tsxGenericArrowFunctionParsing.tsx b/tests/cases/conformance/jsx/tsxGenericArrowFunctionParsing.tsx
new file mode 100644
index 00000000000..b3d3d34020a
--- /dev/null
+++ b/tests/cases/conformance/jsx/tsxGenericArrowFunctionParsing.tsx
@@ -0,0 +1,28 @@
+//@filename: file.tsx
+//@jsx: preserve
+declare module JSX {
+	interface Element { isElement; }
+}
+
+var T, T1, T2;
+
+// This is an element
+var x1 = <T>() => {}</T>;
+x1.isElement;
+
+// This is a generic function
+var x2 = <T extends {}>() => {};
+x2();
+
+// This is a generic function
+var x3 = <T, T1>() => {};
+x3();
+
+// This is an element
+var x4 = <T extends={true}>() => {}</T>;
+x4.isElement;
+
+// This is an element
+var x5 = <T extends>() => {}</T>;
+x5.isElement;
+
diff --git a/tests/cases/conformance/jsx/tsxNoJsx.tsx b/tests/cases/conformance/jsx/tsxNoJsx.tsx
new file mode 100644
index 00000000000..03b827b7e61
--- /dev/null
+++ b/tests/cases/conformance/jsx/tsxNoJsx.tsx
@@ -0,0 +1,3 @@
+//@jsx: preserve
+
+<nope />;
diff --git a/tests/cases/conformance/jsx/tsxParseTests1.tsx b/tests/cases/conformance/jsx/tsxParseTests1.tsx
new file mode 100644
index 00000000000..7675aee7962
--- /dev/null
+++ b/tests/cases/conformance/jsx/tsxParseTests1.tsx
@@ -0,0 +1,8 @@
+//@filename: file.tsx
+//@jsx: preserve
+declare module JSX {
+	interface Element { }
+	interface IntrinsicElements { div; span; }
+}
+
+var x = <div><div><span><div></div></span></div></div>;
diff --git a/tests/cases/conformance/jsx/tsxReactEmit1.tsx b/tests/cases/conformance/jsx/tsxReactEmit1.tsx
new file mode 100644
index 00000000000..8ca8ef1ff40
--- /dev/null
+++ b/tests/cases/conformance/jsx/tsxReactEmit1.tsx
@@ -0,0 +1,41 @@
+//@filename: file.tsx
+//@jsx: react
+declare module JSX {
+	interface Element { }
+	interface IntrinsicElements {
+		[s: string]: any;
+	}
+}
+
+var p;
+var selfClosed1 = <div />;
+var selfClosed2 = <div x="1" />;
+var selfClosed3 = <div x='1' />;
+var selfClosed4 = <div x="1" y='0' />;
+var selfClosed5 = <div x={0} y='0' />;
+var selfClosed6 = <div x={"1"} y='0' />;
+var selfClosed7 = <div x={p} y='p' />;
+
+var openClosed1 = <div></div>;
+var openClosed2 = <div n='m'>foo</div>;
+var openClosed3 = <div n='m'>{p}</div>;
+var openClosed4 = <div n='m'>{p < p}</div>;
+var openClosed5 = <div n='m'>{p > p}</div>;
+
+class SomeClass {
+	f() {
+		var rewrites1 = <div>{() => this}</div>;
+		var rewrites2 = <div>{[p, ...p, p]}</div>;
+		var rewrites3 = <div>{{p}}</div>;
+
+		var rewrites4 = <div a={() => this}></div>;
+		var rewrites5 = <div a={[p, ...p, p]}></div>;
+		var rewrites6 = <div a={{p}}></div>;
+	}
+}
+
+var whitespace1 = <div>      </div>;
+var whitespace2 = <div>  {p}    </div>;
+var whitespace3 = <div>  
+      {p}    
+      </div>;
diff --git a/tests/cases/conformance/jsx/tsxReactEmit2.tsx b/tests/cases/conformance/jsx/tsxReactEmit2.tsx
new file mode 100644
index 00000000000..39a78a7da87
--- /dev/null
+++ b/tests/cases/conformance/jsx/tsxReactEmit2.tsx
@@ -0,0 +1,15 @@
+//@filename: file.tsx
+//@jsx: react
+declare module JSX {
+	interface Element { }
+	interface IntrinsicElements {
+		[s: string]: any;
+	}
+}
+
+var p1, p2, p3;
+var spreads1 = <div {...p1}>{p2}</div>;
+var spreads2 = <div {...p1}>{p2}</div>;
+var spreads3 = <div x={p3} {...p1}>{p2}</div>;
+var spreads4 = <div {...p1} x={p3} >{p2}</div>;
+var spreads5 = <div x={p2} {...p1} y={p3}>{p2}</div>;
diff --git a/tests/cases/conformance/jsx/tsxReactEmit3.tsx b/tests/cases/conformance/jsx/tsxReactEmit3.tsx
new file mode 100644
index 00000000000..eb63be44f3b
--- /dev/null
+++ b/tests/cases/conformance/jsx/tsxReactEmit3.tsx
@@ -0,0 +1,8 @@
+//@jsx: react
+//@filename: test.tsx
+
+declare module JSX { interface Element { } }
+
+declare var Foo, Bar, baz;
+
+<Foo> <Bar> q </Bar> <Bar/>   s <Bar/><Bar/></Foo>;
\ No newline at end of file
diff --git a/tests/cases/conformance/jsx/tsxReactEmit4.tsx b/tests/cases/conformance/jsx/tsxReactEmit4.tsx
new file mode 100644
index 00000000000..0987b89c978
--- /dev/null
+++ b/tests/cases/conformance/jsx/tsxReactEmit4.tsx
@@ -0,0 +1,15 @@
+//@filename: file.tsx
+//@jsx: react
+declare module JSX {
+	interface Element { }
+	interface IntrinsicElements {
+		[s: string]: any;
+	}
+}
+
+var p;
+var openClosed1 = <div>
+
+   {blah}
+
+</div>;
diff --git a/tests/cases/conformance/jsx/tsxReactEmitWhitespace.tsx b/tests/cases/conformance/jsx/tsxReactEmitWhitespace.tsx
new file mode 100644
index 00000000000..38c966fa700
--- /dev/null
+++ b/tests/cases/conformance/jsx/tsxReactEmitWhitespace.tsx
@@ -0,0 +1,52 @@
+//@filename: file.tsx
+//@jsx: react
+declare module JSX {
+	interface Element { }
+	interface IntrinsicElements {
+		[s: string]: any;
+	}
+}
+
+// THIS FILE HAS TEST-SIGNIFICANT LEADING/TRAILING
+// WHITESPACE, DO NOT RUN 'FORMAT DOCUMENT' ON IT
+
+var p = 0;
+// Emit "   "
+<div>   </div>;
+// Emit "  ", p, "   "
+<div>  {p}    </div>;
+// Emit only p
+<div>  
+      {p}    
+      </div>;
+
+// Emit only p
+<div>
+  {p}
+    </div>;
+
+// Emit "  3"
+<div>  3  
+  </div>;
+
+// Emit "  3  "
+<div>  3  </div>;
+
+// Emit "3"
+<div>   
+   3    
+   </div>;
+
+// Emit no args
+<div>   
+   </div>;
+
+// Emit "foo" + ' ' + "bar"
+<div>  
+
+   foo
+
+ bar   
+
+  </div>;
+
diff --git a/tests/cases/conformance/jsx/tsxTypeErrors.tsx b/tests/cases/conformance/jsx/tsxTypeErrors.tsx
new file mode 100644
index 00000000000..f8288b68ce3
--- /dev/null
+++ b/tests/cases/conformance/jsx/tsxTypeErrors.tsx
@@ -0,0 +1,34 @@
+//@jsx: preserve
+
+// A built-in element (OK)
+var a1 = <div id="foo" />;
+
+// A built-in element with a mistyped property (error)
+var a2 = <img srce="foo.jpg" />
+
+// A built-in element with a badly-typed attribute value (error)
+var thing = { oops: 100 };
+var a3 = <div id={thing} />
+
+// Mistyped html name (error)
+var e1 = <imag src="bar.jpg" />
+
+// A custom type
+class MyClass {
+  props: {
+    pt?: { x: number; y: number; };
+	name?: string;
+	reqd: boolean;
+  }
+}
+
+// Let's use it
+// TODO: Error on missing 'reqd'
+var b1 = <MyClass reqd={true} />; 
+
+// Mistyped attribute member
+// sample.tsx(23,22): error TS2322: Type '{ x: number; y: string; }' is not assignable to type '{ x: number; y: number; }'.
+//  Types of property 'y' are incompatible.
+//    Type 'string' is not assignable to type 'number'.
+var b2 = <MyClass pt={{x: 4, y: 'oops'}} />;
+