Skip to content

Identify JSX closing tags as identifiers so they emit correctly #5974

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RyanCavanaugh merged 2 commits into from
Dec 7, 2015
Merged

Identify JSX closing tags as identifiers so they emit correctly #5974

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
04f8c32
Identify JSX closing tags as identifiers so they emit correctly
RyanCavanaugh Dec 7, 2015
05c1703
Actually include the fix....
RyanCavanaugh Dec 7, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/compiler/emitter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
20 changes: 18 additions & 2 deletions tests/baselines/reference/tsxPreserveEmit1.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 18 additions & 2 deletions tests/baselines/reference/tsxPreserveEmit1.symbols
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' {
Expand Down
21 changes: 19 additions & 2 deletions tests/baselines/reference/tsxPreserveEmit1.types
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' {
Expand Down
10 changes: 9 additions & 1 deletion tests/cases/conformance/jsx/tsxPreserveEmit1.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>;
}