microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-15 12:51:30 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Merge pull request #5974 from RyanCavanaugh/fix5955

Browse Source 
Identify JSX closing tags as identifiers so they emit correctly
This commit is contained in:
Ryan Cavanaugh
2015-12-07 12:40:39 -08:00
parent 31f56fdbfd 05c17032a9
commit 7c1ef22cff
5 changed files with 65 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/compiler/emitter.ts
View File

@@ -1453,6 +1453,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
case SyntaxKind.ForInStatement:
case SyntaxKind.ForOfStatement:
case SyntaxKind.IfStatement:
case SyntaxKind.JsxClosingElement:
case SyntaxKind.JsxSelfClosingElement:
case SyntaxKind.JsxOpeningElement:
case SyntaxKind.JsxSpreadAttribute:

20
tests/baselines/reference/tsxPreserveEmit1.js
View File

@@ -22,12 +22,28 @@ import ReactRouter = require('react-router');
import Route = ReactRouter.Route;
var routes = <Route />;
var routes1 = <Route />;
module M {
export var X: any;
}
module M {
// Should emit 'M.X' in both opening and closing tags
var y = <X></X>;
}
//// [test.jsx]
define(["require", "exports", 'react-router'], function (require, exports, ReactRouter) {
"use strict";
var Route = ReactRouter.Route;
var routes = <Route />;
var routes1 = <Route />;
var M;
(function (M) {
})(M || (M = {}));
var M;
(function (M) {
// Should emit 'M.X' in both opening and closing tags
var y = <M.X></M.X>;
})(M || (M = {}));
});

20
tests/baselines/reference/tsxPreserveEmit1.symbols
View File

@@ -11,10 +11,26 @@ import Route = ReactRouter.Route;
>ReactRouter : Symbol(ReactRouter, Decl(react.d.ts, 4, 1))
>Route : Symbol(ReactRouter.Route, Decl(react.d.ts, 7, 4))
var routes = <Route />;
>routes : Symbol(routes, Decl(test.tsx, 6, 3))
var routes1 = <Route />;
>routes1 : Symbol(routes1, Decl(test.tsx, 6, 3))
>Route : Symbol(Route, Decl(test.tsx, 2, 45))
module M {
>M : Symbol(M, Decl(test.tsx, 6, 24), Decl(test.tsx, 10, 1))
export var X: any;
>X : Symbol(X, Decl(test.tsx, 9, 11))
}
module M {
>M : Symbol(M, Decl(test.tsx, 6, 24), Decl(test.tsx, 10, 1))
// Should emit 'M.X' in both opening and closing tags
var y = <X></X>;
>y : Symbol(y, Decl(test.tsx, 13, 4))
>X : Symbol(X, Decl(test.tsx, 9, 11))
>X : Symbol(X, Decl(test.tsx, 9, 11))
}
=== tests/cases/conformance/jsx/react.d.ts ===
declare module 'react' {

21
tests/baselines/reference/tsxPreserveEmit1.types
View File

@@ -11,11 +11,28 @@ import Route = ReactRouter.Route;
>ReactRouter : typeof ReactRouter
>Route : any
var routes = <Route />;
>routes : any
var routes1 = <Route />;
>routes1 : any
><Route /> : any
>Route : any
module M {
>M : typeof M
export var X: any;
>X : any
}
module M {
>M : typeof M
// Should emit 'M.X' in both opening and closing tags
var y = <X></X>;
>y : any
><X></X> : any
>X : any
>X : any
}
=== tests/cases/conformance/jsx/react.d.ts ===
declare module 'react' {

10
tests/cases/conformance/jsx/tsxPreserveEmit1.tsx
View File

@@ -23,4 +23,12 @@ import ReactRouter = require('react-router');
import Route = ReactRouter.Route;
var routes = <Route />;
var routes1 = <Route />;
module M {
export var X: any;
}
module M {
// Should emit 'M.X' in both opening and closing tags
var y = <X></X>;
}