Merge pull request microsoft#3955 from RyanCavanaugh/fix3928

RyanCavanaugh · RyanCavanaugh · commit 8fcca92e4ee4 · 2015-07-22T10:27:55.000-07:00
Correctly identify identifiers inside JSX exprs as expression identifiers
diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
@@ -1425,6 +1425,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                     case SyntaxKind.IfStatement:
                     case SyntaxKind.JsxSelfClosingElement:
                     case SyntaxKind.JsxOpeningElement:
+                    case SyntaxKind.JsxExpression:
                     case SyntaxKind.NewExpression:
                     case SyntaxKind.ParenthesizedExpression:
                     case SyntaxKind.PostfixUnaryExpression:
diff --git a/tests/baselines/reference/jsxImportInAttribute.js b/tests/baselines/reference/jsxImportInAttribute.js
@@ -0,0 +1,21 @@
+//// [tests/cases/compiler/jsxImportInAttribute.tsx] ////
+
+//// [component.d.ts]
+
+declare module "Test" {
+	export default class Text { }
+}
+
+//// [consumer.tsx]
+/// <reference path="component.d.ts" />
+import Test from 'Test';
+
+let x = Test; // emit test_1.default
+<anything attr={Test} />; // ?
+
+
+//// [consumer.jsx]
+/// <reference path="component.d.ts" />
+var Test_1 = require('Test');
+var x = Test_1["default"]; // emit test_1.default
+<anything attr={Test_1["default"]}/>; // ?
diff --git a/tests/baselines/reference/jsxImportInAttribute.symbols b/tests/baselines/reference/jsxImportInAttribute.symbols
@@ -0,0 +1,19 @@
+=== tests/cases/compiler/consumer.tsx ===
+/// <reference path="component.d.ts" />
+import Test from 'Test';
+>Test : Symbol(Test, Decl(consumer.tsx, 1, 6))
+
+let x = Test; // emit test_1.default
+>x : Symbol(x, Decl(consumer.tsx, 3, 3))
+>Test : Symbol(Test, Decl(consumer.tsx, 1, 6))
+
+<anything attr={Test} />; // ?
+>attr : Symbol(unknown)
+
+=== tests/cases/compiler/component.d.ts ===
+
+declare module "Test" {
+	export default class Text { }
+>Text : Symbol(Text, Decl(component.d.ts, 1, 23))
+}
+
diff --git a/tests/baselines/reference/jsxImportInAttribute.types b/tests/baselines/reference/jsxImportInAttribute.types
@@ -0,0 +1,22 @@
+=== tests/cases/compiler/consumer.tsx ===
+/// <reference path="component.d.ts" />
+import Test from 'Test';
+>Test : typeof Test
+
+let x = Test; // emit test_1.default
+>x : typeof Test
+>Test : typeof Test
+
+<anything attr={Test} />; // ?
+><anything attr={Test} /> : any
+>anything : any
+>attr : any
+>Test : any
+
+=== tests/cases/compiler/component.d.ts ===
+
+declare module "Test" {
+	export default class Text { }
+>Text : Text
+}
+
diff --git a/tests/cases/compiler/jsxImportInAttribute.tsx b/tests/cases/compiler/jsxImportInAttribute.tsx
@@ -0,0 +1,14 @@
+//@jsx: preserve
+//@module: commonjs
+
+//@filename: component.d.ts
+declare module "Test" {
+	export default class Text { }
+}
+
+//@filename: consumer.tsx
+/// <reference path="component.d.ts" />
+import Test from 'Test';
+
+let x = Test; // emit test_1.default
+<anything attr={Test} />; // ?
